summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/bibtex/bst/apacite/apacann.bst')
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacann.bst46
1 files changed, 24 insertions, 22 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$
""
}