summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx67
1 files changed, 58 insertions, 9 deletions
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 e3a66102f11..b718305caef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.4 2011/09/21 10:53:18 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.7 2011/09/28 17:33:47 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authoryear-comp.cbx. It is heavily modified, with the intention of
% providing inline citations (and a reference list) for the
% author-date style of the Chicago Manual of Style, _15th_ edition.
\ProvidesFile{chicago-authordate.cbx}
-[2011/09/21 v 1.6 biblatex citation style]
+[2011/09/28 v 1.6 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -20,7 +20,6 @@
\providetoggle{cms@reprint}
\providetoggle{cms@switchdates}
\providetoggle{cms@los}
-\providetoggle{cms@oneyear}
\providetoggle{cms@nodates}
\providetoggle{cms@url}% These are for the field-exclusion options
@@ -488,10 +487,51 @@
not togl {cms@nodates}
}%
{}%
- {\bibstring{nodate}}}% For CMS?
+ {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
{\printtext[bibhyperref]{%
- \printfield{labelyear}\setunit{}% Needed for patent type
- \printfield{extrayear}}}}
+ \iffieldundef{year}%
+ {\iffieldundef{eventyear}
+ {\iffieldundef{origyear}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{urlendyear}%
+ {}%
+ {\iffieldequalstr{urlendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{origendyear}%
+ {}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{eventendyear}%
+ {}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{endyear}% DATE FIX
+ {}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}}}
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
@@ -501,7 +541,11 @@
}%
{\usebibmacro{cmsciteyear}}%
{\iffieldint{year}%
- {\iffieldundef{endyear}% Needed for date ranges -- video type, esp.
+ {\ifboolexpr{% Needed for date ranges
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
\usebibmacro{cmsciteyear}}%
@@ -1136,6 +1180,11 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+ \iffieldequalstr{editortype}{none}%
+ {\addperiod\addspace}%
+ {\addcomma\addspace}}
+
\newcommand*{\lbx@cfromlang}{%
\iffieldundef{userf}
{\iffieldundef{origlanguage}
@@ -1793,8 +1842,8 @@
\newbibmacro*{url+date}{% Changed for 0.9
\printfield{url}%
- \iffieldundef{urlyear}
- {}
+ \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
+ {}%
{\setunit{\addspace}%
\printtext[urldate]{\printurldate}}}