From 4550b1cb3cc63b73ebca0d72cafc0e7b8c6f9397 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Jul 2013 21:59:50 +0000 Subject: apacite (8jul13) git-svn-id: svn://tug.org/texlive/trunk@31135 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/apacite/apacann.bst | 87 ++---- Master/texmf-dist/bibtex/bst/apacite/apacannx.bst | 87 ++---- Master/texmf-dist/bibtex/bst/apacite/apacite.bst | 87 ++---- Master/texmf-dist/bibtex/bst/apacite/apacitex.bst | 87 ++---- Master/texmf-dist/doc/bibtex/apacite/README | 2 +- Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib | 4 +- Master/texmf-dist/doc/bibtex/apacite/apacite.pdf | Bin 627632 -> 628196 bytes Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex | 8 +- .../texmf-dist/source/bibtex/apacite/apacite.drv | 8 +- .../texmf-dist/source/bibtex/apacite/apacite.dtx | 315 ++++++++++++++------- .../texmf-dist/source/bibtex/apacite/apacite.ins | 18 +- Master/texmf-dist/tex/latex/apacite/apacdoc.sty | 4 +- Master/texmf-dist/tex/latex/apacite/apacite.sty | 33 ++- Master/texmf-dist/tex/latex/apacite/dutch.apc | 10 +- Master/texmf-dist/tex/latex/apacite/english.apc | 10 +- Master/texmf-dist/tex/latex/apacite/finnish.apc | 10 +- Master/texmf-dist/tex/latex/apacite/french.apc | 8 +- Master/texmf-dist/tex/latex/apacite/german.apc | 10 +- Master/texmf-dist/tex/latex/apacite/greek.apc | 10 +- Master/texmf-dist/tex/latex/apacite/ngerman.apc | 4 +- Master/texmf-dist/tex/latex/apacite/norsk.apc | 10 +- Master/texmf-dist/tex/latex/apacite/spanish.apc | 10 +- Master/texmf-dist/tex/latex/apacite/swedish.apc | 10 +- 23 files changed, 436 insertions(+), 396 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst index 5784c8a5958..7aa48c55c8c 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apacann.bst -%% [2012/02/25 v6.01 APA annotated bibliography style] +%% [2013/07/04 v6.02 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/25 v6.01 APA annotated bibliography style]" + " [2013/07/04 v6.02 APA annotated bibliography style]" * top$ } ENTRY @@ -74,6 +74,7 @@ ENTRY key lastchecked month + nihms note number organization @@ -88,6 +89,7 @@ ENTRY originalvolume originalyear pages + pmcid publisher school series @@ -101,7 +103,8 @@ ENTRY volume year } - { title.number %% for sorting titles + { cite.order %% order of first citation + title.number %% for sorting titles cite.initials %% dummy (0-1) indicating whether or not %% initials of the 1st author must %% be used for citing @@ -116,6 +119,7 @@ ENTRY %% should be cited and whether a, b, etc. %% after year is necessary title.sort.label %% for sorting titles + citeorder.sort.label %% for sorting by citation order type.2 %% Replacement for type with misc entries and %% entries that revert to misc. } @@ -136,6 +140,7 @@ STRINGS { s t u old.label field } FUNCTION {test} { #0 } FUNCTION {make.index} { #0 } +FUNCTION {unsorted} { #0 } MACRO {jan} {"{\APACmonth{01}}"} MACRO {feb} {"{\APACmonth{02}}"} MACRO {mar} {"{\APACmonth{03}}"} @@ -1945,58 +1950,15 @@ FUNCTION {make.definitive.author.sort.label} { author make.definitive.name.sort.label } if$ } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.final.sort.key} -{ % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % General strategy: - % - % Ordinary situation: author or editor-acting-as-author - % available. - % => Make author-with-initials label (L1) of one of the forms - % "Last1 F1 Last2 F2 ... LastN FN" - % "Last1 F1 Last2 F2 ... Last6 F6 zzzz" - % (where N <= 6 is the total number of authors, and - % "zzzz" represents et al. if there are more than 6 authors) - % No author, editor, and key: define title or substitute as sort key. - % - % Then format year label (L2) of one of the forms: - % "0000" (missing year or explicit `no date') - % "9999" (`in press') - % year (otherwise; don't use originalyear here yet) - % Add "/"month"/"day to the latter when available. - % - % From earlier sorting of titles, we have title number. Convert - % to string, which gives title label (L3) . - % - % Then final sorting label (author.year.sort.label) is a - % concatenation of - % L1 - % " " - % L2 - % " " - % L3 - % - % This can then be sorted. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % - % - % Find out which field - % to use as author. - % - % Check reference type: - % if result is 1 then possibly editor acts as author - % 2 then editor does not act as author - % 3 then key should have been used - % 0 then unknown reference type - ref.type #2 = +{ ref.type #2 = { make.definitive.author.sort.label } { make.definitive.author.editor.sort.label } if$ - % - author.year.sort.label 'sort.key$ := + unsorted + { citeorder.sort.label 'sort.key$ := } + { author.year.sort.label 'sort.key$ := } + if$ } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2068,23 +2030,23 @@ FUNCTION {make.sort.title} 'title.sort.label := title.sort.label 'sort.key$ := } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.title.number} { title.sort.label old.label = - { % - % A tie: old and new label are the same . + { old.number 'title.number := } - { % - % The usual situation: titles are different. + { old.number #1 + 'title.number := title.number 'old.number := title.sort.label 'old.label := } if$ } +FUNCTION {make.citeorder.number} +{ old.number #1 + 'cite.order := + cite.order 'old.number := + cite.order conv.int.to.str citeorder.sort.label := +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5117,6 +5079,8 @@ FUNCTION {initialize} { % % Maximum number of names to be formatted . #6 'name.max := +%% #250 'entry.max$ := +%% #5000 'global.max$ := } FUNCTION {init.old.number} @@ -5200,6 +5164,11 @@ EXECUTE { identify.apacite.version } EXECUTE { initialize } +EXECUTE { init.old.number } + +ITERATE { make.citeorder.number } + + ITERATE { make.sort.title } SORT diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst index efc5ef2d65f..79e3ddb0b96 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apacannx.bst -%% [2012/02/25 v6.01 APA annotated bibl. style with author index info] +%% [2013/07/04 v6.02 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/25 v6.01 APA annotated bibl. style with author index info]" +" [2013/07/04 v6.02 APA annotated bibl. style with author index info]" * top$ } ENTRY @@ -74,6 +74,7 @@ ENTRY key lastchecked month + nihms note number organization @@ -88,6 +89,7 @@ ENTRY originalvolume originalyear pages + pmcid publisher school series @@ -101,7 +103,8 @@ ENTRY volume year } - { title.number %% for sorting titles + { cite.order %% order of first citation + title.number %% for sorting titles cite.initials %% dummy (0-1) indicating whether or not %% initials of the 1st author must %% be used for citing @@ -116,6 +119,7 @@ ENTRY %% should be cited and whether a, b, etc. %% after year is necessary title.sort.label %% for sorting titles + citeorder.sort.label %% for sorting by citation order type.2 %% Replacement for type with misc entries and %% entries that revert to misc. } @@ -136,6 +140,7 @@ STRINGS { s t u old.label field } FUNCTION {test} { #0 } FUNCTION {make.index} { #1 } +FUNCTION {unsorted} { #0 } MACRO {jan} {"{\APACmonth{01}}"} MACRO {feb} {"{\APACmonth{02}}"} MACRO {mar} {"{\APACmonth{03}}"} @@ -1945,58 +1950,15 @@ FUNCTION {make.definitive.author.sort.label} { author make.definitive.name.sort.label } if$ } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.final.sort.key} -{ % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % General strategy: - % - % Ordinary situation: author or editor-acting-as-author - % available. - % => Make author-with-initials label (L1) of one of the forms - % "Last1 F1 Last2 F2 ... LastN FN" - % "Last1 F1 Last2 F2 ... Last6 F6 zzzz" - % (where N <= 6 is the total number of authors, and - % "zzzz" represents et al. if there are more than 6 authors) - % No author, editor, and key: define title or substitute as sort key. - % - % Then format year label (L2) of one of the forms: - % "0000" (missing year or explicit `no date') - % "9999" (`in press') - % year (otherwise; don't use originalyear here yet) - % Add "/"month"/"day to the latter when available. - % - % From earlier sorting of titles, we have title number. Convert - % to string, which gives title label (L3) . - % - % Then final sorting label (author.year.sort.label) is a - % concatenation of - % L1 - % " " - % L2 - % " " - % L3 - % - % This can then be sorted. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % - % - % Find out which field - % to use as author. - % - % Check reference type: - % if result is 1 then possibly editor acts as author - % 2 then editor does not act as author - % 3 then key should have been used - % 0 then unknown reference type - ref.type #2 = +{ ref.type #2 = { make.definitive.author.sort.label } { make.definitive.author.editor.sort.label } if$ - % - author.year.sort.label 'sort.key$ := + unsorted + { citeorder.sort.label 'sort.key$ := } + { author.year.sort.label 'sort.key$ := } + if$ } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2068,23 +2030,23 @@ FUNCTION {make.sort.title} 'title.sort.label := title.sort.label 'sort.key$ := } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.title.number} { title.sort.label old.label = - { % - % A tie: old and new label are the same . + { old.number 'title.number := } - { % - % The usual situation: titles are different. + { old.number #1 + 'title.number := title.number 'old.number := title.sort.label 'old.label := } if$ } +FUNCTION {make.citeorder.number} +{ old.number #1 + 'cite.order := + cite.order 'old.number := + cite.order conv.int.to.str citeorder.sort.label := +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5117,6 +5079,8 @@ FUNCTION {initialize} { % % Maximum number of names to be formatted . #6 'name.max := +%% #250 'entry.max$ := +%% #5000 'global.max$ := } FUNCTION {init.old.number} @@ -5200,6 +5164,11 @@ EXECUTE { identify.apacite.version } EXECUTE { initialize } +EXECUTE { init.old.number } + +ITERATE { make.citeorder.number } + + ITERATE { make.sort.title } SORT diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst index c69c9b3b2de..fc6365ea3a7 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,14 +43,14 @@ %% the generated files. %% %% apacite.bst -%% [2012/02/25 v6.01 APA bibliography style] +%% [2013/07/04 v6.02 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/25 v6.01 APA bibliography style]" + " [2013/07/04 v6.02 APA bibliography style]" * top$ } ENTRY @@ -73,6 +73,7 @@ ENTRY key lastchecked month + nihms note number organization @@ -87,6 +88,7 @@ ENTRY originalvolume originalyear pages + pmcid publisher school series @@ -100,7 +102,8 @@ ENTRY volume year } - { title.number %% for sorting titles + { cite.order %% order of first citation + title.number %% for sorting titles cite.initials %% dummy (0-1) indicating whether or not %% initials of the 1st author must %% be used for citing @@ -115,6 +118,7 @@ ENTRY %% should be cited and whether a, b, etc. %% after year is necessary title.sort.label %% for sorting titles + citeorder.sort.label %% for sorting by citation order type.2 %% Replacement for type with misc entries and %% entries that revert to misc. } @@ -135,6 +139,7 @@ STRINGS { s t u old.label field } FUNCTION {test} { #0 } FUNCTION {make.index} { #0 } +FUNCTION {unsorted} { #0 } MACRO {jan} {"{\APACmonth{01}}"} MACRO {feb} {"{\APACmonth{02}}"} MACRO {mar} {"{\APACmonth{03}}"} @@ -1944,58 +1949,15 @@ FUNCTION {make.definitive.author.sort.label} { author make.definitive.name.sort.label } if$ } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.final.sort.key} -{ % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % General strategy: - % - % Ordinary situation: author or editor-acting-as-author - % available. - % => Make author-with-initials label (L1) of one of the forms - % "Last1 F1 Last2 F2 ... LastN FN" - % "Last1 F1 Last2 F2 ... Last6 F6 zzzz" - % (where N <= 6 is the total number of authors, and - % "zzzz" represents et al. if there are more than 6 authors) - % No author, editor, and key: define title or substitute as sort key. - % - % Then format year label (L2) of one of the forms: - % "0000" (missing year or explicit `no date') - % "9999" (`in press') - % year (otherwise; don't use originalyear here yet) - % Add "/"month"/"day to the latter when available. - % - % From earlier sorting of titles, we have title number. Convert - % to string, which gives title label (L3) . - % - % Then final sorting label (author.year.sort.label) is a - % concatenation of - % L1 - % " " - % L2 - % " " - % L3 - % - % This can then be sorted. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % - % - % Find out which field - % to use as author. - % - % Check reference type: - % if result is 1 then possibly editor acts as author - % 2 then editor does not act as author - % 3 then key should have been used - % 0 then unknown reference type - ref.type #2 = +{ ref.type #2 = { make.definitive.author.sort.label } { make.definitive.author.editor.sort.label } if$ - % - author.year.sort.label 'sort.key$ := + unsorted + { citeorder.sort.label 'sort.key$ := } + { author.year.sort.label 'sort.key$ := } + if$ } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2067,23 +2029,23 @@ FUNCTION {make.sort.title} 'title.sort.label := title.sort.label 'sort.key$ := } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.title.number} { title.sort.label old.label = - { % - % A tie: old and new label are the same . + { old.number 'title.number := } - { % - % The usual situation: titles are different. + { old.number #1 + 'title.number := title.number 'old.number := title.sort.label 'old.label := } if$ } +FUNCTION {make.citeorder.number} +{ old.number #1 + 'cite.order := + cite.order 'old.number := + cite.order conv.int.to.str citeorder.sort.label := +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5092,6 +5054,8 @@ FUNCTION {initialize} { % % Maximum number of names to be formatted . #6 'name.max := +%% #250 'entry.max$ := +%% #5000 'global.max$ := } FUNCTION {init.old.number} @@ -5175,6 +5139,11 @@ EXECUTE { identify.apacite.version } EXECUTE { initialize } +EXECUTE { init.old.number } + +ITERATE { make.citeorder.number } + + ITERATE { make.sort.title } SORT diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst index 007a2804076..5cdb579a91a 100644 --- a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst +++ b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apacitex.bst -%% [2012/02/25 v6.01 APA bibl. style with author index info] +%% [2013/07/04 v6.02 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/25 v6.01 APA bibl. style with author index info]" + " [2013/07/04 v6.02 APA bibl. style with author index info]" * top$ } ENTRY @@ -74,6 +74,7 @@ ENTRY key lastchecked month + nihms note number organization @@ -88,6 +89,7 @@ ENTRY originalvolume originalyear pages + pmcid publisher school series @@ -101,7 +103,8 @@ ENTRY volume year } - { title.number %% for sorting titles + { cite.order %% order of first citation + title.number %% for sorting titles cite.initials %% dummy (0-1) indicating whether or not %% initials of the 1st author must %% be used for citing @@ -116,6 +119,7 @@ ENTRY %% should be cited and whether a, b, etc. %% after year is necessary title.sort.label %% for sorting titles + citeorder.sort.label %% for sorting by citation order type.2 %% Replacement for type with misc entries and %% entries that revert to misc. } @@ -136,6 +140,7 @@ STRINGS { s t u old.label field } FUNCTION {test} { #0 } FUNCTION {make.index} { #1 } +FUNCTION {unsorted} { #0 } MACRO {jan} {"{\APACmonth{01}}"} MACRO {feb} {"{\APACmonth{02}}"} MACRO {mar} {"{\APACmonth{03}}"} @@ -1945,58 +1950,15 @@ FUNCTION {make.definitive.author.sort.label} { author make.definitive.name.sort.label } if$ } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.final.sort.key} -{ % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % General strategy: - % - % Ordinary situation: author or editor-acting-as-author - % available. - % => Make author-with-initials label (L1) of one of the forms - % "Last1 F1 Last2 F2 ... LastN FN" - % "Last1 F1 Last2 F2 ... Last6 F6 zzzz" - % (where N <= 6 is the total number of authors, and - % "zzzz" represents et al. if there are more than 6 authors) - % No author, editor, and key: define title or substitute as sort key. - % - % Then format year label (L2) of one of the forms: - % "0000" (missing year or explicit `no date') - % "9999" (`in press') - % year (otherwise; don't use originalyear here yet) - % Add "/"month"/"day to the latter when available. - % - % From earlier sorting of titles, we have title number. Convert - % to string, which gives title label (L3) . - % - % Then final sorting label (author.year.sort.label) is a - % concatenation of - % L1 - % " " - % L2 - % " " - % L3 - % - % This can then be sorted. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % - % - % Find out which field - % to use as author. - % - % Check reference type: - % if result is 1 then possibly editor acts as author - % 2 then editor does not act as author - % 3 then key should have been used - % 0 then unknown reference type - ref.type #2 = +{ ref.type #2 = { make.definitive.author.sort.label } { make.definitive.author.editor.sort.label } if$ - % - author.year.sort.label 'sort.key$ := + unsorted + { citeorder.sort.label 'sort.key$ := } + { author.year.sort.label 'sort.key$ := } + if$ } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2068,23 +2030,23 @@ FUNCTION {make.sort.title} 'title.sort.label := title.sort.label 'sort.key$ := } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - FUNCTION {make.title.number} { title.sort.label old.label = - { % - % A tie: old and new label are the same . + { old.number 'title.number := } - { % - % The usual situation: titles are different. + { old.number #1 + 'title.number := title.number 'old.number := title.sort.label 'old.label := } if$ } +FUNCTION {make.citeorder.number} +{ old.number #1 + 'cite.order := + cite.order 'old.number := + cite.order conv.int.to.str citeorder.sort.label := +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5093,6 +5055,8 @@ FUNCTION {initialize} { % % Maximum number of names to be formatted . #6 'name.max := +%% #250 'entry.max$ := +%% #5000 'global.max$ := } FUNCTION {init.old.number} @@ -5176,6 +5140,11 @@ EXECUTE { identify.apacite.version } EXECUTE { initialize } +EXECUTE { init.old.number } + +ITERATE { make.citeorder.number } + + ITERATE { make.sort.title } SORT diff --git a/Master/texmf-dist/doc/bibtex/apacite/README b/Master/texmf-dist/doc/bibtex/apacite/README index f13a666b78a..85499490f18 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/README +++ b/Master/texmf-dist/doc/bibtex/apacite/README @@ -16,7 +16,7 @@ provides the possibility of automatically generating an author index. Copyright and license --------------------- -Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this package. This package may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib index 24b503c578d..04bf44e07a5 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib +++ b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apa5ex.bib -%% [2012/02/25 v6.01 bibliography database for examples] +%% [2013/07/04 v6.02 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 index 001341838be..9e8c077f336 100644 Binary files a/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf and b/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf differ diff --git a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex index 4630fe5da50..cbfbec3be7d 100644 --- a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex +++ b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% %% apacxmpl.tex -%% [2012/02/25 v6.01 LaTeX file for examples] +%% [2013/07/04 v6.02 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/25} +\date{2013/07/04} \begin{document} \maketitle \begin{abstract} -This document tests \textsf{apacite} [2012/02/25 v6.01]. See the +This document tests \textsf{apacite} [2013/07/04 v6.02]. 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 1379e1c0c04..5ebef50f0df 100644 --- a/Master/texmf-dist/source/bibtex/apacite/apacite.drv +++ b/Master/texmf-dist/source/bibtex/apacite/apacite.drv @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -48,13 +48,13 @@ %% do not change apacite.dtx for this purpose. %% \ProvidesFile{apacite.drv} - [2012/02/25 v6.01 apacite documentation driver file] + [2013/07/04 v6.02 apacite documentation driver file] \documentclass{ltxdoc} %\documentclass[twoside]{ltxdoc} %\documentclass[a4paper]{ltxdoc} %\documentclass[twoside,a4paper]{ltxdoc} %% -\usepackage{apacdoc}[2012/02/25 v6.01] +\usepackage{apacdoc}[2013/07/04 v6.02] %% 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/25 v6.01] +\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/04 v6.02] %% \raggedbottom %% diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx index 92232a40317..bdfe93f0eea 100644 --- a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx +++ b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed % elsewhere in this file. % % This file is part of the `apacite' package. @@ -56,7 +56,7 @@ % \iffalse %<*dtx> \ProvidesFile{apacite.dtx} - [2012/02/25 v6.01 apacite dtx file] + [2013/07/04 v6.02 apacite dtx file] % %\ProvidesFile{apacite.drv} %\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 -% [2012/02/25 v6.01 apacite documentation driver file] -% [2012/02/25 v6.01 APA citation] -% [2012/02/25 v6.01 apacite documentation style] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -% [2012/02/25 v6.01 apacite language file] -%%% [2012/02/25 v6.01 LaTeX file for examples] -%%% [2012/02/25 v6.01 bibliography database for examples] -%%% [2012/02/25 v6.01 APA bibliography style] +% [2013/07/04 v6.02 apacite documentation driver file] +% [2013/07/04 v6.02 APA citation] +% [2013/07/04 v6.02 apacite documentation style] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +% [2013/07/04 v6.02 apacite language file] +%%% [2013/07/04 v6.02 LaTeX file for examples] +%%% [2013/07/04 v6.02 bibliography database for examples] +%%% [2013/07/04 v6.02 APA bibliography style] %<*xbibstyle&!annotated> -%% [2012/02/25 v6.01 APA bibl. style with author index info] +%% [2013/07/04 v6.02 APA bibl. style with author index info] % -%%% [2012/02/25 v6.01 APA annotated bibliography style] +%%% [2013/07/04 v6.02 APA annotated bibliography style] %<*xbibstyle&annotated> -%% [2012/02/25 v6.01 APA annotated bibl. style with author index info] +%% [2013/07/04 v6.02 APA annotated bibl. style with author index info] % % %<*install> @@ -116,7 +116,7 @@ %% This file will generate fast loadable files and documentation %% driver files from apacite.dtx when run through LaTeX. %% -%% Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -157,7 +157,7 @@ This is a generated file. -Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this file. This file is part of the `apacite' package. @@ -197,7 +197,7 @@ the generated files. This is a generated file. -Copyright (C) 1994-2012 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this file. This file is part of the `apacite' package. @@ -430,7 +430,7 @@ do not change apacite.dtx for this purpose. %%\documentclass[a4paper]{ltxdoc} %%\documentclass[twoside,a4paper]{ltxdoc} %% -\usepackage{apacdoc}[2012/02/25 v6.01] +\usepackage{apacdoc}[2013/07/04 v6.02] %% 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/25 v6.01] +\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/04 v6.02] %% \raggedbottom %% @@ -523,9 +523,11 @@ 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/25}{First step towards compliance with v6 of +% \changes{v6.00}{2012/02/14}{First step towards compliance with v6 of % the APA manual; version number now indicates which version of the APA % manual is implemented.} +% \changes{v6.01}{2012/02/25}{Bug fix} +% \changes{v6.02}{2013/07/04}{Bug fixes} % % \GetFileInfo{apacite.sty} % @@ -647,11 +649,13 @@ will be inconvenient to other users, then I will not pursue it. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection*{New in this version} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -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 current version \fileversion{} \APACversiondate{2013/07/04} and +the previous one (v6.01, \APACversiondate{2012/02/25}) fix a few bugs +in version v6.00 \APACversiondate{2012/02/14}, which 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 @@ -6002,6 +6006,7 @@ short form, of the examples. % The next options determine whether the bibliography should be a section or % a chapter. % \begin{macro}{\if@sectionbib} +% \begin{macro}{\if@sectionbibdefault} % With the \pkgoption{sectionbib} option, the bibliography is a section. This % is typically used with the \pkg{chapterbib} package; then each chapter has a % bibliography section. The \pkgoption{nosectionbib} option makes the @@ -6009,18 +6014,27 @@ short form, of the examples. % are requested, \pkg{apacite} tries to guess the most logical choice. The % bibliography is a section if chapters are not defined or if we are in the % ``mainmatter'' of a document. Otherwise, i.e., in the ``backmatter'' of a -% document that has chapters, it is a chapter. +% document that has chapters, it is a chapter. |\if@sectionbibdefault| +% registers whether the default should be used (neither +% \pkgoption{sectionbib} nor \pkgoption{nosectionbib} chosen) and if +% the default is not used, |\if@sectionbib| registers which option was +% chosen. % \begin{macrocode} +\newif\if@sectionbib +\newif\if@sectionbibdefault +\@sectionbibfalse +\@sectionbibdefaulttrue \DeclareOption{sectionbib}{% - \@ifundefined{@sectionbibtrue}{\newif\if@sectionbib}{}% + \@sectionbibdefaultfalse \@sectionbibtrue } \DeclareOption{nosectionbib}{% - \@ifundefined{@sectionbibfalse}{\newif\if@sectionbib}{}% + \@sectionbibdefaultfalse \@sectionbibfalse } % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\if@tocbib} % These options determine whether the bibliography should be in the table of @@ -7653,8 +7667,14 @@ short form, of the examples. \fi } \if@APAC@natbib@apa -\AtEndOfPackage{% -\RequirePackage[longnamesfirst,sort]{natbib} + \AtEndOfPackage{% + \if@sectionbibdefault + \RequirePackage[longnamesfirst,sort]{natbib} + \else\if@sectionbib + \RequirePackage[longnamesfirst,sort,sectionbib]{natbib} + \else + \RequirePackage[longnamesfirst,sort]{natbib} + \fi\fi % \end{macrocode} % % \begin{macro}{\NAT@parse@date} @@ -7732,7 +7752,9 @@ short form, of the examples. % \end{macrocode} % \pkg{natbib} is inconsistent with adding space. % \begin{macrocode} - \renewcommand{\BBAY}{,\ignorespaces }% + \renewcommand{\BBAY}{,}% + \renewcommand{\BBC}{;}% + \renewcommand{\BBYY}{,}% \bibpunct[\BBN ]{\BBOP }{\BBCP }{\BBC }{a}{\BBAY }{\BBYY }% \setlength{\bibhang}{2.5em}% \setlength{\bibsep}{0pt}% @@ -8136,7 +8158,7 @@ short form, of the examples. % Else, chapter is defined. Check first whether an explicit option has been % chosen. % \begin{macrocode} - {\@ifundefined{@sectionbibtrue}% + {\if@sectionbibdefault % \end{macrocode} % No explicit option chosen, so we have to speculate. If \cmd{\mainmatter} % is not defined (typically a report), assume that the bibliography is @@ -8157,12 +8179,13 @@ short form, of the examples. % \end{macrocode} % If an explicit option has been chosen, simply use this. % \begin{macrocode} - {\if@sectionbib + \else + \if@sectionbib \st@rtbibsection \else \st@rtbibchapter \fi - }% + \fi }% % \end{macrocode} % Insert some code between the chapter or section heading and the reference @@ -11493,6 +11516,12 @@ short form, of the examples. \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or January\or February\or March\or @@ -11855,6 +11884,12 @@ short form, of the examples. \renewcommand{\BCBT}{}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or januari\or februari\or maart\or @@ -12108,6 +12143,12 @@ short form, of the examples. \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting, adapted from babel's finnish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or @@ -12290,6 +12331,12 @@ short form, of the examples. \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{~;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or janvier\or f\'evrier\or mars\or @@ -12548,6 +12595,12 @@ short form, of the examples. \renewcommand{\BBN}{, }% Zwischen Zitat und Postfix (default ", ") \renewcommand{\BCBT}{}% Zwischen 2 Autoren (zus. zu "&", default ",") \renewcommand{\BCBL}{}% Zwischen 3 o. mehr Autoren (zus. zu "&", default ",") +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting, adapted from babel's germanb.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or @@ -12855,6 +12908,12 @@ short form, of the examples. \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting. Adapted from babel's greek.dtx \renewcommand{\APACmonth}[1]{\textgreek{\ifcase #1\or @@ -13042,6 +13101,12 @@ short form, of the examples. \renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's norsk.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or @@ -13262,6 +13327,12 @@ short form, of the examples. \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's spanish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or enero\or febrero\or @@ -13507,6 +13578,12 @@ short form, of the examples. \renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's swedish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or @@ -15535,12 +15612,12 @@ short form, of the examples. \author{Erik Meijer\\ \textsf{apacite at gmail.com} } -\date{2012/02/25} +\date{2013/07/04} \begin{document} \maketitle \begin{abstract} -This document tests \textsf{apacite} [2012/02/25 v6.01]. See the +This document tests \textsf{apacite} [2013/07/04 v6.02]. See the \textsf{apacite} documentation for more information. \end{abstract} @@ -16732,15 +16809,15 @@ FUNCTION {identify.apacite.version} %<*!annotated> % "apacite.bst" % "apacitex.bst" -% " [2012/02/25 v6.01 APA bibliography style]" -% " [2012/02/25 v6.01 APA bibl. style with author index info]" +% " [2013/07/04 v6.02 APA bibliography style]" +% " [2013/07/04 v6.02 APA bibl. style with author index info]" % %<*annotated> % "apacann.bst" % "apacannx.bst" -% " [2012/02/25 v6.01 APA annotated bibliography style]" +% " [2013/07/04 v6.02 APA annotated bibliography style]" %<*xbibstyle> -" [2012/02/25 v6.01 APA annotated bibl. style with author index info]" +" [2013/07/04 v6.02 APA annotated bibl. style with author index info]" % % %<*bibstyle|xbibstyle> @@ -16769,6 +16846,7 @@ ENTRY key lastchecked month + nihms note number organization @@ -16783,6 +16861,7 @@ ENTRY originalvolume originalyear pages + pmcid publisher school series @@ -16796,7 +16875,8 @@ ENTRY volume year } - { title.number %% for sorting titles + { cite.order %% order of first citation + title.number %% for sorting titles cite.initials %% dummy (0-1) indicating whether or not %% initials of the 1st author must %% be used for citing @@ -16811,6 +16891,7 @@ ENTRY %% should be cited and whether a, b, etc. %% after year is necessary title.sort.label %% for sorting titles + citeorder.sort.label %% for sorting by citation order type.2 %% Replacement for type with misc entries and %% entries that revert to misc. } @@ -16847,6 +16928,11 @@ FUNCTION {test} { #0 } %FUNCTION {make.index} { #1 } %<*bibstyle|xbibstyle> % \end{macrocode} +% A small function that indicates whether the reference list must be +% sorted. +% \begin{macrocode} +FUNCTION {unsorted} { #0 } +% \end{macrocode} % Month macros. We use numbers, along with a \LaTeX{} function, which % translates them into words. This allows language-specific deviations. % \begin{macrocode} @@ -18878,62 +18964,55 @@ FUNCTION {make.definitive.author.sort.label} { author make.definitive.name.sort.label } if$ } - - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Make final sort key . - +% \end{macrocode} +% Make the final sort key. The general strategy is the following. The +% ordinary situation is that an author or editor-acting-as-author +% is available. In this case, make an author-with-initials label (L1) +% of one of the forms +% \begin{verbatim} +% "Last1 F1 Last2 F2 ... LastN FN" +% "Last1 F1 Last2 F2 ... Last6 F6 zzzz" +% \end{verbatim} +% where $N \leq 6$ is the total number of authors, and ``|zzzz|'' +% represents et al.\ if there are more than 6 authors. If there is +% no author, editor, and key, define the title or its substitute as a +% sort key. Note that there are two spaces between last name and first +% name and three spaces between authors. +% +% Next format a year label (L2) that is equal to the \fieldname{year} +% field, unless that is missing or an explicit ``no date'', in which +% case it is |0000| (and thus comes first) or if it is an explicit +% in press (|\BIP|), in which case the year label is |9999| (and thus +% it comes last). We don't use the \fieldname{originalyear} field here +% yet. We add |/|\fieldname{month}|/|\fieldname{day} to the year label +% when available. +% +% From earlier sorting of titles, we have the sorted title number. This +% is converted to a string, which gives title label (L3). +% +% Then the final sorting label (|author.year.sort.label|) is a +% concatenation of L1, L2, and L3, with four spaces between them. This +% can then be sorted. +% +% If the reference type is 1, then possibly the editor acts as author; +% if it is 2, then editor does not act as author; if it is 3, then the +% \fieldname{key} field should have been used; if it is 0, this is an +% unknown reference type. +% \begin{macrocode} FUNCTION {make.final.sort.key} -{ % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % General strategy: - % - % Ordinary situation: author or editor-acting-as-author - % available. - % => Make author-with-initials label (L1) of one of the forms - % "Last1 F1 Last2 F2 ... LastN FN" - % "Last1 F1 Last2 F2 ... Last6 F6 zzzz" - % (where N <= 6 is the total number of authors, and - % "zzzz" represents et al. if there are more than 6 authors) - % No author, editor, and key: define title or substitute as sort key. - % - % Then format year label (L2) of one of the forms: - % "0000" (missing year or explicit `no date') - % "9999" (`in press') - % year (otherwise; don't use originalyear here yet) - % Add "/"month"/"day to the latter when available. - % - % From earlier sorting of titles, we have title number. Convert - % to string, which gives title label (L3) . - % - % Then final sorting label (author.year.sort.label) is a - % concatenation of - % L1 - % " " - % L2 - % " " - % L3 - % - % This can then be sorted. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % - % - % Find out which field - % to use as author. - % - % Check reference type: - % if result is 1 then possibly editor acts as author - % 2 then editor does not act as author - % 3 then key should have been used - % 0 then unknown reference type - ref.type #2 = +{ ref.type #2 = { make.definitive.author.sort.label } { make.definitive.author.editor.sort.label } if$ - % - author.year.sort.label 'sort.key$ := +% \end{macrocode} +% With the \pkgoption{unsorted} option, the reference listed is sorted +% in the order in which \BibTeX{} reads the references, that is, in +% order of first citation. +% \begin{macrocode} + unsorted + { citeorder.sort.label 'sort.key$ := } + { author.year.sort.label 'sort.key$ := } + if$ } @@ -19030,18 +19109,21 @@ FUNCTION {make.sort.title} 'title.sort.label := title.sort.label 'sort.key$ := } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Make title number: rank number of sorted title . - +% \end{macrocode} +% Make title number: rank number of sorted title. +% \begin{macrocode} FUNCTION {make.title.number} { title.sort.label old.label = - { % - % A tie: old and new label are the same . + { +% \end{macrocode} +% A tie: old and new label are the same. +% \begin{macrocode} old.number 'title.number := } - { % - % The usual situation: titles are different. + { +% \end{macrocode} +% The usual situation: titles are different. +% \begin{macrocode} old.number #1 + 'title.number := title.number 'old.number := title.sort.label 'old.label := @@ -19049,6 +19131,14 @@ FUNCTION {make.title.number} if$ } % \end{macrocode} +% Order in which reference was first cited (integer and conversion to string). +% \begin{macrocode} +FUNCTION {make.citeorder.number} +{ old.number #1 + 'cite.order := + cite.order 'old.number := + cite.order conv.int.to.str citeorder.sort.label := +} +% \end{macrocode} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \subsection{Name formatting} @@ -22525,8 +22615,8 @@ FUNCTION {initialize} { % % Maximum number of names to be formatted . #6 'name.max := -% #250 'entry.max$ := -% #5000 'global.max$ := +%% #250 'entry.max$ := +%% #5000 'global.max$ := } FUNCTION {init.old.number} @@ -22619,6 +22709,13 @@ EXECUTE { identify.apacite.version } EXECUTE { initialize } +% Store the citation order in an integer variable, and a corresponding +% string variable that can be used for sorting. + +EXECUTE { init.old.number } + +ITERATE { make.citeorder.number } + % Sort items by title in order to replace each title by % its number in later sorting . diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.ins b/Master/texmf-dist/source/bibtex/apacite/apacite.ins index 0ecec8fc23a..1328acc3a9b 100644 --- a/Master/texmf-dist/source/bibtex/apacite/apacite.ins +++ b/Master/texmf-dist/source/bibtex/apacite/apacite.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation %% driver files from apacite.dtx when run through LaTeX. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -23,8 +23,8 @@ %% apacite.sty, apacdoc.sty, apacite.drv, %% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst, %% apa5ex.bib, apacxmpl.tex, -%% english.apc, dutch.apc, finnish.apc, french.apc, -%% german.apc, ngerman.apc, greek.apc, norsk.apc, +%% english.apc, dutch.apc, finnish.apc, french.apc, +%% german.apc, ngerman.apc, greek.apc, norsk.apc, %% spanish.apc, swedish.apc. %% %% This work has the LPPL maintenance status `maintained' @@ -43,7 +43,7 @@ This is a generated file. -Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this file. This file is part of the `apacite' package. @@ -64,8 +64,8 @@ apacite.ins, and the following generated files: apacite.sty, apacdoc.sty, apacite.drv, apacite.bst, apacitex.bst, apacann.bst, apacannx.bst, apa5ex.bib, apacxmpl.tex, -english.apc, dutch.apc, finnish.apc, french.apc, -german.apc, ngerman.apc, greek.apc, norsk.apc, +english.apc, dutch.apc, finnish.apc, french.apc, +german.apc, ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc. This work has the LPPL maintenance status `maintained' @@ -83,7 +83,7 @@ the generated files. This is a generated file. -Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +Copyright (C) 1994-2013 Erik Meijer and any individual authors listed elsewhere in this file. This file is part of the `apacite' package. @@ -104,8 +104,8 @@ apacite.ins, and the following generated files: apacite.sty, apacdoc.sty, apacite.drv, apacite.bst, apacitex.bst, apacann.bst, apacannx.bst, apa5ex.bib, apacxmpl.tex, -english.apc, dutch.apc, finnish.apc, french.apc, -german.apc, ngerman.apc, greek.apc, norsk.apc, +english.apc, dutch.apc, finnish.apc, french.apc, +german.apc, ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc. This work has the LPPL maintenance status `maintained' diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty index 8d2073dfce6..a301b52d413 100644 --- a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty +++ b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{apacdoc} - [2012/02/25 v6.01 apacite documentation style] + [2013/07/04 v6.02 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 b0fe680309a..710737939e0 100644 --- a/Master/texmf-dist/tex/latex/apacite/apacite.sty +++ b/Master/texmf-dist/tex/latex/apacite/apacite.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{apacite} - [2012/02/25 v6.01 APA citation] + [2013/07/04 v6.02 APA citation] %% %% apacite.sty : citation and reference list according to APA manual %% Written by Erik Meijer @@ -113,12 +113,16 @@ \newif\if@numberedbib \DeclareOption{numberedbib}{\@numberedbibtrue} \DeclareOption{unnumberedbib}{\@numberedbibfalse} +\newif\if@sectionbib +\newif\if@sectionbibdefault +\@sectionbibfalse +\@sectionbibdefaulttrue \DeclareOption{sectionbib}{% - \@ifundefined{@sectionbibtrue}{\newif\if@sectionbib}{}% + \@sectionbibdefaultfalse \@sectionbibtrue } \DeclareOption{nosectionbib}{% - \@ifundefined{@sectionbibfalse}{\newif\if@sectionbib}{}% + \@sectionbibdefaultfalse \@sectionbibfalse } \newif\if@tocbib @@ -989,8 +993,14 @@ \fi } \if@APAC@natbib@apa -\AtEndOfPackage{% -\RequirePackage[longnamesfirst,sort]{natbib} + \AtEndOfPackage{% + \if@sectionbibdefault + \RequirePackage[longnamesfirst,sort]{natbib} + \else\if@sectionbib + \RequirePackage[longnamesfirst,sort,sectionbib]{natbib} + \else + \RequirePackage[longnamesfirst,sort]{natbib} + \fi\fi \renewcommand\NAT@parse@date{} \def\NAT@parse@date#1#2#3#4#5#6@@{% \def\NAT@year{#1#2}\def\NAT@exlab{{#3}}} @@ -1014,7 +1024,9 @@ \DeclareRobustCommand{\Citefullauthort}{\Citeauthort*} \DeclareRobustCommand{\Citefullauthorp}{\Citeauthorp*} \providecommand\bibstyle@apacite{% - \renewcommand{\BBAY}{,\ignorespaces }% + \renewcommand{\BBAY}{,}% + \renewcommand{\BBC}{;}% + \renewcommand{\BBYY}{,}% \bibpunct[\BBN ]{\BBOP }{\BBCP }{\BBC }{a}{\BBAY }{\BBYY }% \setlength{\bibhang}{2.5em}% \setlength{\bibsep}{0pt}% @@ -1187,7 +1199,7 @@ \def\thebibliography#1{% \@ifundefined{chapter}% {\st@rtbibsection}% - {\@ifundefined{@sectionbibtrue}% + {\if@sectionbibdefault {\@ifundefined{@mainmatterfalse}% {\st@rtbibchapter}% {\if@mainmatter @@ -1197,12 +1209,13 @@ \fi }% }% - {\if@sectionbib + \else + \if@sectionbib \st@rtbibsection \else \st@rtbibchapter \fi - }% + \fi }% \bibliographytypesize % e.g., to put the bibliography in \small type \bibliographyprenote % some explanatory note before the references diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc index 273093cd043..6e66b9656e4 100644 --- a/Master/texmf-dist/tex/latex/apacite/dutch.apc +++ b/Master/texmf-dist/tex/latex/apacite/dutch.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{dutch.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% dutch.apc - dutch translation of apacite elements %% Written by Erik Meijer @@ -150,6 +150,12 @@ \renewcommand{\BCBT}{}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or januari\or februari\or maart\or diff --git a/Master/texmf-dist/tex/latex/apacite/english.apc b/Master/texmf-dist/tex/latex/apacite/english.apc index 13fd688bd23..a9dc4fb84f2 100644 --- a/Master/texmf-dist/tex/latex/apacite/english.apc +++ b/Master/texmf-dist/tex/latex/apacite/english.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{english.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% english.apc - english version of apacite elements %% Written by Erik Meijer @@ -136,6 +136,12 @@ \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or January\or February\or March\or diff --git a/Master/texmf-dist/tex/latex/apacite/finnish.apc b/Master/texmf-dist/tex/latex/apacite/finnish.apc index 4dda6f36ef6..628ea9185eb 100644 --- a/Master/texmf-dist/tex/latex/apacite/finnish.apc +++ b/Master/texmf-dist/tex/latex/apacite/finnish.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{finnish.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% finnish.apc - finnish version of apacite elements %% Written by Kari Pyykk\"o, with some minor edits by Erik Meijer. @@ -215,6 +215,12 @@ \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting, adapted from babel's finnish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or diff --git a/Master/texmf-dist/tex/latex/apacite/french.apc b/Master/texmf-dist/tex/latex/apacite/french.apc index 8c43e6b2199..47c5652e364 100644 --- a/Master/texmf-dist/tex/latex/apacite/french.apc +++ b/Master/texmf-dist/tex/latex/apacite/french.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -137,6 +137,12 @@ \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{~;}% +\fi %% %% Date formatting \renewcommand{\APACmonth}[1]{\ifcase #1\or janvier\or f\'evrier\or mars\or diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc index 5e61b9c8d54..9204ba23ead 100644 --- a/Master/texmf-dist/tex/latex/apacite/german.apc +++ b/Master/texmf-dist/tex/latex/apacite/german.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{german.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% german.apc - Deutsche Uebersetzung der Apacite-Elemente %% (German version of apacite elements) @@ -148,6 +148,12 @@ \renewcommand{\BBN}{, }% Zwischen Zitat und Postfix (default ", ") \renewcommand{\BCBT}{}% Zwischen 2 Autoren (zus. zu "&", default ",") \renewcommand{\BCBL}{}% Zwischen 3 o. mehr Autoren (zus. zu "&", default ",") +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting, adapted from babel's germanb.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or diff --git a/Master/texmf-dist/tex/latex/apacite/greek.apc b/Master/texmf-dist/tex/latex/apacite/greek.apc index df4f8011a4b..47ba7984990 100644 --- a/Master/texmf-dist/tex/latex/apacite/greek.apc +++ b/Master/texmf-dist/tex/latex/apacite/greek.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{greek.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% greek.apc - Greek version of apacite elements %% Greek translations by Athanassios Protopapas and Ioannis Dimakos @@ -154,6 +154,12 @@ \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting. Adapted from babel's greek.dtx \renewcommand{\APACmonth}[1]{\textgreek{\ifcase #1\or diff --git a/Master/texmf-dist/tex/latex/apacite/ngerman.apc b/Master/texmf-dist/tex/latex/apacite/ngerman.apc index dff41f890d8..73dc2536afd 100644 --- a/Master/texmf-dist/tex/latex/apacite/ngerman.apc +++ b/Master/texmf-dist/tex/latex/apacite/ngerman.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{ngerman.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 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 6924252af7e..96b0241fc48 100644 --- a/Master/texmf-dist/tex/latex/apacite/norsk.apc +++ b/Master/texmf-dist/tex/latex/apacite/norsk.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{norsk.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements. %% Version 1.1. @@ -138,6 +138,12 @@ \renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's norsk.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or diff --git a/Master/texmf-dist/tex/latex/apacite/spanish.apc b/Master/texmf-dist/tex/latex/apacite/spanish.apc index bd44d61228b..5d746ef7386 100644 --- a/Master/texmf-dist/tex/latex/apacite/spanish.apc +++ b/Master/texmf-dist/tex/latex/apacite/spanish.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{spanish.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% spanish.apc - Versi\'on espa\~nola de elementos en apacite %% Escrito por Jorge L\'opez Puga @@ -145,6 +145,12 @@ \renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's spanish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or enero\or febrero\or diff --git a/Master/texmf-dist/tex/latex/apacite/swedish.apc b/Master/texmf-dist/tex/latex/apacite/swedish.apc index 0f21f3f8d9c..10fed68e466 100644 --- a/Master/texmf-dist/tex/latex/apacite/swedish.apc +++ b/Master/texmf-dist/tex/latex/apacite/swedish.apc @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed +%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed %% elsewhere in this file. %% %% This file is part of the `apacite' package. @@ -43,7 +43,7 @@ %% the generated files. %% \ProvidesFile{swedish.apc} - [2012/02/25 v6.01 apacite language file] + [2013/07/04 v6.02 apacite language file] %% %% swedish.apc - swedish translation of apacite elements %% Written by Stefan Bjork. @@ -141,6 +141,12 @@ \renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of %% authors = 2 \renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2 +%% Remove excess space with the natbibapa option +\if@APAC@natbib@apa + \renewcommand{\BBAY}{,}% + \renewcommand{\BBYY}{,}% + \renewcommand{\BBC}{;}% +\fi %% %% Date formatting; adapted from babel's swedish.dtx \renewcommand{\APACmonth}[1]{\ifcase #1\or -- cgit v1.2.3