diff options
author | Karl Berry <karl@freefriends.org> | 2019-08-24 20:53:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-08-24 20:53:26 +0000 |
commit | 0b2e3d90de5730215a88a0bcf9b18495d512a23b (patch) | |
tree | 266db2ba05a0028a1fec4b50160b054478c78b7c /Master/texmf-dist/bibtex/bst | |
parent | 84f8a525e2b7f097efa0065802286d59857225a4 (diff) |
biblatex (24aug19)
git-svn-id: svn://tug.org/texlive/trunk@51953 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex/bst')
-rw-r--r-- | Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst | 73 |
1 files changed, 50 insertions, 23 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 1d52835c94d..4b1dcee4d76 100644 --- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst +++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst @@ -168,7 +168,10 @@ ENTRY { warningmsg } INTEGERS { ctrl.debug ctrl.bibtex8 ctrl.maxline ctrl.sorting ctrl.cssort - ctrl.maxnames ctrl.minnames ctrl.maxalphanames ctrl.minalphanames + ctrl.maxcitenames ctrl.mincitenames + ctrl.maxsortnames ctrl.minsortnames + ctrl.nohashothers ctrl.nosortothers + ctrl.maxalphanames ctrl.minalphanames ctrl.useauthor ctrl.useeditor ctrl.usetranslator ctrl.useprefix ctrl.labelalpha ctrl.singletitle ctrl.labeldate citecount @@ -180,7 +183,7 @@ STRINGS { ctrl.alphaothers ctrl.sortalphaothers ctrl.sortstr last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 3.11 $" + "$Revision: 3.13 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ @@ -193,8 +196,12 @@ FUNCTION {initialize} { #1 'ctrl.useeditor := #0 'ctrl.usetranslator := #0 'ctrl.useprefix := - #1 'ctrl.minnames := - #99 'ctrl.maxnames := + #99 'ctrl.maxcitenames := + #1 'ctrl.mincitenames := + #99 'ctrl.maxsortnames := + #1 'ctrl.minsortnames := + #0 'ctrl.nohashothers := + #0 'ctrl.nosortothers := #1 'ctrl.minalphanames := #3 'ctrl.maxalphanames := #79 'ctrl.maxline := @@ -551,8 +558,8 @@ FUNCTION {shortname:hash} { tempctrc #0 = { tempctrb 'tempctrc := } { tempctrb tempctrc > - { ctrl.minnames 'tempctrc := } - { ctrl.maxnames 'tempctrc := } + { ctrl.mincitenames 'tempctrc := } + { ctrl.maxcitenames 'tempctrc := } if$ } if$ @@ -568,6 +575,8 @@ FUNCTION {shortname:hash} { templist andothers tempctrb #0 > or + ctrl.nohashothers not + and { "+" * } 'skip$ if$ @@ -580,7 +589,7 @@ FUNCTION {push:name:namehash} { 'skip$ if$ } - { ctrl.maxnames shortname:hash } + { ctrl.maxcitenames shortname:hash } if$ } @@ -903,9 +912,9 @@ FUNCTION {sortkey:name:format} { { tempctrb #1 - 'tempctrb := } 'skip$ if$ - tempctrb ctrl.maxnames > - { ctrl.minnames 'tempctrc := } - { ctrl.maxnames 'tempctrc := } + tempctrb ctrl.maxsortnames > + { ctrl.minsortnames 'tempctrc := } + { ctrl.maxsortnames 'tempctrc := } if$ "" { duplicate$ text.length$ entry.max$ #50 - < @@ -944,6 +953,8 @@ FUNCTION {sortkey:name:format} { templist andothers tempctrb #0 > or + ctrl.nosortothers not + and { delimiter.2 * "zzzz" * } 'skip$ if$ @@ -1314,6 +1325,11 @@ FUNCTION {output:write:name} { templist andothers { tempctrb #1 - 'tempctrb := "more" tempstrga * #1 output:write:bool + % not actually required, biblatex should resolve this + tempstrga push:labelname = + { "morelabelname" #1 output:write:bool } + 'skip$ + if$ } 'skip$ if$ @@ -1895,18 +1911,18 @@ FUNCTION {input:control:options} { input:control:parse str.to.int } -% This version corresponds to the .bbl version, *not* the biblatex version! +% This version corresponds to the .bcf version, *not* the biblatex version! FUNCTION {input:control:version} { input:control:parse - "$Revision: 3.0 $" + "$Revision: 3.6 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ 'tempstrga := duplicate$ tempstrga = { pop$ } - { "bbl version mismatch: biblatex.bst has " tempstrga * + { "bcf version mismatch: biblatex.bst has " tempstrga * ", but biblatex.sty has " * swap$ * warning$ - " The bbl version need not be the same as the biblatex version." + " The bcf version need not be the same as the biblatex version." top$ pop$ "" } if$ @@ -1929,8 +1945,12 @@ FUNCTION {input:control} { input:control:options 'ctrl.labeldate := input:control:options 'ctrl.singletitle := input:control:options 'ctrl.sorting := - input:control:options 'ctrl.maxnames := - input:control:options 'ctrl.minnames := + input:control:options 'ctrl.maxcitenames := + input:control:options 'ctrl.mincitenames := + input:control:options 'ctrl.maxsortnames := + input:control:options 'ctrl.minsortnames := + input:control:options 'ctrl.nohashothers := + input:control:options 'ctrl.nosortothers := input:control:options 'ctrl.maxalphanames := input:control:options 'ctrl.minalphanames := input:control:options 'ctrl.maxline := @@ -2125,9 +2145,9 @@ FUNCTION {makelabel:name:format} { { tempctrb #1 - 'tempctrb := } 'skip$ if$ - tempctrb ctrl.maxnames > - { ctrl.minnames 'tempctrc := } - { ctrl.maxnames 'tempctrc := } + tempctrb ctrl.maxcitenames > + { ctrl.mincitenames 'tempctrc := } + { ctrl.maxcitenames 'tempctrc := } if$ "" { duplicate$ text.length$ entry.max$ #50 - < @@ -2157,11 +2177,14 @@ FUNCTION {makelabel:name:format} { templist andothers tempctrb #0 > or + ctrl.nohashothers not + and { delimiter.2 * "zzzz" * } 'skip$ if$ } + FUNCTION {makelabel:name:full} { duplicate$ num.names$ #1 = { #1 @@ -2235,9 +2258,9 @@ FUNCTION {makelabel:hash:format} { { tempctrb #1 - 'tempctrb := } 'skip$ if$ - tempctrb ctrl.maxnames > - { ctrl.minnames 'tempctrc := } - { ctrl.maxnames 'tempctrc := } + tempctrb ctrl.maxcitenames > + { ctrl.mincitenames 'tempctrc := } + { ctrl.maxcitenames 'tempctrc := } if$ "" { tempctra tempctrc > not @@ -2256,6 +2279,8 @@ FUNCTION {makelabel:hash:format} { templist andothers tempctrb #0 > or + ctrl.nohashothers not + and { "+" * } 'skip$ if$ @@ -2282,6 +2307,8 @@ FUNCTION {makelabel:hash:format:full} { } while$ templist andothers + ctrl.nohashothers not + and { "+" * } 'skip$ if$ @@ -2730,7 +2757,7 @@ SORT % This version corresponds to the .bbl version, *not* the biblatex version! FUNCTION {output:main:begin} { "% $ biblatex auxiliary file $" write$ newline$ - "% $ biblatex bbl format version " "$Revision: 3.0 $" + "% $ biblatex bbl format version " "$Revision: 3.1 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$ "% Do not modify the above lines!" write$ newline$ "%" write$ newline$ |