summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-04 21:10:04 +0000
committerKarl Berry <karl@freefriends.org>2017-11-04 21:10:04 +0000
commit8ff328d8d6a3cf9e4ce34a6cd1ee676afe63be33 (patch)
tree0701cff1cc3f9c39cd63e13feb3572e61d33d951 /Master/texmf-dist/tex/latex/biblatex/bbx
parent4882493e5183ee14767c5f3c00d3f834c1bf95eb (diff)
biblatex (4nov17)
git-svn-id: svn://tug.org/texlive/trunk@45690 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx19
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx112
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx22
6 files changed, 101 insertions, 70 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index 06d91ba6c07..8a41db44fa8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -4,10 +4,16 @@
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
+\providebool{bbx:subentry}
+
+\DeclareBibliographyOption[boolean]{subentry}[true]{%
+ \setbool{bbx:subentry}{#1}}
+
\DeclareNameAlias{author}{default}
\DeclareNameAlias{editor}{default}
\DeclareNameAlias{translator}{default}
+\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
\DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}}
\DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}}
@@ -15,7 +21,7 @@
{\list
{\printtext[labelalphawidth]{%
\printfield{labelprefix}%
- \printfield{labelalpha}%
+ \printfield{labelalpha}%
\printfield{extraalpha}}}
{\setlength{\labelwidth}{\labelalphawidth}%
\setlength{\leftmargin}{\labelwidth}%
@@ -40,4 +46,15 @@
{\endlist}
{\item}
+\DeclareBibliographyDriver{set}{%
+ \entryset
+ {\ifbool{bbx:subentry}
+ {\printfield[bibentrysetcount]{entrysetcount}%
+ \printunit*{\addnbspace}}
+ {}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
+ \finentry}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index a3f26dd9fe2..cd89399bfaa 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -69,8 +69,8 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{author}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
+ \setunit{\printdelim{authortypedelim}}%
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{authorstrg}}
{\global\undef\bbx@lasthash}}
@@ -87,8 +87,8 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}}
{\global\undef\bbx@lasthash}}
@@ -106,7 +106,7 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{translator}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{translatortypedelim}}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{translator}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index e27b18904e2..62df365d2d7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -17,59 +17,80 @@
{Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
'true' (=compact), and 'false'.}}}
-\providebibmacro*{date+extrayear}{}
+\providebibmacro*{date+extradate}{}
+\providebibmacro*{date+extrayear}{\usebibmacro{date+extradate}}
\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
% merge date/issue with date label
\def\bbx@opt@mergedate@maximum{%
- \renewbibmacro*{date+extrayear}{%
+ \renewbibmacro*{date+extradate}{%
\iffieldundef{labelyear}
{}
{\printtext[parens]{%
+ \iflabeldateisdate
+ {\printfield{issue}%
+ \setunit*{\addspace}%
+ \printdateextra}
+ {\printlabeldateextra}}}}%
+ \renewbibmacro*{date}{%
+ \iflabeldateisdate
+ {}
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \iflabeldateisdate
+ {}
+ {\printtext[parens]{%
\printfield{issue}%
\setunit*{\addspace}%
- \iffieldsequal{year}{labelyear}
- {\printlabeldateextra}%
- {\printfield{labelyear}%
- \printfield{extrayear}}}}}%
- \renewbibmacro*{date}{}%
- \renewbibmacro*{issue+date}{}}
+ \printdate}}}}
% merge date with date label
\def\bbx@opt@mergedate@compact{%
- \renewbibmacro*{date+extrayear}{%
+ \renewbibmacro*{date+extradate}{%
\iffieldundef{labelyear}
{}
{\printtext[parens]{%
- \iffieldsequal{year}{labelyear}
- {\printlabeldateextra}%
- {\printfield{labelyear}%
- \printfield{extrayear}}}}}%
- \renewbibmacro*{date}{}%
- \renewbibmacro*{issue+date}{%
- \iffieldundef{issue}
+ \iflabeldateisdate
+ {\printdateextra}
+ {\printlabeldateextra}}}}%
+ \renewbibmacro*{date}{%
+ \iflabeldateisdate
{}
- {\printtext[parens]{\printfield{issue}}}%
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{not test {\iffieldundef{issue}}
+ or not test {\iflabeldateisdate}}
+ {\printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \iflabeldateisdate
+ {}
+ {\printdate}}}
+ {}%
\newunit}}
% merge year-only date with date label
\def\bbx@opt@mergedate@basic{%
- \renewbibmacro*{date+extrayear}{%
+ \renewbibmacro*{date+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ {\printtext[parens]{\printlabeldateextra}}}%
\renewbibmacro*{date}{%
- \iffieldundef{month}
+ \ifboolexpr{
+ test {\iflabeldateisdate}
+ and
+ not test {\ifdateshavedifferentprecision{label}{}}
+ }
{}
{\printdate}}%
\renewbibmacro*{issue+date}{%
\ifboolexpr{
- test {\iffieldundef{issue}}
+ test {\iflabeldateisdate}
and
- test {\iffieldundef{month}}
+ not test {\ifdateshavedifferentprecision{label}{}}
+ and
+ test {\iffieldundef{issue}}
}
{}
{\printtext[parens]{%
@@ -80,27 +101,29 @@
% merge year-only date with year-only date label
\def\bbx@opt@mergedate@minimum{%
- \renewbibmacro*{date+extrayear}{%
+ \renewbibmacro*{date+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ {\printtext[parens]{\printlabeldateextra}}}%
\renewbibmacro*{date}{%
\ifboolexpr{
- test {\iffieldundef{month}}
+ test {\iflabeldateisdate}
and
- test {\iffieldundef{extrayear}}
+ not test {\ifdateshavedifferentprecision{label}{}}
+ and
+ test {\iffieldundef{extradate}}
}
{}
{\printdate}}%
\renewbibmacro*{issue+date}{%
\ifboolexpr{
- test {\iffieldundef{issue}}
+ test {\iflabeldateisdate}
+ and
+ not test {\ifdateshavedifferentprecision{label}{}}
and
- test {\iffieldundef{month}}
+ test {\iffieldundef{extradate}}
and
- test {\iffieldundef{extrayear}}
+ test {\iffieldundef{issue}}
}
{}
{\printtext[parens]{%
@@ -111,21 +134,18 @@
% don't merge date/issue with date label
\def\bbx@opt@mergedate@false{%
- \renewbibmacro*{date+extrayear}{%
+ \renewbibmacro*{date+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ {\printtext[parens]{\printlabeldateextra}}}%
\renewbibmacro*{date}{\printdate}%
\renewbibmacro*{issue+date}{%
\printtext[parens]{%
\printfield{issue}%
\setunit*{\addspace}%
- \printdate}%
+ \usebibmacro{date}}%
\newunit}}
-% n.b. the default labeldate=year overrides merging of months and days
\ExecuteBibliographyOptions{labeldateparts,sorting=nyt,pagetracker,mergedate}
\DeclareFieldFormat{shorthandwidth}{#1}
@@ -189,7 +209,7 @@
\printnames{author}%
\iffieldundef{authortype}
{\setunit{\printdelim{nameyeardelim}}}
- {\setunit{\addcomma\space}}}%
+ {\setunit{\printdelim{authortypedelim}}}}%
\iffieldundef{authortype}
{}
{\usebibmacro{authorstrg}%
@@ -197,7 +217,7 @@
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
\setunit*{\printdelim{nonameyeardelim}}}%
- \usebibmacro{date+extrayear}}
+ \usebibmacro{date+extradate}}
\renewbibmacro*{editor}{%
\usebibmacro{bbx:editor}{editorstrg}}
@@ -212,7 +232,7 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{editortypedelim}}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
@@ -220,7 +240,7 @@
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
\setunit*{\printdelim{nonameyeardelim}}}%
- \usebibmacro{date+extrayear}}
+ \usebibmacro{date+extradate}}
\renewbibmacro*{translator}{%
\usebibmacro{bbx:translator}{translatorstrg}}
@@ -235,15 +255,15 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{translator}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{translatortypedelim}}%
\usebibmacro{bbx:savehash}}%
- \usebibmacro{translator+othersstrg}%
+ \usebibmacro{#1}%
\clearname{translator}%
\setunit{\printdelim{nameyeardelim}}}%
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
\setunit*{\printdelim{nonameyeardelim}}}%
- \usebibmacro{date+extrayear}}
+ \usebibmacro{date+extradate}}
\newbibmacro*{bbx:dashcheck}[2]{%
\ifboolexpr{
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index e86e97ac041..1c573251577 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -18,7 +18,7 @@
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}%
\renewcommand*{\makelabel}[1]{%
- \hspace\labelsep\bfseries##1}}}
+ \hspace\labelsep\bfseries##1}}}
{\endlist}
{\item}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 5458f8a5957..70c2134c4eb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -20,8 +20,8 @@
\defbibenvironment{bibliography}
{\list
{\printtext[labelnumberwidth]{%
- \printfield{labelprefix}%
- \printfield{labelnumber}}}
+ \printfield{labelprefix}%
+ \printfield{labelnumber}}}
{\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\leftmargin}{\labelwidth}%
\setlength{\labelsep}{\biblabelsep}%
@@ -49,7 +49,7 @@
\entryset
{\ifbool{bbx:subentry}
{\printfield[bibentrysetcount]{entrysetcount}%
- \printunit*{\addnbspace}}
+ \printunit*{\addnbspace}}
{}}
{}%
\newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index d5bf3f198d1..8edb549d154 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -719,10 +719,10 @@
{\iffieldundef{maintitle}
{}
{\usebibmacro{maintitle}%
- \newunit\newblock
- \iffieldundef{volume}
- {}
- {\printfield{volume}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
\printfield{part}%
\setunit{\addcolon\space}}}}%
\usebibmacro{title}%
@@ -771,11 +771,7 @@
{\newunit
\printfield{series}%
\setunit{\addspace}}%
- \printfield{volume}%
- \setunit*{\adddot}%
- \printfield{number}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
+ \usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
\setunit{\addcolon\space}%
@@ -784,11 +780,9 @@
\newbibmacro*{issue+date}{%
\printtext[parens]{%
- \iffieldundef{issue}
- {\usebibmacro{date}}
- {\printfield{issue}%
- \setunit*{\addspace}%
- \usebibmacro{date}}}%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \usebibmacro{date}}%
\newunit}
\newbibmacro*{event+venue+date}{%