summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-08 21:59:50 +0000
committerKarl Berry <karl@freefriends.org>2013-07-08 21:59:50 +0000
commit4550b1cb3cc63b73ebca0d72cafc0e7b8c6f9397 (patch)
treebd988c6cc4f5dd56173db354af36fc2f655879de /Master/texmf-dist/bibtex
parent4fa56fbb23e2c4f58ec892731a6acb431846c5da (diff)
apacite (8jul13)
git-svn-id: svn://tug.org/texlive/trunk@31135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacann.bst87
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacannx.bst87
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacite.bst87
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacitex.bst87
4 files changed, 112 insertions, 236 deletions
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