summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-03 23:41:22 +0000
committerKarl Berry <karl@freefriends.org>2013-11-03 23:41:22 +0000
commit6d78dd05c8df1af50da359daef0e5b0206716fa5 (patch)
tree2ca1f3e17b7191b14d049f8c7627b0257d0e13d0 /Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
parent2e0f0a6481179c2675b3f48041daf9dbffbc6ff5 (diff)
biblatex-chicago
git-svn-id: svn://tug.org/texlive/trunk@32046 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx72
1 files changed, 68 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
index 390c0b9d176..318c5f68121 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.20 2012/12/06 12:16:45 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.21 2013/10/21 14:51:16 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-authordate15.cbx}
-[2012/12/06 v 2.4 biblatex citation style]
+[2013/10/21 v 2.8 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -155,6 +155,69 @@
\ExecuteBibliographyOptions{includeall}%
+%% From 16th ed. %%
+
+\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldate=true}}%
+{\ExecuteBibliographyOptions{labelyear=true}}%
+
+\DeclareDataInheritance{collection}{suppcollection}{%
+ \inherit{title}{title}
+ \inherit{subtitle}{subtitle}
+ \inherit{titleaddon}{titleaddon}}
+
+\DeclareDataInheritance{mvbook}{incollection}{% ???
+ \inherit{title}{maintitle}
+ \inherit{subtitle}{mainsubtitle}
+ \inherit{titleaddon}{maintitleaddon}
+ \noinherit{shorttitle}
+ \noinherit{sorttitle}
+ \noinherit{indextitle}
+ \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book,collection}{letter}{% ???
+ \inherit{title}{booktitle}
+ \inherit{subtitle}{booksubtitle}
+ \inherit{titleaddon}{booktitleaddon}
+ \noinherit{shorttitle}
+ \noinherit{sorttitle}
+ \noinherit{indextitle}
+ \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{mvbook,mvcollection}{letter}{% ???
+ \inherit{title}{maintitle}
+ \inherit{subtitle}{mainsubtitle}
+ \inherit{titleaddon}{maintitleaddon}
+ \noinherit{shorttitle}
+ \noinherit{sorttitle}
+ \noinherit{indextitle}
+ \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{*}{*}{%
+ \noinherit{namea}
+ \noinherit{nameb}
+ \noinherit{sortyear}
+ \noinherit{sortname}
+ \noinherit{sorttitle}}
+
+\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
+{*}{% ???
+ \noinherit{year}
+ \noinherit{month}
+ \noinherit{day}
+ \noinherit{endyear}
+ \noinherit{endmonth}
+ \noinherit{endday}
+ \noinherit{origyear}
+ \noinherit{origmonth}
+ \noinherit{origday}
+ \noinherit{origendyear}
+ \noinherit{origendmonth}
+ \noinherit{origendday}}
+
% More authordate options %
\DeclareSortingScheme{cms}{
@@ -536,7 +599,8 @@
{\printtext[bibhyperref]{\printfield{label}}}}
\newbibmacro*{cite:labelyear+extrayear}{%
- \iffieldundef{labelyear}
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
test {\iffieldequalstr{entrytype}{misc}}
or
@@ -1155,7 +1219,7 @@
\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{\addcomma\addspace\bibstring{partvolume}~#1}
\DeclareFieldAlias[review]{volume}[article]{volume}