summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-16 20:34:42 +0000
committerKarl Berry <karl@freefriends.org>2016-05-16 20:34:42 +0000
commita23814813ddc2837007fa10e3b895a5da6dae34f (patch)
tree3431a5ae9d4405adfc7a61ffdf6cdddc72df2d32 /Master/texmf-dist/tex/latex/biblatex-chicago
parent93e3b5c54ef8b5a993186f2254fad3e6732b1172 (diff)
biblatex-chicago (16may16)
git-svn-id: svn://tug.org/texlive/trunk@41200 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx47
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx53
5 files changed, 90 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
index 2ef864027a6..86f8a1d82f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.55 2016/03/15 14:12:03 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.57 2016/05/08 19:58:55 dfussner Exp $
% Copyright (c) 2009-2016 David Fussner. This package is
% author-maintained.
@@ -128,7 +128,7 @@
{\DeclareLanguageMapping{american}{cms-american}}%
{\ifthenelse{\equal{\languagename}{english}}%
{\DeclareLanguageMapping{english}{cms-american}}%
- {}}}%
+ {\DeclareLanguageMapping{american}{cms-american}}}}%
{\DeclareLanguageMapping{english}{cms-american}}
\DeclareLanguageMapping{british}{cms-british}
@@ -144,12 +144,17 @@
\@ifpackagelater{biblatex}{2012/06/30}
{\@ifpackagelater{biblatex}{2016/03/01}
- {\def\cms@choose{%
- \ifblx@load@version@legacy
- nty%
- \else
- cms%
- \fi}}
+ {\@ifpackagelater{biblatex}{2016/05/01}
+ {\def\cms@choose{%
+ \iftoggle{blx@bibtex}%
+ {nty}%
+ {cms}}}%
+ {\def\cms@choose{%
+ \ifblx@load@version@legacy
+ nty%
+ \else
+ cms%
+ \fi}}}
{\def\cms@choose{%
\ifblx@load@version@one
nty%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
index 7e02e710103..77f95a52929 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -1642,17 +1642,18 @@ citation style]
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
\renewcommand*{\nameyeardelim}{%
- \iffieldundef{origyear}% Is this test correct?
- {\iffieldundef{year}%
- {\addspace}
- {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
- \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
- \iffieldnums{year}% This one works.
- {\addspace}%
- {\iffieldequalstr{year}{\bibstring{nodate}}% This also works.
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}%
+ {\addcomma\addspace}%
+ {\iffieldundef{origyear}% Is this test correct?
+ {\iffieldundef{year}%
{\addspace}
- {\addcomma\addspace}}}}%
- {\addspace}}
+ {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
+ \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
+ \iffieldnums{year}% This one works.
+ {\addspace}%
+ {\addcomma\addspace}}}% 16th ed. wants comma before n.d.
+ {\addspace}}}
\newcommand{\classicpunct}{%
\ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
index 5731d9bb75e..3db9745b33e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -144,40 +144,45 @@ bibliography style]
\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
{\renewbibmacro*{name:family-given}[4]{%
- \ifuseprefix
+ \ifuseprefix%
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifempty{#3}{}{%
- \ifcapital
+ \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?
test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
and
@@ -185,7 +190,7 @@ bibliography style]
}
{\revsdnamepunct}%
{}}}%
- {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}%
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
\newbibmacro*{author/editors/translators}{%
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
index c1c1a13eb0d..bea3e54af0b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1638,17 +1638,18 @@ citation style]
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
\renewcommand*{\nameyeardelim}{%
- \iffieldundef{origyear}% Is this test correct?
- {\iffieldundef{year}%
- {\addspace}
- {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
- \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
- \iffieldnums{year}% This one works.
- {\addspace}%
- {\iffieldequalstr{year}{\bibstring{nodate}}% This also works.
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}%
+ {\addcomma\addspace}%
+ {\iffieldundef{origyear}% Is this test correct?
+ {\iffieldundef{year}%
{\addspace}
- {\addcomma\addspace}}}}%
- {\addspace}}
+ {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
+ \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
+ \iffieldnums{year}% This one works.
+ {\addspace}%
+ {\addcomma\addspace}}}% 16th ed. wants comma before n.d.
+ {\addspace}}}
\newcommand{\classicpunct}{%
\ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
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}}%