diff options
20 files changed, 193 insertions, 161 deletions
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst index c073b547a78..5784c8a5958 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst @@ -43,7 +43,7 @@ %% the generated files. %% %% apacann.bst -%% [2012/02/14 v6.00 APA annotated bibliography style] +%% [2012/02/25 v6.01 APA annotated bibliography style] %% apacann.bst : reference list according to APA manual %% with annotations %% Written by Erik Meijer @@ -51,7 +51,7 @@ FUNCTION {identify.apacite.version} { % Put identifying string in the .blg file "apacann.bst" - " [2012/02/14 v6.00 APA annotated bibliography style]" + " [2012/02/25 v6.01 APA annotated bibliography style]" * top$ } ENTRY @@ -1508,10 +1508,12 @@ FUNCTION {make.tentative.year.sort.label} year empty$ { "0000" 'year.label := } { year "\bibnodate" = - year "n.d." = - or + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "0000" 'year.label := } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "9999" 'year.label := } { % It is not checked whether the year field % makes sense. @@ -2576,8 +2578,12 @@ FUNCTION {make.definitive.year.supplement} year empty$ { "\BCntND " * } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "\BCntND " * } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "\BCntIP " * } { "\BCnt " * } if$ @@ -2596,8 +2602,12 @@ FUNCTION {protect.year} { year empty$ { "{\protect \bibnodate {}}" } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "{\protect \bibnodate {}}" } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "{\protect \BIP {}}" } { year } if$ @@ -2614,13 +2624,11 @@ FUNCTION {make.definitive.year.label} originalyear empty$ { protect.year } { originalyear "\bibnodate" = % date of original publication unknown + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or { translator empty$ { protect.year } - { year empty$ - { "{\protect \BTRANSL {}~\protect \bibnodate {}}" } % trans. n.d. - { "{\protect \BTRANSL {}}~" protect.year * } % trans. 1931 - if$ - } + { "{\protect \BTRANSL {}}~" protect.year * } if$ } { year empty$ @@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans} FUNCTION {format.year.check} { "\APACrefYear{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -3355,10 +3360,7 @@ FUNCTION {format.year.check} FUNCTION {format.year.month.day.check} { "\APACrefYearMonthDay{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -4026,6 +4028,8 @@ FUNCTION {format.orig.note} { originalyear empty$ 'skip$ { originalyear "\bibnodate" = + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or 'skip$ { output.new.block format.orig.year.note @@ -4710,11 +4714,9 @@ FUNCTION {thesis} % pop default published thesis, top is default unpublished thesis % { pop$ - type empty$ - school empty$ - originalyear empty$ - and - and + type empty$ + school empty$ and + originalyear empty$ and { pop$ "" } diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst index 59e57437fdc..efc5ef2d65f 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst @@ -43,7 +43,7 @@ %% the generated files. %% %% apacannx.bst -%% [2012/02/14 v6.00 APA annotated bibl. style with author index info] +%% [2012/02/25 v6.01 APA annotated bibl. style with author index info] %% apacannx.bst : reference list according to APA manual %% with annotations and author indexing information %% Written by Erik Meijer @@ -51,7 +51,7 @@ FUNCTION {identify.apacite.version} { % Put identifying string in the .blg file "apacannx.bst" -" [2012/02/14 v6.00 APA annotated bibl. style with author index info]" +" [2012/02/25 v6.01 APA annotated bibl. style with author index info]" * top$ } ENTRY @@ -1508,10 +1508,12 @@ FUNCTION {make.tentative.year.sort.label} year empty$ { "0000" 'year.label := } { year "\bibnodate" = - year "n.d." = - or + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "0000" 'year.label := } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "9999" 'year.label := } { % It is not checked whether the year field % makes sense. @@ -2576,8 +2578,12 @@ FUNCTION {make.definitive.year.supplement} year empty$ { "\BCntND " * } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "\BCntND " * } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "\BCntIP " * } { "\BCnt " * } if$ @@ -2596,8 +2602,12 @@ FUNCTION {protect.year} { year empty$ { "{\protect \bibnodate {}}" } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "{\protect \bibnodate {}}" } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "{\protect \BIP {}}" } { year } if$ @@ -2614,13 +2624,11 @@ FUNCTION {make.definitive.year.label} originalyear empty$ { protect.year } { originalyear "\bibnodate" = % date of original publication unknown + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or { translator empty$ { protect.year } - { year empty$ - { "{\protect \BTRANSL {}~\protect \bibnodate {}}" } % trans. n.d. - { "{\protect \BTRANSL {}}~" protect.year * } % trans. 1931 - if$ - } + { "{\protect \BTRANSL {}}~" protect.year * } if$ } { year empty$ @@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans} FUNCTION {format.year.check} { "\APACrefYear{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -3355,10 +3360,7 @@ FUNCTION {format.year.check} FUNCTION {format.year.month.day.check} { "\APACrefYearMonthDay{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -4026,6 +4028,8 @@ FUNCTION {format.orig.note} { originalyear empty$ 'skip$ { originalyear "\bibnodate" = + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or 'skip$ { output.new.block format.orig.year.note @@ -4710,11 +4714,9 @@ FUNCTION {thesis} % pop default published thesis, top is default unpublished thesis % { pop$ - type empty$ - school empty$ - originalyear empty$ - and - and + type empty$ + school empty$ and + originalyear empty$ and { pop$ "" } diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst index f8cdfd16d12..c69c9b3b2de 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst @@ -43,14 +43,14 @@ %% the generated files. %% %% apacite.bst -%% [2012/02/14 v6.00 APA bibliography style] +%% [2012/02/25 v6.01 APA bibliography style] %% apacite.bst : reference list according to APA manual %% Written by Erik Meijer FUNCTION {identify.apacite.version} { % Put identifying string in the .blg file "apacite.bst" - " [2012/02/14 v6.00 APA bibliography style]" + " [2012/02/25 v6.01 APA bibliography style]" * top$ } ENTRY @@ -1507,10 +1507,12 @@ FUNCTION {make.tentative.year.sort.label} year empty$ { "0000" 'year.label := } { year "\bibnodate" = - year "n.d." = - or + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "0000" 'year.label := } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "9999" 'year.label := } { % It is not checked whether the year field % makes sense. @@ -2575,8 +2577,12 @@ FUNCTION {make.definitive.year.supplement} year empty$ { "\BCntND " * } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "\BCntND " * } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "\BCntIP " * } { "\BCnt " * } if$ @@ -2595,8 +2601,12 @@ FUNCTION {protect.year} { year empty$ { "{\protect \bibnodate {}}" } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "{\protect \bibnodate {}}" } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "{\protect \BIP {}}" } { year } if$ @@ -2613,13 +2623,11 @@ FUNCTION {make.definitive.year.label} originalyear empty$ { protect.year } { originalyear "\bibnodate" = % date of original publication unknown + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or { translator empty$ { protect.year } - { year empty$ - { "{\protect \BTRANSL {}~\protect \bibnodate {}}" } % trans. n.d. - { "{\protect \BTRANSL {}}~" protect.year * } % trans. 1931 - if$ - } + { "{\protect \BTRANSL {}}~" protect.year * } if$ } { year empty$ @@ -3339,10 +3347,7 @@ FUNCTION {format.in.editors.trans} FUNCTION {format.year.check} { "\APACrefYear{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -3354,10 +3359,7 @@ FUNCTION {format.year.check} FUNCTION {format.year.month.day.check} { "\APACrefYearMonthDay{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -4025,6 +4027,8 @@ FUNCTION {format.orig.note} { originalyear empty$ 'skip$ { originalyear "\bibnodate" = + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or 'skip$ { output.new.block format.orig.year.note @@ -4685,11 +4689,9 @@ FUNCTION {thesis} % pop default published thesis, top is default unpublished thesis % { pop$ - type empty$ - school empty$ - originalyear empty$ - and - and + type empty$ + school empty$ and + originalyear empty$ and { pop$ "" } diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst index 046a4951491..007a2804076 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst @@ -43,7 +43,7 @@ %% the generated files. %% %% apacitex.bst -%% [2012/02/14 v6.00 APA bibl. style with author index info] +%% [2012/02/25 v6.01 APA bibl. style with author index info] %% apacitex.bst : reference list according to APA manual %% with author indexing information %% Written by Erik Meijer @@ -51,7 +51,7 @@ FUNCTION {identify.apacite.version} { % Put identifying string in the .blg file "apacitex.bst" - " [2012/02/14 v6.00 APA bibl. style with author index info]" + " [2012/02/25 v6.01 APA bibl. style with author index info]" * top$ } ENTRY @@ -1508,10 +1508,12 @@ FUNCTION {make.tentative.year.sort.label} year empty$ { "0000" 'year.label := } { year "\bibnodate" = - year "n.d." = - or + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "0000" 'year.label := } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "9999" 'year.label := } { % It is not checked whether the year field % makes sense. @@ -2576,8 +2578,12 @@ FUNCTION {make.definitive.year.supplement} year empty$ { "\BCntND " * } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "\BCntND " * } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "\BCntIP " * } { "\BCnt " * } if$ @@ -2596,8 +2602,12 @@ FUNCTION {protect.year} { year empty$ { "{\protect \bibnodate {}}" } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "{\protect \bibnodate {}}" } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "{\protect \BIP {}}" } { year } if$ @@ -2614,13 +2624,11 @@ FUNCTION {make.definitive.year.label} originalyear empty$ { protect.year } { originalyear "\bibnodate" = % date of original publication unknown + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or { translator empty$ { protect.year } - { year empty$ - { "{\protect \BTRANSL {}~\protect \bibnodate {}}" } % trans. n.d. - { "{\protect \BTRANSL {}}~" protect.year * } % trans. 1931 - if$ - } + { "{\protect \BTRANSL {}}~" protect.year * } if$ } { year empty$ @@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans} FUNCTION {format.year.check} { "\APACrefYear{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -3355,10 +3360,7 @@ FUNCTION {format.year.check} FUNCTION {format.year.month.day.check} { "\APACrefYearMonthDay{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -4026,6 +4028,8 @@ FUNCTION {format.orig.note} { originalyear empty$ 'skip$ { originalyear "\bibnodate" = + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or 'skip$ { output.new.block format.orig.year.note @@ -4686,11 +4690,9 @@ FUNCTION {thesis} % pop default published thesis, top is default unpublished thesis % { pop$ - type empty$ - school empty$ - originalyear empty$ - and - and + type empty$ + school empty$ and + originalyear empty$ and { pop$ "" } diff --git a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib index 730c4cfb2e9..24b503c578d 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib +++ b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib @@ -43,7 +43,7 @@ %% the generated files. %% %% apa5ex.bib -%% [2012/02/14 v6.00 bibliography database for examples] +%% [2012/02/25 v6.01 bibliography database for examples] %% %% apa5ex.bib: References from the 5th edition of the Publication Manual %% of the APA, plus a few additional references diff --git a/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf b/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf Binary files differindex 7633b204684..001341838be 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf +++ b/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf diff --git a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex index 4631a648388..4630fe5da50 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex +++ b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex @@ -43,7 +43,7 @@ %% the generated files. %% %% apacxmpl.tex -%% [2012/02/14 v6.00 LaTeX file for examples] +%% [2012/02/25 v6.01 LaTeX file for examples] \documentclass{article} \usepackage{url} \usepackage{apacite} @@ -53,12 +53,12 @@ \author{Erik Meijer\\ \textsf{apacite at gmail.com} } -\date{2012/02/14} +\date{2012/02/25} \begin{document} \maketitle \begin{abstract} -This document tests \textsf{apacite} [2012/02/14 v6.00]. See the +This document tests \textsf{apacite} [2012/02/25 v6.01]. See the \textsf{apacite} documentation for more information. \end{abstract} diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.drv b/Master/texmf-dist/source/bibtex/apacite/apacite.drv index cbd31bef776..1379e1c0c04 100644 --- a/Master/texmf-dist/source/bibtex/apacite/apacite.drv +++ b/Master/texmf-dist/source/bibtex/apacite/apacite.drv @@ -48,13 +48,13 @@ %% do not change apacite.dtx for this purpose. %% \ProvidesFile{apacite.drv} - [2012/02/14 v6.00 apacite documentation driver file] + [2012/02/25 v6.01 apacite documentation driver file] \documentclass{ltxdoc} %\documentclass[twoside]{ltxdoc} %\documentclass[a4paper]{ltxdoc} %\documentclass[twoside,a4paper]{ltxdoc} %% -\usepackage{apacdoc}[2012/02/14 v6.00] +\usepackage{apacdoc}[2012/02/25 v6.01] %% The |\providecommand|s make sure we don't get an error during %% installation. %% Define document-specific macros that are not interesting for @@ -86,7 +86,7 @@ %% \usepackage{german} %% %% Loading apacite with author index option. -\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/14 v6.00] +\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/25 v6.01] %% \raggedbottom %% diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx index 1fc67a07e8d..92232a40317 100644 --- a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx +++ b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx @@ -56,7 +56,7 @@ % \iffalse %<*dtx> \ProvidesFile{apacite.dtx} - [2012/02/14 v6.00 apacite dtx file] + [2012/02/25 v6.01 apacite dtx file] %</dtx> %<driver>\ProvidesFile{apacite.drv} %<package|docpkg>\NeedsTeXFormat{LaTeX2e}[1999/12/01] @@ -82,27 +82,27 @@ %^^A command such that the value of the command is written to the file instead %^^A of the name. %^^A -%<driver> [2012/02/14 v6.00 apacite documentation driver file] -%<package> [2012/02/14 v6.00 APA citation] -%<docpkg> [2012/02/14 v6.00 apacite documentation style] -%<english> [2012/02/14 v6.00 apacite language file] -%<dutch> [2012/02/14 v6.00 apacite language file] -%<finnish> [2012/02/14 v6.00 apacite language file] -%<german> [2012/02/14 v6.00 apacite language file] -%<ngerman> [2012/02/14 v6.00 apacite language file] -%<greek> [2012/02/14 v6.00 apacite language file] -%<norsk> [2012/02/14 v6.00 apacite language file] -%<spanish> [2012/02/14 v6.00 apacite language file] -%<swedish> [2012/02/14 v6.00 apacite language file] -%<xmpl>%% [2012/02/14 v6.00 LaTeX file for examples] -%<bibdb>%% [2012/02/14 v6.00 bibliography database for examples] -%<bibstyle&!annotated>%% [2012/02/14 v6.00 APA bibliography style] +%<driver> [2012/02/25 v6.01 apacite documentation driver file] +%<package> [2012/02/25 v6.01 APA citation] +%<docpkg> [2012/02/25 v6.01 apacite documentation style] +%<english> [2012/02/25 v6.01 apacite language file] +%<dutch> [2012/02/25 v6.01 apacite language file] +%<finnish> [2012/02/25 v6.01 apacite language file] +%<german> [2012/02/25 v6.01 apacite language file] +%<ngerman> [2012/02/25 v6.01 apacite language file] +%<greek> [2012/02/25 v6.01 apacite language file] +%<norsk> [2012/02/25 v6.01 apacite language file] +%<spanish> [2012/02/25 v6.01 apacite language file] +%<swedish> [2012/02/25 v6.01 apacite language file] +%<xmpl>%% [2012/02/25 v6.01 LaTeX file for examples] +%<bibdb>%% [2012/02/25 v6.01 bibliography database for examples] +%<bibstyle&!annotated>%% [2012/02/25 v6.01 APA bibliography style] %<*xbibstyle&!annotated> -%% [2012/02/14 v6.00 APA bibl. style with author index info] +%% [2012/02/25 v6.01 APA bibl. style with author index info] %</xbibstyle&!annotated> -%<bibstyle&annotated>%% [2012/02/14 v6.00 APA annotated bibliography style] +%<bibstyle&annotated>%% [2012/02/25 v6.01 APA annotated bibliography style] %<*xbibstyle&annotated> -%% [2012/02/14 v6.00 APA annotated bibl. style with author index info] +%% [2012/02/25 v6.01 APA annotated bibl. style with author index info] %</xbibstyle&annotated> % %<*install> @@ -430,7 +430,7 @@ do not change apacite.dtx for this purpose. %<driver>%\documentclass[a4paper]{ltxdoc} %<driver>%\documentclass[twoside,a4paper]{ltxdoc} %% -\usepackage{apacdoc}[2012/02/14 v6.00] +\usepackage{apacdoc}[2012/02/25 v6.01] %% The |\providecommand|s make sure we don't get an error during %% installation. %% Define document-specific macros that are not interesting for @@ -462,7 +462,7 @@ do not change apacite.dtx for this purpose. %% \usepackage{german} %% %% Loading apacite with author index option. -\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/14 v6.00] +\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/25 v6.01] %% \raggedbottom %% @@ -523,7 +523,7 @@ do not change apacite.dtx for this purpose. % and extended language support; more extensive customizability.} % \changes{v4.05}{2009/03/01}{Some bug fixes; extended language support; % annotated bibliographies.} -% \changes{v6.00}{2012/02/14}{First step towards compliance with v6 of +% \changes{v6.00}{2012/02/25}{First step towards compliance with v6 of % the APA manual; version number now indicates which version of the APA % manual is implemented.} % @@ -647,7 +647,13 @@ will be inconvenient to other users, then I will not pursue it. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection*{New in this version} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -The previous version \APACversiondate{2009/03/01} of \pkg{apacite} +The current version \fileversion{} \APACversiondate{2012/02/25} fixes a +small but annoying bug in version v6.00 \APACversiondate{2012/02/14}, +which only affected documents compiled with the \pkgoption{natbibapa} +option. In the rest of this document, ``the previous version'' should be +interpreted as ``the \APACversiondate{2009/03/01} version''. + +The \APACversiondate{2009/03/01} version of \pkg{apacite} implemented the rules in the 5th edition of the APA manual. The current version aims to conform with the new (2009) 6th edition of the APA manual. It does not completely succeed in this yet, although the instances of @@ -9839,12 +9845,20 @@ short form, of the examples. maskciteyear,maskciteyearNP,masknocite% } \fi -% \end{macrocode} -% Only handle the commands \pkg{apacite} defines. The rest is -% \pkg{natbib}'s purview. -% \begin{macrocode} \if@APAC@natbib@apa \AtEndOfPackage{% +% \end{macrocode} +% The \pkg{natbib} commands, if they haven't been declared already. +% \begin{macrocode} +\@ifundefined{@mb@citenamelist}{% + \def\@mb@citenamelist{% + nocite,citep,citealp,citet,citealt,citeauthor,citefullauthor,% + citeyearpar,citeyear,citetext,cite,shortcites,citetalias,% + citepalias,Citet,Citep,Citealt,Citealp,Citeauthor,citenum}% +}{} +% \end{macrocode} +% The commands \pkg{apacite} adds. +% \begin{macrocode} \let\orig@mb@citenamelist\@mb@citenamelist \edef\@mb@citenamelist{% \orig@mb@citenamelist,% @@ -9854,7 +9868,8 @@ short form, of the examples. maskciteauthor,maskcitefullauthor,maskciteyearpar,maskciteyear,% maskcite,maskcitetalias,maskcitepalias,maskCitet,maskCitep,% maskCitealt,maskCitealp,maskCiteauthor,maskcitenum,maskciteauthort,% - maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp% + maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp,% + nocitemeta% } } \fi @@ -15520,12 +15535,12 @@ short form, of the examples. \author{Erik Meijer\\ \textsf{apacite at gmail.com} } -\date{2012/02/14} +\date{2012/02/25} \begin{document} \maketitle \begin{abstract} -This document tests \textsf{apacite} [2012/02/14 v6.00]. See the +This document tests \textsf{apacite} [2012/02/25 v6.01]. See the \textsf{apacite} documentation for more information. \end{abstract} @@ -16717,15 +16732,15 @@ FUNCTION {identify.apacite.version} %<*!annotated> %<bibstyle> "apacite.bst" %<xbibstyle> "apacitex.bst" -%<bibstyle> " [2012/02/14 v6.00 APA bibliography style]" -%<xbibstyle> " [2012/02/14 v6.00 APA bibl. style with author index info]" +%<bibstyle> " [2012/02/25 v6.01 APA bibliography style]" +%<xbibstyle> " [2012/02/25 v6.01 APA bibl. style with author index info]" %</!annotated> %<*annotated> %<bibstyle> "apacann.bst" %<xbibstyle> "apacannx.bst" -%<bibstyle> " [2012/02/14 v6.00 APA annotated bibliography style]" +%<bibstyle> " [2012/02/25 v6.01 APA annotated bibliography style]" %<*xbibstyle> -" [2012/02/14 v6.00 APA annotated bibl. style with author index info]" +" [2012/02/25 v6.01 APA annotated bibl. style with author index info]" %</xbibstyle> %</annotated> %<*bibstyle|xbibstyle> @@ -18377,10 +18392,12 @@ FUNCTION {make.tentative.year.sort.label} year empty$ { "0000" 'year.label := } { year "\bibnodate" = - year "n.d." = - or + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "0000" 'year.label := } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "9999" 'year.label := } { % It is not checked whether the year field % makes sense. @@ -19596,8 +19613,12 @@ FUNCTION {make.definitive.year.supplement} year empty$ { "\BCntND " * } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "\BCntND " * } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "\BCntIP " * } { "\BCnt " * } if$ @@ -19617,8 +19638,12 @@ FUNCTION {protect.year} { year empty$ { "{\protect \bibnodate {}}" } { year "\bibnodate" = + year "l" change.case$ "no date" = or + year "l" change.case$ "n.d." = or { "{\protect \bibnodate {}}" } { year "\BIP" = + year "l" change.case$ "in press" = or + year "l" change.case$ "forthcoming" = or { "{\protect \BIP {}}" } { year } if$ @@ -19636,13 +19661,11 @@ FUNCTION {make.definitive.year.label} originalyear empty$ { protect.year } { originalyear "\bibnodate" = % date of original publication unknown + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or { translator empty$ { protect.year } - { year empty$ - { "{\protect \BTRANSL {}~\protect \bibnodate {}}" } % trans. n.d. - { "{\protect \BTRANSL {}}~" protect.year * } % trans. 1931 - if$ - } + { "{\protect \BTRANSL {}}~" protect.year * } if$ } { year empty$ @@ -20527,10 +20550,7 @@ FUNCTION {format.in.editors.trans} FUNCTION {format.year.check} { "\APACrefYear{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -20549,10 +20569,7 @@ FUNCTION {format.year.check} FUNCTION {format.year.month.day.check} { "\APACrefYearMonthDay{" - year empty$ - { "\bibnodate{}" * } - { year * } - if$ + protect.year * % % Add "a", "b", etc. when necessary. % @@ -21328,6 +21345,8 @@ FUNCTION {format.orig.note} { originalyear empty$ 'skip$ { originalyear "\bibnodate" = + originalyear "l" change.case$ "no date" = or + originalyear "l" change.case$ "n.d." = or 'skip$ { output.new.block format.orig.year.note @@ -22085,11 +22104,9 @@ FUNCTION {thesis} % pop default published thesis, top is default unpublished thesis % { pop$ - type empty$ - school empty$ - originalyear empty$ - and - and + type empty$ + school empty$ and + originalyear empty$ and { pop$ "" } diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty index a83073cbfb6..8d2073dfce6 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} - [2012/02/14 v6.00 apacite documentation style] + [2012/02/25 v6.01 apacite documentation style] %% %% apacdoc.sty : Style package that is used for the apacite documentation. %% Written by Erik Meijer diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty index 040a7dd869b..b0fe680309a 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} - [2012/02/14 v6.00 APA citation] + [2012/02/25 v6.01 APA citation] %% %% apacite.sty : citation and reference list according to APA manual %% Written by Erik Meijer @@ -1979,6 +1979,12 @@ \fi \if@APAC@natbib@apa \AtEndOfPackage{% +\@ifundefined{@mb@citenamelist}{% + \def\@mb@citenamelist{% + nocite,citep,citealp,citet,citealt,citeauthor,citefullauthor,% + citeyearpar,citeyear,citetext,cite,shortcites,citetalias,% + citepalias,Citet,Citep,Citealt,Citealp,Citeauthor,citenum}% +}{} \let\orig@mb@citenamelist\@mb@citenamelist \edef\@mb@citenamelist{% \orig@mb@citenamelist,% @@ -1988,7 +1994,8 @@ maskciteauthor,maskcitefullauthor,maskciteyearpar,maskciteyear,% maskcite,maskcitetalias,maskcitepalias,maskCitet,maskCitep,% maskCitealt,maskCitealp,maskCiteauthor,maskcitenum,maskciteauthort,% - maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp% + maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp,% + nocitemeta% } } \fi diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc index 846fec859c7..273093cd043 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 7d9327d3b38..13fd688bd23 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 5ad1f550cf3..4dda6f36ef6 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 313ee53e660..5e61b9c8d54 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 bee6f81c1b9..df4f8011a4b 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 fc37248af59..dff41f890d8 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 81ce7295f41..6924252af7e 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 6538dac8d2d..bd44d61228b 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 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 964f90b7308..0f21f3f8d9c 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} - [2012/02/14 v6.00 apacite language file] + [2012/02/25 v6.01 apacite language file] %% %% swedish.apc - swedish translation of apacite elements %% Written by Stefan Bjork. |