summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-18 22:29:05 +0000
committerKarl Berry <karl@freefriends.org>2014-08-18 22:29:05 +0000
commit9422fc520291ceb7eb36aaacb2b97c08bdb02c9e (patch)
treef9aa98cb24fb2f56941fa7773eba010804383254 /Master/texmf-dist/tex/latex/biblatex-chicago
parent389e6d20a6f1b1e09d2e129c21dbad563c233a56 (diff)
biblatex-chicago (18aug14)
git-svn-id: svn://tug.org/texlive/trunk@34969 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.sty6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx255
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx350
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx264
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx33
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx291
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx485
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx30
9 files changed, 1380 insertions, 402 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 90984961343..8ec06e36667 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,6 +1,6 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.53 2013/10/29 14:10:24 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.54 2014/08/15 13:51:57 dfussner Exp $
-% Copyright (c) 2009-2013 David Fussner. This package is
+% Copyright (c) 2009-2014 David Fussner. This package is
% author-maintained.
%
% This work may be copied, distributed and/or modified under the
@@ -13,7 +13,7 @@
% but not limited to, the implied warranties of merchantability and
% fitness for a particular purpose.
-\ProvidesPackage{biblatex-chicago}[2013/10/29 v 2.8 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2014/08/15 v 2.9a biblatex style]
\RequirePackage{etoolbox}
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 34c817312f4..8360287b050 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
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.1.42 2013/10/29 14:03:58 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.2.3 2014/08/15 09:44:56 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, 16th edition.
-\ProvidesFile{chicago-authordate-trad.cbx}[2013/10/29 v 2.8 biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2014/08/15 v 2.9a biblatex
citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -26,6 +26,8 @@ citation style]
\providetoggle{cms@ordate}
\providetoggle{cms@nodates}
\providetoggle{cms@authorparens}
+\providetoggle{cms@datedash}
+\providetoggle{cms@modpostnote}
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
@@ -35,6 +37,7 @@ citation style]
\providetoggle{cms@numbermonth}
\providetoggle{cms@bookpages}
\providetoggle{cms@hidevolumes}% Modify Volume fix
+\providetoggle{cms@comprange}
\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
@@ -147,6 +150,25 @@ citation style]
\DeclareBibliographyOption{noibid}[true]{%
\global\toggletrue{cms@noibid}}
+\DeclareBibliographyOption{compresspages}[true]{%
+ \ifcsdef{cms@opt@crange@#1}%
+ {\csuse{cms@opt@crange@#1}}%
+ {\blx@err@invopt{compresspages=#1}{}}}%
+\def\cms@opt@crange@true{%
+ \global\toggletrue{cms@comprange}%
+ \setcounter{mincomprange}{100}%
+ \setcounter{mincompwidth}{10}%
+}%
+\def\cms@opt@crange@false{}%
+
+\DeclareBibliographyOption{postnotepunct}[true]{%
+ \ifcsdef{cms@opt@ppunct@#1}%
+ {\csuse{cms@opt@ppunct@#1}}%
+ {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+ \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
\DeclareBibliographyOption{usecompiler}[true]{%
\settoggle{cms@usecompiler}{#1}}
@@ -268,6 +290,10 @@ citation style]
{\ExecuteBibliographyOptions{labeldate=true}}%
{\ExecuteBibliographyOptions{labelyear=true}}%
+\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+{\global\toggletrue{cms@datedash}}%
+{\global\togglefalse{cms@datedash}}%
+
\DeclareDataInheritance{collection}{suppcollection}{%
\inherit{title}{title}
\inherit{subtitle}{subtitle}
@@ -283,6 +309,16 @@ citation style]
\noinherit{indexsorttitle}
}
+\DeclareDataInheritance{book}{incollection}{%
+ \inherit{title}{booktitle}
+ \inherit{subtitle}{booksubtitle}
+ \inherit{titleaddon}{booktitleaddon}
+ \noinherit{shorttitle}
+ \noinherit{sorttitle}
+ \noinherit{indextitle}
+ \noinherit{indexsorttitle}
+}
+
\DeclareDataInheritance{book,collection}{letter}{%
\inherit{title}{booktitle}
\inherit{subtitle}{booksubtitle}
@@ -440,6 +476,11 @@ citation style]
\global\undef\cbx@lasthash
\global\undef\cbx@lastyear}
+\newbibmacro*{backref+check}{%
+ \ifbibliography%
+ {\backtrackerfalse}%
+ {}}
+
\newbibmacro*{cite}{%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}%
@@ -671,7 +712,7 @@ citation style]
\iffieldundef{postnote}%
{}%
{\savefield{namehash}{\cbx@lastyear}%
- \setunit{\postnotedelim}%
+ \setunit{\postnotewrapper}%
\printfield{postnote}}%
\ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
{\setunit{}%
@@ -743,15 +784,15 @@ citation style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -766,7 +807,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -776,7 +821,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -786,7 +835,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -796,7 +849,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
@@ -804,15 +861,15 @@ citation style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -827,7 +884,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -837,7 +898,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -847,7 +912,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -857,7 +926,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{origendyear}% DATE FIX
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
@@ -865,15 +938,15 @@ citation style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -888,7 +961,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -898,7 +975,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -908,7 +989,11 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -918,22 +1003,26 @@ citation style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}% DATE FIX
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
or
- not test {\iffieldint{origyear}}
+ not test {\iffieldint{origyear}}%
}%
{\usebibmacro{cmsciteyear}}%
{\iffieldint{year}%
{\ifboolexpr{% Needed for date ranges
test {\iffieldundef{endyear}}%
or
- not test {\iffieldnum{endyear}}
+ not test {\iffieldnum{endyear}}%
}%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
@@ -1138,7 +1227,8 @@ citation style]
{\footcitetext}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bibxrefcite}
- {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
+{\usebibmacro{cite:init}%
+ \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?)
{\usebibmacro{xref-in:}%
\blx@ibidreset% For authordate style
\usebibmacro{cite}}
@@ -1146,27 +1236,31 @@ citation style]
{}
\DeclareCiteCommand{\origfullcite}
- {\nopunct\unspace%
+{\usebibmacro{backref+check}%
+ \nopunct\unspace%
\savebibmacro{cmsbibsortdate}%
\renewbibmacro*{cmsbibsortdate}{}}%
{\usedriver
{\DeclareNameAlias{sortname}{default}\clearfield{postnote}
\clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}%
\toggletrue{cms@headlessnote}\frenchspacing}%
- {\thefield{entrytype}}}%
+ {\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\restorebibmacro{cmsbibsortdate}}
\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
- {\nopunct\unspace%
- \savebibmacro{cmsbibsortdate}%
- \renewbibmacro*{cmsbibsortdate}{}}%
+{\usebibmacro{backref+check}%
+ \nopunct\unspace%
+ \savebibmacro{cmsbibsortdate}%
+ \renewbibmacro*{cmsbibsortdate}{}}%
{\usedriver
{\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
\usebibmacro{clearpublin}%
\toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}%
\toggletrue{cms@origpublished}\frenchspacing}%
- {\thefield{entrytype}}}%
+ {\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\restorebibmacro{cmsbibsortdate}}
@@ -1267,20 +1361,43 @@ citation style]
\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
-\DeclareFieldFormat{postnote}{% Removed \isdots -- required
- \iffieldundef{pagination}% elsewhere also?
- {#1}%
- {\mkpageprefix[pagination]{#1}}}
+\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
+{\patchcmd{\blx@comprange@check}%
+ {\blx@comprange@comp{#1}{#2}}%
+ {\blx@tempcnta=#1%
+ \divide\blx@tempcnta100%
+ \multiply\blx@tempcnta100%
+ \ifnumequal{\blx@tempcnta}{#1}%
+ {\blx@range@out@value{#1\bibrangedash#2}}%
+ {\blx@comprange@comp{#1}{#2}}}%
+ {}{}}{}%
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {\mkcomprange{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {#1}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat[inreference]{postnote}{%
- \iffieldundef{pagination}%
- {s\adddot v\adddot\addspace\mkbibquote{#1}}
- {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also.
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat{pages}{%
- \iffieldundef{bookpagination}%
- {#1\isdot}%
- {\mkpageprefix[bookpagination]{#1}}}
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{bookpagination}%
+ {\mkcomprange{#1}\isdot}%
+ {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+ {\iffieldundef{bookpagination}%
+ {#1\isdot}%
+ {\mkpageprefix[bookpagination]{#1}}}}%
\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
@@ -1483,9 +1600,9 @@ citation style]
\DeclareFieldFormat{journum}{% Revised for 0.9.5
\ifboolexpr{%
- test {\ifnumerals{#1}}
+ test {\ifnumerals{#1}}%
and
- not test {\ifnumeral{#1}}
+ not test {\ifnumeral{#1}}%
}%
{\bibstring{numbers}\addspace #1}%
{\bibstring{number}\addspace #1}}
@@ -1601,6 +1718,34 @@ citation style]
{\addcomma\addspace}}%
{\addcomma\addspace}}}
+\newcommand*{\postnotewrapper}{%
+ \iftoggle{cms@modpostnote}%
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{,}}%
+ or
+ test {\iffieldstart{postnote}{\bibrangessep}}%
+ }%
+ {\addcomma}% w/ or w/o \addspace?
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{;}}%
+ or
+ test {\iffieldstart{postnote}{:}}%
+ or
+ test {\iffieldstart{postnote}{.}}%
+ }%
+ {}{\postnotedelim}}}%
+ {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+ \begingroup% comp.text.tex
+ \edef\@tempa{%
+ \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+ \@tempa\@nil{\endgroup\ifblank{##1}}%
+ \savefield*{#1}{\@tempa}%
+ \expandafter\iffieldstart@i\detokenize
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@tempa\detokenize{#2}}\@nil}
+
\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
\iffieldequalstr{editortype}{none}%
{\addperiod\addspace}%
@@ -1773,9 +1918,9 @@ citation style]
{\iflistundef{organization}%
{\let\bbx@lasthash\undefined}%
{\ifboolexpr{
- test {\iflistequals{organization}{\bbx@lasthash}}
+ test {\iflistequals{organization}{\bbx@lasthash}}%
and
- not test {\iffirstonpage}
+ not test {\iffirstonpage}%
}%
{\bibnamedash\addperiod\addspace}%
{\iftoggle{cms@authorparens}%
@@ -2337,7 +2482,7 @@ citation style]
\renewbibmacro*{postnote}{%
\iffieldundef{postnote}%
{}%
- {\setunit{\postnotedelim}%
+ {\setunit{\postnotewrapper}%
\printfield{postnote}}}
\newbibmacro*{part+editor+translator}{%
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 c60c053a134..631ace42640 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,9 @@
-% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.7 2014/08/15 09:45:18 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's
% standard.bbx and from chicago-notes.bbx. It provides the
% reference list formatting for the Chicago author-date style.
-
-\ProvidesFile{chicago-authordate.bbx}[2013/10/29 v 2.8 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2014/08/15 v 2.9a biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -23,7 +22,20 @@ bibliography style]
{\endlist}
{\item}
-\defbibenvironment{shorthands}
+\defbibenvironment{shorthands}% biblatex < 2.9
+ {\list
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\lositemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}
+ {\endlist}
+ {\item}
+
+\defbibenvironment{shorthand}
{\list
{\printfield[shorthandwidth]{shorthand}}%
{\setlength{\labelwidth}{\shorthandwidth}%
@@ -122,9 +134,9 @@ bibliography style]
{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
\ifboolexpr{
- test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+ test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
and
- test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+ test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
}
{\addcomma}%
{}}}%
@@ -336,7 +348,34 @@ bibliography style]
%%%% Drivers for Bibliography entries and Shorthands %%%%
-\DeclareBibliographyDriver{shorthands}{%
+\DeclareBibliographyDriver{shorthand}{%
+ \iftoggle{cms@los}%
+ {\ifnameundef{labelname}
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{shorthand:label}}%
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{author/editor}}%
+ \finentry}%
+ {\iftoggle{cms@fullshhand}%
+ {\usedriver{\frenchspacing}%
+ {\thefield{entrytype}}%
+ \finentry}%
+ {\ifnameundef{labelname}
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+ \ifentrytype{periodical}}%
+ {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+ \newcunit}}%
+ {\ifentrytype{manual}%
+ {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+ {}}}
+ {\usebibmacro{author/editor}%
+ \setunit{\addcomma\space}}%
+ \printfield[lostitle]{title}%
+ \finentry}}}
+
+\DeclareBibliographyDriver{shorthands}{% biblatex < 2.9
\iftoggle{cms@los}%
{\ifnameundef{labelname}
{\mkbibemph{\bibstring{see}}%
@@ -637,13 +676,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{bookinbook}{%
@@ -715,13 +772,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{booklet}{%
@@ -811,13 +886,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{customc}{%
@@ -932,13 +1025,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{incollection}{%
@@ -1002,13 +1113,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inproceedings}{%
@@ -1065,13 +1194,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inreference}{%
@@ -1198,17 +1345,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifpunctmark{*}% Likewise.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{manual}{%
@@ -1640,13 +1801,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{reference}{%
@@ -2097,13 +2276,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}% or new declaration ???
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2118,7 +2297,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2133,7 +2316,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2148,7 +2335,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2163,7 +2354,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2176,13 +2371,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2197,7 +2392,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2212,7 +2411,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2227,7 +2430,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2242,7 +2449,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}% DATE FIX
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2255,13 +2466,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2276,7 +2487,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2291,7 +2506,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2306,7 +2525,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2321,7 +2544,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}% DATE FIX
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2352,9 +2579,9 @@ bibliography style]
\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
or
- not test {\iffieldint{origyear}}
+ not test {\iffieldint{origyear}}%
}%
{\usebibmacro{cmsbibyear}}%
{\iffieldint{year}%
@@ -2522,6 +2749,9 @@ bibliography style]
\newunit%
\printfield{volumes}}}}%
+\newbibmacro*{bibprexref}{% For back references
+ \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}%
+
\newbibmacro*{bibpostxref}{% Volume fix
\iffieldundef{chapter}%
{\iffieldundef{pages}%
@@ -2577,7 +2807,13 @@ bibliography style]
\printfield{part}%
\newcunit%
\printfield{pages}}}}}}%
- {\newcunit\printfield{chapter}}}
+ {\newcunit\printfield{chapter}}%
+ \ifcsdef{cbx@incollpgref}% Here we print and clear the child's
+ {\restorelist{pageref}{\cbx@incollpgref}% backrefs
+ \newunit%
+ \usebibmacro{pageref}%
+ \global\let\cbx@incollpgref\undefined}%
+ {}}
\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
\iffieldundef{maintitle}%
@@ -2693,7 +2929,8 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iffieldundef{bookpagination}% Removed kludge for French colon spacing?
+ {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
+ \iffieldundef{volume}}% Removed kludge for French colon spacing?
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}% This may not be universally correct.
{\printtext[parens]{% Perhaps if it's wrong use magazine subtype?
@@ -2712,7 +2949,8 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iffieldundef{bookpagination}% Removed kludge for French ???
+ {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
+ \iffieldundef{volume}}% Removed kludge for French ???
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}%
{\printtext[parens]{%
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 08a623d20db..5b865d75d64 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,10 +1,11 @@
-% $Id: chicago-authordate.cbx,v 0.8.1.57 2013/10/29 14:04:11 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.2.5 2014/08/15 09:45:07 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, 16th edition.
-\ProvidesFile{chicago-authordate.cbx}[2013/10/29 v 2.8 biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2014/08/15 v 2.9a biblatex
+citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -25,6 +26,8 @@
\providetoggle{cms@ordate}
\providetoggle{cms@nodates}
\providetoggle{cms@authorparens}
+\providetoggle{cms@datedash}
+\providetoggle{cms@modpostnote}
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
@@ -34,6 +37,7 @@
\providetoggle{cms@numbermonth}
\providetoggle{cms@bookpages}
\providetoggle{cms@hidevolumes}% Modify Volume fix
+\providetoggle{cms@comprange}
\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
@@ -146,6 +150,25 @@
\DeclareBibliographyOption{noibid}[true]{%
\global\toggletrue{cms@noibid}}
+\DeclareBibliographyOption{compresspages}[true]{%
+ \ifcsdef{cms@opt@crange@#1}%
+ {\csuse{cms@opt@crange@#1}}%
+ {\blx@err@invopt{compresspages=#1}{}}}%
+\def\cms@opt@crange@true{%
+ \global\toggletrue{cms@comprange}%
+ \setcounter{mincomprange}{100}%
+ \setcounter{mincompwidth}{10}%
+}%
+\def\cms@opt@crange@false{}%
+
+\DeclareBibliographyOption{postnotepunct}[true]{%
+ \ifcsdef{cms@opt@ppunct@#1}%
+ {\csuse{cms@opt@ppunct@#1}}%
+ {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+ \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
\DeclareBibliographyOption{usecompiler}[true]{%
\settoggle{cms@usecompiler}{#1}}
@@ -264,6 +287,10 @@
{\ExecuteBibliographyOptions{labeldate=true}}%
{\ExecuteBibliographyOptions{labelyear=true}}%
+\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+{\global\toggletrue{cms@datedash}}%
+{\global\togglefalse{cms@datedash}}%
+
\DeclareDataInheritance{collection}{suppcollection}{%
\inherit{title}{title}
\inherit{subtitle}{subtitle}
@@ -279,6 +306,16 @@
\noinherit{indexsorttitle}
}
+\DeclareDataInheritance{book}{incollection}{%
+ \inherit{title}{booktitle}
+ \inherit{subtitle}{booksubtitle}
+ \inherit{titleaddon}{booktitleaddon}
+ \noinherit{shorttitle}
+ \noinherit{sorttitle}
+ \noinherit{indextitle}
+ \noinherit{indexsorttitle}
+}
+
\DeclareDataInheritance{book,collection}{letter}{%
\inherit{title}{booktitle}
\inherit{subtitle}{booksubtitle}
@@ -436,6 +473,11 @@
\global\undef\cbx@lasthash
\global\undef\cbx@lastyear}
+\newbibmacro*{backref+check}{%
+ \ifbibliography%
+ {\backtrackerfalse}%
+ {}}
+
\newbibmacro*{cite}{%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}%
@@ -667,7 +709,7 @@
\iffieldundef{postnote}%
{}%
{\savefield{namehash}{\cbx@lastyear}%
- \setunit{\postnotedelim}%
+ \setunit{\postnotewrapper}%delim}%
\printfield{postnote}}%
\ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
{\setunit{}%
@@ -739,15 +781,15 @@
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -762,7 +804,11 @@
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -772,7 +818,11 @@
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -782,7 +832,11 @@
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -792,7 +846,11 @@
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
@@ -800,15 +858,15 @@
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -823,7 +881,11 @@
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -833,7 +895,11 @@
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -843,7 +909,11 @@
\printfield{extrayear}}%
\iffieldundef{endyear}%
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -853,7 +923,11 @@
\printfield{extrayear}}%
\iffieldundef{origendyear}% DATE FIX
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
@@ -861,15 +935,15 @@
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
- not togl {cms@nodates}
+ not togl {cms@nodates}%
}%
{}%
{\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
@@ -884,7 +958,11 @@
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -894,7 +972,11 @@
\printfield{extrayear}}%
\iffieldundef{endyear}%
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -904,7 +986,11 @@
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -914,22 +1000,26 @@
\printfield{extrayear}}%
\iffieldundef{eventendyear}% DATE FIX
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
or
- not test {\iffieldint{origyear}}
+ not test {\iffieldint{origyear}}%
}%
{\usebibmacro{cmsciteyear}}%
{\iffieldint{year}%
{\ifboolexpr{% Needed for date ranges
test {\iffieldundef{endyear}}%
or
- not test {\iffieldnum{endyear}}
+ not test {\iffieldnum{endyear}}%
}%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
@@ -1134,7 +1224,8 @@
{\footcitetext}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bibxrefcite}
- {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
+ {\usebibmacro{cite:init}%
+ \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?)
{\usebibmacro{xref-in:}%
\blx@ibidreset% For authordate style
\usebibmacro{cite}}
@@ -1142,19 +1233,22 @@
{}
\DeclareCiteCommand{\origfullcite}
- {\nopunct\unspace%
- \savebibmacro{cmsbibsortdate}%
- \renewbibmacro*{cmsbibsortdate}{}}%
+ {\usebibmacro{backref+check}%
+ \nopunct\unspace%
+ \savebibmacro{cmsbibsortdate}%
+ \renewbibmacro*{cmsbibsortdate}{}}%
{\usedriver
{\DeclareNameAlias{sortname}{default}\clearfield{postnote}
\clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}%
\toggletrue{cms@headlessnote}\frenchspacing}%
- {\thefield{entrytype}}}%
+ {\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\restorebibmacro{cmsbibsortdate}}
\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
- {\nopunct\unspace%
+ {\usebibmacro{backref+check}%
+ \nopunct\unspace%
\savebibmacro{cmsbibsortdate}%
\renewbibmacro*{cmsbibsortdate}{}}%
{\usedriver
@@ -1162,7 +1256,8 @@
\usebibmacro{clearpublin}%
\toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}%
\toggletrue{cms@origpublished}\frenchspacing}%
- {\thefield{entrytype}}}%
+ {\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\restorebibmacro{cmsbibsortdate}}
@@ -1263,20 +1358,43 @@
\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
-\DeclareFieldFormat{postnote}{% Removed \isdots -- required
- \iffieldundef{pagination}% elsewhere also?
- {#1}%
- {\mkpageprefix[pagination]{#1}}}
+\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
+{\patchcmd{\blx@comprange@check}%
+ {\blx@comprange@comp{#1}{#2}}%
+ {\blx@tempcnta=#1%
+ \divide\blx@tempcnta100%
+ \multiply\blx@tempcnta100%
+ \ifnumequal{\blx@tempcnta}{#1}%
+ {\blx@range@out@value{#1\bibrangedash#2}}%
+ {\blx@comprange@comp{#1}{#2}}}%
+ {}{}}{}%
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {\mkcomprange{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {#1}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat[inreference]{postnote}{%
- \iffieldundef{pagination}%
- {s\adddot v\adddot\addspace\mkbibquote{#1}}
- {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also.
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat{pages}{%
- \iffieldundef{bookpagination}%
- {#1\isdot}%
- {\mkpageprefix[bookpagination]{#1}}}% Removed \isdot.
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{bookpagination}%
+ {\mkcomprange{#1}\isdot}%
+ {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+ {\iffieldundef{bookpagination}%
+ {#1\isdot}%
+ {\mkpageprefix[bookpagination]{#1}}}}%
\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
@@ -1478,9 +1596,9 @@
\DeclareFieldFormat{journum}{% Revised for 0.9.5
\ifboolexpr{%
- test {\ifnumerals{#1}}
+ test {\ifnumerals{#1}}%
and
- not test {\ifnumeral{#1}}
+ not test {\ifnumeral{#1}}%
}%
{\bibstring{numbers}\addspace #1}%
{\bibstring{number}\addspace #1}}
@@ -1596,6 +1714,34 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}
+\newcommand*{\postnotewrapper}{%
+ \iftoggle{cms@modpostnote}%
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{,}}%
+ or
+ test {\iffieldstart{postnote}{\bibrangessep}}%
+ }%
+ {\addcomma}% w/ or w/o \addspace?
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{;}}%
+ or
+ test {\iffieldstart{postnote}{:}}%
+ or
+ test {\iffieldstart{postnote}{.}}%
+ }%
+ {}{\postnotedelim}}}%
+ {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+ \begingroup% comp.text.tex
+ \edef\@tempa{%
+ \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+ \@tempa\@nil{\endgroup\ifblank{##1}}%
+ \savefield*{#1}{\@tempa}%
+ \expandafter\iffieldstart@i\detokenize
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@tempa\detokenize{#2}}\@nil}
+
\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
\iffieldequalstr{editortype}{none}%
{\addperiod\addspace}%
@@ -1768,9 +1914,9 @@
{\iflistundef{organization}%
{\let\bbx@lasthash\undefined}%
{\ifboolexpr{
- test {\iflistequals{organization}{\bbx@lasthash}}
+ test {\iflistequals{organization}{\bbx@lasthash}}%
and
- not test {\iffirstonpage}
+ not test {\iffirstonpage}%
}%
{\bibnamedash\addperiod\addspace}%
{\iftoggle{cms@authorparens}%
@@ -2215,14 +2361,14 @@
\newcommand*{\cms@datelong}{% Modified for 0.9
\iffieldundef{origmonth}%
{\printfield{origyear}}%
- {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+ {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
\printfield{origyear}}}%
\newcommand*{\cms@datelongalt}{% Modified for 0.9
\iffieldundef{month}%
{\printfield{year}}%
- {\printfield[letterday]{day}\setunit{\nobreakspace}%
+ {\printfield[letterday]{day}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
\printfield{year}}}%
@@ -2232,14 +2378,14 @@
{}%
{\iffieldundef{month}%
{\printfield{year}}%
- {\printfield[letterday]{day}\setunit{\nobreakspace}%
+ {\printfield[letterday]{day}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
\printfield{year}}}}%
{\iffieldundef{origyear}%
{}%
{\iffieldundef{origmonth}%
{\printfield{origyear}}%
- {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+ {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
\printfield{origyear}}}}}%
@@ -2332,7 +2478,7 @@
\renewbibmacro*{postnote}{%
\iffieldundef{postnote}%
{}%
- {\setunit{\postnotedelim}%
+ {\setunit{\postnotewrapper}%delim}%
\printfield{postnote}}}
\newbibmacro*{part+editor+translator}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
index 7364ef99492..5c6563948d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.17 2013/10/21 14:51:44 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.18 2014/08/14 14:11:21 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's
% standard.bbx and from chicago-notes.bbx. It provides the
% reference list formatting for the Chicago author-date style,
% _15th_ edition.
\ProvidesFile{chicago-authordate15.bbx}
-[2013/10/21 v 2.8 biblatex bibliography style]
+[2014/08/15 v 2.9a biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -36,6 +36,19 @@
{\endlist}
{\item}
+\defbibenvironment{shorthand}
+ {\list
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\lositemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}
+ {\endlist}
+ {\item}
+
\defbibenvironment{losnotes}
{\list
{\printfield[shorthandwidth]{shorthand}}%
@@ -346,6 +359,33 @@
\printfield[lostitle]{title}%
\finentry}}}
+\DeclareBibliographyDriver{shorthand}{%
+ \iftoggle{cms@los}%
+ {\ifnameundef{labelname}
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{shorthand:label}}%
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{author/editor}}%
+ \finentry}%
+ {\iftoggle{cms@fullshhand}%
+ {\usedriver{\frenchspacing}%
+ {\thefield{entrytype}}%
+ \finentry}%
+ {\ifnameundef{labelname}
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+ \iffieldequalstr{entrytype}{periodical}}%
+ {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+ \newcunit}}%
+ {\iffieldequalstr{entrytype}{manual}%
+ {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+ {}}}
+ {\usebibmacro{author/editor}%
+ \setunit{\addcomma\space}}%
+ \printfield[lostitle]{title}%
+ \finentry}}}
+
\DeclareBibliographyDriver{article}{%
\iffieldequalstr{entrysubtype}{magazine}%
{\usebibmacro{bibindex}%
@@ -2129,7 +2169,11 @@
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2144,7 +2188,11 @@
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2159,7 +2207,11 @@
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2174,7 +2226,11 @@
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
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 318c5f68121..3cc6554a665 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.21 2013/10/21 14:51:16 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.22 2014/08/14 14:11:29 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}
-[2013/10/21 v 2.8 biblatex citation style]
+[2014/08/15 v 2.9a biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -22,6 +22,7 @@
\providetoggle{cms@switchdates}
\providetoggle{cms@los}
\providetoggle{cms@nodates}
+\providetoggle{cms@datedash}
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
@@ -161,6 +162,10 @@
{\ExecuteBibliographyOptions{labeldate=true}}%
{\ExecuteBibliographyOptions{labelyear=true}}%
+\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+{\global\toggletrue{cms@datedash}}%
+{\global\togglefalse{cms@datedash}}%
+
\DeclareDataInheritance{collection}{suppcollection}{%
\inherit{title}{title}
\inherit{subtitle}{subtitle}
@@ -623,7 +628,11 @@
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}%
{\printfield{labelyear}%
@@ -633,7 +642,11 @@
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -643,7 +656,11 @@
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}
{\printfield{labelyear}%
@@ -653,7 +670,11 @@
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}}%
{}}}}}}
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 a9f4d864a7d..ee20a01d713 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.62 2014/08/15 09:27:26 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's standard.bbx
% It provides the bibliography formatting for the Chicago notes +
% bibliography style.
-\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2014/08/15 v 2.9a biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -22,10 +22,23 @@
{\endlist}
{\item}
-\defbibenvironment{shorthands}
+\defbibenvironment{shorthand}%
{\list
- {\printfield[shorthandwidth]{shorthand}}%
- {\setlength{\labelwidth}{\shorthandwidth}%
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\lositemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}
+ {\endlist}
+ {\item}
+
+\defbibenvironment{shorthands}% For biblatex < 2.9
+ {\list
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
\setlength{\leftmargin}{\labelwidth}%
\setlength{\labelsep}{\biblabelsep}%
\addtolength{\leftmargin}{\labelsep}%
@@ -75,16 +88,22 @@
{\toggletrue{cms@reprint}}%
{\togglefalse{cms@reprint}}%
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
or
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
or
- not test {\iffieldint{year}}
+ not test {\iffieldint{year}}%
or
- togl {cms@switchdates}
+ not test {\iffieldint{origyear}}%
+ or
+ togl {cms@switchdates}%
}%
{}%
- {\iffieldundef{endyear}%
+ {\ifboolexpr{% Needed for open-ended ranges
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}%
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}}%
{}}%
@@ -97,16 +116,22 @@
{\toggletrue{cms@reprint}}%
{\togglefalse{cms@reprint}}%
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
+ or
+ test {\iffieldundef{year}}%
or
- test {\iffieldundef{year}}
+ not test {\iffieldint{year}}%
or
- not test {\iffieldint{year}}
+ not test {\iffieldint{origyear}}%
or
- togl {cms@switchdates}
+ togl {cms@switchdates}%
}%
{}%
- {\iffieldundef{endyear}%
+ {\ifboolexpr{% Needed for open-ended ranges
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}%
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}}%
{}}%
@@ -159,9 +184,9 @@
{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
\ifboolexpr{
- test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+ test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
and
- test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+ test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
}
{\addcomma}%
{}}}%
@@ -243,7 +268,7 @@
\newbibmacro*{justauthor}{%
\ifnameundef{author}
- {\let\bbx@lasthash\undefined}
+ {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}%
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\iffieldundef{nameaddon}%
@@ -337,9 +362,9 @@
\newbibmacro*{compiler}{%
\ifboolexpr{
- test {\ifnameundef{namec}}
+ test {\ifnameundef{namec}}%
or
- not togl {cms@usecompiler}
+ not togl {cms@usecompiler}%
}%
{\let\bbx@lasthash\undefined}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
@@ -357,14 +382,32 @@
%%%% Drivers for Bibliography entries and Shorthands %%%%
-\DeclareBibliographyDriver{shorthands}{%
+\DeclareBibliographyDriver{shorthand}{%
\iftoggle{cms@fullshhand}%
{\usedriver{\frenchspacing}%
{\thefield{entrytype}}%
\finentry}%
{\ifnameundef{labelname}%
{\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
- \ifentrytype{periodical}}%
+ \ifentrytype{periodical}}%
+ {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+ \newcunit}}%
+ {\ifentrytype{manual}%
+ {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+ {}}}%
+ {\usebibmacro{author/editor}%
+ \setunit{\addcomma\space}}%
+ \printfield[lostitle]{title}%
+ \finentry}}
+
+\DeclareBibliographyDriver{shorthands}{% For biblatex < 2.9
+ \iftoggle{cms@fullshhand}%
+ {\usedriver{\frenchspacing}%
+ {\thefield{entrytype}}%
+ \finentry}%
+ {\ifnameundef{labelname}%
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+ \ifentrytype{periodical}}%
{\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
\newcunit}}%
{\ifentrytype{manual}%
@@ -619,15 +662,31 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{bookinbook}{%
@@ -694,15 +753,31 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{booklet}{%
@@ -780,15 +855,31 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{customc}{%
@@ -891,17 +982,33 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{incollection}{%
@@ -960,17 +1067,33 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inproceedings}{%
@@ -1020,17 +1143,33 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inreference}{%
@@ -1146,21 +1285,33 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifpunctmark{*}% Likewise.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
\usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{manual}{%
@@ -1517,15 +1668,31 @@
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{reference}{%
@@ -2010,11 +2177,11 @@
\newbibmacro*{journal+issue+year+pages}{%
\usebibmacro{cjournal+ser+vol+num}%
\ifboolexpr{% 16th ed.
- test {\iffieldundef{issue}}
+ test {\iffieldundef{issue}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
and
- not togl {cms@switchdates}
+ not togl {cms@switchdates}%
}%
{\iffieldundef{number}%
{\iffieldundef{bookpagination}%
@@ -2022,24 +2189,32 @@
{\setunit{\addcolon\addspace}}%
\printfield{pages}}%
{\newcunit\printfield{pages}}}%
- {\setunit{\addspace}%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+ {\newcunit%
+ \iffieldundef{issue}
+ {\usebibmacro{number+or+month}}%
+ {\printfield{issue}%
+ \setunit{\addspace}%
+ \usebibmacro{cmsyear}}%
+ \newcunit\printfield{pages}}%
+ {\setunit{\addspace}%
\printtext[parens]{%
\iffieldundef{issue}
{\usebibmacro{number+or+month}}%
{\printfield{issue}%
\setunit{\addspace}%
\usebibmacro{cmsyear}}}%
- \setunit{\addcolon\addspace}
- \printfield{pages}}}
+ \setunit{\addcolon\addspace}%
+ \printfield{pages}}}}
\newbibmacro*{periodical+issue+year+pages}{%
\usebibmacro{cperiodical+ser+vol+num}%
\ifboolexpr{% 16th ed.
- test {\iffieldundef{issue}}
+ test {\iffieldundef{issue}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
and
- not togl {cms@switchdates}
+ not togl {cms@switchdates}%
}%
{\iffieldundef{number}%
{\iffieldundef{bookpagination}%
@@ -2047,15 +2222,23 @@
{\setunit{\addcolon\addspace}}%
\printfield{pages}}%
{\newcunit\printfield{pages}}}%
- {\setunit{\addspace}%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+ {\newcunit%
+ \iffieldundef{issue}
+ {\usebibmacro{number+or+month}}%
+ {\printfield{issue}%
+ \setunit{\addspace}%
+ \usebibmacro{cmsyear}}%
+ \newcunit\printfield{pages}}%
+ {\setunit{\addspace}%
\printtext[parens]{%
\iffieldundef{issue}
{\usebibmacro{number+or+month}}%
{\printfield{issue}%
\setunit{\addspace}%
\usebibmacro{cmsyear}}}%
- \setunit{\addcolon\addspace}
- \printfield{pages}}}
+ \setunit{\addcolon\addspace}%
+ \printfield{pages}}}}
\newbibmacro*{bycompiler}{%
\ifnameundef{namec}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
index 4f4cc556a58..83013a2a7f3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.cbx,v 0.9.7.95 2014/01/29 11:26:57 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.112 2014/08/15 09:27:37 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authortitle-cverb.cbx. It is heavily modified, with the intention
% of providing footnote citations and a bibliography formatted
% according to the specifications of the Chicago Manual of Style.
-\ProvidesFile{chicago-notes.cbx}[2014/01/29 v 2.8a biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2014/08/15 v 2.9a biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -27,8 +27,12 @@
\providetoggle{cms@bookseries}
\providetoggle{cms@notefield}
\providetoggle{cms@addendum}
+\providetoggle{cms@comprange}
+\providetoggle{cms@modpostnote}
+\providetoggle{cms@crspace}
\providetoggle{cms@headlessnote}
+\providetoggle{cms@origcite}
\providetoggle{cms@fullnote}
\providetoggle{cms@shortnote}
\providetoggle{cms@allshort}
@@ -37,6 +41,7 @@
\providetoggle{cms@shorthandibid}
\providetoggle{cms@printshhand}
\providetoggle{cms@fullshhand}
+\providetoggle{cms@inheritshhand}
\providetoggle{cms@origpublished}
\providetoggle{cms@loccit}
\providetoggle{cms@annotation}
@@ -67,6 +72,8 @@
or
not test {\iffieldint{year}}%
or
+ not test {\iffieldint{origyear}}%
+ or
togl {cms@switchdates}%
}%
{}%
@@ -97,6 +104,34 @@
\DeclareBibliographyOption{shorthandfull}[true]{%
\settoggle{cms@fullshhand}{#1}}
+\DeclareBibliographyOption{inheritshorthand}[true]{%
+ \settoggle{cms@inheritshhand}{#1}
+ \iftoggle{cms@inheritshhand}%
+ {\DeclareDataInheritance{*}{*}{%
+ \inherit{shorthand}{shorthand}
+ \inherit{shorthandintro}{shorthandintro}
+ }}%
+ {}}
+
+\DeclareBibliographyOption{compresspages}[true]{%
+ \ifcsdef{cms@opt@crange@#1}%
+ {\csuse{cms@opt@crange@#1}}%
+ {\blx@err@invopt{compresspages=#1}{}}}%
+\def\cms@opt@crange@true{%
+ \global\toggletrue{cms@comprange}%
+ \setcounter{mincomprange}{100}%
+ \setcounter{mincompwidth}{10}%
+}%
+\def\cms@opt@crange@false{}%
+
+\DeclareBibliographyOption{postnotepunct}[true]{%
+ \ifcsdef{cms@opt@ppunct@#1}%
+ {\csuse{cms@opt@ppunct@#1}}%
+ {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+ \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
\DeclareBibliographyOption{usecompiler}[true]{%
\settoggle{cms@usecompiler}{#1}}
@@ -368,7 +403,7 @@
\ifboolexpr{%
togl {cms@allshort}%
or
- test {\ifbibliography}
+ test {\ifbibliography}%
}%
{\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}%
@@ -394,16 +429,20 @@
\printfield{shorthandintro}}}}
\newbibmacro*{cite:ibid}{%
- \iftoggle{cms@noibid}
+ \ifboolexpr{%
+ togl {cms@noibid}%
+ or
+ test {\ifbibliography}% Needed for inheritshorthand option
+ }%
{\global\toggletrue{cms@shortnote}%
\global\togglefalse{cms@fullnote}%
\usebibmacro{cite:short}%
\usebibmacro{cite:save}}%
{\iftoggle{cms@allshort}%
{\printtext[bibhyperref]{%
- \bibstring[\mkibid]{ibidem}}}
+ \bibstring[\mkibid]{ibidem}}}%
{\printtext[cmshyperlink]{%
- \bibstring[\mkibid]{ibidem}}}
+ \bibstring[\mkibid]{ibidem}}}%
\ifboolexpr{%
test {\ifloccit}%
or
@@ -411,6 +450,8 @@
test {\ifciteibid}%
and
test {\iffieldequalcs{postnote}{cms@pnsaved}}%
+ and
+ not test {\ifdefvoid{\blx@loccittracker}}% Package option=false
)
}%
{\global\toggletrue{cms@loccit}}%
@@ -497,8 +538,8 @@
{}{}{}{}%
\DeclareCiteCommand{\bibxrefcite}
- {}%\usebibmacro{clearalmostall}} (?)
- {\usebibmacro{cms-in:}%
+ {\usebibmacro{backref+check}}% So cites in biblio don't turn up
+ {\usebibmacro{cms-in:}% in backref list
\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
\(\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
\ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\)}%
@@ -508,13 +549,19 @@
{}%
\toggletrue{cms@shortnote}%
\togglefalse{cms@fullnote}%
- \usebibmacro{cite:short}}
+ \ifboolexpr{
+ togl {cms@inheritshhand}%
+ and
+ not test {\iffieldundef{shorthand}}%
+ }
+ {\usebibmacro{cite}}%
+ {\usebibmacro{cite:short}}}% Would {cite} be better?
{}
{\usebibmacro{crossref:volume+postnote}}% Volume fix
\DeclareCiteCommand{\bookbibxrefcite}
- {}%\usebibmacro{clearalmostall}} (?)
- {\iffieldequals{fullhash}{\bbx@lasthash}%
+ {\usebibmacro{backref+check}}% So cites in biblio don't turn up
+ {\iffieldequals{fullhash}{\bbx@lasthash}% in backref list
{\ifthenelse{\ifentrytype{collection}\OR%
\ifentrytype{proceedings}\OR\ifentrytype{mvcollection}\OR%
\ifentrytype{mvproceedings}}%
@@ -528,8 +575,14 @@
\toggletrue{cms@shortnote}%
\togglefalse{cms@fullnote}%
\usebibmacro{bibxref-in:}%
- \usebibmacro{cite:short}}
- {}
+ \ifboolexpr{
+ togl {cms@inheritshhand}%
+ and
+ not test {\iffieldundef{shorthand}}%
+ }
+ {\usebibmacro{cite}}%
+ {\usebibmacro{cite:short}}}%
+ {}%
{\usebibmacro{crossref:volume+postnote}}% Volume fix
\DeclareCiteCommand*{\cite}
@@ -587,21 +640,24 @@
{}
\DeclareCiteCommand{\origfullcite}
- {\ifhyperref%
+ {\usebibmacro{backref+check}%
+ \ifhyperref%
{\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
{}%
\nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
{\usedriver
{\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
- \clearname{author}\clearfield{userf}\clearfield{shorthand}%
+ \usebibmacro{clearorigin}\clearfield{userf}\clearfield{shorthand}%
\toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
\frenchspacing}%
- {cite:\thefield{entrytype}}}%
+ {cite:\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\finentry}% Helps with annotated bibliographies (?)
\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
- {\ifhyperref%
+ {\usebibmacro{backref+check}%
+ \ifhyperref%
{\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
{}%
\nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
@@ -610,7 +666,8 @@
\usebibmacro{clearpublin}\clearfield{shorthand}%
\toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
\toggletrue{cms@origpublished}\frenchspacing}%
- {cite:\thefield{entrytype}}}%
+ {cite:\thefield{entrytype}}%
+ \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
{\multicitedelim}%
{\finentry}
@@ -664,9 +721,9 @@
{\usebibmacro{prenote}}%\usebibmacro{hlcprenote}}
{\usebibmacro{citeindex}%
\ifboolexpr{%
- test {\ifciteseen}
+ test {\ifciteseen}%
or
- togl {cms@allshort}
+ togl {cms@allshort}%
}%
{\usebibmacro{cite:short}}
{\toggletrue{cms@headlessnote}%
@@ -767,8 +824,11 @@
\protected@xappto\cbx@footcite@args{%
[\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
\iflastcitekey
- {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch
- \protected@xappto\cbx@footcite@args{\nopunct}}% these two?
+ {\iffootnote
+ {\protected@xappto\cbx@textcite@args{\nopunct}%
+ \protected@xappto\cbx@footcite@args{\thefield{postpunct}}}%
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch
+ \protected@xappto\cbx@footcite@args{\nopunct}}}% these two?
{}}
{}}
{}
@@ -907,7 +967,6 @@
\usebibmacro{institution+organization}%
\newcunit\newblock
\printlist{location}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1042,7 +1101,6 @@
\iftoggle{cms@bookpages}%
{}%
{\clearfield{pages}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1059,14 +1117,18 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{book:xref+finentry}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
@@ -1116,7 +1178,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1131,14 +1192,18 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{book:xref+finentry}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
@@ -1158,7 +1223,6 @@
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{howpubl+loc+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1208,7 +1272,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1223,14 +1286,18 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{book:xref+finentry}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work. Only with Vol?
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
@@ -1270,7 +1337,6 @@
\usebibmacro{institution+organization}%
\newcunit\newblock
\printlist{location}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1326,7 +1392,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1341,21 +1406,15 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{cite:xref+finentry}}%
-{\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}% All altered for 0.9c.
- {\addcomma\addspace}% Perhaps need to alter it back
+{\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
@@ -1405,7 +1464,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1420,21 +1478,15 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{cite:xref+finentry}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}% All altered for 0.9c.
- {\addcomma\addspace}% Perhaps need to alter it back
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
@@ -1478,7 +1530,6 @@
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1493,21 +1544,15 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{cite:xref+finentry}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}% See incollection
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
@@ -1540,7 +1585,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{inreffullpostnote}%
\newcunit\newblock%setunit{\addspace}% 16th ed
@@ -1607,7 +1651,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubletter+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -1622,21 +1665,15 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{cite:xref+finentry}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{xref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\iffieldundef{chapter}% New test needed to cope with
- {\addspace\bibsentence}% new chapter citing system.
- {\setunit{\addspace\bibsentence}}}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
\usebibmacro{xrefprenote}% Volume fix
- \usebibmacro{chapincoll}%
+ \usebibmacro{xrefchapincoll}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
@@ -1661,7 +1698,6 @@
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1713,7 +1749,6 @@
{\newcunit\newblock
\usebibmacro{date}}%
{}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1889,7 +1924,6 @@
\setunit{\addcomma\addspace\bibstring{and}%
\addspace\bibstring{patentissued}\addspace}%
\usebibmacro{date}}%
- \newcunit%
\usebibmacro{caddendum}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -1995,7 +2029,6 @@
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -2010,14 +2043,18 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}%
\usebibmacro{book:xref+finentry}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
\usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
- {\ifterm{\addspace\bibsentence}%
- {\addcomma\addspace}%
+ {\ifpunctmark{.}% This seems to work.
+ {\ifbibliography%
+ {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+ {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
\usebibmacro{xrefprenote}% Volume fix
\bookbibxrefcite{\thefield{crossref}}%
\usebibmacro{xrefpostnote}%
@@ -2051,7 +2088,6 @@
\usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -2086,7 +2122,6 @@
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{inst+loc+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -2179,7 +2214,6 @@
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\clearfield{pages}% ?? For 16th ed.
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{volfullpostnote}%
\newcunit\newblock
@@ -2214,7 +2248,6 @@
\setunit{\addspace}%
\printtext[parens]{%
\usebibmacro{type+inst+year}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -2247,7 +2280,6 @@
\printlist{location}%
\newcunit\newblock
\usebibmacro{date}}%
- \newcunit\newblock
\usebibmacro{caddendum}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
@@ -2429,20 +2461,43 @@
\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
-\DeclareFieldFormat{postnote}{% Removed \isdots -- required
- \iffieldundef{pagination}% elsewhere also?
- {#1}%
- {\mkpageprefix[pagination]{#1}}}
+\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
+{\patchcmd{\blx@comprange@check}%
+ {\blx@comprange@comp{#1}{#2}}%
+ {\blx@tempcnta=#1%
+ \divide\blx@tempcnta100%
+ \multiply\blx@tempcnta100%
+ \ifnumequal{\blx@tempcnta}{#1}%
+ {\blx@range@out@value{#1\bibrangedash#2}}%
+ {\blx@comprange@comp{#1}{#2}}}%
+ {}{}}{}%
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {\mkcomprange{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {#1}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat[inreference]{postnote}{%
- \iffieldundef{pagination}%
- {s\adddot v\adddot\addspace\mkbibquote{#1}}
- {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also.
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+ {\iffieldundef{pagination}%
+ {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+ {\mkpageprefix[pagination]{#1}}}}%
\DeclareFieldFormat{pages}{%
- \iffieldundef{bookpagination}%
- {#1\isdot}%
- {\mkpageprefix[bookpagination]{#1}}}
+ \iftoggle{cms@comprange}%
+ {\iffieldundef{bookpagination}%
+ {\mkcomprange{#1}\isdot}%
+ {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+ {\iffieldundef{bookpagination}%
+ {#1\isdot}%
+ {\mkpageprefix[bookpagination]{#1}}}}%
\DeclareFieldFormat{edlang}{%
\ifbibstring{#1}
@@ -2653,9 +2708,9 @@
\DeclareFieldFormat{journum}{% Revised for 0.9.5
\ifboolexpr{%
- test {\ifnumerals{#1}}
+ test {\ifnumerals{#1}}%
and
- not test {\ifnumeral{#1}}
+ not test {\ifnumeral{#1}}%
}%
{\bibstring{numbers}\addspace #1}%
{\bibstring{number}\addspace #1}}
@@ -2715,7 +2770,7 @@
test {\ifentrytype{inproceedings}}%
)
and
- not togl {cms@citecrossref}
+ not togl {cms@citecrossref}%
)
}%
{\bibhyperlink{\thefield{xref}}{#1}}%
@@ -2743,7 +2798,7 @@
test {\ifentrytype{inproceedings}}%
)
and
- not togl {cms@citecrossref}
+ not togl {cms@citecrossref}%
)
}%
{\bibhyperlink{\thefield{crossref}}{#1}}%
@@ -2908,8 +2963,40 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}%
+\newcommand*{\postnotewrapper}{%
+ \iftoggle{cms@modpostnote}%
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{,}}%
+ or
+ test {\iffieldstart{postnote}{\bibrangessep}}%
+ }%
+ {\addcomma}% w/ or w/o \addspace?
+ {\ifboolexpr{%
+ test {\iffieldstart{postnote}{;}}%
+ or
+ test {\iffieldstart{postnote}{:}}%
+ or
+ test {\iffieldstart{postnote}{.}}%
+ }%
+ {}{\postnotedelim}}}%
+ {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+ \begingroup% comp.text.tex
+ \edef\@tempa{%
+ \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+ \@tempa\@nil{\endgroup\ifblank{##1}}%
+ \savefield*{#1}{\@tempa}%
+ \expandafter\iffieldstart@i\detokenize
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@tempa\detokenize{#2}}\@nil}
+
\newcommand*{\editordelim}{%
- \iffieldequalstr{editortype}{none}%
+ \ifboolexpr{%
+ test {\iffieldequalstr{editortype}{none}}%
+ and
+ not togl {cms@fullnote}%
+ }%
{\addperiod\addspace}%
{\addcomma\addspace}}
@@ -3130,9 +3217,9 @@
{\iflistundef{organization}%
{}%
{\ifboolexpr{
- test {\iflistequals{organization}{\bbx@lasthash}}
+ test {\iflistequals{organization}{\bbx@lasthash}}%
and
- not test {\iffirstonpage}
+ not test {\iffirstonpage}%
}%
{\bibnamedash\addperiod\addspace}%
{\printlist{organization}%
@@ -3347,8 +3434,8 @@
\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
\iftoggle{cms@origpublished}%
- {}
- {\bibstring{in}%
+ {}% The following is needed for userf + crossref inside bib.
+ {\iftoggle{cms@crspace}{\addspace}{}\bibstring{in}% ?!?
\setunit{\addspace}}}
\newbibmacro*{bibxref-in:}{%
@@ -3369,7 +3456,8 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\usebibmacro{cms-in:}}}%
+ {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
+ \togglefalse{cms@crspace}}}%
{\iffieldundef{part}%
{\ifcsdef{cbx@incollpart}%
{\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3383,7 +3471,8 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\usebibmacro{cms-in:}}}}%
+ {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
+ \togglefalse{cms@crspace}}}}%
{\iffieldundef{part}%
{\ifcsdef{cbx@incollpart}%
{\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3400,7 +3489,8 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\usebibmacro{cms-in:}}}}%
+ {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
+ \togglefalse{cms@crspace}}}}%
\newbibmacro*{chapincoll}{%
\iffieldundef{chapter}%
@@ -3408,6 +3498,12 @@
{\printfield{chapter}\addspace%
\clearfield{chapter}}}
+\newbibmacro*{xrefchapincoll}{%
+ \iffieldundef{chapter}%
+ {\printtext{\relax}}
+ {\printfield{chapter}\addspace%
+ \clearfield{chapter}}}
+
\newbibmacro*{chapinscore}{%
\iffieldundef{chapter}%
{\ifthenelse{\ifentrytype{music}% 16th ed.
@@ -3419,8 +3515,12 @@
\clearfield{chapter}}}
\newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
- \iftoggle{cms@addendum}%
- {\printfield{addendum}}%
+ \ifboolexpr{%
+ togl {cms@addendum}%
+ and
+ not test {\iffieldundef{addendum}}%
+ }%
+ {\newcunit\printfield{addendum}}%
{}}%
\newbibmacro*{cnotefield}{%
@@ -3547,9 +3647,9 @@
\newbibmacro*{publ+loc+year}{% Revised for reprint
\ifboolexpr{
- togl {cms@reprint}
+ togl {cms@reprint}%
and
- not test {\ifentrytype{video}}
+ not test {\ifentrytype{video}}%
}%
{\bibstring{reprint}%
\newcunit}%
@@ -3605,13 +3705,13 @@
\newbibmacro*{cpubl+loc+year}{% Revised for reprint
\ifboolexpr{
- test {\iflistundef{location}}
+ test {\iflistundef{location}}%
and
- test {\iflistundef{publisher}}
+ test {\iflistundef{publisher}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
and
- not togl {cms@reprint}
+ not togl {cms@reprint}%
}%
{}%
{\setunit{\addspace}%
@@ -3619,9 +3719,9 @@
\usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}%
\setunit*{\addsemicolon\addspace}%
\ifboolexpr{
- togl {cms@reprint}
+ togl {cms@reprint}%
and
- not test{\ifentrytype{video}}
+ not test{\ifentrytype{video}}%
}%
{\bibsstring{reprint}%
\newcunit}%
@@ -3636,11 +3736,11 @@
\newbibmacro*{cpubletter+loc+year}{%
\ifboolexpr{
- test {\iflistundef{location}}
+ test {\iflistundef{location}}%
and
- test {\iflistundef{publisher}}
+ test {\iflistundef{publisher}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
}%
{}%
{\setunit{\addspace}%
@@ -3703,11 +3803,11 @@
\newbibmacro*{cjournal+issue+year+pages}{%
\usebibmacro{cjournal+ser+vol+num}%
\ifboolexpr{% 16th ed.
- test {\iffieldundef{issue}}
+ test {\iffieldundef{issue}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
and
- not togl {cms@switchdates}
+ not togl {cms@switchdates}%
}%
{\iffieldundef{number}%
{\ifthenelse{\iffieldundef{pagination}\AND%
@@ -3715,22 +3815,30 @@
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}%
{\addcomma\addspace}}%
- {\setunit{\addspace}%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+ {\newcunit%
+ \iffieldundef{issue}
+ {\usebibmacro{number+or+month}}%
+ {\printfield{issue}%
+ \setunit{\addspace}%
+ \usebibmacro{cmsyear}}%
+ \addcomma\addspace}%
+ {\setunit{\addspace}%
\printtext[parens]{% parens is the default here
\iffieldundef{issue}
{\usebibmacro{number+or+month}}%
{\printfield{issue}%
\setunit{\addspace}%
- \usebibmacro{cmsyear}}}}}
+ \usebibmacro{cmsyear}}}}}}
\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
\usebibmacro{cperiodical+ser+vol+num}% subtype article
\ifboolexpr{% 16th ed.
- test {\iffieldundef{issue}}
+ test {\iffieldundef{issue}}%
and
- test {\iffieldundef{year}}
+ test {\iffieldundef{year}}%
and
- not togl {cms@switchdates}
+ not togl {cms@switchdates}%
}%
{\iffieldundef{number}%
{\ifthenelse{\iffieldundef{pagination}\AND%
@@ -3738,13 +3846,21 @@
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}%
{\addcomma\addspace}}%
- {\setunit{\addspace}%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+ {\newcunit%
+ \iffieldundef{issue}
+ {\usebibmacro{number+or+month}}%
+ {\printfield{issue}%
+ \setunit{\addspace}%
+ \usebibmacro{cmsyear}}%
+ \addcomma\addspace}%
+ {\setunit{\addspace}%
\printtext[parens]{% parens is the default here
\iffieldundef{issue}
{\usebibmacro{number+or+month}}%
{\printfield{issue}%
\setunit{\addspace}%
- \usebibmacro{cmsyear}}}}}
+ \usebibmacro{cmsyear}}}}}}
\newbibmacro*{letter+date}{% New for 0.9
\iflistundef{origlocation}%
@@ -3828,7 +3944,7 @@
or
test {\iffieldundef{xref}}%
or
- test {\iffieldundef{maintitle}}
+ test {\iffieldundef{maintitle}}%
or
((
test {\iffieldundef{year}}%
@@ -3867,14 +3983,14 @@
\newcommand*{\cms@datelong}{% Modified for 0.9
\iffieldundef{origmonth}%
{\printfield{origyear}}%
- {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+ {\printfield[letterday]{origday}\setunit*{\nobreakspace}% Bug fix
\mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
\printfield{origyear}}}%
\newcommand*{\cms@datelongalt}{% Modified for 0.9
\iffieldundef{month}%
{\printfield{year}}%
- {\printfield[letterday]{day}\setunit{\nobreakspace}%
+ {\printfield[letterday]{day}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
\printfield{year}}}%
@@ -3884,14 +4000,14 @@
{}%
{\iffieldundef{month}%
{\printfield{year}}%
- {\printfield[letterday]{day}\setunit{\nobreakspace}%
+ {\printfield[letterday]{day}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
\printfield{year}}}}%
{\iffieldundef{origyear}%
{}%
{\iffieldundef{origmonth}%
{\printfield{origyear}}%
- {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+ {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
\mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
\printfield{origyear}}}}}%
@@ -4061,6 +4177,11 @@
\newcunit
\printfield{maintitleaddon}}}}
+\newbibmacro*{backref+check}{%
+ \ifbibliography%
+ {\backtrackerfalse}%
+ {}}
+
\newbibmacro*{cite:postnote}{%
\iftoggle{cms@loccit}%
{}%
@@ -4087,12 +4208,12 @@
\global\togglefalse{cms@shortnote}%
\global\togglefalse{cms@fullnote}}}
{\iffieldundef{shorthand}
- {\postnotedelim%
+ {\postnotewrapper%delim%
\usebibmacro{semel:postnote}%
\global\togglefalse{cms@printshhand}%
\global\togglefalse{cms@shortnote}%
\global\togglefalse{cms@fullnote}}
- {\postnotedelim%
+ {\postnotewrapper%delim%
\usebibmacro{semel:postnote}%
\usebibmacro{cms:shorthandintro}%
\global\togglefalse{cms@printshhand}%
@@ -4101,7 +4222,7 @@
{\iffieldundef{postnote}%
{\global\togglefalse{cms@shortnote}%
\global\togglefalse{cms@fullnote}}
- {\postnotedelim%
+ {\postnotewrapper%delim%
\usebibmacro{semel:postnote}%
\global\togglefalse{cms@shortnote}%
\global\togglefalse{cms@fullnote}}}}}%
@@ -4115,7 +4236,7 @@
\printfield{pages}}}%
{\postnotedelim%
\printfield{chapter}}}%
- {\postnotedelim% Don't need \ifbibliography test w/ following
+ {\postnotewrapper%delim% Don't need \ifbibliography test w/ following
\usebibmacro{semel:postnote}}}
\newbibmacro*{volfullpostnote}{%
@@ -4348,7 +4469,7 @@
\printfield{pages}}}%
{\postnotedelim%
\printfield{chapter}}}%
- {\postnotedelim%
+ {\postnotewrapper%delim%
\usebibmacro{semel:postnote}}}
\newbibmacro*{xrefprenote}{%
@@ -4357,9 +4478,16 @@
\iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
\iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}%
\iffieldundef{bookpagination}{}{\savefield{bookpagination}%
- {\cbx@incollbkpgn}}}
+ {\cbx@incollbkpgn}}% The next line saves the child's backrefs
+ \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}
\newbibmacro*{xrefpostnote}{%
+ \ifcsdef{cbx@incollpgref}% Here we print and clear the child's
+ {\restorelist{pageref}{\cbx@incollpgref}% backrefs
+ \newunit%
+ \usebibmacro{pageref}%
+ \global\let\cbx@incollpgref\undefined}%
+ {}%
\togglefalse{cms@xrefvol}%
\togglefalse{cms@xrefpart}%
\global\togglefalse{cms@usedvol}%
@@ -4380,9 +4508,9 @@
{\bibsentence}% Needed for Ibid to be capitalized.
{\printfield{prenote}%
\ifboolexpr{%
- test {\ifciteseen}
+ test {\ifciteseen}%
or
- togl {cms@allshort}
+ togl {cms@allshort}%
}%
{\addspace}%
{\nopunct}}}% Do we need \unspace here?
@@ -4411,9 +4539,9 @@
{\printnames{labelname}\newcunit%
\usebibmacro{transstrg}}%
{\ifboolexpr{%
- not test {\ifnameundef{namec}}
+ not test {\ifnameundef{namec}}%
and
- togl {cms@usecompiler}
+ togl {cms@usecompiler}%
}%
{\printnames[labelname]{namec}\newcunit%
\usebibmacro{compilestrg}}%
@@ -4431,9 +4559,9 @@
{\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
{\printnames{labelname}}%
{\ifboolexpr{%
- not test {\ifnameundef{namec}}
+ not test {\ifnameundef{namec}}%
and
- togl {cms@usecompiler}
+ togl {cms@usecompiler}%
}%
{\printnames[labelname]{namec}}%
{}}}}}}}%
@@ -4470,6 +4598,16 @@
\noinherit{indexsorttitle}
}
+\DeclareDataInheritance{book}{incollection}{%
+ \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}
@@ -4661,8 +4799,33 @@
{\bibstring{editor}}}}}%
\clearname{namea}}
+\newbibmacro*{clearorigin}{%
+ \toggletrue{cms@origcite}%
+ \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+ {\ifnameundef{bookauthor}%
+ {\savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}%
+ {\ifnamesequal{author}{bookauthor}%
+ {\clearname{bookauthor}%
+ \savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}%
+ {\savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}}}%
+ {\clearname{author}}}%
+
\newbibmacro*{clearpublin}{%
- \clearname{author}%
+ \toggletrue{cms@origcite}%
+ \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+ {\ifnameundef{bookauthor}%
+ {\savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}%
+ {\ifnamesequal{author}{bookauthor}%
+ {\clearname{bookauthor}%
+ \savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}%
+ {\savefield{fullhash}{\bbx@lasthash}%
+ \clearname{author}}}}%
+ {\clearname{author}}%
\clearname{namea}%
\clearname{nameb}%
\clearfield{nameaddon}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
index 4000aed9950..f9947981869 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.bbx,v 0.9.7.14 2012/12/06 12:15:47 dfussner Exp $
+% $Id: chicago-notes15.bbx,v 0.9.7.15 2014/08/14 14:30:19 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's standard.bbx
% It provides the bibliography formatting for the Chicago notes +
% bibliography style, _15th_ edition.
\ProvidesFile{chicago-notes15.bbx}
-[2012/12/06 v 2.4 biblatex bibliography style]
+[2014/08/15 v 2.9a biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -36,6 +36,19 @@
{\endlist}
{\item}
+\defbibenvironment{shorthand}
+ {\list
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\lositemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}
+ {\endlist}
+ {\item}
+
\AtBeginBibliography{%
\togglefalse{cms@headlessnote}%
\togglefalse{cms@shortnote}%
@@ -323,6 +336,19 @@
\printfield[lostitle]{title}%
\finentry}
+\DeclareBibliographyDriver{shorthand}{%
+ \ifnameundef{labelname}
+ {\iffieldequalstr{entrysubtype}{magazine}%
+ {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+ \newcunit}}%
+ {\iffieldequalstr{entrytype}{manual}%
+ {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+ {}}}%
+ {\usebibmacro{author/editor}%
+ \setunit{\addcomma\space}}%
+ \printfield[lostitle]{title}%
+ \finentry}
+
\DeclareBibliographyDriver{article}{%
\iffieldequalstr{entrysubtype}{magazine}%
{\usebibmacro{bibindex}%