summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/apacite
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-09-06 00:08:55 +0000
committerKarl Berry <karl@freefriends.org>2007-09-06 00:08:55 +0000
commita8abd64279331cac2c141488b03a710e755e3fad (patch)
tree52b10a31167e0077005f3039f2e8007a8222078a /Master/texmf-dist/tex/latex/apacite
parentead5e3fc51a4bb838c6501f0b5629ee4bdb05f1e (diff)
apacite update (5sep07)
git-svn-id: svn://tug.org/texlive/trunk@4889 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/apacite')
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacdoc.sty594
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacite.sty1809
-rw-r--r--Master/texmf-dist/tex/latex/apacite/dutch.apc354
-rw-r--r--Master/texmf-dist/tex/latex/apacite/english.apc223
-rw-r--r--Master/texmf-dist/tex/latex/apacite/finnish.apc132
-rw-r--r--Master/texmf-dist/tex/latex/apacite/german.apc259
-rw-r--r--Master/texmf-dist/tex/latex/apacite/greek.apc215
-rw-r--r--Master/texmf-dist/tex/latex/apacite/ngerman.apc89
-rw-r--r--Master/texmf-dist/tex/latex/apacite/norsk.apc163
-rw-r--r--Master/texmf-dist/tex/latex/apacite/spanish.apc110
-rw-r--r--Master/texmf-dist/tex/latex/apacite/swedish.apc208
11 files changed, 2879 insertions, 1277 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
new file mode 100644
index 00000000000..95b16aedbbc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
@@ -0,0 +1,594 @@
+%%
+%% This is file `apacdoc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `docpkg')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{apacdoc}
+ [2007/09/03 v4.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.
+\newcommand{\bibliteral}[1]{\string\bibliteral\space{#1}}
+\DeclareRobustCommand{\bibinitial}[1]{\string#1}
+
+\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{}%
+ \def\oldBEDS{}%
+ \DeclareRobustCommand{\bibeditortype}[1]{%
+ \global\let\oldBED\BED
+ \global\let\oldBEDS\BEDS
+ \global\def\BED{##1\global\let\BED\oldBED \global\let\BEDS\oldBEDS}%
+ \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}%
+}
+
+\global\def\BAbstractRetrieved#1{Abstract retrieved {#1}, from\ }%
+\DeclareRobustCommand{\BmakeAbstractRetrieved}{%
+ \global\def\oldBRetrieved{}%
+ \global\let\oldBRetrieved\BRetrieved
+ \global\def\BRetrieved##1{%
+ \BAbstractRetrieved{##1}%
+ \global\let\BRetrieved\oldBRetrieved%
+ }%
+}
+
+\DeclareRobustCommand{\noedition}{%
+ \global\def\oldBEd{}%
+ \global\let\oldBEd\BEd
+ \global\def\BEd{%
+ \unskip
+ \global\let\BEd\oldBEd
+ }%
+}
+
+\def\swallownext#1{\relax}
+\def\swallowdot{%
+ \@ifnextchar.%
+ {\swallownext}%
+ {\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
+ \global\let\oldbibskipbracenodot\bibskipbracenodot
+ \global\def\bibskipbracenodot{\aftergroup\swallowdot}%
+ \global\let\oldbibliteral\bibliteral
+ \renewcommand{\bibliteral}[1]{##1}%
+ \global\let\oldbibinitial\bibinitial
+ \renewcommand{\bibinitial}[1]{##1}%
+}
+
+\def\APACbibstyle{%
+ \if@APAC@index
+ apacitex% with index option
+ \else
+ 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}}%
+ }%
+}
+
+\def\APACdocindex{%
+ \ifhave@multicol
+ \renewenvironment{theindex}
+ {\begin{multicols}\c@IndexColumns[\index@prologue][\IndexMin]%
+ \IndexParms \let\item\@idxitem \ignorespaces}%
+ {\end{multicols}}
+ \else
+ \typeout{Can't find multicol.sty -- will use normal index layout if
+ necessary.}
+ \def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi
+ \columnseprule \z@ \columnsep 35\p@
+ \twocolumn[\index@prologue]%
+ \IndexParms \let\item\@idxitem \ignorespaces}
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \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}%
+ }%
+ \shortciteauthor{#1}%
+ \def\bibsong##1##2##3##4{}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% COMMANDS TO CITE DSM.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareRobustCommand{\bibDSM}[4]{#1}
+\def\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};
+ \APACcitebtitle{\DSMshorttitle{#1}};
+ \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};
+ \APACcitebtitle{\DSMshorttitle{#1}};
+ \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{\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
+%%
+
+\endinput
+%%
+%% End of file `apacdoc.sty'.
diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty
index 8a0cb810d61..3944dfd5454 100644
--- a/Master/texmf-dist/tex/latex/apacite/apacite.sty
+++ b/Master/texmf-dist/tex/latex/apacite/apacite.sty
@@ -1,128 +1,100 @@
-% \iffalse meta-comment
-%
-% This is file `apacite.sty'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
+%%
+%% This is file `apacite.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{apacite}
+ [2007/09/03 v4.00 APA citation]
+%%
%% apacite.sty : citation and reference list according to APA manual
-%% Written by Erik Meijer <e.meijer@eco.rug.nl>
+%% Written by Erik Meijer
%%
%% Contains code adapted from
%% index.sty [1995/09/28 v4.1beta Improved index support (dmj)],
%% hyperref.dtx [6.71, 2000/10/04],
%% babel.def [2001/03/01, v3.7h],
%% backref.dtx [1.20, 2002/06/09],
-%% and code (used with permission) provided by others:
-%% Ross Moore, Stefan Bj\"ork.
-
-\NeedsTeXFormat{LaTeX2e}[1998/06/01] % Should this be a later one?
-\ProvidesPackage{apacite}[2005/06/08 APA citation]
-
-
+%% ltbibl.dtx [2004/02/15 v1.1q LaTeX Kernel (Bibliography)],
+%% bibtopic.dtx [2002/08/22 v1.0k],
+%% multibib.dtx [2004/01/28 v1.3 Multiple bibliographies for one document.],
+%% multibbl.dtx [2004/07/27 v1.1],
+%% amsrefs.dtx [2004/06/30 v2.0]
+%% ltidxglo.dtx [1996/01/20 v1.1e LaTeX Kernel (Index and Glossary)]
+%% doc.dtx [2004/02/09 v2.1b Standard LaTeX documentation package (FMi)]
+%% and code (used with permission) provided by:
+%% Stefan Bj\"ork.
+%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Default. The ``old'' version
%%% \def\@year@\BCAY#1#2#3{#3}
%%% cannot exist jointly with this, so has to be moved to an option.
\def\@year@\citeauthoryear#1#2#3{#3}
-\DeclareOption{BCAY}{% kept for compatibility with previous versions
+\DeclareOption{BCAY}{% kept for compatibility with old versions
\def\@year@\BCAY#1#2#3{#3}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% Accent fix options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\DeclareOption{accentfix}{%
- %
- % A cedilla accent (\c{c}) in an author name used to lead
- % to errors, only due to the checking whether subsequent authors
- % in the same citation are equivalent. The same problem is
- % anticipated with the \b{...} accent and the \d{...} accent
- % and the \copyright symbol (will the latter turn up in an
- % author name?), due to the same use of \crcr, cf. The TeXbook, p. 356.
- %
- % This fix therefore redefines these to sensible alternatives,
- % only for comparison of authors, not for any real formatting.
- % Therefore, the user should not notice this, apart from the
- % lack of errors, of course. Therefore, it is also a default
- % option. However, because I haven't tested this thoroughly, I give
- % the user the option to turn it off (noaccentfix). The user
- % is then responsible for fixing any error messages generated
- % by such characters.
- %
- \def\b@APAC#1{#1\_}% bar-under accent
- \def\c@APAC#1{\accent'30 #1}% cedilla accent
- \def\d@APAC#1{#1.}% dot-under accent
- \def\copyright@APAC#1{copyright}% copyright symbol
- \def\@pre@accentfix{%
- %
- % store original definitions
- \let\old@b@APAC\b
- \let\old@c@APAC\c
- \let\old@d@APAC\d
- \let\old@copyright@APAC\copyright
- %
- % redefine them
- \let\b\b@APAC
- \let\c\c@APAC
- \let\d\d@APAC
- \let\copyright\copyright@APAC
- }%
- \def\@post@accentfix{%
- %
- % restore original definitions
- \let\b\old@b@APAC
- \let\c\old@c@APAC
- \let\d\old@d@APAC
- \let\copyright\old@copyright@APAC
- }%
-}
-
-\DeclareOption{noaccentfix}{%
- %
- % See accentfix above for description.
- %
- \let\@pre@accentfix\relax%
- \let\@post@accentfix\relax%
-}
-%%% End Accent fix options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
%%%%%% No Author Index option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% The \if is necessary because packages can not be required here, so
-% we must handle the consequences of the index and noindex options
-% later.
-%
\newif\if@APAC@index
\DeclareOption{noindex}{\@APAC@indexfalse}%
-%
%%%%%% End No Author Index option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%% Author Index option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
\DeclareOption{index}{\@APAC@indextrue}%
-%
%%%%%% End Author Index option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%% Include Corporate Authors in index? %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\if@APAC@include@corporate
+\DeclareOption{includecorporate}{\@APAC@include@corporatetrue}%
+\DeclareOption{suppresscorporate}{\@APAC@include@corporatefalse}%
+%%%%%% End Corporate Author options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%% Use index package or standard LaTeX index? %%%%%%%%%%%%%%%%%%%%%
+\newif\if@APAC@index@package
+\DeclareOption{indexpackage}{\@APAC@index@packagetrue}%
+\DeclareOption{noindexpackage}{\@APAC@index@packagefalse}%
+%%%%%% End index package options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%% Modifications of Author Index %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% Standard index: from the index package
@@ -134,6 +106,10 @@
%% i.e., without table of contents entry.
%%
\ExecuteOptions{index}%
+ %%
+ %% This option requires the index package
+ \ExecuteOptions{indexpackage}%
+ %%
\AtEndOfPackage{%
\@ifclassloaded{article}{%
\renewenvironment{theindex}{%
@@ -198,13 +174,16 @@
}%
}%
}%
-%
\DeclareOption{tocindex}{%
%%
%% Index style as with the stdindex option, but with an
%% added table of contents entry.
%%
\ExecuteOptions{index}%
+ %%
+ %% This option requires the index package
+ \ExecuteOptions{indexpackage}%
+ %%
\AtEndOfPackage{%
\@ifclassloaded{article}{%
\renewenvironment{theindex}{%
@@ -277,12 +256,15 @@
}%
}%
}
-%
\DeclareOption{emindex}{%
%%
%% My (EM) own favorite index style. Maybe you like it too.
%%
\ExecuteOptions{index}%
+ %%
+ %% This option requires the index package
+ \ExecuteOptions{indexpackage}%
+ %%
\AtEndOfPackage{%
%%
%% Redefine theindex such that automatically a chapter or section
@@ -312,11 +294,54 @@
}%
}%
}%
+\DeclareOption{ltxemindex}{%
+ %%
+ %% Variation on emindex, without the `index' package
+ %%
+ \ExecuteOptions{index}%
+ %%
+ %% This option drops the index package
+ \ExecuteOptions{noindexpackage}%
+ %%
+ \AtEndOfPackage{%
+ %%
+ %% Redefine theindex such that automatically a chapter or section
+ %% title is generated, with a corresponding table of contents
+ %% entry. theindex is now in multicol environment.
+ %%
+ \RequirePackage{multicol}
+ \renewenvironment{theindex}{%
+ % The index naming scheme of the `index' package is also absent,
+ % therefore try to guess an index name.
+ \@ifundefined{currentindexname}{%
+ \@ifundefined{indexname}{%
+ \edef\@indexname{Index}%
+ }{\edef\@indexname{\indexname}}%
+ }{\edef\@indexname{\currentindexname}}%
+ \@ifundefined{chapter}%
+ {\section*{\@indexname}%
+ \addcontentsline{toc}{section}{\@indexname}%
+ }%
+ {\chapter*{\@indexname}%
+ \addcontentsline{toc}{chapter}{\@indexname}%
+ }%
+ \@mkboth{{\@indexname}}{{\@indexname}}% do we need this?
+ \def\pfill{\relax{}}%
+ \parindent\z@
+ \parskip\z@ \@plus .3\p@\relax
+ \let\item\@idxitem
+ \setlength{\columnsep}{2em}
+ \small
+ \begin{multicols}{2}
+ \raggedright
+ }%
+ {\end{multicols}\normalsize
+ }%
+ }%
+}
%%%%%% End Modifications of Author Index %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%% Some options for the bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
\newif\if@numberedbib
\DeclareOption{numberedbib}{%
%
@@ -394,120 +419,158 @@
\let\@bibnewpage\relax
}
-
%%%%%% End options for the bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%% Hyperref compatibility option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% (This does not work completely satisfactory, so
-% is only a non-default option.)
-%
-\newif\if@hyper@APA@comp
+%%%%%% Obsolete hyperref compatibility options %%%%%%%%%%%%%%%%%%%%%%%%
\DeclareOption{hyper}{%
- \@hyper@APA@comptrue % hyperref compatibility option is on
+ \PackageWarningNoLine{apacite}{Obsolete option `hyper' ignored}%
}
-%%%%%% End Hyperref compatibility option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%% No Hyperref compatibility option %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% If the hyperref compatibility code is not desired.
-%
\DeclareOption{nohyper}{%
- \@hyper@APA@compfalse % hyperref compatibility option is off
+ \PackageWarningNoLine{apacite}{Obsolete option `nohyper' ignored}%
}
-%%%%%% End No Hyperref compatibility option %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%% End obsolete hyperref compatibility options %%%%%%%%%%%%%%%%%%%%
+%%%%%% Obsolete accentfix options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\DeclareOption{accentfix}{%
+ \PackageWarningNoLine{apacite}{Obsolete option `accentfix' ignored}%
+}
+\DeclareOption{noaccentfix}{%
+ \PackageWarningNoLine{apacite}{Obsolete option `noaccentfix' ignored}%
+}
+%%%%%% End obsolete accentfix options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%% Execute default options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-\ExecuteOptions{accentfix,noindex,nohyper,unnumberedbib,tocbib,%
- nobibnewpage}
+\ExecuteOptions{noindex,indexpackage,unnumberedbib,tocbib,%
+ nobibnewpage,suppresscorporate}
%%%%%% Execute user-requested options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
\ProcessOptions
%%%%%% Define author indexing stuff when requested
-%
\newcommand{\authorindexname}{Author Index}
\if@APAC@index
- %
- % Author index requested.
- % Load \pkg{index} package.
- %
- \RequirePackage{index}[1995/09/28]
- %
- % Define Author Index.
- % This may be changed in the preamble of the
- % document (or in a user-provided package)
- % by a \renewindex command.
- %
- \newindex{autx}{adx}{and}{\authorindexname}
- %
- % Author indexing command
- %
- \def\AX#1{%
- \write\@auxout%
- {\string\@writefile{autx}{%
- \string\indexentry{\string#1}{\thepage}}}%
-% \expandafter\string\expandafter\indexentry{#1}{\thepage}}}%
- }
- %
+ %
+ % Author index requested.
+ %
+ \if@APAC@index@package
+ %
+ % Load \pkg{index} package.
+ \RequirePackage{index}[1995/09/28]
+ %
+ % Define Author Index.
+ % This may be changed in the preamble of the
+ % document (or in a user-provided package)
+ % by a \renewindex command.
+ %
+ \newindex{autx}{adx}{and}{\authorindexname}
+ %
+ % Author indexing command
+ %
+ \DeclareRobustCommand{\AX}[1]{%
+ \if@filesw{%
+ \protected@write\@auxout{}{%
+ \string\protected@write\string\tf@autx{}{%
+ \string\string\string
+ \indexentry{\string#1|hyperpage}{\thepage}}}%
+ }%
+ \fi
+ }%
+ \else
+ %
+ % Without \pkg{index} package (experimental).
+ % A bit of code adapted from ltidxglo.dtx
+ \newwrite\@AXfile
+ \immediate\openout\@AXfile=\jobname.adx
+ \typeout
+ {Writing author index file \jobname.adx }%
+ %
+ \DeclareRobustCommand{\AX}[1]{%
+ \protected@write\@AXfile{}%
+ {\string\indexentry{\string#1}{\thepage}}%
+ }%
+ %
+ % Some code adapted from doc.dtx
+ \def\PrintAX{\edef\currentindexname{\authorindexname}%
+ \@input@{\jobname.and}%
+ \global\let\PrintAX\@empty
+ }%
+ %
+ % Do some hacking to make sure both \printindex and \printindex[autx] are defined
+ % As yet untested.
+ \AtBeginDocument{%
+ % Make sure \printindex is defined.
+ \@ifundefined{printindex}{\makeindex}{}%
+ % Now, redefine \printindex to accommodate both \printindex and \printindex[autx]
+ \let\orig@printindex\printindex
+ \def\printindex{\@ifnextchar[{\APAC@printindex}{%
+ \orig@printindex}}%
+ %
+ \def\APAC@printindex[autx]{\PrintAX}%
+ }%
+ \fi
+ %
+ % Index corporate authors?
+ \if@APAC@include@corporate
+ % Include corporate authors in index.
+ \let\corporateAX\AX
+ \else
+ % Swallow argument (do not index).
+ \let\corporateAX\@gobble
+ \fi
+ %
\else
- %
- % No author index.
- %
- % Wait till \begin{document} for checking whether another
- % package is loaded that defines \printindex.
- %
- \AtBeginDocument{%
- \@ifundefined{printindex}%
- {%% \printindex not defined. Define \printindex so that it
- % suppresses the indexes.
- \def\printindex{\@ifnextchar[{\check@printindex}{%
- \check@printindex[]}}%
- %
- \def\check@printindex[#1]{\relax }%
- }%
- {% \printindex defined, so save its definition.
- \let\orig@printindex\printindex
- %
- % Redefine \printindex so that it suppresses the author index
- % but does not change other indexes.
- % 1. If there is no optional argument, use the original
- % definition.
- \def\printindex{\@ifnextchar[{\check@printindex}{\orig@printindex}}%
- %
- % 2. If there is an optional argument, check whether it is
- % equal to `autx'. If so, suppress this (author) index.
- % If not, use the original definition.
- \def\check@printindex[#1]{%
- % Use a clumsy way to check whether #1 = autx
- % but seemingly more elegant ways somehow didn't work.
- \expandafter\def\csname APAC@#1\endcsname{DUMMY}%
- \@ifundefined{APAC@autx}%
- {\orig@printindex[#1]}%
- {\let\APAC@autx\@undefined}%
- }%
- }%
- }%
- %
- % Empty author indexing command
- %
- \def\AX#1{}
- %
+ %
+ % No author index.
+ %
+ % Wait till \begin{document} for checking whether another
+ % package is loaded that defines \printindex.
+ %
+ \AtBeginDocument{%
+ \@ifundefined{printindex}%
+ {%% \printindex not defined. Define \printindex so that it
+ % suppresses the indexes.
+ \def\printindex{\@ifnextchar[{\check@printindex}{%
+ \check@printindex[]}}%
+ %
+ \def\check@printindex[#1]{\relax }%
+ }%
+ {% \printindex defined, so save its definition.
+ \let\orig@printindex\printindex
+ %
+ % Redefine \printindex so that it suppresses the author index
+ % but does not change other indexes.
+ % 1. If there is no optional argument, use the original
+ % definition.
+ \def\printindex{\@ifnextchar[{\check@printindex}{\orig@printindex}}%
+ %
+ % 2. If there is an optional argument, check whether it is
+ % equal to `autx'. If so, suppress this (author) index.
+ % If not, use the original definition.
+ \def\check@printindex[#1]{%
+ % Use a clumsy way to check whether #1 = autx
+ % but seemingly more elegant ways somehow didn't work.
+ \expandafter\def\csname APAC@#1\endcsname{DUMMY}%
+ \@ifundefined{APAC@autx}%
+ {\orig@printindex[#1]}%
+ {\let\APAC@autx\@undefined}%
+ }%
+ }%
+ }%
+ %
+ % Empty author indexing commands
+ %
+ \let\AX\@gobble
+ \let\corporateAX\@gobble
+ %
\fi
-
%%%%%% Chapterbib compatibility %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% From the instructions of the chapterbib package.
\@ifundefined{@extra@b@citeb}{\def\@extra@b@citeb{}}{}
\gdef\@extra@binfo{}
%%%%%% End Chapterbib compatibility %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Commands for specific types of @misc entries.
%%% These are recognized by apacite.bst.
@@ -521,25 +584,23 @@
\newcommand{\bibprogramminglanguage}{Programming language}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Command for corporate authors.
+%%% This is recognized by apacite.bst.
+\let\bibcorporate\relax
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% The following commands are recognized by apacite.bst.
%%% They denote that the publication date is unknown,
%%% and that the type should be left empty (for @techreport, where
%%% ``Tech. Rep.'' is the default type if the field is left empty).
-\newcommand{\bibnodate}{n.d.{}}
+\newcommand{\bibnodate}{n.d.\hbox{}}
\newcommand{\bibnotype}{}
%%%%%%%%%%%%%%%%%%%%%
-% cite punctuations %
%%%%%%%%%%%%%%%%%%%%%
-% text style of authors in-text citation
-% (\cite, \shortcite, \fullcite,
-% \citeA, \shortciteA, \fullciteA,
-% \citeNP, \shortciteNP, \fullciteNP)
\newcommand{\BAstyle}{}%
-% text style of authors in-text citation
-% (\citeauthor, \shortciteauthor, \fullciteauthor)
\newcommand{\BAastyle}{}%
\newcommand{\BBOP}{(} % open parenthesis
@@ -553,14 +614,13 @@
\newcommand{\BBN}{, } % before note
\newcommand{\BBOQ}{} % open quote for article title
\newcommand{\BBCQ}{} % closing quote for article title
-%
\newcommand{\BCBT}{,} % comma between authors in ref. sec
% when no. of authors = 2
\newcommand{\BCBL}{,} % comma before last author
\newcommand{\BAnd}{\&} % for ``Ed. \& Trans.'' in ref. list
-%
+\DeclareRobustCommand{\BPBI}{.~}% Period between initials
+\DeclareRobustCommand{\BHBI}{.-}% Hyphen between initials
\newcommand{\BBA}{\BBAA}
-%
\let\Bem\emph
\newcommand{\APACciteatitle}[1]{``#1''}% Format as article title in text
@@ -571,97 +631,60 @@
% the argument of this command, but the
% argument is never displayed.
-% Two commands that are used to trick natbib.
\newcommand{\APACyear}[1]{{#1}}%
\newcommand{\APACexlab}[1]{{#1}}%
-%
-% For multiple citations with same author-year.
-% (Kruskal, 1964a, 1964b)
-% The \protect is necessary when natbib is used.
-%
\newcounter{BibCnt}
\renewcommand{\theBibCnt}{\alph{BibCnt}}
\newcommand{\BCnt}[1]{\setcounter{BibCnt}{#1}\protect\theBibCnt}
-%
-% In press, no date.
-% The \mbox prevents a line break at the hyphen.
-%
\newcommand{\BCntIP}[1]{\setcounter{BibCnt}{#1}\mbox{-\protect\theBibCnt}}
\newcommand{\BCntND}[1]{\setcounter{BibCnt}{#1}\mbox{-\protect\theBibCnt}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Labels, mostly for reference list %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\BOthers}[1]{et al.{}} % ``others'', the argument contains a
- % dot to suppress an additional one
- % in the reference list
-\newcommand{\BOthersPeriod}[1]{et al.{}}% ``others'', the argument contains a
- % dot to suppress an additional one
- % in the reference list. The difference
- % with \BOthers is that, if another
- % string is used to define \BOthers,
- % this one should always finish with a
- % period and the previous one not
- % necessarily (e.g., if explicit
- % ``others'' is used).
+\newcommand{\BOthers}[1]{et al.\hbox{}}
+\newcommand{\BOthersPeriod}[1]{et al.\hbox{}}
\newcommand{\BIP}{in press} % used as year for in-press citations
\newcommand{\BIn}{In} % for ``In '' editor...
-\newcommand{\BCHAP}{chap.{}} % chapter
-\newcommand{\BCHAPS}{chap.{}} % chapters
-\newcommand{\BED}{Ed.{}} % editor
-\newcommand{\BEDS}{Eds.{}} % editors
-\newcommand{\BTRANS}{Trans.{}} % translator
-\newcommand{\BTRANSS}{Trans.{}} % translators
-\newcommand{\BTRANSL}{trans.{}} % translation, for the year field
+\newcommand{\Bby}{by} % for ``by '' editor... (in reprints)
+\newcommand{\BCHAP}{chap.\hbox{}} % chapter
+\newcommand{\BCHAPS}{chap.\hbox{}} % chapters
+\newcommand{\BED}{Ed.\hbox{}} % editor
+\newcommand{\BEDS}{Eds.\hbox{}} % editors
+\newcommand{\BTRANS}{Trans.\hbox{}} % translator
+\newcommand{\BTRANSS}{Trans.\hbox{}} % translators
+\newcommand{\BTRANSL}{trans.\hbox{}} % translation, for the year field
\newcommand{\BCHAIR}{Chair} % chair of symposium
\newcommand{\BCHAIRS}{Chairs} % chairs
-\newcommand{\BVOL}{Vol.{}} % volume
-\newcommand{\BVOLS}{Vols.{}} % volumes
-\newcommand{\BNUM}{No.{}} % number
-\newcommand{\BNUMS}{Nos.{}} % numbers
-\newcommand{\BEd}{ed.{}} % edition
-\newcommand{\BPG}{p.{}} % page
-\newcommand{\BPGS}{pp.{}} % pages
-\newcommand{\BTR}{Tech.\ Rep.{}} % (default) technical report type name
-\newcommand{\BPhD}{Doctoral dissertation}
- % (default) PhD thesis type name
+\newcommand{\BVOL}{Vol.\hbox{}} % volume
+\newcommand{\BVOLS}{Vols.\hbox{}} % volumes
+\newcommand{\BNUM}{No.\hbox{}} % number
+\newcommand{\BNUMS}{Nos.\hbox{}} % numbers
+\newcommand{\BEd}{ed.\hbox{}} % edition
+\newcommand{\BPG}{p.\hbox{}} % page
+\newcommand{\BPGS}{pp.\hbox{}} % pages
+\newcommand{\BTR}{Tech.\ Rep.\hbox{}} % (default) technical report type name
+\newcommand{\BPhD}{Doctoral dissertation}% (default) PhD thesis type name
\newcommand{\BUPhD}{Unpublished doctoral dissertation}
- % (default) unpublished PhD thesis
- % type name
\newcommand{\BMTh}{Master's thesis} % (default) master's thesis type name
-\newcommand{\BUMTh}%
- {Unpublished master's thesis} % (default) unpublished
- % master's thesis type name
+\newcommand{\BUMTh}{Unpublished master's thesis}
+\newcommand{\BAuthor}{Author} % Used if publisher = author
\newcommand{\BOWP}{Original work published}
\newcommand{\BREPR}{Reprinted from}
-
+\newcommand{\BAvailFrom}{Available from\ }% Websites; note the space.
+\newcommand{\BRetrieved}[1]{Retrieved {#1}, from\ }% Websites; note the space.
+\newcommand{\BMsgPostedTo}{Message posted to\ }% Messages; note the space.
\def\refname{References}% Name of ref. list if it's a section.
\def\bibname{References}% Name of ref. list if it's a chapter.
-%
-% An optional note just before the references in the reference list.
-% Defaults to nothing, but can be changed to a list of commands
-% (e.g., if author formatting should be different in the reference
-% list) and/or text (e.g., for an explanatory note).
-%
\newcommand{\bibliographyprenote}{}
-%
-% Prenote used just before the references in the reference list
-% when a meta-analysis is reported.
-%
\newcommand{\APACmetaprenote}{%
References marked with an asterisk indicate studies
included in the meta-analysis.}
-%
-% The star that's put in front of the entries used in the meta-analysis
-%
-\newcommand{\APACmetastar}{$\star$\ }
+\newcommand{\APACmetastar}{\ensuremath{{}^\ast}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Load language dependent sections from an external file.
-% (Based on code by Stefan Bj\"ork, 2004/12/25.)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\AtBeginDocument{%
@@ -679,35 +702,6 @@
\@ifundefined{iflanguage}%
{\relax }%
{% %
- % Define a modification of \iflanguage that executes the "true"
- % code if the language is defined and equal to the current
- % language and does nothing otherwise. (Just \iflanguage gives
- % an error if the language is not loaded.)
- %
- \def\APAC@iflang#1#2{%
- \expandafter\ifx\csname l@#1\endcsname\relax
- \else
- \ifnum\csname l@#1\endcsname=\language
- {#2}%
- \fi
- \fi
- }%
- % Define language support file. The \def instead of a direct \input
- % is done to provide a mechanism to check whether a language file
- % has been defined. The language files that are shipped with the
- % current release are defined explicitly. If the requested language
- % is not in this list, \languagename.apc is loaded if it exists.
- %
- \APAC@iflang{dutch}{\gdef\APAC@apcfile{dutch.apc}}%
- \APAC@iflang{english}{\gdef\APAC@apcfile{english.apc}}%
- \APAC@iflang{german}{\gdef\APAC@apcfile{german.apc}}%
- \APAC@iflang{ngerman}{\gdef\APAC@apcfile{ngerman.apc}}%
- \APAC@iflang{greek}{\gdef\APAC@apcfile{greek.apc}}%
- \APAC@iflang{swedish}{\gdef\APAC@apcfile{swedish.apc}}%
- %
- \@ifundefined{APAC@apcfile}{%
- \def\APAC@apcfile{\languagename.apc}}{\relax}%
- %
% My teTeX under Cygwin automatically loads babel with
% default language "nohyphenation", so this language should
% revert to doing nothing. Strangely enough \iflanguage
@@ -719,76 +713,352 @@
\edef\APAC@tmp{nohyphenation}%
\ifx\languagename\APAC@tmp
\else
- \InputIfFileExists{\APAC@apcfile}{}{%
- \PackageWarningNoLine{apacite}{%
- Language definition file \APAC@apcfile\space not found.}}%
+ \InputIfFileExists{\languagename.apc}{}{%
+ %
+ % \languagename.apc does not exist; try whether the current
+ % language is a dialect of one of the known languages. This
+ % is not perfect, because languages for which no hyphenation
+ % patterns have been found revert to the default language,
+ % so that the wrong language file may be loaded here in that
+ % case.
+ %
+ % Define a modification of \iflanguage that executes the "true"
+ % code if the language is defined and equal to the current
+ % language and does nothing otherwise. (Just \iflanguage gives
+ % an error if the language is not loaded.)
+ %
+ \def\APAC@iflang##1##2{%
+ \expandafter\ifx\csname l@##1\endcsname\relax
+ \else
+ \ifnum\csname l@##1\endcsname=\language
+ {##2}%
+ \fi
+ \fi
+ }%
+ % Define language support file. The \def instead of a direct \input
+ % is done to provide a mechanism to check whether a language file
+ % has been defined.
+ %
+ \APAC@iflang{dutch}{\gdef\APAC@apcfile{dutch.apc}}%
+ \APAC@iflang{finnish}{\gdef\APAC@apcfile{finnish.apc}}%
+ \APAC@iflang{german}{\gdef\APAC@apcfile{german.apc}}%
+ \APAC@iflang{ngerman}{\gdef\APAC@apcfile{ngerman.apc}}%
+ \APAC@iflang{greek}{\gdef\APAC@apcfile{greek.apc}}%
+ \APAC@iflang{norsk}{\gdef\APAC@apcfile{norsk.apc}}%
+ \APAC@iflang{spanish}{\gdef\APAC@apcfile{spanish.apc}}%
+ \APAC@iflang{swedish}{\gdef\APAC@apcfile{swedish.apc}}%
+ %
+ % The default English as last one.
+ \APAC@iflang{english}{\gdef\APAC@apcfile{english.apc}}%
+ %
+ \@ifundefined{APAC@apcfile}{%
+ \PackageWarningNoLine{apacite}{%
+ No suitable language definition file (\languagename.apc) found}%
+ }{%
+ \InputIfFileExists{\APAC@apcfile}{}{%
+ \PackageWarningNoLine{apacite}{%
+ Language definition file \APAC@apcfile\space not found}%
+ }%
+ }%
+ \let\APAC@apcfile\@undefined
+ }%
\fi
\let\APAC@tmp\@undefined
}%
+ \let\APAC@iflang\@undefined
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Bibliography style parameters.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\bibnewpage{\clearpage}% apa.cls uses \newpage, change with \renewcommand
\let\bibliographytypesize\normalsize
-%
%%% declare four parameters
\newskip{\bibleftmargin}
\newskip{\bibindent}
\newskip{\bibparsep}
\newskip{\bibitemsep}
-%
%%% and give them default values
\bibleftmargin=2.5em
\bibindent=-\bibleftmargin
\bibparsep=0pt%
\bibitemsep\z@ \@plus .3\p@\relax
-%
-% To force another order (in Part 1, Part 2 cases)
-% Actually, this is the same as \SortNoop used in the examples,
-% so I do not discuss this in the documentation. It should
-% not be considered part of apacite, but I keep it for backwards
-% compatibility.
\newcommand{\bibphant}[1]{}
-%
-% Around 1998, I got error messages with accented characters
-% in author names. After some trial and error, I found out that
-% this works. However, later it was apparently not necessary anymore
-% (tests without it worked well), but I keep it because it's harmless
-% and I'm not sure enough.
-%
-\@ifundefined{accent@spacefactor}{\def\accent@spacefactor{}}{}
+\def\APAC@extra@b@citeb{\APAC@curr@aux\APAC@bu\@extra@b@citeb}%
+\def\APAC@extra@binfo{\APAC@curr@aux\APAC@bu\@extra@binfo}%
-%%%%%%%%%%%%%
-% citations %
-%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%
\def\@lbibitem[#1]#2{%
\def\BBA{\BBAA}%
- \item[\@biblabel{#1}]%
+ % For compatibility with chapterbib, bibunits, backref, and hyperref.
+ % Adapted from natbib.dtx.
+ \item[\hyper@natanchorstart{#2\APAC@extra@b@citeb}%
+ \@biblabel{#1}%
+ \hyper@natanchorend]%
\if@filesw{%
\def\BBA{\string\BBA}%
- \def\protect##1{\string ##1}%
- \immediate\write\@auxout{\string\bibcite{#2}{#1}}%
+ \let\protect\noexpand
+ % bibunits redefines \bibcite through \AtBeginDocument
+ % in a way that is incompatible with apacite's definition.
+ % The simplest way to get things working automatically
+ % seems to be introducing the parallel \APACbibcite command.
+ % This should also solve many other compatibility problems.
+ \immediate\write\@newciteauxhandle{\string\bibcite{#2}{#1}}%
+ \immediate\write\@newciteauxhandle{\string\APACbibcite{#2}{#1}}%
\def\BBA{\BBAA}%
}%
- \fi%
- \ignorespaces%
+ \fi
+ \ignorespaces
+}
+
+\def\APACbibcite#1#2{%
+ \global\expandafter
+ \def\csname b@#1\APAC@extra@binfo\endcsname{#2}% names
+ \global\expandafter
+ \def\csname Y@#1\APAC@extra@binfo\endcsname{\@year@#2}% year
}
+\let\bibcite\APACbibcite
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH BABEL %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% COMMENTS FROM hyperref.dtx:
+%%
+%% Package |babel| redefines \cmd{\bibcite} with
+%% macro \cmd{\bbl@cite@choice}. It needs to be overwritten
+%% to avoid the warning ``Label(s) may have changed.''.
+%%
+%% END COMMENTS
+%%
+%% Here, a slightly adapted version of the code mentioned above is inserted.
+%% The other \bibcite-restoring compatibility code above does something
+%% similar, but does not do the job correctly if babel is loaded (why?).
+%% Clearly, this only works if babel is loaded before apacite, but
+%% putting it in a \AtBeginDocument does not work well.
+
+\@ifundefined{bbl@cite@choice}{}{%
+ \g@addto@macro\bbl@cite@choice{%
+ \let\bibcite\APACbibcite
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH BIBTOPIC %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\AtBeginDocument{%
+ \@ifpackageloaded{bibtopic}{%
+ %
+ % Somewhat rudely disable this command to prevent an undesired
+ % error message of bibtopic.
+ \renewcommand*\bt@change@thb{\relax}%
+ }{%
+ %
+ % These bibtopic hooks are included in the thebibliography
+ % environment, so bibtopic should work correctly. If bibtopic is
+ % not loaded, they should do nothing.
+ \providecommand{\bt@beg@thb@hook}{\relax}
+ \providecommand{\bt@end@thb@hook}{\relax}
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH BIBUNITS %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\AtEndOfPackage{%
+ \let\APACstd@cite\cite
+ \let\APACstd@nocite\nocite
+ \let\APACstd@lbibitem\@lbibitem
+}
+
+\@ifundefined{APAC@bu}{\def\APAC@bu{}}{}
+
+\AtBeginDocument{%
+ \@ifpackageloaded{bibunits}{%
+ % To mimic chapterbib behavior (with flags etc.).
+ \def\APAC@bu{%
+ \ifx\cite\std@cite
+ % Outside a bibunit; the `@APACbu' strings are intended to
+ % minimize the possibility of wrong matches, such as
+ % \b@ex11 = ex11 from the global aux
+ % or
+ % \b@ex11 = ex1 from bibunit 1,
+ % and the last `@' is similarly intended to avoid confusion
+ % if both bibunits and chapterbib are loaded (`11@1' = 11th
+ % bibunit, 1st chapterbib unit; `1@11' = 1st bibunit, 11th
+ % chapterbib unit). It seems unlikely that both packages would
+ % be used at the same time, but safety first.
+ @APACbu0@%
+ \else
+ % Within a bibunit: use bibunit number to distinguish the bibunits.
+ @APACbu\the\@bibunitauxcnt @%
+ \fi
+ }%%
+ % Standard apacite definition of \cite and \nocite commands.
+ \let\std@cite\APACstd@cite
+ % This is mainly necessary to avoid incorrect `Citation undefined'
+ % warnings.
+ \let\std@nocite\APACstd@nocite
+ % Restore apacite definition of \bibitem, mainly because of the
+ % \@newciteauxhandle instead of \@auxout.
+ \def\std@lbibitem[#1]#2{%
+ \let\@APACtemp@auxout\@newciteauxhandle
+ \let\@newciteauxhandle\@bibunitaux
+ \APACstd@lbibitem[#1]{#2}%
+ \let\@newciteauxhandle\@APACtemp@auxout
+ }%%
+ % To make sure everything works whether bibunits is loaded
+ % before or after apacite.
+ \let\@lbibitem\std@lbibitem
+ %
+ }{}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH MULTIBBL %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifundefined{APAC@curr@aux}{\def\APAC@curr@aux{}}{}
+\AtBeginDocument{%
+ \@ifpackageloaded{multibbl}{%
+ % To mimic chapterbib behavior (with flags etc.).
+ \def\APAC@def@curr@aux#1{\def\APAC@curr@aux{@APACaux@#1@}}%
+ % Ditto. This puts the \bibcite commands in #1.aux instead
+ % of in the main aux file, so that the flags can be differentiated.
+ % This also means that the aux file has to be read by LaTeX
+ % before it is overwritten.
+ \def\newbibliography#1{%
+ \APAC@def@curr@aux{#1}%
+ \@input@{#1.aux}%
+ \begingroup
+ \if@filesw
+ \expandafter\newwrite\csname #1@auxfile\endcsname
+ \expandafter\immediate\openout
+ \csname #1@auxfile\endcsname #1.aux\relax
+ \typeout{Writing auxiliary file #1.aux }%
+ \fi
+ \endgroup
+ }%%
+ % Add the flag to the bibliography.
+ \let\APAC@mbbl@bibliography\bibliography
+ \def\bibliography#1#2#3{%
+ \APAC@def@curr@aux{#1}%
+ \let\@APACtemp@auxout\@newciteauxhandle
+ \def\@APACtemp{\csname #1@auxfile\endcsname}%
+ \let\@newciteauxhandle\@APACtemp
+ \APAC@mbbl@bibliography{#1}{#2}{#3}%
+ \let\@newciteauxhandle\@APACtemp@auxout
+ }%%
+ % Add an extra argument to \@@cite.
+ \let\@orig@@cite\@@cite
+ \def\@@cite<#1>[#2]#3#4{%
+ \nocite{#3}{#4}%
+ \let\@temp@nocite\nocite
+ \let\nocite\@gobble
+ %
+ \APAC@def@curr@aux{#3}%
+ \@orig@@cite<#1>[#2]{#4}%
+ %
+ \let\nocite\@temp@nocite
+ \let\@temp@nocite\@undefined
+ }%%
+ %
+ % Add an extra argument to \nocite.
+ \let\@orig@nocite\nocite
+ \def\nocite#1#2{%
+ % Define a flag.
+ \APAC@def@curr@aux{#1}%
+ %
+ % No flag-setting in \nocite: a no-cite is not a cite,
+ % so a subsequent cite may be the first cite.
+ \@bsphack
+ \ifx\@onlypreamble\document
+ % Since we are after \begin{document} we can do the citations:
+ \@for\@citeb:=#2\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ % \@newciteauxhandle for compatibility with multibib
+ % #1@auxfile for compatibility with multibbl
+ \@ifundefined{#1@auxfile}{%
+ \if@filesw
+ \immediate\write\@newciteauxhandle{\string\citation{\@citeb}}%
+ \fi
+ }{\if@filesw
+ \expandafter\immediate%
+ \write\csname #1@auxfile\endcsname{\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
+ % apacite has no compatibility problems, because it does not work
+ % with LaTeX 2.09 anyway, so we can do the following, suggested
+ % in ltbibl.dtx:
+ \AtBeginDocument{\nocite{#1}{#2}}%
+ \fi
+ \@esphack
+ %
+ % For compatibility with multibib.
+ \@restore@auxhandle
+ }%%
+ %
+ % Add an extra argument to \nocitemeta.
+ \let\@orig@@nocitemeta\nocitemeta
+ \def\nocitemeta#1#2{%
+ \nocite{#1}{#2}%
+ \let\@temp@nocite\nocite
+ \let\nocite\@gobble
+ %
+ \@orig@@nocitemeta{#2}%
+ %
+ \let\nocite\@temp@nocite
+ \let\@temp@nocite\@undefined
+ }%
+ }{}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH MULTIBIB %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand\@newciteauxhandle{\@auxout}
+\def\@restore@auxhandle{\gdef\@newciteauxhandle{\@auxout}}
+\def\@mb@citenamelist{%
+ cite,fullcite,shortcite,citeNP,fullciteNP,shortciteNP,%
+ citeA,fullciteA,shortciteA,citeauthor,fullciteauthor,shortciteauthor,%
+ citeauthorNP,fullciteauthorNP,shortciteauthorNP,%
+ citeyear,citeyearNP,nocite,nocitemeta%
+}%
+\AtBeginDocument{%
+ \@ifundefined{newcites}{\global\let\@restore@auxhandle\relax}{}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% COMPATIBILITY WITH SPLITBIB %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Year is separately handled by \Y@<citation key>
-\def\bibcite#1#2{%
- \global\expandafter\def\csname b@#1\@extra@binfo\endcsname{#2}% names
- \global\expandafter\def\csname Y@#1\@extra@binfo\endcsname{\@year@#2}% year
+\AtBeginDocument{%
+ \@ifpackageloaded{splitbib}{%
+ % Presumably, this doesn't hurt without splitbib as well.
+ \def\citeauthoryear{\string\citeauthoryear}%
+ }{}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% COMPATIBILITY WITH NATBIB %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\AtBeginDocument{%
\@ifpackageloaded{natbib}{%
%
@@ -803,119 +1073,187 @@
% is necessary and therefore I do this here.
%
\def\NAT@parse@date#1#2#3#4#5#6@@{%
- \def\NAT@year{{#1}}\def\NAT@exlab{{#2}}%
+ \def\NAT@year{{#1}}\def\NAT@exlab{{#2}}%
+ }%
+ %
+ % natbib redefines \thebibliography, which interferes a little
+ % with our purposes. Therefore, add some patches.
+ %
+ \let\@oldbibpreamble\bibpreamble
+ \def\bibpreamble{% This goes wrong if \bibpreamble is redefined
+ % later on, i.e., by the user, but I haven't thought
+ % of a better hack yet.
+ \@oldbibpreamble%
+ \bibliographytypesize%
+ \bibliographyprenote%
+ \@ifundefined{APAC@metaprenote@\APAC@extra@b@citeb}%
+ {}% skip
+ {\csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname}%
}%
+ \let\@old@endthebibliography\endthebibliography
+ \def\endthebibliography{\@old@endthebibliography%
+ \normalsize}%
}{}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% COMPATIBILITY WITH HYPERREF %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Include experimental hyperref-compatibility code provided by Ross Moore,
-% if the hyper option is requested.
-\if@hyper@APA@comp% hyperref compatibility option is on
- %
- % accommodate both APA and other (e.g. hyperref) patchings of \bibcite
- %
- \def\bibcite@APA@other#1#2{%
- \bibcite@other{#1}{#2}%
- \expandafter\xdef\csname Y@#1\endcsname{\@year@#2}}%
- \let\bibcite@APA\bibcite % record the APA-only definition of \bibcite
- %
- % check via \AtBeginDocument as to whether \bibcite has been changed;
- % if so, then correct the patching when the .aux file is read.
- %
- \AtBeginDocument{%
- \ifx\bibcite\bibcite@APA\else
- \immediate\write\@auxout{\string\install@other@APA}%
- \fi }%
- %
- \def\install@other@APA{%
- \ifx\bibcite\bibcite@APA\else
- \let\bibcite@other\bibcite
- \let\bibcite\bibcite@APA@other
- \fi \let\install@other@APA\relax }%
- %
- % This command should not be needed; it allows the patch to be
- % forced at an earlier time, if desired.
- %
- \def\installhyperAPA{%
- \@ifpackageloaded{hyperref}{\install@other@APA}%
- {\AtBeginDocument{\install@other@APA}}%
- }%
-\fi
+
+\AtBeginDocument{%
+ \@ifundefined{NAT@parse}{%
+ \def\NAT@parse{This is a fake natbib command to fool hyperref.}}{}%
+ \@ifundefined{hyper@natlinkstart}{%
+ \let\hyper@natlinkstart\@gobble}{}%
+ \@ifundefined{hyper@natlinkend}{%
+ \let\hyper@natlinkend\relax}{}%
+ \@ifundefined{hyper@natanchorstart}{%
+ \let\hyper@natanchorstart\@gobble}{}%
+ \@ifundefined{hyper@natanchorend}{%
+ \let\hyper@natanchorend\relax}{}%
+ \@ifundefined{hyperpage}{%
+ \def\hyperpage#1{#1}}{}%
+}
+\AtBeginDocument{%
+ \@ifpackageloaded{hyperref}{%
+ % The next should always be true, but just to be sure...
+ \@ifpackageloaded{url}{%
+ % Is obeyspaces option requested? If not, then...
+ \ifx\@empty\Url@ObeySp\@empty
+ % remove spaces from hyperlinks.
+ \def\url@#1{\def\@tmp@arg{\string#1}%
+ \HyPsd@Subst{ }{}{\@tmp@arg}%
+ \hyper@linkurl{\Hurl{#1}}{\@tmp@arg}}%
+ \fi
+ }{}%
+ }{}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% COMPATIBILITY WITH BABEL %%
+%% COMPATIBILITY WITH BACKREF %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% COMMENTS FROM hyperref.dtx:
-%%
-%% Package |babel| redefines \cmd{\bibcite} with
-%% macro \cmd{\bbl@cite@choice}. It needs to be overwritten
-%% to avoid the warning ``Label(s) may have changed.''.
-%%
-%% END COMMENTS
-%%
-%% Here, I (EM) literally insert the code mentioned above.
-%% Are the \begingroup and \endgroup necessary or even useful?
-%% The hyperref-compatibility patch above does a similar thing with
-%% \bibcite.
-%%
-
-\let\Hy@bibcite\bibcite
-\begingroup
- \@ifundefined{bbl@cite@choice}{}{%
- \g@addto@macro\bbl@cite@choice{%
- \let\bibcite\Hy@bibcite
+%% A bit of code that makes life a little easier
+%% (adapted from amsrefs.dtx).
+\def\back@cite{}%
+\def\CurrentBib{}%
+\def\PrintBackRefs{}%
+\def\APACrestorebibitem{}%
+\AtBeginDocument{%
+ \@ifpackageloaded{backref}{%
+ % Make sure that \ifBR@verbose is defined.
+ \@ifundefined{ifBR@verbose}{%
+ \let\ifBR@verbose\iffalse
+ \let\fi\fi}{}%
+ % A backcite command that makes the code of other commands better
+ % readable.
+ \def\back@cite#1{%
+ \ifBR@verbose
+ \PackageInfo{backref}{back cite \string`#1\string'}%
+ \fi
+ \Hy@backout{#1\APAC@extra@b@citeb}%
+ }%%
+ % Adaptation of the \bibitem command so that backref does not
+ % scan the whole entry. The placement of the backrefs is explicitly
+ % done through \PrintBackRefs.
+ \def\APACrestorebibitem{%
+ \def\BR@@lbibitem[##1]##2{%
+ \BRorg@bibitem[{##1}]{##2}%
+ \def\CurrentBib{##2\APAC@extra@b@citeb}%
+ }%%
}%
+ % Printing the backrefs: revert to the standard backrefs macro.
+ \def\PrintBackRefs#1{\BR@backref{#1}}%
+ }{%%%
+ % backref not loaded.
+ \let\back@cite\@gobble
+ \let\PrintBackRefs\@gobble
}%
-\endgroup
+}
+
+\def\BR@@lbibitem[#1]#2#3\par{%
+ \BRorg@bibitem[#1]{#2}#3%
+ \BR@backref{#2}%
+}%
+
+\def\makehashother{\catcode`\#=12\relax}%
+\def\makehashmacropar{\catcode`\#=6\relax}%
-%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% COMPATIBILITY WITH BACKREF %%
+%% FOR USE WITH THE URL PACKAGE (AND HYPERREF) %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% some code from backref.dtx, adapted by EM
-%%
\AtBeginDocument{%
- \@ifpackageloaded{backref}{%
- \global\let\BRorg@citeapa\@@cite % EM
- \global\let\@@cite\BR@citeapa % EM
+ \@ifpackageloaded{url}{%
+ % To circumvent an ``undefined'' error
+ \@ifundefined{Url@force@Tilde}{\def\Url@force@Tilde{\relax}}{}%
+ %
+ % The original dot. (Simply using `.' causes an infinite loop.
+ % This command is used below, so that encoding-issues can be resolved
+ % easier by redefining \Url@APACdot.)
+ \def\Url@APACdot{\mathchar"2E }%
+ \def\Url@APACcomma{\mathchar"2C }%
+ \def\Url@APACquestionmark{\mathchar"3F }%
+ \def\Url@APACexclamation{\mathchar"21 }%
+ \def\Url@APAChyphen{\mathchar"2D }%
+ \def\Url@APACunderscore{\_}%
+ %
+ % APA-definitions.
+ \def\APACurlBreaks{%
+ % Remove dot and slash from ordinary breaks.
+ \def\UrlBreaks{\do\@\do\\\do\|\do\;\do\>\do\]\do\)\do\'\do+\do\=\do\#}%
+ % Add slash to big breaks, so that http:// is broken after the second
+ % slash instead of after the colon.
+ \def\UrlBigBreaks{\do\/\do\:\do@url@hyp}%
+ % These are the default ones. Repeat them to get a complete style and
+ % we don't have to rely on what is the default (which might change).
+ \def\UrlNoBreaks{\do\(\do\[\do\{\do\<}%
+ \def\UrlOrds{\do\*\do\~\do\'\do\"}%
+ % Define a dot as an empty binary relation (after which a break may
+ % occur) followed by a dot-symbol (after which no break may occur).
+ % The Chicago Manual of Style requests the same treatment of
+ % a couple of other punctuation marks, different from url.sty's
+ % default behavior.
+ \def\UrlSpecials{%
+ \do\.{\mathbin{}\Url@APACdot }\do\,{\mathbin{}\Url@APACcomma }%
+ \do\-{\mathbin{}\Url@APAChyphen }%
+ \do\?{\mathbin{}\Url@APACquestionmark }%
+ \do\!{\mathbin{}\Url@APACexclamation }%
+ \do\_{\mathbin{}\Url@APACunderscore }%
+ \do\ {\Url@space}\do\%{\Url@percent}\do\^^M{\Url@space}%
+ \Url@force@Tilde}% package option may force faked text-ascii-tilde
+ }%%
+ % Change underscore for when a non-tt font is used.
+ \def\Url@OTnonTT{\do\<{\langle}\do\>{\mathbin{\rangle}}\do
+ \_{\mathbin{}\_}\do\|{\mid}\do\{{\lbrace}\do\}{\mathbin{\rbrace}}\do
+ \\{\mathbin{\backslash}}\UrlTildeSpecial}
+
+ % Now define four APA url-styles, based on the standard styles in
+ % url.sty.
+ \def\url@APACttstyle{\def\UrlFont{\ttfamily}\APACurlBreaks }%
+ \def\url@APACrmstyle{\def\UrlFont{\rmfamily}\APACurlBreaks }%
+ \def\url@APACsfstyle{\def\UrlFont{\sffamily}\APACurlBreaks }%
+ \def\url@APACsamestyle{\def\UrlFont{}\APACurlBreaks }%
+ %
+ % Use APACtt-style by default.
+ \urlstyle{APACtt}%
}{}%
}
-\def\BR@citeapa<#1>[#2]#3{% % EM
- \BRorg@citeapa<#1>[#2]{#3}% % EM
- \ifBR@verbose
- \PackageInfo{backref}{back cite \string`#3\string'}% EM
- % Am I allowed to define an info message of another package?
- % It seems strange. But it's also strange to change `backref'
- % into `apacite', because backref does the backreferencing,
- % and the command is merely an adaptation of the corresponding
- % backref command.
- \fi
- \Hy@backout{#3}%
+
+\AtBeginDocument{%
+ \@ifundefined{url}{%
+ \def\url#1{\texttt{#1}}%
+ }{}%
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% THE CITATION COMMANDS %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% First citation in multi-citation.
\newif\if@F@cite\@F@citetrue
-% Two flags to denote whether only author or year must be cited or both.
\newif\if@A@cite\@A@citefalse
\newif\if@Y@cite\@Y@citefalse
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \cite<prefix>[postfix]{keys}
-% \fullcite<prefix>[postfix]{keys}
-% \shortcite<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces (prefix Authors1, Year1; Authors2, Year2; ..., postfix)
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\cite{%
@@ -949,13 +1287,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \citeNP<prefix>[postfix]{keys}
-% \fullciteNP<prefix>[postfix]{keys}
-% \shortciteNP<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces prefix Authors1, Year1; Authors2, Year2; ..., postfix
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\citeNP{%
@@ -989,9 +1320,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% second layer of \cite command
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\@cite<#1>{%
@@ -1014,13 +1342,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \citeA<prefix>[postfix]{keys}
-% \fullciteA<prefix>[postfix]{keys}
-% \shortciteA<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces prefix Authors1 (Year1), ..., AuthorN (YearN, postfix)
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\citeA{%
@@ -1048,16 +1369,13 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% second layer of \citeA command
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\@citeA<#1>{%
%
% definition of some parameters
%
- \def\@BBOP{}% % open parenthesis
+ \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
@@ -1075,13 +1393,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \citeauthor<prefix>[postfix]{keys}
-% \fullciteauthor<prefix>[postfix]{keys}
-% \shortciteauthor<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces prefix Authors1, ..., AuthorsN, postfix
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\citeauthor{%
@@ -1108,10 +1419,31 @@
{\@citeauthor<>}%
}
+\def\citeauthorNP{%
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ \@ifnextchar<% %>
+ {\@citeauthorNP}%
+ {\@citeauthorNP<>}%
+}
+
+\def\fullciteauthorA{%
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ \@ifnextchar<% %>
+ {\@citeauthorNP}%
+ {\@citeauthorNP<>}%
+}
+
+\def\shortciteauthorA{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \@ifnextchar<% %>
+ {\@citeauthorNP}%
+ {\@citeauthorNP<>}%
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% second layer of \citeauthor command
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\@citeauthor<#1>{%
@@ -1135,16 +1467,28 @@
{\@@cite<#1>[]}%
}
+\def\@citeauthorNP<#1>{%
+ %
+ % definition of some parameters
+ %
+ \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[% % ]
+ {\@@cite<#1>}%
+ {\@@cite<#1>[]}%
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \citeyear<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces (prefix Year1, ..., YearN, postfix)
-%
-% \citeyearNP<prefix>[postfix]{keys}
-% writes \citation{keys} on .aux
-% produces prefix Year1, ..., YearN, postfix
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\citeyear{%
@@ -1168,9 +1512,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% second layer of \citeyear command
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\@citeyear<#1>{%
@@ -1210,7 +1551,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Code to be executed if current author(s) equal previous
-\def\@ifauthorsequalc@de{%
+\def\@ifauthorsequalc@de#1{%
\if@F@cite%
\@F@citefalse%
\else%
@@ -1219,12 +1560,14 @@
\fi%
\fi%
\if@Y@cite%
- {\csname Y@\@citeb\@extra@b@citeb\endcsname}%
+ \hyper@natlinkstart{#1}%
+ {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
\fi%
}
%%% Code to be executed if current author(s) do not equal previous
-\def\@ifauthorsunequalc@de{%
+\def\@ifauthorsunequalc@de#1{%
\if@F@cite%
\@F@citefalse%
\else%
@@ -1236,34 +1579,35 @@
\edef\@cite@undefined{?}%
\def\BBA{\@BBA}%
\if@A@cite%
- {\csname b@\@citeb\@extra@b@citeb\endcsname}%
+ \hyper@natlinkstart{#1}%
+ {\csname b@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
\if@Y@cite%
{\@BBAY}%
\fi%
\fi%
\if@Y@cite%
- {\csname Y@\@citeb\@extra@b@citeb\endcsname}%
+ \hyper@natlinkstart{#1}%
+ {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
\fi%
\let\BBA\relax%
}
\def\@@cite<#1>[#2]#3{%
%
- % write citation(s) to .aux file
+ % Write citation(s) to .aux file(s)
%
- \if@filesw{%
- \immediate\write\@auxout{\string\citation{#3}}%
- }%
- \fi%
+ \nocite{#3}%
%
% the previous cite, for multiple citations with same author
%
\edef\@citeP{}%
%
- % open parenthesis and precitation
- %
- {\@BBOP}%
- \ifx\@empty#1%
+ % open parenthesis and pre-note
+ % The \mbox is to avoid hyperref problems if a \citeA follows an \item.
+ \mbox{\@BBOP}%
+ \ifx\@empty#1\@empty
\else%
{\ignorespaces #1\@BAP}%
\fi%
@@ -1271,15 +1615,22 @@
% loop over citation entries
%
\@for\@citeb:=#3\do{%
+ % Removes a possible space before the citation key, so that
+ % e.g. \cite{key1, key2} can be done.
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ % For backref.
+ \back@cite{\@citeb}%
%
% check whether citation is defined
%
- \@ifundefined{b@\@citeb\@extra@b@citeb}%
- {\expandafter\def\csname b@\@citeb\@extra@b@citeb\endcsname{?}%
- \expandafter\def\csname Y@\@citeb\@extra@b@citeb\endcsname{?}%
- \@warning{Citation `\@citeb' on page \thepage\space undefined}%
+ \@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{?}%
+ % The following is now handled by \nocite
+ %\G@refundefinedtrue
+ %\@latex@warning{Citation `\@citeb' undefined}%
}%%
- % if citation is defined:
+ % If citation is defined:
% check whether flag is set that identifies that
% this is not the first citation to the work
% if flag is not set, it will be set to DUMMY
@@ -1287,9 +1638,9 @@
% the full citation is used; else the short version
% is used
%
- {\@ifundefined{flag@\@citeb\@extra@b@citeb}%
+ {\@ifundefined{flag@\@citeb\APAC@extra@b@citeb}%
{\global\expandafter
- \def\csname flag@\@citeb\@extra@b@citeb\endcsname{DUMMY}%
+ \def\csname flag@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
\def\BCA##1##2{{\@BAstyle ##1}}%
}%
{\def\BCA##1##2{{\@BAstyle ##2}}%
@@ -1300,48 +1651,26 @@
% and a \@BBY (probably comma and space) is inserted between
% the two years.
%
- % Code differs depending on whether hyperref-compatibility
- % option is loaded.
- \if@hyper@APA@comp
- % hyperref-compatibility option on
- % (code provided by Ross Moore)
- \expandafter\def\expandafter\B@my@dummy
- \expandafter{\csname b@\@citeb\@extra@b@citeb\endcsname}%
- \expandafter\expandafter\expandafter
- \ifx\expandafter\@citeP\B@my@dummy\relax%
- \@ifauthorsequalc@de
- \else%
- \@ifauthorsunequalc@de
- \fi%
- % define previous citation-author as current
- %
- \expandafter\def\expandafter\@citeP
- \expandafter{\csname b@\@citeb\@extra@b@citeb\endcsname}%
- %
+ % The \protected@edef fixes the problem with authors with accents
+ % (e.g., J{\"{o}}reskog). Previous versions of apacite solved this
+ % less elegantly (accentfix option). This fix provided by Robert Schlicht.
+ % See also the new definition of \@citeP below.
+ \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%
- % else: hyperref-compatibility option off
- % (code dating from theapa.sty)
- \@pre@accentfix% fix problems with cedilla-type accents
- \edef\B@my@dummy{\csname b@\@citeb\@extra@b@citeb\endcsname}%
- \@post@accentfix% return to old definitions
- \ifx\@citeP\B@my@dummy%
- \@ifauthorsequalc@de
- \else%
- \@ifauthorsunequalc@de
- \fi%
- % define previous citation-author as current
- %
- \@pre@accentfix% fix problems with cedilla-type accents
- \edef\@citeP{\csname b@\@citeb\@extra@b@citeb\endcsname}%
- \@post@accentfix% return to old definitions
+ \@ifauthorsunequalc@de{\@citeb\APAC@extra@b@citeb}%
+ \fi%
+ % define previous citation-author as current
+ %
+ \protected@edef\@citeP{\csname b@\@citeb\APAC@extra@b@citeb\endcsname}%
%
- \fi
\let\BCA\relax%
}%%
% end loop over citation entries
% add note [=#2] and closing parenthesis
%
- \ifx\@empty#2%
+ \ifx\@empty#2\@empty
\else%
{\@BBN #2}%
\fi%
@@ -1356,92 +1685,79 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \nocite{key} : entry in reference list, not in text
-%
-% This is a little different from \@@cite with
-% \@A@citefalse and \@Y@citefalse
-% because of the `*' variant (cite all entries in bibfile)
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\nocite#1{%
- \@bsphack%
- \if@filesw{%
- \immediate\write\@auxout{\string\citation{#1}}}%
- \fi%
+ % No flag-setting in \nocite: a no-cite is not a cite,
+ % so a subsequent cite may be the first cite.
+ \@bsphack
+ \ifx\@onlypreamble\document
+ % Since we are after \begin{document} we can do the citations:
\@for\@citeb:=#1\do{%
- \@ifundefined{b@\@citeb\@extra@b@citeb}%
- {\edef\B@my@dummy{*}%
- \ifx\@citeb\B@my@dummy%
- \else%
- \@warning{Citation `\@citeb' on page \thepage\space undefined}%
- \fi%
- }%
- {}% Removed flag-setting: a no-cite is not a cite,
- % so a subsequent cite may be the first cite.
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ % \@newciteauxhandle for compatibility with multibib
+ \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
+ }{}%
}%
- \@esphack%
+ \else
+ % apacite has no compatibility problems, because it does not work
+ % with LaTeX 2.09 anyway, so we can do the following, suggested
+ % in ltbibl.dtx:
+ \AtBeginDocument{\nocite{#1}}%
+ \fi
+ \@esphack
+ %
+ % For compatibility with multibib.
+ \@restore@auxhandle
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \nocitemeta{key} : entry in reference list, not in text,
-% for entries that are used in a meta-analysis.
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\nocitemeta#1{%
+ \nocite{#1}%
\@bsphack%
- \if@filesw{%
- \immediate\write\@auxout{\string\citation{#1}}}%
- \fi%
- %
- \global\def\APAC@metaprenote{\APACmetaprenote}%
+ \expandafter\global\expandafter\def
+ \csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname{%
+ \APACmetaprenote}%
+ %
\@for\@citeb:=#1\do{%
- \@ifundefined{b@\@citeb\@extra@b@citeb}%
- {\edef\B@my@dummy{*}%
- \ifx\@citeb\B@my@dummy%
- \else%
- \@warning{Citation `\@citeb' on page \thepage\space undefined}%
- \fi%
- }%
- { % Define meta-analysis flag for current item
- %
- \@ifundefined{flagmeta@\@citeb\@extra@b@citeb}%
- {\global\expandafter
- \def\csname flagmeta@\@citeb\@extra@b@citeb\endcsname{DUMMY}%
- }%
- {}%
- }%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ % Define meta-analysis flag for current item
+ \@ifundefined{flagmeta@\@citeb\APAC@extra@b@citeb}%
+ {\global\expandafter
+ \def\csname flagmeta@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
+ }%
+ {}%
}%
\@esphack%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \APACinsertmetastar{key}: insert an asterisk before the names in the
-% reference list for entries that are used in a meta-analysis.
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\APACinsertmetastar#1{%
- \@bsphack%
- \@for\@citeb:=#1\do{%
- \@ifundefined{flagmeta@\@citeb\@extra@b@citeb}%
- {}% skip
- {{\APACmetastar}}%
- }%
- \@esphack%
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \@ifundefined{flagmeta@\@citeb\APAC@extra@b@citeb}%
+ {}% skip
+ {{\APACmetastar}}%
+ }%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% No labels in the bibliography.
-%
\def\@biblabel#1{}
-%
\def\st@rtbibsection{%
\@bibnewpage% start a new page if desired
\if@numberedbib%
@@ -1457,7 +1773,6 @@
%
\fi%
}%
-%
\def\st@rtbibchapter{%
% here no \@bibnewpage, because it is assumed that
% the \chapter starts a new page
@@ -1472,19 +1787,15 @@
%
\fi%
}%
-%
-%
\def\thebibliography#1{%
%
% Start the bibliography section or chapter
%
\@ifundefined{chapter}%
{\st@rtbibsection}%
-% else: chapter is defined
{\@ifundefined{@sectionbibtrue}% we have to guess
{\@ifundefined{@mainmatterfalse}% check if mainmatter exists
{\st@rtbibchapter}%
-% else: mainmatter is defined
{\if@mainmatter%
\st@rtbibsection% typically, a chapter-specific bibliogr.
\else%
@@ -1504,47 +1815,335 @@
%
\bibliographytypesize% e.g., to put the bibliography in \small type
\bibliographyprenote% some explanatory note before the references
- \@ifundefined{APAC@metaprenote}
+ %
+ \@ifundefined{APAC@metaprenote@\APAC@extra@b@citeb}%
{}% skip
- {\APAC@metaprenote}
+ {\csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname}%
%
\list{\relax}{\labelsep=0em%
-% \parskip\z@ \@plus .3\p@\relax
\parsep=\bibparsep%
\itemsep=\bibitemsep%
\leftmargin=\bibleftmargin%
\itemindent=\bibindent}% changed to cope with 4th ed.
- \def\newblock{\unskip\ \hskip .11em plus .33em minus .07em}%
+ \def\newblock{\hskip .11em plus .33em minus .07em}%
\sloppy\clubpenalty4000\widowpenalty4000
\sfcode`\.=1000\relax
+ % For compatibility with bibtopic.
+ \bt@beg@thb@hook
+ % To overrule backref.
+ \APACrestorebibitem
}
-\def\endthebibliography{\endlist\normalsize}
-%
-% natbib redefines \thebibliography, which interferes a little
-% with our purposes. Therefore, add some patches.
-%
-\AtBeginDocument{%
- \@ifpackageloaded{natbib}{%
- \let\@oldbibpreamble\bibpreamble
- \def\bibpreamble{% This goes wrong if \bibpreamble is redefined
- % later on, i.e., by the user, but I haven't thought
- % of a better hack yet.
- \@oldbibpreamble%
- \bibliographytypesize%
- \bibliographyprenote%
- \@ifundefined{APAC@metaprenote}
- {}% skip
- {\APAC@metaprenote}%
- }%
- \let\@old@endthebibliography\endthebibliography
- \def\endthebibliography{\@old@endthebibliography%
- \normalsize}
+\def\endthebibliography{%
+ % For compatibility with bibtopic.
+ \bt@end@thb@hook
+ %
+ \def\@noitemerr{%
+ \@latex@warning{Empty `thebibliography' environment}%
+ }%
+ \endlist\normalsize
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% REFERENCE LIST FORMATTING COMMANDS %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\APACrefYear}[1]{%
+ % Should never be empty.
+ {\BBOP}{#1}{\BBCP}%
+}
+\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
+ {#1}\fi}
+\newcommand{\APACrefYearMonthDay}[3]{%
+ % year (+ addendum)
+ {\BBOP}{#1}%
+ % month
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}%
+ \fi
+ % day
+ \ifx\@empty#3\@empty
+ \else
+ \unskip\ {#3}%
+ \fi
+ {\BBCP}%
+}
+\newcommand{\APACrefatitle}[2]{#2}
+\newcommand{\APACrefbtitle}[2]{\Bem{#2}}
+\newcommand{\APACrefaetitle}[2]{[#2]}
+\newcommand{\APACrefbetitle}[2]{[#2]}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\let\@xp\expandafter
+\newcommand{\PrintCardinal}[1]{%
+ \afterassignment\print@cardinal
+ \count@ 0#1\relax\@nil
+}
+\def\print@cardinal#1#2\@nil{%
+ \ifx\relax#1\relax
+ \ifnum\count@>\z@
+ \CardinalNumeric\count@
+ \else
+ ??th%
+ \fi
+ \else
+ \ifnum \count@>\z@ \number\count@ \fi
+ #1#2\relax
+ \fi
+}
+\newcommand{\CardinalNumeric}[1]{%
+ \number#1\relax
+ \if
+ \ifnum#1<14
+ \ifnum#1>\thr@@ T\else F\fi
+ \else
+ F%
+ \fi
+ T%
+ th%
+ \else
+ \@xp\keep@last@digit\@xp#1\number#1\relax
+ \ifcase#1th\or st\or nd\or rd\else th\fi
+ \fi
+}
+\def\keep@last@digit#1#2{%
+ \ifx\relax#2%
+ \@xp\@gobbletwo
+ \else
+ #1=#2\relax
+ \fi
+ \keep@last@digit#1%
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\APACjournalVolNumPages}[4]{%
+ % journal
+ \Bem{#1}%
+ % volume
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, \Bem{#2}%
+ \fi
+ % issue number
+ \ifx\@empty#3\@empty
+ \else
+ \unskip({#3})%
+ \fi
+ % pages
+ \ifx\@empty#4\@empty
+ \else
+ \unskip, {#4}%
+ \fi
+}
+\newcommand{\APACaddressPublisher}[2]{%
+ \ifx\@empty#1\@empty
+ % publisher
+ \ifx\@empty#2\@empty
+ \else
+ {#2}%
+ \fi
+ %
+ \else
+ % address
+ {#1}%
+ % publisher
+ \ifx\@empty#2\@empty
+ \else
+ \unskip: {#2}%
+ \fi
+ %
+ \fi
+}
+\let\APACaddressInstitution\APACaddressPublisher
+\newcommand{\APACaddressPublisherEqAuth}[2]{%
+ \ifx\@empty#1\@empty
+ % Publisher. This cannot be empty, because it is equal to the author.
+ {\BAuthor{}}%
+ %
+ \else
+ % Address and publisher. These are not empty.
+ {#1\unskip: \BAuthor{}}%
+ %
+ \fi
+}
+\let\APACaddressInstitutionEqAuth\APACaddressPublisherEqAuth
+\let\APAChowpublished\relax
+\newenvironment{APACrefURL}[1][]{%
+ \ifx\@empty#1\@empty
+ \BAvailFrom
+ \else
+ \BRetrieved{#1}%
+ \fi
+}{}
+\newenvironment{APACrefURLmsg}{%
+ \BMsgPostedTo
+}{}
+\newcommand{\APACorigED}[1]{%
+ \ifx\@empty#1\@empty
+ \else
+ % ``by E. D. Itor (Ed.)''
+ \Bby\ {#1}, \BED{}%
+ \fi
+}
+\newcommand{\APACorigEDS}[1]{%
+ \ifx\@empty#1\@empty
+ \else
+ % ``by E. D. Itor \& A. N. Other (Eds.)''
+ \Bby\ {#1}, \BEDS{}%
+ \fi
+}
+\newcommand{\APACrefnote}[1]{%
+ \ifx\@empty#1\@empty
+ \else
+ ({#1})%
+ \fi
+}
+\newcommand{\APACorigyearnote}[2]{%
+ \ifx\@empty#1\@empty
+ % Original year empty: format note.
+ \APACrefnote{#2}%
+ \else
+ % Check for \bibnodate. I think the following command does not check
+ % whether #1 = `\bibnodate', but expands them, but that should
+ % also be OK and saves a lot of juggling with \expandafter commands.
+ \ifx\bibnodate#1\@empty
+ % Original year unknown: format (only) note.
+ \APACrefnote{#2}%
+ \else
+ % Original year has been given: ``Original work published''.
+ (\BOWP{} {#1}%
+ % Note
+ \ifx\@empty#2\@empty
+ \else
+ \unskip; {#2}%
+ \fi
+ % Final parenthesis.
+ )%%
+ %
+ \fi
+ \fi
+}
+\newcommand{\APACorigjournalnote}[6]{%
+ % "(Reprinted from " (note the space)
+ (\BREPR{} %
+ % Journal (should not be empty)
+ \Bem{#2}%
+ % Year
+ \ifx\@empty#1\@empty
+ \else
+ \unskip, {#1}%
+ \fi
+ % Volume
+ \ifx\@empty#3\@empty
+ \else
+ \unskip, \Bem{#3}%
+ \fi
+ % Issue number
+ \ifx\@empty#4\@empty
+ \else
+ \unskip{[#4]}%
+ \fi
+ % Pages
+ \ifx\@empty#5\@empty
+ \else
+ \unskip, {#5}%
+ \fi
+ % Note
+ \ifx\@empty#6\@empty
+ \else
+ \unskip; {#6}%
+ \fi
+ % Final parenthesis.
+ )%%
+ %
+}
+\def\@connect@with@commas#1{%
+ % Commas should only be inserted if both sides are nonempty.
+ \def\@comma@space{\unskip, }%
+ \let\@connect@string\relax
+ % Loop over elements.
+ \@for\@element@:=#1\do{%
+ \ifx\@empty\@element@%
+ \else
+ % Not empty: insert connect string (nothing for the first
+ % nonempty element, a comma and space afterwards).
+ \@connect@string\@element@%
+ \let\@connect@string\@comma@space
+ \fi
}%
- {}%
-}%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% EOF apacite.sty
-%
+ \let\@connect@string\@undefined
+ \let\@comma@space\@undefined
+}
+\newcommand{\APACorigbooknote}[9]{%
+ %
+ % "(Reprinted from " (note the space)
+ (\BREPR{} %
+ %
+ % Title, edition, volume, pages, editor, year, address: publisher
+ % These should not all be empty, but this is not checked here
+ % (because it's done in the .bst file).
+ \@connect@with@commas{%
+ {#3},{#4},{#5},{#6},{#2},{#1},{\APACaddressPublisher{#7}{#8}}%
+ }%%
+ %
+ % Add optional note.
+ \ifx\@empty#9\@empty
+ \else
+ ; #9%
+ \fi
+ %
+ % Final parenthesis.
+ )%%
+ %
+}
+\newcommand{\APACbVolEdTR}[2]{%
+ \ifx\@empty#1\@empty
+ \ifx\@empty#2\@empty
+ \else
+ % (Technical Report No.\ <no>)
+ {(#2)}%
+ \fi
+ \else
+ % (2nd ed., Vol.~1
+ ({#1}%
+ \ifx\@empty#2\@empty
+ \else
+ % ; Technical Report No.\ <no>
+ \unskip; {#2}%
+ \fi
+ % Final parenthesis.
+ )%%
+ \fi
+}
+\newcommand{\APACbVolEdTRpgs}[3]{%
+ \ifx\@empty#1\@empty
+ \ifx\@empty#2\@empty
+ \ifx\@empty#3\@empty
+ \else
+ % (pp. 10--30)
+ {(#3)}%
+ \fi
+ \else
+ % (Technical Report No.\ <no>, pp. 10--30)
+ (\@connect@with@commas{{#2},{#3}})%
+ \fi
+ \else
+ % (2nd ed., Vol.~1
+ ({#1}%
+ \ifx\@empty#2\@empty
+ \ifx\@empty#3\@empty
+ \else
+ % ; pp. 10--30
+ \unskip; {#3}%
+ \fi
+ \else
+ % ; Technical Report No.\ <no>, pp. 10--30
+ \unskip; \@connect@with@commas{{#2},{#3}}%
+ \fi
+ % Final parenthesis.
+ )%%
+ \fi
+}
+%%
+\endinput
+%%
+%% End of file `apacite.sty'.
diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc
index 1624229e010..a5bbe586658 100644
--- a/Master/texmf-dist/tex/latex/apacite/dutch.apc
+++ b/Master/texmf-dist/tex/latex/apacite/dutch.apc
@@ -1,188 +1,166 @@
-% \iffalse meta-comment
-%
-% This is file `dutch.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-\ProvidesFile{dutch.apc}[2005/06/01]
-
-%% dutch.apc - dutch translation of apacite elements
-%% Written by Erik Meijer <e.meijer@eco.rug.nl>
-%%
-%% For compiling the translated elements, the following sources were
-%% used:
-%%
-%% (1) Instructions for Dutch psychology journal "De Psycholoog"
-%% (indicated below as "[DP]"):
-%%
-%% Uitgebreide richtlijnen voor het aanleveren van kopij [Extensive
-%% guidelines for the submission of manuscripts]. (2001).
-%% Retreived January 3, 2005, from
-%% http://upload.lectric.nl/data/nip7/Richtlijnen%20voor%20auteurs.pdf
-%%
-%% (2) Instructions for Dutch psychology journal "Nederlands Tijdschrift
-%% voor de Psychologie en haar Grensgebieden"
-%% (indicated below as "[NTPG]"):
-%%
-%% Aanwijzingen voor auteurs [Directions for authors]. (2004).
-%% Nederlands Tijdschrift voor de Psychologie en haar Grensgebieden,
-%% 59, inside back cover.
-%%
-%% (3) Instructions (pp. 404-410) from the following well-known book
-%% (indicated below as "[SW]"):
-%%
-%% Renkema, J. (2002). Schrijfwijzer [Writing indicator] (4th ed.).
-%% Den Haag, The Netherlands: Sdu.
-%%
-%% These three all state that their rules are adapted from the APA manual.
-%% For translations that are not explicitly mentioned in these sources,
-%% I used the extensive reference list from the following article:
-%%
-%% (4) Schrooten, M. G. S., & Smulders, F. T. Y. (2004). Een experimentele
-%% kijk op angst:
-%% [Anxiety from an experimental point of view: Attention and
-%% automaticity in the processing of threatening stimuli].
-%% Nederlands Tijdschrift voor de Psychologie en haar Grensgebieden,
-%% 59, 135-149.
-%%
-%% Finally, I consulted the following dictionary:
-%%
-%% (5) Groot woordenboek Engels-Nederlands [Large dictionary English-Dutch]
-%% (2nd ed.). (1989). Utrecht, The Netherlands: Van Dale.
-%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Commands for specific types of @misc entries.
-%%% These commands are recognized by apacite.bst.
-\renewcommand{\bibmessage}{Bericht}
-\renewcommand{\bibcomputerprogram}{Computerprogramma}
-\renewcommand{\bibcomputerprogrammanual}{Handleiding van computerprogramma}
-\renewcommand{\bibcomputerprogramandmanual}{Computerprogramma en handleiding}
-\renewcommand{\bibcomputersoftware}{Computersoftware}
-\renewcommand{\bibcomputersoftwaremanual}{Handleiding van computersoftware}
-\renewcommand{\bibcomputersoftwareandmanual}{Computersoftware en handleiding}
-\renewcommand{\bibprogramminglanguage}{Programmeertaal}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Other labels
-\renewcommand{\bibnodate}{z.~j.{}} % [SW] (``zonder jaartal'')
-\renewcommand{\BBAB}{en}
-
-\renewcommand{\BOthers}[1]{et al.{}} % [DP]
-\renewcommand{\BOthersPeriod}[1]{et al.{}} % [DP]
-%% NTPG requires the following, SW allows both variants:
-%\renewcommand{\BOthers}[1]{e.~a.{}} % [NTPG]
-%\renewcommand{\BOthersPeriod}[1]{e.~a.{}} % [NTPG]
-
-\renewcommand{\BIP}{te verschijnen} % [SW]
-\renewcommand{\BIn}{In}
-\renewcommand{\BCHAP}{hfdst.{}}
-\renewcommand{\BCHAPS}{hfdst.{}}
-
-%% Editor(s) is almost impossible to get right in Dutch, because SW
-%% and DP require the translation of ``editor(s)'' to be dependent on
-%% the language in which the referenced work is written:
-%% ``Red.'' (or ``red.'') for referenced works in Dutch
-%% ``Ed.''/``Eds.'' for referenced works in English
-%% ``Hrsg.'' for referenced works in German
-%% ``edt.'' for referenced works in French
-%% NTPG does not give an explicit rule for this, but only an example
-%% in which an English work is referenced and ``Ed.'' is used.
-%%
-%% For the moment, I think it makes most sense to give the Dutch versions here:
-\renewcommand{\BED}{red.{}} % [DP] (SW gives ``Red.'')
-\renewcommand{\BEDS}{red.{}} % [DP] (SW gives ``Red.'')
-
-%% Translators should not be mentioned according to DP.
-%% NTPG does not explain how to format this.
-%% SW gives a completely different format: ``Vertaald door: ''
-%% followed by the name of the translator, or if the translator is unknown:
-%% ``Vertaling van: '' followed by the original title.
-%% This is much too complicated, so I'll choose a simple alternative:
-\renewcommand{\BTRANS}{vert.{}}
-\renewcommand{\BTRANSS}{vert.{}}
-\renewcommand{\BTRANSL}{vert.{}}
-
-\renewcommand{\BCHAIR}{voorz.{}}
-\renewcommand{\BCHAIRS}{voorz.{}}
-
-\renewcommand{\BVOL}{Dl.{}} % [SW]. NTPG gives an example with
- % ``Vol.'' but this is presumably
- % dependent on the language of the
- % referenced work as well.
-\renewcommand{\BVOLS}{Dl.{}} % [SW]
-
-\renewcommand{\BNUM}{nr.{}} % [SW]
-\renewcommand{\BNUMS}{nr.{}} % [SW]
-
-\renewcommand{\BEd}{dr.{}} % [SW]
-\renewcommand{\BPG}{p.{}}
-\renewcommand{\BPGS}{pp.{}} % [SW]. [DP] gives ``p.'', [NTPG] both.
-\renewcommand{\BTR}{Rapport} % Literally translating ``Tech.'' as
- % ``Technisch'' does not make sense.
-\renewcommand{\BPhD}{Academisch proefschrift}
- % Schrooten & Smulders use ``dissertatie''
-\renewcommand{\BUPhD}{Academisch proefschrift}
- % There is no Dutch ``DAI'' and the
- % distinction between ``published'' and
- % ``unpublished'' would generally be
- % interpreted as ``published as a book
- % with an official publisher'' vs.
- % ``privately published''. All PhD theses
- % in the Netherlands are required to be
- % published with an ISBN number.
- % Therefore, it is better in my view to
- % keep the same term here.
-\renewcommand{\BMTh}{Doctoraalscriptie}%
-\renewcommand{\BUMTh}{Doctoraalscriptie}% Again, there is no official forum
- % to publish abstracts of master's theses,
- % but, unblike PhD theses, they are
- % (generally) unpublished.
- % The term used here refers to the Dutch
- % educational system until ca. 2003.
- % Since ca. 2004, universities are
- % gradually converting to a bachelor -
- % master system, so it's likely that
- % this term will have to be adapted
- % in the near future.
-\renewcommand{\BOWP}{Oorspronkelijke editie}% [DP]. They also require the
- % original title after the originalyear.
-\renewcommand{\BREPR}{Overgenomen uit}
-
-\renewcommand{\refname}{Literatuur}% [DP & NTPG]
-\renewcommand{\bibname}{Literatuur}% [DP & NTPG]
- % SW gives the following general names:
- % ``Literatuuropgave'' [literally approx. ``Literature specification'']
- % ``Literatuurlijst'' [literally ``Literature list'']
- % For more specific applications, SW gives the following names:
- % ``Bibliografie'' [``Bibliography'', ``a more or less complete survey
- % of publications in a certain area'']
- % ``Geraadpleegde literatuur'' [``Consulted literature'']
- % ``Aangehaalde literatuur'' [``Referenced literature'']
-
-\renewcommand{\APACmetaprenote}{%
- Met een asterisk gemarkeerde referenties betreffen studies die in de
- meta-analyse zijn gebruikt.}
-
-\renewcommand{\authorindexname}{Auteursindex}
-
-\newcommand{\BCBT}{} % [DP & SW]. NTPG uses the US/APA comma.
-\newcommand{\BCBL}{} % [DP & SW]. NTPG uses the US/APA comma.
-
+%%
+%% This is file `dutch.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `dutch')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{dutch.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% dutch.apc - dutch translation of apacite elements
+%% Written by Erik Meijer
+%%
+%% For compiling the translated elements, the following sources were
+%% used:
+%%
+%% (1) Instructions for Dutch psychology journal "De Psycholoog"
+%% (indicated below as "[DP]"):
+%%
+%% Uitgebreide richtlijnen voor het aanleveren van kopij [Extensive
+%% guidelines for the submission of manuscripts]. (2001).
+%% Retreived January 3, 2005, from
+%% http://upload.lectric.nl/data/nip7/Richtlijnen%20voor%20auteurs.pdf
+%%
+%% (2) Instructions for Dutch psychology journal "Nederlands Tijdschrift
+%% voor de Psychologie en haar Grensgebieden"
+%% (indicated below as "[NTPG]"):
+%%
+%% Aanwijzingen voor auteurs [Directions for authors]. (2004).
+%% Nederlands Tijdschrift voor de Psychologie en haar Grensgebieden,
+%% 59, inside back cover.
+%%
+%% (3) Instructions (pp. 404-410) from the following well-known book
+%% (indicated below as "[SW]"):
+%%
+%% Renkema, J. (2002). Schrijfwijzer [Writing indicator] (4th ed.).
+%% Den Haag, The Netherlands: Sdu.
+%%
+%% These three all state that their rules are adapted from the APA manual.
+%% For translations that are not explicitly mentioned in these sources,
+%% I used the extensive reference list from the following article:
+%%
+%% (4) Schrooten, M. G. S., & Smulders, F. T. Y. (2004). Een experimentele
+%% kijk op angst: Aandacht en automatisme in de verwerking van
+%% bedreigende stimuli
+%% [Anxiety from an experimental point of view: Attention and
+%% automaticity in the processing of threatening stimuli].
+%% Nederlands Tijdschrift voor de Psychologie en haar Grensgebieden,
+%% 59, 135-149.
+%%
+%% Finally, I consulted the following dictionary:
+%%
+%% (5) Groot woordenboek Engels-Nederlands [Large dictionary English-Dutch]
+%% (2nd ed.). (1989). Utrecht, The Netherlands: Van Dale.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Commands for specific types of @misc entries.
+%%% These commands are recognized by apacite.bst.
+\renewcommand{\bibmessage}{Bericht}%
+\renewcommand{\bibcomputerprogram}{Computerprogramma}%
+\renewcommand{\bibcomputerprogrammanual}{Handleiding van computerprogramma}%
+\renewcommand{\bibcomputerprogramandmanual}{Computerprogramma en handleiding}%
+\renewcommand{\bibcomputersoftware}{Computersoftware}%
+\renewcommand{\bibcomputersoftwaremanual}{Handleiding van computersoftware}%
+\renewcommand{\bibcomputersoftwareandmanual}{Computersoftware en handleiding}%
+\renewcommand{\bibprogramminglanguage}{Programmeertaal}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Other labels
+\renewcommand{\bibnodate}{z.~j.\hbox{}}% [SW] (``zonder jaartal'')
+\renewcommand{\BBAB}{en}%
+\renewcommand{\BOthers}[1]{et al.\hbox{}}% % [DP]
+\renewcommand{\BOthersPeriod}[1]{et al.\hbox{}}% % [DP]
+%% NTPG requires the following, SW allows both variants:
+\renewcommand{\BIP}{te verschijnen}% % [SW]
+\renewcommand{\BIn}{In}%
+\renewcommand{\Bby}{door}%
+\renewcommand{\BCHAP}{hfdst.\hbox{}}%
+\renewcommand{\BCHAPS}{hfdst.\hbox{}}%
+%% Editor(s) is almost impossible to get right in Dutch, because SW
+%% and DP require the translation of ``editor(s)'' to be dependent on
+%% the language in which the referenced work is written:
+%% ``Red.'' (or ``red.'') for referenced works in Dutch
+%% ``Ed.''/``Eds.'' for referenced works in English
+%% ``Hrsg.'' for referenced works in German
+%% ``edt.'' for referenced works in French
+%% NTPG does not give an explicit rule for this, but only an example
+%% in which an English work is referenced and ``Ed.'' is used.
+%%
+%% For the moment, I think it makes most sense to give the Dutch versions here:
+\renewcommand{\BED}{red.\hbox{}}% % [DP] (SW gives ``Red.'')
+\renewcommand{\BEDS}{red.\hbox{}}% % [DP] (SW gives ``Red.'')
+%% Translators should not be mentioned according to DP.
+%% NTPG does not explain how to format this.
+%% SW gives a completely different format: ``Vertaald door: ''
+%% followed by the name of the translator, or if the translator is unknown:
+%% ``Vertaling van: '' followed by the original title.
+%% This is much too complicated, so I'll choose a simple alternative:
+\renewcommand{\BTRANS}{vert.\hbox{}}%
+\renewcommand{\BTRANSS}{vert.\hbox{}}%
+\renewcommand{\BTRANSL}{vert.\hbox{}}%
+\renewcommand{\BCHAIR}{voorz.\hbox{}}%
+\renewcommand{\BCHAIRS}{voorz.\hbox{}}%
+\renewcommand{\BVOL}{Dl.\hbox{}}%
+\renewcommand{\BVOLS}{Dl.\hbox{}}% % [SW]
+\renewcommand{\BNUM}{nr.\hbox{}}% % [SW]
+\renewcommand{\BNUMS}{nr.\hbox{}}% % [SW]
+\renewcommand{\BEd}{dr.\hbox{}}% % [SW]
+\renewcommand{\BPG}{p.\hbox{}}%
+\renewcommand{\BPGS}{pp.\hbox{}}% % [SW]. [DP] gives ``p.'', [NTPG] both.
+\renewcommand{\BTR}{Rapport}%
+\renewcommand{\BPhD}{Academisch proefschrift}%
+\renewcommand{\BUPhD}{Academisch proefschrift}%
+\renewcommand{\BMTh}{Doctoraalscriptie}%
+\renewcommand{\BUMTh}{Doctoraalscriptie}%
+\renewcommand{\BAuthor}{Auteur}%
+\renewcommand{\BOWP}{Oorspronkelijke editie}%
+\renewcommand{\BREPR}{Overgenomen uit}%
+\renewcommand{\refname}{Literatuur}% [DP & NTPG]
+\renewcommand{\bibname}{Literatuur}% [DP & NTPG]
+\renewcommand{\APACmetaprenote}{%
+ Met een asterisk gemarkeerde referenties betreffen studies die in de
+ meta-analyse zijn gebruikt.}%
+\renewcommand{\authorindexname}{Auteursindex}%
+\renewcommand{\BCBT}{}% [DP & SW]. NTPG uses the US/APA comma.
+\renewcommand{\BCBL}{}% [DP & SW]. NTPG uses the US/APA comma.
+%%
+
+\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 b173155000a..d9349ddb47f 100644
--- a/Master/texmf-dist/tex/latex/apacite/english.apc
+++ b/Master/texmf-dist/tex/latex/apacite/english.apc
@@ -1,107 +1,116 @@
-% \iffalse meta-comment
-%
-% This is file `english.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-\ProvidesFile{english.apc}[2005/06/01]
-
-%% english.apc - dummy english version of apacite elements
-%% Written by Erik Meijer <e.meijer@eco.rug.nl>
-
-%% NOTE! NOTE! NOTE! NOTE!
-%% If you use this as a template for other languages,
-%% don't forget to uncomment the commands!
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Commands for specific types of @misc entries.
-%%% These commands are recognized by apacite.bst.
-%\renewcommand{\bibmessage}{Msg}
-%\renewcommand{\bibcomputerprogram}{Computer program}
-%\renewcommand{\bibcomputerprogrammanual}{Computer program manual}
-%\renewcommand{\bibcomputerprogramandmanual}{Computer program and manual}
-%\renewcommand{\bibcomputersoftware}{Computer software}
-%\renewcommand{\bibcomputersoftwaremanual}{Computer software manual}
-%\renewcommand{\bibcomputersoftwareandmanual}{Computer software and manual}
-%\renewcommand{\bibprogramminglanguage}{Programming language}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Other labels
-%\renewcommand{\bibnodate}{n.d.{}} % ``no date''
-%\renewcommand{\BBAB}{and} % between authors in text
-%\renewcommand{\BOthers}[1]{et al.{}} % ``others'', the argument contains a
- % dot to suppress an additional one
- % in the reference list
-%\renewcommand{\BOthersPeriod}[1]{et al.{}}% ``others'', the argument contains
- % a dot to suppress an additional one
- % in the reference list. The difference
- % with \BOthers is that, if another
- % string is used to define \BOthers,
- % this one should always finish with a
- % period and the previous one not
- % necessarily (e.g., if explicit
- % ``others'' is used).
-%\renewcommand{\BIP}{in press} % used as year for in-press citations
-%\renewcommand{\BIn}{In} % for ``In '' editor...
-%\renewcommand{\BCHAP}{chap.{}} % chapter
-%\renewcommand{\BCHAPS}{chap.{}} % chapters
-%\renewcommand{\BED}{Ed.{}} % editor
-%\renewcommand{\BEDS}{Eds.{}} % editors
-%\renewcommand{\BTRANS}{Trans.{}} % translator
-%\renewcommand{\BTRANSS}{Trans.{}} % translators
-%\renewcommand{\BTRANSL}{trans.{}} % translation, for the year field
-%\renewcommand{\BCHAIR}{Chair} % chair of symposium
-%\renewcommand{\BCHAIRS}{Chairs} % chairs
-%\renewcommand{\BVOL}{Vol.{}} % volume
-%\renewcommand{\BVOLS}{Vols.{}} % volumes
-%\renewcommand{\BNUM}{No.{}} % number
-%\renewcommand{\BNUMS}{Nos.{}} % numbers
-%\renewcommand{\BEd}{ed.{}} % edition
-%\renewcommand{\BPG}{p.{}} % page
-%\renewcommand{\BPGS}{pp.{}} % pages
-%\renewcommand{\BTR}{Tech.\ Rep.{}} % (default) technical report type name
-%\renewcommand{\BPhD}{Doctoral dissertation}
- % (default) PhD thesis type name
-%\renewcommand{\BUPhD}{Unpublished doctoral dissertation}
- % (default) unpublished PhD thesis
- % type name
-%\renewcommand{\BMTh}{Master's thesis}% (default) master's thesis type name
-%\renewcommand{\BUMTh}{Unpublished master's thesis}%
- % (default) unpublished
- % master's thesis type name
-%\renewcommand{\BOWP}{Original work published}
-%\renewcommand{\BREPR}{Reprinted from}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% The name (heading) of the Reference List
-%\renewcommand{\refname}{References}% Name of ref. list if it's a section.
-%\renewcommand{\bibname}{References}% Name of ref. list if it's a chapter.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Prenote used just before the references in the reference list
-% when a meta-analysis is reported.
-%
-%\renewcommand{\APACmetaprenote}{%
-% References marked with an asterisk indicate studies
-% included in the meta-analysis.}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% The name (heading) of the Author Index
-%\renewcommand{\authorindexname}{Author Index}
+%%
+%% This is file `english.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `english')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{english.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% english.apc - english version of apacite elements
+%% Written by Erik Meijer
+%% Changes since the [2005/06/01] version:
+%% - Uncommented all the \renewcommand's, so that the file can be
+%% \input to override previous definitions.
+%% - Replaced `.{}' by `.\hbox{}', with the same goal (but now it works)
+%% of tricking TeX to make sure the abbreviation period is not
+%% interpreted as a sentence-ending period.
+%% - Inserted many percent signs to make sure no undesired space is
+%% put into the document when this file is read.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Commands for specific types of @misc entries.
+%%% These commands are recognized by apacite.bst.
+\renewcommand{\bibmessage}{Msg}%
+\renewcommand{\bibcomputerprogram}{Computer program}%
+\renewcommand{\bibcomputerprogrammanual}{Computer program manual}%
+\renewcommand{\bibcomputerprogramandmanual}{Computer program and manual}%
+\renewcommand{\bibcomputersoftware}{Computer software}%
+\renewcommand{\bibcomputersoftwaremanual}{Computer software manual}%
+\renewcommand{\bibcomputersoftwareandmanual}{Computer software and manual}%
+\renewcommand{\bibprogramminglanguage}{Programming language}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Other labels
+\renewcommand{\bibnodate}{n.d.\hbox{}}% % ``no date''
+\renewcommand{\BBAB}{and}% % between authors in text
+\renewcommand{\BOthers}[1]{et al.\hbox{}}%
+\renewcommand{\BOthersPeriod}[1]{et al.\hbox{}}%
+\renewcommand{\BIP}{in press}% % used as year for in-press citations
+\renewcommand{\BIn}{In}% % for ``In '' editor...
+\renewcommand{\Bby}{by}% % for ``by '' editor... (in reprints)
+\renewcommand{\BCHAP}{chap.\hbox{}}% % chapter
+\renewcommand{\BCHAPS}{chap.\hbox{}}% % chapters
+\renewcommand{\BED}{Ed.\hbox{}}% % editor
+\renewcommand{\BEDS}{Eds.\hbox{}}% % editors
+\renewcommand{\BTRANS}{Trans.\hbox{}}% % translator
+\renewcommand{\BTRANSS}{Trans.\hbox{}}% % translators
+\renewcommand{\BTRANSL}{trans.\hbox{}}% % translation, for the year field
+\renewcommand{\BCHAIR}{Chair}% % chair of symposium
+\renewcommand{\BCHAIRS}{Chairs}% % chairs
+\renewcommand{\BVOL}{Vol.\hbox{}}% % volume
+\renewcommand{\BVOLS}{Vols.\hbox{}}% % volumes
+\renewcommand{\BNUM}{No.\hbox{}}% % number
+\renewcommand{\BNUMS}{Nos.\hbox{}}% % numbers
+\renewcommand{\BEd}{ed.\hbox{}}% % edition
+\renewcommand{\BPG}{p.\hbox{}}% % page
+\renewcommand{\BPGS}{pp.\hbox{}}% % pages
+\renewcommand{\BTR}{Tech.\ Rep.\hbox{}}% % (default) technical report type name
+\renewcommand{\BPhD}{Doctoral dissertation}% (default) PhD thesis type name
+\renewcommand{\BUPhD}{Unpublished doctoral dissertation}%
+\renewcommand{\BMTh}{Master's thesis}% (default) master's thesis type name
+\renewcommand{\BUMTh}{Unpublished master's thesis}%
+\renewcommand{\BAuthor}{Author}% Used if publisher = author
+\renewcommand{\BOWP}{Original work published}%
+\renewcommand{\BREPR}{Reprinted from}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Reference List
+\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{\APACmetaprenote}{%
+ References marked with an asterisk indicate studies
+ included in the meta-analysis.}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Author Index
+\renewcommand{\authorindexname}{Author Index}%
+%%
+
+\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
new file mode 100644
index 00000000000..14da9396c61
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apacite/finnish.apc
@@ -0,0 +1,132 @@
+%%
+%% This is file `finnish.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `finnish')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{finnish.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% finnish.apc - finnish version of apacite elements
+%%
+%% Reference: Appendix E from book
+%%
+%% --------------------------------------------------------------------
+%% Kansallinen luetteloinnin ohjausryhm\"a. (2006). Monografioiden
+%% kuvailu, Suomalaiset luettelointis\"a\"ann\"ot. Helsinki: BTJ
+%% Kirjastopalvelu.
+%% --------------------------------------------------------------------
+%%
+%% Written by Kari Pyykk\"o
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Commands for specific types of @misc entries.
+%%% These commands are recognized by apacite.bst.
+\renewcommand{\bibmessage}{Sanoma}%
+\renewcommand{\bibcomputerprogram}{Tietokoneohjelma}%
+\renewcommand{\bibcomputerprogrammanual}{Tietokoneohjelman k\"asikirja}%
+\renewcommand{\bibcomputerprogramandmanual}{Tietokoneohjelma ja k\"asikirja}%
+\renewcommand{\bibcomputersoftware}{Ohjelmisto}%
+\renewcommand{\bibcomputersoftwaremanual}{Ohjelmiston k\"asikirja}%
+\renewcommand{\bibcomputersoftwareandmanual}{Ohjelmisto ja k\"asikirja}%
+\renewcommand{\bibprogramminglanguage}{Ohjelmointikieli}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Other labels
+\renewcommand{\bibnodate}{s.a.\hbox{}}% % ``no date'', ``sine anno''
+\renewcommand{\BBAB}{ja}% % between authors in text
+\renewcommand{\BOthers}[1]{et al.\hbox{}}% ``others'', the argument contains a
+ % dot to suppress an additional one
+ % in the reference list
+\renewcommand{\BOthersPeriod}[1]{et al.\hbox{}}%
+ % ``others'', the argument contains
+ % a dot to suppress an additional one
+ % in the reference list. The difference
+ % with \BOthers is that, if another
+ % string is used to define \BOthers,
+ % this one should always finish with a
+ % period and the previous one not
+ % necessarily (e.g., if explicit
+ % ``others'' is used).
+\renewcommand{\BIP}{painossa}% % used as year for in-press citations
+\renewcommand{\BIn}{Teoksessa}% % for ``In '' editor...
+\renewcommand{\BCHAP}{luku{}}% % chapter
+\renewcommand{\BCHAPS}{luvut{}}% % chapters
+\renewcommand{\BED}{toim.\hbox{}}% % editor
+\renewcommand{\BEDS}{toim.\hbox{}}% % editors
+\renewcommand{\BTRANS}{k\"a\"ant.\hbox{}}% translator
+\renewcommand{\BTRANSS}{k\"a\"ant.\hbox{}}% translators
+\renewcommand{\BTRANSL}{k\"a\"an.\hbox{}}% translation, for the year field
+\renewcommand{\BCHAIR}{pj.\hbox{}}% % chair of symposium
+\renewcommand{\BCHAIRS}{pj.\hbox{}}% % chairs
+\renewcommand{\BVOL}{osa}% % volume
+\renewcommand{\BVOLS}{osat}% % volumes
+\renewcommand{\BNUM}{nro}% % number
+\renewcommand{\BNUMS}{nro}% % numbers
+\renewcommand{\BEd}{p.\hbox{}}% % edition
+\renewcommand{\BPG}{s.\hbox{}}% % page
+\renewcommand{\BPGS}{s.\hbox{}}% % pages
+\renewcommand{\BTR}{Tekn.\ rap.\hbox{}}% (default) technical report type name
+\renewcommand{\BPhD}{V\"ait\"oskirja}% (default) PhD thesis type name
+\renewcommand{\BUPhD}{Julkaisematon v\"ait\"oskirja}%
+ % (default) unpublished PhD thesis
+ % type name
+\renewcommand{\BMTh}{Pro gradu -tutkielma}%
+ % (default) master's thesis type name
+\renewcommand{\BUMTh}{Julkaisematon pro gradu -tutkielma}%
+ % (default) unpublished
+ % master's thesis type name
+\renewcommand{\BOWP}{Alkuaan julk.\hbox{}}%
+\renewcommand{\BREPR}{Uudelleen julk.\hbox{}}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Reference List
+\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{\APACmetaprenote}{%
+ \refname merkitty t\"ahtimerkeill\"a osoittaen opintojen
+ sis\"altymist\"a meta-analyysiin.}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Author Index
+\renewcommand{\authorindexname}{Tekij\"ahakemisto}%
+%%
+
+\endinput
+%%
+%% End of file `finnish.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc
index 9eb2ae01041..8e8f1c16520 100644
--- a/Master/texmf-dist/tex/latex/apacite/german.apc
+++ b/Master/texmf-dist/tex/latex/apacite/german.apc
@@ -1,142 +1,117 @@
-% \iffalse meta-comment
-%
-% This is file `german.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-\ProvidesFile{german.apc}[2005/06/01]
-
-%% german.apc - Deutsche Uebersetzung der Apacite-Elemente
-%% Written by Andreas Poege <poge@uni-muenster.de>
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Deutsche Anpassung der Interpunktion und Formatierung
-%\renewcommand{\BAstyle}{\scshape} % Formatierung (Schriftart) Autoren (bei \cite usw, \citeA usw
- % \citeNP)
-%\renewcommand{\BAastyle}{\scshape} % Formatierung (Schriftart) Autoren (bei \citeautor usw.
-%\renewcommand{\BBOP}{(} % Einleitende Klammer (default "(")
-%\renewcommand{\BBCP}{)} % Abschliessende Klammer (default ")")
-%\renewcommand{\BAP}{} % Zeichen zw. Prefix und Zitat (default Leerzeichen)
-%\renewcommand{\BBAA}{\&} % Zwischen Autoren in Klammern (default "\&")
-\renewcommand{\BBAB}{und} % Zwischen Autoren im Text
-\renewcommand{\BBAY}{ } % Zwischen Autoren und Jahr(en) (default ",")
-%\renewcommand{\BBC}{;{}} % Zwischen Autoren (mehrere Zitate) (default ";")
-%\renewcommand{\BBN}{,{}} % Zwischen Zitat und Postfix (default ",")
-%\renewcommand{\BBOQ}{} % Einleitung v. Titel v. Artikel (default "")
-%\renewcommand{\BBCQ}{} % Abschluss v. Titel. von Artikel (default "")
-\renewcommand{\BCBT}{} % Zwischen 2 Autoren (zus. zu "&", default ",")
-\renewcommand{\BCBL}{} % Zwischen 3 o. mehr Autoren (zus. zu "&", default ",")
-%\renewcommand{\BAnd}{} % Zwischen Hg. und Uebers., falls gleich (default "\&")
-%\renewcommand{\theBibCnt}{{\em\alph{BibCnt}\/}}}
- % Formatierung des Zusatzes bei Werken vom selben Autor aus
- % einem Jahr (default "\alph{BibCnt}")
-%\renewcommand{\APACiteatitle}{} % Zitation eines Titels (Artikel o. ae.) ohne Autor o. Hg.
- % (default in Anfόhrungszeichen)
-%\renewcommand{\APACitebtitle}{} % Zitation eines Titels (Buch o. ae.) ohne Autor o. Hg.
- % (default ist \emph)
-%\renewcommand{\APACmetastar}{} % Auszeichnungg eines Werkes im Lit.verz. wenn in Metaanalyse
- % (default "*")
-%\renewcommand{\bibnewpage}{\newpage} % Verhalten von "\bibnewpage" (default "\clearpage")
-%\renewcommand{\BBYY}{, } % Zwischen Jahren, wenn ein Author und mehrere Jahre (
- % NEU, default "\BBAY")
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Formatierung des Literaturverzeichnisses
-%\renewcommand{\bibliographytypesize}{\footnotesize}
- % Schriftgrφίe Literaturverz. (default "\normalsize")
-%\setlength{\bibleftmargin}{2.5em} % Einzug beim Lit.verz. 2. Zeile (default "2.5em")
-%\setlength{\bibindent}{-\bibleftmargin} % Einzug beim Lit.verz. 1. Zeile (default "-\bibleftmargin")
-%\setlength{\bibitemsep}{\baselineskip} % vert. Abstand zwischen Eintrδgen im Lit.verz. (default "0pt")
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Befehle fόr die speziellen @misc-Eintrδge.
-%%% Diese Befehle werden von apacite.bst berόcksichtigt.
-\renewcommand{\bibmessage}{Msg.} % Fόr misc-Literaturtyp bei type, Newsgroup-, Internet-Messages
-\renewcommand{\bibcomputerprogram}{Computerprogramm}
-\renewcommand{\bibcomputerprogrammanual}{Programm-Handbuch}
-\renewcommand{\bibcomputerprogramandmanual}{Computerprogramm und Handbuch}
-\renewcommand{\bibcomputersoftware}{Software}
-\renewcommand{\bibcomputersoftwaremanual}{Software-Handbuch}
-\renewcommand{\bibcomputersoftwareandmanual}{Software und Handbuch}
-\renewcommand{\bibprogramminglanguage}{Programmiersprache}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Weitere Labels
-%\renewcommand{\bibnotype}{ } % Bei Techreport, falls type-Ang. unterdrόckt werden soll (default " ")
-\renewcommand{\BOthers}[1]{et al.{}} % "`und andere"', das Argument beinhaltet
- % einen Punkt, um einen weiteren im
- % Literaturverzeichnis zu unterdruecken
-\renewcommand{\BOthersPeriod}[1]{et al.{}} % "`und andere"', das Argument beinhaltet
- % einen Punkt, um einen weiteren im
- % Literaturverzeichnis zu unterdruecken
- % The difference
- % with \BOthers is that, if another
- % string is used to define \BOthers,
- % this one should always finish with a
- % period and the previous one not
- % necessarily (e.g., if explicit
- % ``others'' is used).
-\renewcommand{\BIP}{in Druck} % Jahresangabe bei im Druck bef. Werken
-\renewcommand{\BIn}{In} % fuer "`In"' Herausgeber...
-\renewcommand{\BCHAP}{Kap.{}} % Kapitel
-\renewcommand{\BCHAPS}{Kap.{}} % Kapitel
-\renewcommand{\BED}{Hg.{}} % Herausgeber(in)
-\renewcommand{\BEDS}{Hg.{}} % Herausgeber(innen)
-\renewcommand{\BTRANS}{\"Ubers.{}} % Uebersetzer(in)
-\renewcommand{\BTRANSS}{\"Ubers.{}} % Uebersetzer(innen)
-\renewcommand{\BTRANSL}{\"Ubers.{}} % Uebersetzung (bei der Jahresangabe)
-\renewcommand{\BCHAIR}{Chair} % Chair (bei Konferenzen)
-\renewcommand{\BCHAIRS}{Chairs} % Chairs (bei Konferenzen)
-\renewcommand{\BVOL}{Bd.{}} % Band
-\renewcommand{\BVOLS}{Bde.{}} % Baende
-\renewcommand{\BNUM}{Nr.{}} % Nummer
-\renewcommand{\BNUMS}{Nr.{}} % Nummern
-\renewcommand{\BEd}{Aufl.{}} % Auflage
-\renewcommand{\BPG}{S.{}} % Seite
-\renewcommand{\BPGS}{S.{}} % Seiten
-\renewcommand{\BTR}{Bericht} % (default) Bezeichnung fuer "`technical report"'
-\renewcommand{\BPhD}{Dissertation} % (default) Bezeichnung fuer Dissertation
-\renewcommand{\BUPhD}{Unver\"offentlichte Dissertation}
- % (default) Bezeichnung fuer unveroeffentlichte Dissertation
-\renewcommand{\BMTh}{Diplomarbeit} % (default) Bezeichnung fόr Abschlussarbeit
-\renewcommand{\BUMTh}{Unver\"offentlichte Diplomarbeit}
- % (default) Bezeichnung fόr unveroeffentlichte Abschlussarbeit
-\renewcommand{\BOWP}{Originalausgabe} % Originalausgabe
-\renewcommand{\BREPR}{Nachdruck von} % Nachdruck von
-\renewcommand{\bibnodate}{o.\,J.{}} % "`ohne Jahresangabe"'
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Bezeichnung (heading) des Literaturverzeichnisses
-\renewcommand{\refname}{Literatur} % Bezeichnung fόr das Literaturverzeichnis, falls Section
-\renewcommand{\bibname}{Literaturverzeichnis}
- % Bezeichnung fόr das Literaturverzeichnis, falls Chapter
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Kommando zwischen "Literaturverzeichnis" und den Eintraegen direkt nach \bibliographytypesize
-%\renewcommand{\bibliographyprenote}{} % default nichts
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Bemerkung vor Literaturangeaben, falls eine Metaanalyse angegeben wurde
-%
-\renewcommand{\APACmetaprenote}{Literaturangaben mit Stern kennzeichnen Studien der Metaanalyse.}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Bezeichnung (heading) des Autorenverzeichnisses
-\renewcommand{\authorindexname}{Autorenregister}
+%%
+%% This is file `german.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `german')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{german.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% german.apc - Deutsche Uebersetzung der Apacite-Elemente
+%% Written by Andreas Poege.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Deutsche Anpassung der Interpunktion und Formatierung
+ % \citeNP)
+\renewcommand{\BBAB}{und}% % Zwischen Autoren im Text
+\renewcommand{\BBAY}{, }% % Zwischen Autoren und Jahr(en) (default ",")
+\renewcommand{\BCBT}{}% % Zwischen 2 Autoren (zus. zu "&", default ",")
+\renewcommand{\BCBL}{}% % Zwischen 3 o. mehr Autoren (zus. zu "&", default ",")
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Formatierung des Literaturverzeichnisses
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Befehle fόr die speziellen @misc-Eintrδge.
+%%% Diese Befehle werden von apacite.bst berόcksichtigt.
+\renewcommand{\bibmessage}{Msg.\hbox{}}% Fόr misc-Literaturtyp bei type, Newsgroup-, Internet-Messages
+\renewcommand{\bibcomputerprogram}{Computerprogramm}%
+\renewcommand{\bibcomputerprogrammanual}{Programm-Handbuch}%
+\renewcommand{\bibcomputerprogramandmanual}{Computerprogramm und Handbuch}%
+\renewcommand{\bibcomputersoftware}{Software}%
+\renewcommand{\bibcomputersoftwaremanual}{Software-Handbuch}%
+\renewcommand{\bibcomputersoftwareandmanual}{Software und Handbuch}%
+\renewcommand{\bibprogramminglanguage}{Programmiersprache}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Weitere Labels
+\renewcommand{\BOthers}[1]{et al.\hbox{}}%
+\renewcommand{\BOthersPeriod}[1]{et al.\hbox{}}%
+\renewcommand{\BIP}{in Druck}% % Jahresangabe bei im Druck bef. Werken
+\renewcommand{\BIn}{In}% % fuer "`In"' Herausgeber...
+\renewcommand{\BCHAP}{Kap.\hbox{}}% % Kapitel
+\renewcommand{\BCHAPS}{Kap.\hbox{}}% % Kapitel
+\renewcommand{\BED}{Hg.\hbox{}}% % Herausgeber(in)
+\renewcommand{\BEDS}{Hg.\hbox{}}% % Herausgeber(innen)
+\renewcommand{\BTRANS}{\"Ubers.\hbox{}}%% Uebersetzer(in)
+\renewcommand{\BTRANSS}{\"Ubers.\hbox{}}% Uebersetzer(innen)
+\renewcommand{\BTRANSL}{\"Ubers.\hbox{}}% Uebersetzung (bei der Jahresangabe)
+\renewcommand{\BCHAIR}{Chair}% % Chair (bei Konferenzen)
+\renewcommand{\BCHAIRS}{Chairs}% % Chairs (bei Konferenzen)
+\renewcommand{\BVOL}{Bd.\hbox{}}% % Band
+\renewcommand{\BVOLS}{Bde.\hbox{}}% % Baende
+\renewcommand{\BNUM}{Nr.\hbox{}}% % Nummer
+\renewcommand{\BNUMS}{Nr.\hbox{}}% % Nummern
+\renewcommand{\BEd}{Aufl.\hbox{}}% % Auflage
+\renewcommand{\BPG}{S.\hbox{}}% % Seite
+\renewcommand{\BPGS}{S.\hbox{}}% % Seiten
+\renewcommand{\BTR}{Bericht}% % (default) Bezeichnung fuer "`technical report"'
+\renewcommand{\BPhD}{Dissertation}% % (default) Bezeichnung fuer Dissertation
+\renewcommand{\BUPhD}{Unver\"offentlichte Dissertation}%
+\renewcommand{\BMTh}{Diplomarbeit}%
+\renewcommand{\BUMTh}{Unver\"offentlichte Diplomarbeit}%
+\renewcommand{\BOWP}{Originalausgabe}% % Originalausgabe
+\renewcommand{\BREPR}{Nachdruck von}% % Nachdruck von
+\renewcommand{\bibnodate}{o.\,J.\hbox{}}% "`ohne Jahresangabe"'
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bezeichnung (heading) des Literaturverzeichnisses
+\renewcommand{\refname}{Literatur}%
+\renewcommand{\bibname}{Literaturverzeichnis}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Kommando zwischen "Literaturverzeichnis" und den Eintraegen direkt
+%%% nach \bibliographytypesize
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bemerkung vor Literaturangeaben, falls eine Metaanalyse angegeben wurde
+\renewcommand{\APACmetaprenote}{Literaturangaben mit Stern kennzeichnen
+ Studien der Metaanalyse.}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bezeichnung (heading) des Autorenverzeichnisses
+\renewcommand{\authorindexname}{Autorenregister}%
+%%
+
+\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 ddd2e2edcca..f7a5f4e1349 100644
--- a/Master/texmf-dist/tex/latex/apacite/greek.apc
+++ b/Master/texmf-dist/tex/latex/apacite/greek.apc
@@ -1,109 +1,106 @@
-% \iffalse meta-comment
-%
-% This is file `greek.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-\ProvidesFile{greek.apc}[2005/06/01]
-
-%% greek.apc - Greek version of apacite elements
-%% Original (English) written by Erik Meijer <e.meijer@eco.rug.nl>
-%% Greek translations by Athanassios Protopapas <protopap@ilsp.gr>
-%% and Ioannis Dimakos <idimakos@upatras.gr>
-
-%% NOTE! NOTE! NOTE! NOTE!
-%% The Greek strings are in ISO-8859-7 encoding.
-\RequirePackage[iso-8859-7]{inputenc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Commands for specific types of @misc entries.
-%%% These commands are recognized by apacite.bst.
-\renewcommand{\bibmessage}{Μήνυμα}
-\renewcommand{\bibcomputerprogram}{Λογισμικό}
-\renewcommand{\bibcomputerprogrammanual}{Εγχειρίδιο λογισμικού}
-\renewcommand{\bibcomputerprogramandmanual}{Λογισμικό και εγχειρίδιο}
-\renewcommand{\bibcomputersoftware}{Λογισμικό}
-\renewcommand{\bibcomputersoftwaremanual}{Εγχειρίδιο λογισμικού}
-\renewcommand{\bibcomputersoftwareandmanual}{Λογισμικό και εγχειρίδιο}
-\renewcommand{\bibprogramminglanguage}{Γλώσσα προγραμματισμού}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Other labels
-\renewcommand{\bibnodate}{χωρίς ημερομηνία} % ``no date''
-\renewcommand{\BBAB}{και} % between authors in text
-\renewcommand{\BOthers}[1]{κ.\ συν.{}} % ``others'', the argument contains a
- % dot to suppress an additional one
- % in the reference list
-\renewcommand{\BOthersPeriod}[1]{κ.\ συν.{}}% ``others'', the argument contains
- % a dot to suppress an additional one
- % in the reference list. The difference
- % with \BOthers is that, if another
- % string is used to define \BOthers,
- % this one should always finish with a
- % period and the previous one not
- % necessarily (e.g., if explicit
- % ``others'' is used).
-\renewcommand{\BIP}{υπό έκδοση} % used as year for in-press citations
-\renewcommand{\BIn}{Στο} % for ``In '' editor...
-\renewcommand{\BCHAP}{κεφ.{}} % chapter
-\renewcommand{\BCHAPS}{κεφ.{}} % chapters
-\renewcommand{\BED}{Επιμ.{}} % editor
-\renewcommand{\BEDS}{Επιμ.{}} % editors
-\renewcommand{\BTRANS}{Μτφ.{}} % translator
-\renewcommand{\BTRANSS}{Μτφ.{}} % translators
-\renewcommand{\BTRANSL}{μτφ.{}} % translation, for the year field
-\renewcommand{\BCHAIR}{Πρόεδρος} % chair of symposium
-\renewcommand{\BCHAIRS}{Πρόεδροι} % chairs
-\renewcommand{\BVOL}{τ.{}} % volume
-\renewcommand{\BVOLS}{τ.{}} % volumes
-\renewcommand{\BNUM}{αρ.{}} % number
-\renewcommand{\BNUMS}{αρ.{}} % numbers
-\renewcommand{\BEd}{έκδ.{}} % edition
-\renewcommand{\BPG}{σελ.{}} % page
-\renewcommand{\BPGS}{σελ.{}} % pages
-\renewcommand{\BTR}{Τεχ.\ έκθ.{}} % (default) technical report type name
-\renewcommand{\BPhD}{Διδακτορική διατριβή}
- % (default) PhD thesis type name
-\renewcommand{\BUPhD}{Αδημοσίευτη διδακτορική διατριβή}
- % (default) unpublished PhD thesis
- % type name
-\renewcommand{\BMTh}{Μεταπτυχιακή διπλωματική εργασία}% (default) master's thesis type name
-\renewcommand{\BUMTh}{Αδημοσίευτη μεταπτυχιακή διπλωματική εργασία}%
- % (default) unpublished
- % master's thesis type name
-\renewcommand{\BOWP}{Πρώτη έκδοση πρωτοτύπου}
-\renewcommand{\BREPR}{Ανατύπωση από}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% The name (heading) of the Reference List
-\renewcommand{\refname}{Βιβλιογραφία}% Name of ref. list if it's a section.
-\renewcommand{\bibname}{Βιβλιογραφία}% Name of ref. list if it's a chapter.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Prenote used just before the references in the reference list
-% when a meta-analysis is reported.
-%
-%\renewcommand{\APACmetaprenote}{%
-% References marked with an asterisk indicate studies
-% included in the meta-analysis.}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% The name (heading) of the Author Index
-\renewcommand{\authorindexname}{Ευρετήριο συγγραφέων}
+%%
+%% This is file `greek.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `greek')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{greek.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% greek.apc - Greek version of apacite elements
+%% Greek translations by Athanassios Protopapas and Ioannis Dimakos
+%% NOTE! NOTE! NOTE! NOTE!
+%% The Greek strings are in ISO-8859-7 encoding.
+\RequirePackage[iso-8859-7]{inputenc}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Commands for specific types of @misc entries.
+%%% These commands are recognized by apacite.bst.
+\renewcommand{\bibmessage}{Μήνυμα}%
+\renewcommand{\bibcomputerprogram}{Λογισμικό}%
+\renewcommand{\bibcomputerprogrammanual}{Εγχειρίδιο λογισμικού}%
+\renewcommand{\bibcomputerprogramandmanual}{Λογισμικό και εγχειρίδιο}%
+\renewcommand{\bibcomputersoftware}{Λογισμικό}%
+\renewcommand{\bibcomputersoftwaremanual}{Εγχειρίδιο λογισμικού}%
+\renewcommand{\bibcomputersoftwareandmanual}{Λογισμικό και εγχειρίδιο}%
+\renewcommand{\bibprogramminglanguage}{Γλώσσα προγραμματισμού}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Other labels
+\renewcommand{\bibnodate}{χωρίς ημερομηνία}% ``no date''
+\renewcommand{\BBAB}{και}% % between authors in text
+\renewcommand{\BOthers}[1]{κ.\ συν.\hbox{}}%
+\renewcommand{\BOthersPeriod}[1]{κ.\ συν.\hbox{}}%
+\renewcommand{\BIP}{υπό έκδοση}% % used as year for in-press citations
+\renewcommand{\BIn}{Στο}% % for ``In '' editor...
+\renewcommand{\BCHAP}{κεφ.\hbox{}}% % chapter
+\renewcommand{\BCHAPS}{κεφ.\hbox{}}% % chapters
+\renewcommand{\BED}{Επιμ.\hbox{}}% % editor
+\renewcommand{\BEDS}{Επιμ.\hbox{}}% % editors
+\renewcommand{\BTRANS}{Μτφ.\hbox{}}% % translator
+\renewcommand{\BTRANSS}{Μτφ.\hbox{}}% % translators
+\renewcommand{\BTRANSL}{μτφ.\hbox{}}% % translation, for the year field
+\renewcommand{\BCHAIR}{Πρόεδρος}% % chair of symposium
+\renewcommand{\BCHAIRS}{Πρόεδροι}% % chairs
+\renewcommand{\BVOL}{τ.\hbox{}}% % volume
+\renewcommand{\BVOLS}{τ.\hbox{}}% % volumes
+\renewcommand{\BNUM}{αρ.\hbox{}}% % number
+\renewcommand{\BNUMS}{αρ.\hbox{}}% % numbers
+\renewcommand{\BEd}{έκδ.\hbox{}}% % edition
+\renewcommand{\BPG}{σελ.\hbox{}}% % page
+\renewcommand{\BPGS}{σελ.\hbox{}}% % pages
+\renewcommand{\BTR}{Τεχ.\ έκθ.\hbox{}}% % (default) technical report type name
+\renewcommand{\BPhD}{Διδακτορική διατριβή}% (default) PhD thesis type name
+\renewcommand{\BUPhD}{Αδημοσίευτη διδακτορική διατριβή}%
+\renewcommand{\BMTh}{Μεταπτυχιακή διπλωματική εργασία}%
+\renewcommand{\BUMTh}{Αδημοσίευτη μεταπτυχιακή διπλωματική εργασία}%
+\renewcommand{\BOWP}{Πρώτη έκδοση πρωτοτύπου}%
+\renewcommand{\BREPR}{Ανατύπωση από}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Reference List
+\renewcommand{\refname}{Βιβλιογραφία}% Name of ref. list if it's a section.
+\renewcommand{\bibname}{Βιβλιογραφία}% Name of ref. list if it's a chapter.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Author Index
+\renewcommand{\authorindexname}{Ευρετήριο συγγραφέων}%
+%%
+
+\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 06ddc0a3827..0a0bbb786c3 100644
--- a/Master/texmf-dist/tex/latex/apacite/ngerman.apc
+++ b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
@@ -1,33 +1,56 @@
-% \iffalse meta-comment
-%
-% This is file `ngerman.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-%% ngerman.apc - german translation of apacite elements (new orthography)
-%% Written by Erik Meijer <e.meijer@eco.rug.nl>, based on instructions of
-%% Andreas Poege.
-
-\ProvidesFile{ngerman.apc}[2005/06/01]
-
-%% According to Andreas Poege, his file german.apc can also be used
-%% for the new orthography, so I'll just do this:
-
-\input{german.apc}
+%%
+%% This is file `ngerman.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `ngerman')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{ngerman.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% ngerman.apc - german translation of apacite elements (new orthography)
+%% Written by Erik Meijer, based on instructions of Andreas Poege.
+%% According to Andreas Poege, his file german.apc can also be used
+%% for the new orthography, so I'll just do this:
+\input{german.apc}%
+%%
+
+\endinput
+%%
+%% End of file `ngerman.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/norsk.apc b/Master/texmf-dist/tex/latex/apacite/norsk.apc
new file mode 100644
index 00000000000..398cd6c9981
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apacite/norsk.apc
@@ -0,0 +1,163 @@
+%%
+%% This is file `norsk.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `norsk')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{norsk.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+%%
+%% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements.
+%% Version 1.0.
+%% Written by Karl Ove Hufthammer.
+%%
+%% Note: To be in line with Norwegian rules of punctuation
+%% a comma is never used before '&' or 'and', and there
+%% is no space between initials. The macro for these
+%% modifications can be found at the end of this file.
+%% Remove them to use a more 'APA-like' style.
+%%
+%% There are no official Norwegian translations of APA.
+%% Some ideas for this translation have been taken from the following sources:
+%%
+%% http://www.ub.uib.no/felles/IK/APA.pdf
+%% http://www.uio.no/studier/emner/medisin/isv/SYKVIT4400/v07/REV_normer_skriftl_arb.pdf
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Commands for specific types of @misc entries.
+%%% These commands are recognized by apacite.bst.
+\renewcommand{\bibmessage}{innlegg}
+\renewcommand{\bibcomputerprogram}{dataprogram}
+\renewcommand{\bibcomputerprogrammanual}{dataprogramh\aa{}ndbok}
+\renewcommand{\bibcomputerprogramandmanual}{dataprogram og brukerh\aa{}ndbok}
+\renewcommand{\bibcomputersoftware}{programvare}
+\renewcommand{\bibcomputersoftwaremanual}{programvareh\aa{}ndbok}
+\renewcommand{\bibcomputersoftwareandmanual}{programvare og brukerh\aa{}ndbok}
+\renewcommand{\bibprogramminglanguage}{programmeringssprΓ₯k}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Other labels
+\renewcommand{\bibnodate}{u.d.\hbox{}} % ``no date''
+\renewcommand{\BBAB}{og} % between authors in text
+\renewcommand{\BOthers}[1]{et al.\hbox{}} % ``others'', the argument contains a
+ % dot to suppress an additional one
+ % in the reference list
+\renewcommand{\BOthersPeriod}[1]{et al.\hbox{}}% ``others'', the argument contains
+ % a dot to suppress an additional one
+ % in the reference list. The difference
+ % with \BOthers is that, if another
+ % string is used to define \BOthers,
+ % this one should always finish with a
+ % period and the previous one not
+ % necessarily (e.g., if explicit
+ % ``others'' is used).
+\renewcommand{\BIP}{under publisering} % used as year for in-press citations
+\renewcommand{\BIn}{I} % for ``In '' editor...
+\renewcommand{\BCHAP}{kap.\hbox{}} % chapter
+\renewcommand{\BCHAPS}{kap.\hbox{}} % chapters
+\renewcommand{\BED}{red.\hbox{}} % editor
+\renewcommand{\BEDS}{red.\hbox{}} % editors
+\renewcommand{\BTRANS}{oms.\hbox{}} % translator
+\renewcommand{\BTRANSS}{oms.\hbox{}} % translators
+\renewcommand{\BTRANSL}{oms.\hbox{}} % translation, for the year field
+\renewcommand{\BCHAIR}{ordstyrer} % chair of symposium
+\renewcommand{\BCHAIRS}{ordstyrere} % chairs
+\renewcommand{\BVOL}{vol.\hbox{}} % volume
+\renewcommand{\BVOLS}{vol.\hbox{}} % volumes
+\renewcommand{\BNUM}{nr.\hbox{}} % number
+\renewcommand{\BNUMS}{nr.\hbox{}} % numbers
+\renewcommand{\BEd}{utg.\hbox{}} % edition
+\renewcommand{\BPG}{s.\hbox{}} % page
+\renewcommand{\BPGS}{s.\hbox{}} % pages
+\renewcommand{\BTR}{Teknisk rapport} % (default) technical report type name
+\renewcommand{\BPhD}{Akademisk avhandling}
+ % (default) PhD thesis type name
+\renewcommand{\BUPhD}{Upublisert akademisk avhandling}
+ % (default) unpublished PhD thesis
+ % type name
+\renewcommand{\BMTh}{Masteroppgave}% (default) master's thesis type name
+\renewcommand{\BUMTh}{Upublisert masteroppgave}%
+ % (default) unpublished
+ % master's thesis type name
+\renewcommand{\BOWP}{Original publisert}
+\renewcommand{\BREPR}{Opptrykk fra}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Reference List
+\renewcommand{\refname}{Referanser}% Name of ref. list if it's a section.
+\renewcommand{\bibname}{Referanser}% Name of ref. list if it's a chapter.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\APACmetaprenote}{%
+Referanser merket med en stjerne viser til studier som er med i metaanalysen.}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% The name (heading) of the Author Index
+\renewcommand{\authorindexname}{Forfatterregister}
+
+%%%%%%%%%%%%%%%%%%%%%%
+
+\renewcommand{\BCBT}{} % No comma before & when we have two authors.
+\renewcommand{\BCBL}{} % No comma before & when we have three or more authors.
+\renewcommand{\BPBI}{.} % Period between initials. No space.
+
+\edef\APACnynorsk{\string nynorsk}
+\ifx\languagename\APACnynorsk
+ \renewcommand{\bibcomputerprogrammanual}{dataprogramhandbok}
+ \renewcommand{\bibcomputerprogramandmanual}{dataprogram og brukarhandbok}
+ \renewcommand{\bibcomputersoftwaremanual}{programvarehandbok}
+ \renewcommand{\bibcomputersoftwareandmanual}{programvare og brukarhandbok}
+ \renewcommand{\BCHAIR}{ordstyrar} % chair of symposium
+ \renewcommand{\BCHAIRS}{ordstyrarar} % chairs
+ \renewcommand{\BMTh}{Masteroppg\aa{}ve}% (default) master's thesis type name
+ \renewcommand{\BUMTh}{Upublisert masteroppg\aa{}ve}%
+ \renewcommand{\BREPR}{Opptrykk fr\aa{}}
+ \renewcommand{\refname}{Referansar}% Name of ref. list if it's a section.
+ \renewcommand{\bibname}{Referansar}% Name of ref. list if it's a chapter.
+ \renewcommand{\APACmetaprenote}{%
+ Referansar merkte med ei stjerne viser til studiar som er med i metaanalysen.}
+ \renewcommand{\authorindexname}{Forfattarregister}
+\fi
+\let\APACnynorsk\undefined
+%%
+
+\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
new file mode 100644
index 00000000000..88de1763212
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apacite/spanish.apc
@@ -0,0 +1,110 @@
+%%
+%% This is file `spanish.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `spanish')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{spanish.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+
+%%
+%% spanish.apc - Versiσn espaρola de elementos en apacite
+%% Escrito por Jorge Lσpez Puga
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Comandos para tipos especνficos de entradas @misc.
+%%% Estos comandos son reconocidos por apacite.bst.
+\renewcommand{\bibcomputerprogram}{Programa informαtico}
+\renewcommand{\bibcomputerprogrammanual}{Manual de programa informαtico}
+\renewcommand{\bibcomputerprogramandmanual}{Programa informαtico y manual}
+\renewcommand{\bibcomputersoftware}{Software informαtico}
+\renewcommand{\bibcomputersoftwaremanual}{Manual de software informαtico}
+\renewcommand{\bibcomputersoftwareandmanual}{Manual y software informαtico}
+\renewcommand{\bibprogramminglanguage}{Lenguaje de programaciσn}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Otras etiquetas
+\renewcommand{\BBAB}{y} % Entre autores en el texto
+\renewcommand{\BOthers}[1]{y cols.\hbox{}} % ``y colaboradores'', El argumento contiene un punto, por tanto, %evita poner uno adicional en la lista de referencias. No obstante %algunas revistas aceptan "et al." que es lo que aparece por defecto
+ % a dot to suppress an additional one
+ % in the reference list. The difference
+ % with \BOthers is that, if another
+ % string is used to define \BOthers,
+ % this one should always finish with a
+ % period and the previous one not
+ % necessarily (e.g., if explicit
+ % ``others'' is used).
+\renewcommand{\BBAA}{y} % Letra que va entre los autores en las referencias (por defecto "\&")
+\renewcommand{\BIP}{en prensa} % Usado como aρo para citas "en prensa"
+\renewcommand{\BIn}{En} % Para ``En '' editor...
+\renewcommand{\BCHAP}{cap.\hbox{}} % capνtulo
+\renewcommand{\BCHAPS}{caps.\hbox{}} % capνtulos
+\renewcommand{\BTRANS}{Traduc.\hbox{}} % traductor
+\renewcommand{\BTRANSS}{Traducs.\hbox{}} % traductores
+\renewcommand{\BTRANSL}{traduc.\hbox{}} % traducciσn, para el campo aρo
+\renewcommand{\BPhD}{Tesis Doctoral}
+ % (por defecto) PhD thesis type name
+\renewcommand{\BUPhD}{Tesis doctoral no publicada}
+ % (por defecto) unpublished PhD thesis
+ % type name
+\renewcommand{\BMTh}{Tesis de master}% (por defecto) master's thesis type name
+\renewcommand{\BUMTh}{Tesis de master no publicada}%
+ % (por defecto) unpublished
+ % master's thesis type name
+\renewcommand{\BOWP}{Trabajo original publicado en}
+\renewcommand{\BREPR}{Reimpresiσn de}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% El nombre (del encabezado) de la Lista Referencias
+\renewcommand{\refname}{Referencias}% Nombbre de la lista de ref. si es una secciσn.
+\renewcommand{\bibname}{Referencias}% Nomber de la lista de refs. si es un capνtulo.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %Nota previa usada justo antes de la lista de referencias si un meta-anαlisis es usado.
+\renewcommand{\APACmetaprenote}{%
+ Las referencias marcadas con un asterisco indican estudios incluidos en el meta-anαlisis.}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% El nombre (del encabezado) del Νndice de Autores.
+\renewcommand{\authorindexname}{Νndice de Autores}
+%%
+\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 9615c949366..57e78862253 100644
--- a/Master/texmf-dist/tex/latex/apacite/swedish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/swedish.apc
@@ -1,93 +1,115 @@
-% \iffalse meta-comment
-%
-% This is file `swedish.apc'.
-%
-% Copyright 1994-2005 Erik Meijer and any individual authors listed
-% elsewhere in this file. All rights reserved.
-%
-% This file is part of the `apacite' package.
-% -------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2003/12/01 or later.
-%
-% The list of all files belonging to the `apacite' package, with a
-% short description, is given in the file `manifest.txt'.
-%
-% \fi
-
-\ProvidesFile{swedish.apc}[2005/06/01]
-
-%% swedish.apc - swedish translation of apacite elements
-%% Written by Stefan Bjork <stefan@raggmunk.nu>
-%% $Revision: 1.2 $
-%%
-%% Translation of APA elements into swedish is not obvious. Ideas of
-%% which terms to use have been taken from the following sources:
-%%
-%% Eriksson, M. G. (2001). Att skriva litteraturreferenser enligt
-%% Harvard-systemet. Retreived December 9, 2004, from:
-%% http://www.ida.his.se/ida/kurser/exjobb/kursmaterial/referenser.pdf
-%% Jonsson, Mattias. (n.d.). Lathund for referensskrivning. Retreived
-%% December 9, 2004, from:
-%% http://www.ped.gu.se/users/berner/htmarkiv/referens.html
-%% Referensskrivning. (1994). Retreived December 9, 2004, from
-%% Gothenburg University Web site:
-%% http://www.ped.gu.se/forskarutbildning/Referens_skrivning.htm
-%%
-
-%% Punctuations
-\renewcommand{\BBAB}{och}
-
-%% Labels
-\renewcommand{\BOthers}[1]{m.\thinspace{}fl.}
-\renewcommand{\BOthersPeriod}[1]{m.\thinspace{}fl.}
-\renewcommand{\BIP}{under tryckning}
-\renewcommand{\BIn}{I}
-\renewcommand{\BCHAP}{kap.}
-\renewcommand{\BCHAPS}{kap.}
-\renewcommand{\BED}{red.}
-\renewcommand{\BEDS}{red:er}
-\renewcommand{\BTRANS}{\"overs.}
-\renewcommand{\BTRANSS}{\"overs.}
-\renewcommand{\BTRANSL}{\"overs.}
-\renewcommand{\BCHAIR}{ordf\"orande}
-\renewcommand{\BCHAIRS}{ordf\"orande}
-\renewcommand{\BVOL}{vol.}
-\renewcommand{\BVOLS}{vol.}
-\renewcommand{\BNUM}{nr.}
-\renewcommand{\BNUMS}{nr.}
-\renewcommand{\BEd}{upplagan}
-\renewcommand{\BPG}{s.}
-\renewcommand{\BPGS}{ss.}
-\renewcommand{\BTR}{teknisk rapport}
-\renewcommand{\BPhD}{diss.}
-\renewcommand{\BUPhD}{opublicerad diss.}
-\renewcommand{\BMTh}{examensuppsats}
-\renewcommand{\BUMTh}{opublicerad examensuppsats}
-\renewcommand{\BOWP}{Original publicerat}
-\renewcommand{\BREPR}{\AA{}terutgivning fr\aa{}n}
-\renewcommand{\APACmetaprenote}{%
-Referenser markerade med stj\"arna avser studier inkluderade i
-meta-analys.}
-
-%% Commands for specific types of @misc entries.
-\renewcommand{\bibmessage}{meddelande}
-\renewcommand{\bibcomputerprogram}{datorprogram}
-\renewcommand{\bibcomputerprogrammanual}{handbok till datorprogram}
-\renewcommand{\bibcomputerprogramandmanual}{datorprogram och handbok}
-\renewcommand{\bibcomputersoftware}{mjukvara}
-\renewcommand{\bibcomputersoftwaremanual}{handbok till mjukvara}
-\renewcommand{\bibcomputersoftwareandmanual}{datorprogram och handbok}
-\renewcommand{\bibprogramminglanguage}{programmeringsspr\aa{}k}
-
-%% Publication date unknown
-\renewcommand{\bibnodate}{u.\thinspace\aa{}.}
-
-%% Author Index
-\renewcommand{\authorindexname}{F\"orfattarindex}
+%%
+%% This is file `swedish.apc',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apacite.dtx (with options: `swedish')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1994-2007 Erik Meijer and any individual authors listed
+%% elsewhere in this file.
+%%
+%% This file is part of the `apacite' package.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% 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,
+%% english.apc, dutch.apc, finnish.apc, german.apc, ngerman.apc,
+%% greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%%
+%% This work has the LPPL maintenance status `maintained'
+%%
+%% The Current Maintainer of this work is Erik Meijer
+%%
+%% This file may only be distributed together with a copy of the
+%% source files of the apacite package, i.e., apacite.dtx and
+%% apacite.ins. You may however distribute the apacite package without
+%% the generated files.
+%%
+\ProvidesFile{swedish.apc}
+ [2007/09/03 v4.00 apacite language file]
+
+
+%%
+%% swedish.apc - swedish translation of apacite elements
+%% Written by Stefan Bjork.
+%% Small adaptations by Erik Meijer
+%% $Revision: 1.3 $
+%%
+%% Translation of APA elements into swedish is not obvious. Ideas of
+%% which terms to use have been taken from the following sources:
+%%
+%% Eriksson, M. G. (2001). Att skriva litteraturreferenser enligt
+%% Harvard-systemet. Retreived December 9, 2004, from:
+%% http://www.ida.his.se/ida/kurser/exjobb/kursmaterial/referenser.pdf
+%% Jonsson, Mattias. (n.d.). Lathund for referensskrivning. Retreived
+%% December 9, 2004, from:
+%% http://www.ped.gu.se/users/berner/htmarkiv/referens.html
+%% Referensskrivning. (1994). Retreived December 9, 2004, from
+%% Gothenburg University Web site:
+%% http://www.ped.gu.se/forskarutbildning/Referens_skrivning.htm
+%%
+%% Punctuations
+\renewcommand{\BBAB}{och}%
+%% Labels
+\renewcommand{\BOthers}[1]{m.\thinspace{}fl.\hbox{}}%
+\renewcommand{\BOthersPeriod}[1]{m.\thinspace{}fl.\hbox{}}%
+\renewcommand{\BIP}{under tryckning}%
+\renewcommand{\BIn}{I}%
+\renewcommand{\BCHAP}{kap.\hbox{}}%
+\renewcommand{\BCHAPS}{kap.\hbox{}}%
+\renewcommand{\BED}{red.\hbox{}}%
+\renewcommand{\BEDS}{red:er}%
+\renewcommand{\BTRANS}{\"overs.\hbox{}}%
+\renewcommand{\BTRANSS}{\"overs.\hbox{}}%
+\renewcommand{\BTRANSL}{\"overs.\hbox{}}%
+\renewcommand{\BCHAIR}{ordf\"orande}%
+\renewcommand{\BCHAIRS}{ordf\"orande}%
+\renewcommand{\BVOL}{vol.\hbox{}}%
+\renewcommand{\BVOLS}{vol.\hbox{}}%
+\renewcommand{\BNUM}{nr.\hbox{}}%
+\renewcommand{\BNUMS}{nr.\hbox{}}%
+\renewcommand{\BEd}{upplagan}%
+\renewcommand{\BPG}{s.\hbox{}}%
+\renewcommand{\BPGS}{ss.\hbox{}}%
+\renewcommand{\BTR}{teknisk rapport}%
+\renewcommand{\BPhD}{diss.\hbox{}}%
+\renewcommand{\BUPhD}{opublicerad diss.\hbox{}}%
+\renewcommand{\BMTh}{examensuppsats}%
+\renewcommand{\BUMTh}{opublicerad examensuppsats}%
+\renewcommand{\BOWP}{Original publicerat}%
+\renewcommand{\BREPR}{\AA{}terutgivning fr\aa{}n}%
+\renewcommand{\APACmetaprenote}{%
+ Referenser markerade med stj\"arna avser studier inkluderade i
+ meta-analys.}%
+%% Commands for specific types of @misc entries.
+\renewcommand{\bibmessage}{meddelande}%
+\renewcommand{\bibcomputerprogram}{datorprogram}%
+\renewcommand{\bibcomputerprogrammanual}{handbok till datorprogram}%
+\renewcommand{\bibcomputerprogramandmanual}{datorprogram och handbok}%
+\renewcommand{\bibcomputersoftware}{mjukvara}%
+\renewcommand{\bibcomputersoftwaremanual}{handbok till mjukvara}%
+\renewcommand{\bibcomputersoftwareandmanual}{datorprogram och handbok}%
+\renewcommand{\bibprogramminglanguage}{programmeringsspr\aa{}k}%
+%% Publication date unknown
+\renewcommand{\bibnodate}{u.\thinspace\aa{}.\hbox{}}%
+%% Author Index
+\renewcommand{\authorindexname}{F\"orfattarindex}%
+%%
+\endinput
+%%
+%% End of file `swedish.apc'.