summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-20 21:11:51 +0000
committerKarl Berry <karl@freefriends.org>2020-08-20 21:11:51 +0000
commit007811a6dc1c41c75d2fc3ac86ecb35014856a72 (patch)
tree624a9014bb69937073cb2f5bdbcb9dc5e20db1a6 /Master/texmf-dist/bibtex
parent09ce7eaab854b9d1a6d44d71e17f88d19424885a (diff)
biblatex (20aug20)
git-svn-id: svn://tug.org/texlive/trunk@56143 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib10
-rw-r--r--Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst44
2 files changed, 28 insertions, 26 deletions
diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
index 10f114bc76d..5aaa9d2196f 100644
--- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
@@ -25,19 +25,13 @@
@set{set,
entryset = {herrmann,aksin,yoon},
- annotation = {A \texttt{set} with three members. The \texttt{crossref} field
- in the \texttt{@set} entry and the \texttt{entryset} field in
- each set member entry is needed only when using BibTeX as the
- backend},
+ annotation = {A \texttt{set} with three members.},
}
@set{stdmodel,
entryset = {glashow,weinberg,salam},
annotation = {A \texttt{set} with three members discussing the standard
- model of particle physics. The \texttt{crossref} field
- in the \texttt{@set} entry and the \texttt{entryset} field in
- each set member entry is needed only when using BibTeX as the
- backend},
+ model of particle physics.},
}
@article{aksin,
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index e3b5fbb23e1..dc1837f9418 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -16,6 +16,7 @@
ENTRY {
% special fields
+ fakeset
entryset
entrysubtype
execute
@@ -183,7 +184,7 @@ STRINGS { ctrl.alphaothers ctrl.sortalphaothers ctrl.sortstr
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 3.13 $"
+ "$Revision: 3.15 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -257,16 +258,11 @@ FUNCTION {ctrl:set} {
type$ "set" =
}
-FUNCTION {ctrl:skiplos} {
- ctrl:control skiplos or
- ctrl:set not
- and
-}
FUNCTION {ctrl:skiplab} {
ctrl:control skiplab or
- ctrl:set not
- and
+ ctrl:set % fakeset empty$ and
+ or
}
FUNCTION {ctrl:labelalpha} {
@@ -1413,6 +1409,14 @@ FUNCTION {output:write:list} {
}
FUNCTION {output:specials} {
+ fakeset empty$
+ 'skip$
+ { ctrl:set
+ { "\fakeset" fakeset wrap:braces * output:indent:field }
+ { "fakeset can only be used for @set entries" warning * }
+ if$
+ }
+ if$
entryset empty$
'skip$
{ ctrl:set
@@ -1459,23 +1463,27 @@ FUNCTION {output:specials} {
'skip$
if$
ctrl:labeldate
- dateyear empty$ not
- and
- { "labelyear" dateyear output:write:field
- dateendyear empty$
- 'skip$
- { dateyear dateendyear =
+ { dateyear empty$ not
+ { "labelyear" dateyear output:write:field
+ dateendyear empty$
'skip$
- { dateendyear open.ended =
+ { dateyear dateendyear =
'skip$
- { "labelendyear" dateendyear output:write:field }
+ { dateendyear open.ended =
+ 'skip$
+ { "labelendyear" dateendyear output:write:field }
+ if$
+ }
if$
}
if$
+ "extradate" extradate output:write:field
+ "labeldatesource" "" output:write:field:maybeempty
+ }
+ { "extradate" extradate output:write:field
+ "labeldatesource" "nodate" output:write:field
}
if$
- "extradate" extradate output:write:field
- "labeldatesource" "" output:write:field:maybeempty
}
'skip$
if$