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 | |
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')
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/apacdoc.sty | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/apacite.sty | 50 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/dutch.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/english.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/finnish.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/german.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/greek.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/ngerman.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/norsk.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/spanish.apc | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apacite/swedish.apc | 2 |
11 files changed, 72 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty index a301b52d413..990c850f7dd 100644 --- a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty +++ b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{apacdoc} - [2013/07/04 v6.02 apacite documentation style] + [2013/07/21 v6.03 apacite documentation style] %% %% apacdoc.sty : Style package that is used for the apacite documentation. %% Written by Erik Meijer @@ -62,6 +62,20 @@ \newcommand{\SwapArgs}[2]{#2#1} \newcommand{\bibreftext}[2]{#2} \newcommand{\Dutchvon}[2]{#2} +\DeclareRobustCommand\APACredefineOnce[2]{% + \global + \expandafter\let + \csname old#1\expandafter\endcsname + \csname #1\endcsname + \expandafter\gdef + \csname #1\expandafter\endcsname + {{#2}% + \global + \expandafter\let + \csname #1\expandafter\endcsname + \csname old#1\endcsname + }% +} \DeclareRobustCommand{\bibeditortype}[1]{\relax }% \def\renewbibeditortype{% \def\oldBED{}% 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'' diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc index 6e66b9656e4..00e2ec21940 100644 --- a/Master/texmf-dist/tex/latex/apacite/dutch.apc +++ b/Master/texmf-dist/tex/latex/apacite/dutch.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{dutch.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% dutch.apc - dutch translation of apacite elements %% Written by Erik Meijer diff --git a/Master/texmf-dist/tex/latex/apacite/english.apc b/Master/texmf-dist/tex/latex/apacite/english.apc index a9dc4fb84f2..ee8ff2148b6 100644 --- a/Master/texmf-dist/tex/latex/apacite/english.apc +++ b/Master/texmf-dist/tex/latex/apacite/english.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{english.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% english.apc - english version of apacite elements %% Written by Erik Meijer diff --git a/Master/texmf-dist/tex/latex/apacite/finnish.apc b/Master/texmf-dist/tex/latex/apacite/finnish.apc index 628ea9185eb..343f4a047ef 100644 --- a/Master/texmf-dist/tex/latex/apacite/finnish.apc +++ b/Master/texmf-dist/tex/latex/apacite/finnish.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{finnish.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% finnish.apc - finnish version of apacite elements %% Written by Kari Pyykk\"o, with some minor edits by Erik Meijer. diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc index 9204ba23ead..fb053a0143c 100644 --- a/Master/texmf-dist/tex/latex/apacite/german.apc +++ b/Master/texmf-dist/tex/latex/apacite/german.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{german.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% german.apc - Deutsche Uebersetzung der Apacite-Elemente %% (German version of apacite elements) diff --git a/Master/texmf-dist/tex/latex/apacite/greek.apc b/Master/texmf-dist/tex/latex/apacite/greek.apc index 47ba7984990..0ad81ee55b5 100644 --- a/Master/texmf-dist/tex/latex/apacite/greek.apc +++ b/Master/texmf-dist/tex/latex/apacite/greek.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{greek.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% greek.apc - Greek version of apacite elements %% Greek translations by Athanassios Protopapas and Ioannis Dimakos diff --git a/Master/texmf-dist/tex/latex/apacite/ngerman.apc b/Master/texmf-dist/tex/latex/apacite/ngerman.apc index 73dc2536afd..bad625df5c7 100644 --- a/Master/texmf-dist/tex/latex/apacite/ngerman.apc +++ b/Master/texmf-dist/tex/latex/apacite/ngerman.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{ngerman.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% ngerman.apc - german translation of apacite elements (new orthography) %% Written by Erik Meijer, based on instructions of Andreas Poege. diff --git a/Master/texmf-dist/tex/latex/apacite/norsk.apc b/Master/texmf-dist/tex/latex/apacite/norsk.apc index 96b0241fc48..227dd83b2d2 100644 --- a/Master/texmf-dist/tex/latex/apacite/norsk.apc +++ b/Master/texmf-dist/tex/latex/apacite/norsk.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{norsk.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements. %% Version 1.1. diff --git a/Master/texmf-dist/tex/latex/apacite/spanish.apc b/Master/texmf-dist/tex/latex/apacite/spanish.apc index 5d746ef7386..63136b34b95 100644 --- a/Master/texmf-dist/tex/latex/apacite/spanish.apc +++ b/Master/texmf-dist/tex/latex/apacite/spanish.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{spanish.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% spanish.apc - Versi\'on espa\~nola de elementos en apacite %% Escrito por Jorge L\'opez Puga diff --git a/Master/texmf-dist/tex/latex/apacite/swedish.apc b/Master/texmf-dist/tex/latex/apacite/swedish.apc index 10fed68e466..786c0beea82 100644 --- a/Master/texmf-dist/tex/latex/apacite/swedish.apc +++ b/Master/texmf-dist/tex/latex/apacite/swedish.apc @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{swedish.apc} - [2013/07/04 v6.02 apacite language file] + [2013/07/21 v6.03 apacite language file] %% %% swedish.apc - swedish translation of apacite elements %% Written by Stefan Bjork. |