summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx53
1 files changed, 29 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index 60eed677dd0..66907a36043 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -192,50 +192,55 @@
{}}}%
{\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
-\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
+\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3/3.4
{\renewbibmacro*{name:family-given}[4]{%
- \ifuseprefix
+ \ifuseprefix%
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifempty{#3}{}{%
- \ifcapital
- {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ \ifdefvoid{#3}{}{%
+ \ifcapital%
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
{\mkbibnameprefix{#3}\isdot}%
\ifprefchar{}{\bibnamedelimc}}%
- \mkbibnamefamily{#1}\isdot
- \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
- \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}%
+ \mkbibnamefamily{#1}\isdot%
+ \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{#1}\isdot
- \ifempty{#2#3}{}{\revsdnamepunct}%
- \ifempty{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
- \ifempty{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
- \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}%
+ \mkbibnamefamily{#1}\isdot%
+ \ifboolexpr{%
+ test {\ifdefvoid{#2}}%
+ and
+ test {\ifdefvoid{#3}}%
+ }%
+ {}{\revsdnamepunct}%
+ \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}%
\renewbibmacro*{name:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
- \ifempty{#3}{}{%
- \mkbibnameprefix{#3}\isdot
- \ifprefchar
- {}
+ \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
+ \ifdefvoid{#3}{}{%
+ \mkbibnameprefix{#3}\isdot%
+ \ifprefchar%
+ {}%
{\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
- \mkbibnamefamily{#1}\isdot
- \ifempty{#4}{}{%
+ \mkbibnamefamily{#1}\isdot%
+ \ifdefvoid{#4}{}{%
\iftoggle{cms@jrcomma}%
{\ifnumeral{#4}%
- {\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
- {\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot%
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+ {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot%
\ifboolexpr{% Test needed in notes
test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
and
test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
- }
+ }%
{\revsdnamepunct}%
{}}}%
- {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}%
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
\newbibmacro*{author/editors/translators}{%
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%