diff options
author | Karl Berry <karl@freefriends.org> | 2013-07-22 22:04:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-07-22 22:04:45 +0000 |
commit | d8c45c205a8c3d026e4db8c8af520b856e430463 (patch) | |
tree | 6a9dec763e855c3c3992d0c74601c6a928205572 /Master/texmf-dist/tex/latex/apacite/apacite.sty | |
parent | 6cc97d4684de46171247737d676c4cbf45afdbbf (diff) |
apacite (22jul13)
git-svn-id: svn://tug.org/texlive/trunk@31264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/apacite/apacite.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/apacite.sty | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty index 710737939e0..11a4c757b78 100644 --- a/Master/texmf-dist/tex/latex/apacite/apacite.sty +++ b/Master/texmf-dist/tex/latex/apacite/apacite.sty @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{apacite} - [2013/07/04 v6.02 APA citation] + [2013/07/21 v6.03 APA citation] %% %% apacite.sty : citation and reference list according to APA manual %% Written by Erik Meijer @@ -1287,7 +1287,7 @@ \unskip, {#4}% pages \fi } -\newcommand{\APACaddressPublisher}[2]{% +\DeclareRobustCommand{\APACaddressPublisher}[2]{% \ifx\@empty#1\@empty \ifx\@empty#2\@empty \else @@ -1302,6 +1302,52 @@ \fi } \let\APACaddressInstitution\APACaddressPublisher +\DeclareRobustCommand{\APACaddressSchool}[2]{% + \ifx\@empty#2\@empty + \ifx\@empty#1\@empty + \else + {#1}% address + \fi + \else + {#2}% school + \ifx\@empty#1\@empty + \else + \unskip, {#1}% address + \fi + \fi +} +\DeclareRobustCommand{\APACtypeAddressSchool}[3]{% + \ifx\@empty#1\@empty + \ifx\@empty#3\@empty + \ifx\@empty#2\@empty + \else + ({#2})% address + \fi + \else + ({#3}% school + \ifx\@empty#2\@empty + \else + \unskip, {#2}% address + \fi + )% + \fi + \else + ({#1}% type + \ifx\@empty#3\@empty + \ifx\@empty#2\@empty + \else + \unskip, {#2}% address + \fi + \else + \unskip, {#3}% school + \ifx\@empty#2\@empty + \else + \unskip, {#2}% address + \fi + \fi + )% + \fi +} \newcommand{\APACaddressPublisherEqAuth}[2]{% \ifx\@empty#1\@empty {\BAuthor{}}% Publisher formatted as ``Author'' |