summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-05 23:51:11 +0000
committerKarl Berry <karl@freefriends.org>2017-11-05 23:51:11 +0000
commit24f27b13d3ff59a9fc025ce009af154a95fd9acf (patch)
treeab567aa908a22d634c40bf2037cca0ae2f38be7f /Master/texmf-dist/bibtex
parent95108cf71ce35a8dc9cb0739da991e6c4b950f4a (diff)
revert to biblatex 3.7, since 3.8 (and companion biber) was apparently not ready
git-svn-id: svn://tug.org/texlive/trunk@45702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst37
1 files changed, 17 insertions, 20 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 6ee883631be..1f498b29225 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -159,7 +159,7 @@ ENTRY {
verbc
}
{ skipbib skiplos skiplab useauthor useeditor usetranslator useprefix singletitle }
- { entryoptions labelhash namehash fullhash dateyear dateendyear extradate labelalpha extraalpha
+ { entryoptions labelhash namehash fullhash dateyear dateendyear extrayear labelalpha extraalpha
sortinit label.name label.year sortkey.nosort sortkey.name sortkey.year
sortkey.title sortkey.alpha sort.year sort.alph warningmsg }
@@ -175,7 +175,7 @@ STRINGS { ctrl.alphaothers ctrl.sortstr
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 3.8 $"
+ "$Revision: 3.3 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -1430,21 +1430,22 @@ FUNCTION {output:specials} {
ctrl:labeldate
dateyear empty$ not
and
- { "labelyear" dateyear output:write:field
+ { "labelyear"
+ dateyear
dateendyear empty$
'skip$
{ dateyear dateendyear =
'skip$
{ dateendyear open.ended =
'skip$
- { "labelendyear" dateendyear output:write:field }
+ { "\bibdatedash " * dateendyear * }
if$
}
if$
}
if$
- "extradate" extradate output:write:field
- "labeldatesource" "year" output:write:field
+ output:write:field
+ "extrayear" extrayear output:write:field
}
'skip$
if$
@@ -1482,7 +1483,6 @@ FUNCTION {output:names} {
FUNCTION {output:lists} {
"language" language output:write:list
"organization" organization output:write:list
- "origlanguage" origlanguage output:write:list
"origlocation" origlocation output:write:list
"origpublisher" origpublisher output:write:list
"publisher" publisher output:write:list
@@ -1526,6 +1526,7 @@ FUNCTION {output:fields.2} {
"nameaddon" nameaddon output:write:field
"note" note output:write:field
"number" number output:write:field
+ "origlanguage" origlanguage output:write:field
"origtitle" origtitle output:write:field
"pages" pages output:write:range
"pagetotal" pagetotal output:write:range
@@ -1887,7 +1888,7 @@ FUNCTION {input:control:options} {
% This version corresponds to the .bbl version, *not* the biblatex version!
FUNCTION {input:control:version} {
input:control:parse
- "$Revision: 2.9 $"
+ "$Revision: 2.8 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
'tempstrga :=
@@ -2279,11 +2280,7 @@ FUNCTION {makelabel:ctrl:alpha} {
{ label makelabel:alpha:year * }
if$
}
- { shorthand empty$
- { "" }
- { shorthand }
- if$
- }
+ { "" }
if$
}
@@ -2552,10 +2549,10 @@ FUNCTION {labelsort:main:year:iterate} {
'label.year :=
label.year last.year =
{ last.extra.num #1 + 'last.extra.num :=
- last.extra.num int.to.str$ 'extradate :=
+ last.extra.num int.to.str$ 'extrayear :=
}
{ #1 'last.extra.num :=
- "" 'extradate :=
+ "" 'extrayear :=
label.year 'last.year :=
}
if$
@@ -2567,10 +2564,10 @@ FUNCTION {labelsort:main:year:iterate} {
FUNCTION {labelsort:main:year:reverse} {
ctrl:labeldate
{ last.extra "2" =
- { "1" 'extradate := }
+ { "1" 'extrayear := }
'skip$
if$
- extradate 'last.extra :=
+ extrayear 'last.extra :=
}
'skip$
if$
@@ -2705,7 +2702,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: 2.9 $"
+ "% $ biblatex bbl format version " "$Revision: 2.8 $"
#12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$
"% Do not modify the above lines!" write$ newline$
"%" write$ newline$
@@ -2723,7 +2720,7 @@ FUNCTION {output:main:begin} {
" {}" write$ newline$
"\endgroup" write$ newline$
newline$
- "\datalist[entry]{" ctrl.sortstr * "/global//global/global}" * write$
+ "\sortlist[entry]{" ctrl.sortstr * "/global/}" * write$
}
FUNCTION {output:main:preamble} {
@@ -2738,7 +2735,7 @@ FUNCTION {output:main:preamble} {
}
FUNCTION {output:main:end} {
- "\enddatalist" write$ newline$
+ "\endsortlist" write$ newline$
"\endinput" write$ newline$
}