summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-11-03 21:11:01 +0000
committerKarl Berry <karl@freefriends.org>2018-11-03 21:11:01 +0000
commit75d35a09f72ec23912d8aa1b40dcbf674a91c398 (patch)
treec6bdec0150292bc936d76dd87049fe00452aba3a /Master/texmf-dist/tex/latex/biblatex/bbx
parentf1dd9b42c3592316b29602acadfbce3f2d975424 (diff)
biblatex (3nov18)
git-svn-id: svn://tug.org/texlive/trunk@49069 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/authortitle.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx60
2 files changed, 33 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index cd89399bfaa..d378cd55c48 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -17,6 +17,10 @@
\DeclareNameAlias{editor}{sortname}
\DeclareNameAlias{translator}{sortname}
+\DeclareNameWrapperAlias{author}{sortname}
+\DeclareNameWrapperAlias{editor}{sortname}
+\DeclareNameWrapperAlias{translator}{sortname}
+
\defbibenvironment{bibliography}
{\list
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 0a2a8a741ef..b7f558329da 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -24,6 +24,13 @@
Using 'date+extradate' instead}%
\usebibmacro{date+extradate}}
+\newbibmacro*{bbx:ifmergeddate}{\@secondoftwo}
+
+\renewbibmacro*{date}{%
+ \usebibmacro{bbx:ifmergeddate}
+ {}
+ {\printdate}}%
+
\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
% merge date/issue with date label
@@ -37,12 +44,9 @@
\setunit*{\addspace}%
\printdateextra}
{\printlabeldateextra}}}}%
- \renewbibmacro*{date}{%
- \iflabeldateisdate
- {}
- {\printdate}}%
+ \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}%
\renewbibmacro*{issue+date}{%
- \iflabeldateisdate
+ \usebibmacro{bbx:ifmergeddate}
{}
{\printtext[parens]{%
\printfield{issue}%
@@ -58,20 +62,18 @@
\iflabeldateisdate
{\printdateextra}
{\printlabeldateextra}}}}%
- \renewbibmacro*{date}{%
- \iflabeldateisdate
- {}
- {\printdate}}%
+ \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}%
\renewbibmacro*{issue+date}{%
- \ifboolexpr{not test {\iffieldundef{issue}}
- or not test {\iflabeldateisdate}}
+ \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}}
+ and
+ test {\iffieldundef{issue}}}
+ {}
{\printtext[parens]{%
\printfield{issue}%
\setunit*{\addspace}%
- \iflabeldateisdate
+ \usebibmacro{bbx:ifmergeddate}
{}
- {\printdate}}}
- {}%
+ {\printdate}}}%
\newunit}}
% merge year-only date with date label
@@ -80,19 +82,16 @@
\iffieldundef{labelyear}
{}
{\printtext[parens]{\printlabeldateextra}}}%
- \renewbibmacro*{date}{%
+ \renewbibmacro*{bbx:ifmergeddate}{%
\ifboolexpr{
test {\iflabeldateisdate}
and
not test {\ifdateshavedifferentprecision{label}{}}
- }
- {}
- {\printdate}}%
+ }%
+ }%
\renewbibmacro*{issue+date}{%
\ifboolexpr{
- test {\iflabeldateisdate}
- and
- not test {\ifdateshavedifferentprecision{label}{}}
+ test {\usebibmacro{bbx:ifmergeddate}}
and
test {\iffieldundef{issue}}
}
@@ -109,23 +108,18 @@
\iffieldundef{labelyear}
{}
{\printtext[parens]{\printlabeldateextra}}}%
- \renewbibmacro*{date}{%
+ \renewbibmacro*{bbx:ifmergeddate}{%
\ifboolexpr{
test {\iflabeldateisdate}
and
not test {\ifdateshavedifferentprecision{label}{}}
and
test {\iffieldundef{extradate}}
- }
- {}
- {\printdate}}%
+ }%
+ }%
\renewbibmacro*{issue+date}{%
\ifboolexpr{
- test {\iflabeldateisdate}
- and
- not test {\ifdateshavedifferentprecision{label}{}}
- and
- test {\iffieldundef{extradate}}
+ test {\usebibmacro{bbx:ifmergeddate}}
and
test {\iffieldundef{issue}}
}
@@ -142,7 +136,7 @@
\iffieldundef{labelyear}
{}
{\printtext[parens]{\printlabeldateextra}}}%
- \renewbibmacro*{date}{\printdate}%
+ \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}%
\renewbibmacro*{issue+date}{%
\printtext[parens]{%
\printfield{issue}%
@@ -159,6 +153,10 @@
\DeclareNameAlias{editor}{sortname}
\DeclareNameAlias{translator}{sortname}
+\DeclareNameWrapperAlias{author}{sortname}
+\DeclareNameWrapperAlias{editor}{sortname}
+\DeclareNameWrapperAlias{translator}{sortname}
+
\defbibenvironment{bibliography}
{\list
{}