summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-24 22:26:48 +0000
committerKarl Berry <karl@freefriends.org>2016-03-24 22:26:48 +0000
commit0062ac57f73dc90d1b3784ab8a05a5c7c4f4d45b (patch)
treec6ab31f0bf4067e2be43aaa2efec41292785970d /Master
parent1196ba45d8b7f20df149107b5e22d3a83ca00ad0 (diff)
biblatex-chicago (22mar16)
git-svn-id: svn://tug.org/texlive/trunk@40123 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/README19
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE21
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdfbin960429 -> 961562 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex55
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdfbin435606 -> 435557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdfbin315118 -> 315072 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdfbin434769 -> 434746 bytes
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty27
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx49
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx49
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx20
13 files changed, 204 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 71b7b5bb523..4e8a28c8df6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,20 +1,21 @@
IMPORTANT NOTE:
This is the package formerly known as biblatex-chicago-notes-df. It
-works best with the latest version (2.9a) of biblatex, and may not
-work well or at all with earlier (or future) versions. It contains
-both the 15th- and 16th-edition Chicago style files, though I am now
-marking the 15th-edition styles as "strongly deprecated" and am
-concentrating my development time on the 16th edition. If you have
-used the package before, then you should be sure to consult the
+works well with the latest version (3.3) of biblatex, but has been
+most thoroughly tested against 2.9a, so it may be worth trying that
+version in case you run into issues I haven't seen. The package
+contains both the 15th- and 16th-edition Chicago style files, though I
+have marked the 15th-edition styles as "strongly deprecated" and am
+concentrating all of my development time on the 16th edition. If you
+have used the package before, then you should be sure to consult the
RELEASE file to find out what alterations you may need to make to your
.bib files and document preambles to bring them up to date. Most
particularly please note that Biber is now required for the
author-date styles, and very strongly advised for the notes &
-bibliography style (version 1.9 is designed for use with the latest
+bibliography style (version 2.4 is designed for use with the latest
biblatex).
-README (version 0.9.9g, 2014-08-21):
+README (version 0.9.9h, 2016-03-22):
Biblatex-chicago contains five biblatex styles implementing the
specifications of the Chicago Manual of Style in both its 15th and
@@ -120,7 +121,7 @@ Changelog: See the RELEASE file, and also the end of
biblatex-chicago.pdf (or biblatex-chicago15.pdf).
-Copyright (c) 2008-2014 David Fussner. This package is
+Copyright (c) 2008-2016 David Fussner. This package is
author-maintained. This work may be copied, distributed and/or
modified under the conditions of the LaTeX Project Public License,
either version 1.3 of this license or (at your option) any later
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index 071f57c4d7e..44b1013e4c8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,22 @@
+Release notes for version 0.9.9h [2016-03-22]:
+
+ - This is an interim bug-fix release, updating the styles so that
+ they will work with biblatex 3.3. The notes & bibliography style,
+ as pointed out by several users, wouldn't compile at all with the
+ newest biblatex version, and all styles had inaccuracies in the
+ presentation of names due to changes in the name-handling code in
+ biblatex. I've done some testing against biblatex 3.3, and fixed
+ all the errors I've spotted, but there may still be parts of my
+ code that need updating to work well with the current version, so
+ you can still downgrade to an earlier biblatex -- I recommend 2.9a
+ -- if 3.3 doesn't work for you. The next release will be a feature
+ release, so if you've made a request, it should be fulfilled then.
+
+ - I've also fixed a couple of long-standing bugs, one in the entry
+ options controlling abbreviated cross-references and another in the
+ formatting of the "prenote" field, the latter identified (ages ago)
+ by Bernd Rellermeyer.
+
Release notes for version 0.9.9g [2014-08-21]:
- Alexandre Roberts found a showstopper in the functionality related
@@ -1329,7 +1348,7 @@ Changelog for version 0.7 [2008-08-18]:
- First public release
-Copyright (c) 2008-2014 David Fussner. This package is
+Copyright (c) 2008-2016 David Fussner. This package is
author-maintained. This work may be copied, distributed and/or
modified under the conditions of the LaTeX Project Public License,
either version 1.3 of this license or (at your option) any later
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
index 032a7ac1367..e1710e0049b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
index b0156d3ae5a..e3a3cdeeb72 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -63,7 +63,7 @@
Style files for biblatex
\vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9g (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9h (beta) \\
\href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
\end{center}
@@ -157,12 +157,13 @@ release.
\textsf{biblatex-chicago}:
\begin{itemize}{}{}
-\item Philipp Lehman's \textsf{biblatex} package, of course! You
- should use the current version(s) --- 1.7 or 2.9a at the time of
- writing --- as my code has been most extensively tested with, and
- relies on features and bug fixes only available in, this current
- release. Lehman's tools require several packages, and he strongly
- recommends several more:
+\item Philipp Lehman's \textsf{biblatex} package, of course! The
+ current version(s) --- 1.7 or 3.3 at the time of writing --- work
+ well, but the older 2.9a has been somewhat more extensively tested,
+ so please try it if you have any issues with the latest
+ \textsf{biblatex}. Both of these versions contain features and bug
+ fixes upon which my code relies. Lehman's tools require several
+ packages, and he strongly recommends several more:
\begin{itemize}{}{}
\item e-\TeX\ (required)
\item \textsf{etoolbox} --- available from CTAN (required)
@@ -185,8 +186,9 @@ release.
use the following:
\item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\
replacement, which is available from SourceForge. You should use
- the latest version, 1.9, to work with \textsf{biblatex} 2.9a and
- \textsf{biblatex-chicago}, and it is required for users who are
+ the latest version, 2.4, to work with \textsf{biblatex} 3.3 and
+ \textsf{biblatex-chicago} (or \textsf{Biber} 1.9 with
+ \textsf{biblatex} 2.9a), and it is required for users who are
either using the author-date styles or processing a .bib file in
Unicode. See \textsf{cms-dates-sample.pdf} and, for example, the
\textsf{crossref} documentation in section~\ref{sec:entryfields},
@@ -216,10 +218,11 @@ release.
automatically. You can also load the package via the usual
\cmd{usepackage\{biblatex\}}, adding either
\texttt{style=chicago\-notes} or \texttt{style=chicago-authordate},
- but this is mainly for those who wish to set much of the low-level
- formatting of their document themselves. Please see
- sections~\ref{sec:loading} and \ref{sec:loading:auth} below for a
- fuller discussion of the issues involved here.
+ but this is mainly for those, probably experienced users, who wish
+ to set much of the low-level formatting of their documents
+ themselves. Please see sections~\ref{sec:loading} and
+ \ref{sec:loading:auth} below for a fuller discussion of the issues
+ involved here.
\item You can use \cmd{usepackage[notes,short]\{biblatex-chicago\}} to
get the short note format even in the first reference of a notes \&\
bibliography document, letting the bibliography provide the full
@@ -326,7 +329,7 @@ release.
\subsection{License}
\label{sec:lppl}
-Copyright © 2008--2014 David Fussner. This package is
+Copyright © 2008--2016 David Fussner. This package is
author-maintained. This work may be copied, distributed and/or
modified under the conditions of the \LaTeX\ Project Public License,
either version 1.3 of this license or (at your option) any later
@@ -10850,7 +10853,29 @@ code for it, let me know, and I'll look into it.
\section{Revision History}
\label{sec:history}
-\textbf{0.9.9g: Released \today}
+\textbf{0.9.9h: Released \today}
+\begin{itemize}
+\item This is an interim bug-fix release, updating the styles so that
+ they will work with \textsf{biblatex} 3.3. The notes \&\
+ bibliography style, as pointed out by several users, wouldn't
+ compile at all with the newest \textsf{biblatex} version, and all
+ styles had inaccuracies in the presentation of names due to changes
+ in the name-handling code in \textsf{biblatex}. I've done some
+ testing against \textsf{biblatex} 3.3, and fixed all the errors I've
+ spotted, but there may still be parts of my code that need updating
+ to work well with the current version, so you can still downgrade to
+ an earlier \textsf{biblatex} --- I recommend 2.9a --- if 3.3 doesn't
+ work for you. The next release will be a feature release, so if
+ you've made a request, it should be fulfilled then.
+
+\item I've also fixed a couple of long-standing bugs, one in the entry
+ options controlling abbreviated cross-references and another in the
+ formatting of the \textsf{prenote} field, the latter identified
+ (ages ago) by Bernd Rellermeyer.
+
+\end{itemize}
+
+\textbf{0.9.9g: Released August 21, 2014}
\begin{itemize}
\item Alexandre Roberts found a showstopper in the functionality
related to the new \mycolor{\texttt{inheritshorthand}} option in the
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
index 08bd6675a95..a2c89af9330 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
index 151aba708e9..93e6352a44a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
index 9e03d784874..6e24993b371 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
Binary files differ
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 8ec06e36667..2ef864027a6 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.54 2014/08/15 13:51:57 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.55 2016/03/15 14:12:03 dfussner Exp $
-% Copyright (c) 2009-2014 David Fussner. This package is
+% Copyright (c) 2009-2016 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}[2014/08/15 v 2.9a biblatex style]
+\ProvidesPackage{biblatex-chicago}[2016/03/15 v 3.3 biblatex style]
\RequirePackage{etoolbox}
@@ -140,13 +140,22 @@
\DeclareLanguageMapping{norsk}{cms-norsk}
\DeclareLanguageMapping{nynorsk}{cms-nynorsk}
+\ifundef\bbl@loaded{\let\bbl@loaded\@empty}{}% For old versions of babel
+
\@ifpackagelater{biblatex}{2012/06/30}
-{\def\cms@choose{%
- \ifblx@load@version@one
- nty%
- \else
- cms%
- \fi}}
+{\@ifpackagelater{biblatex}{2016/03/01}
+ {\def\cms@choose{%
+ \ifblx@load@version@legacy
+ nty%
+ \else
+ cms%
+ \fi}}
+ {\def\cms@choose{%
+ \ifblx@load@version@one
+ nty%
+ \else
+ cms%
+ \fi}}}
{\def\cms@choose{%
\ifnum\blx@backend=\blx@backend@biber
cms%
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 8360287b050..7e02e710103 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.2.3 2014/08/15 09:44:56 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.2.5 2016/03/18 18:46:43 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}[2014/08/15 v 2.9a biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2016/03/18 v 2.9a biblatex
citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -207,9 +207,9 @@ citation style]
\toggletrue{cms@crossref}}%
\DeclareEntryOption{longcrossref}[false]{%
- \ifcsdef{cms@opt@doi@#1}%
- {\csuse{cms@opt@doi@#1}}
- {\blx@err@invopt{doi=#1}{}}}
+ \ifcsdef{cms@opt@lxref@#1}%
+ {\csuse{cms@opt@lxref@#1}}
+ {\blx@err@invopt{longcrossref=#1}{}}}
\DeclareBibliographyOption{booklongxref}[true]{%
\ifcsdef{cms@opt@bklxref@#1}%
@@ -1359,7 +1359,7 @@ citation style]
\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
-\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
{\patchcmd{\blx@comprange@check}%
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 631ace42640..5731d9bb75e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,9 +1,9 @@
-% $Id: chicago-authordate.bbx,v 0.8.2.7 2014/08/15 09:45:18 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.9 2016/03/21 18:06:54 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}[2014/08/15 v 2.9a biblatex
+\ProvidesFile{chicago-authordate.bbx}[2016/03/21 v 2.9a biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -142,6 +142,51 @@ bibliography style]
{}}}%
{\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
+{\renewbibmacro*{name:family-given}[4]{%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifempty{#3}{}{%
+ \ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}%
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#2#3}{}{\revsdnamepunct}%
+ \ifempty{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifempty{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}%
+
+\renewbibmacro*{name:given-family}[4]{%
+ \usebibmacro{name:delim}{#2#3#1}%
+ \usebibmacro{name:hook}{#2#3#1}%
+ \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
+ \ifempty{#3}{}{%
+ \mkbibnameprefix{#3}\isdot
+ \ifprefchar
+ {}
+ {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{%
+ \iftoggle{cms@jrcomma}%
+ {\ifnumeral{#4}%
+ {\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+ {\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot%
+ \ifboolexpr{% Test needed?
+ test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+ and
+ test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+ }
+ {\revsdnamepunct}%
+ {}}}%
+ {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}%
+
\newbibmacro*{author/editors/translators}{%
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
{\usebibmacro{author}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
index 5b865d75d64..c1c1a13eb0d 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,10 @@
-% $Id: chicago-authordate.cbx,v 0.8.2.5 2014/08/15 09:45:07 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.2.7 2016/03/18 18:46:17 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}[2014/08/15 v 2.9a biblatex
+\ProvidesFile{chicago-authordate.cbx}[2016/03/18 v 2.9a biblatex
citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -204,9 +204,9 @@ citation style]
\toggletrue{cms@crossref}}%
\DeclareEntryOption{longcrossref}[false]{%
- \ifcsdef{cms@opt@doi@#1}%
- {\csuse{cms@opt@doi@#1}}
- {\blx@err@invopt{doi=#1}{}}}
+ \ifcsdef{cms@opt@lxref@#1}%
+ {\csuse{cms@opt@lxref@#1}}
+ {\blx@err@invopt{longcrossref=#1}{}}}
\DeclareBibliographyOption{booklongxref}[true]{%
\ifcsdef{cms@opt@bklxref@#1}%
@@ -1356,7 +1356,7 @@ citation style]
\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
-\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
{\patchcmd{\blx@comprange@check}%
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 ee20a01d713..60eed677dd0 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.62 2014/08/15 09:27:26 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.64 2016/03/21 18:06:34 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}[2014/08/15 v 2.9a biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2016/03/21 v 2.9a biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -192,6 +192,51 @@
{}}}%
{\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
+{\renewbibmacro*{name:family-given}[4]{%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifempty{#3}{}{%
+ \ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}%
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#2#3}{}{\revsdnamepunct}%
+ \ifempty{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifempty{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}%
+
+\renewbibmacro*{name:given-family}[4]{%
+ \usebibmacro{name:delim}{#2#3#1}%
+ \usebibmacro{name:hook}{#2#3#1}%
+ \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
+ \ifempty{#3}{}{%
+ \mkbibnameprefix{#3}\isdot
+ \ifprefchar
+ {}
+ {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{%
+ \iftoggle{cms@jrcomma}%
+ {\ifnumeral{#4}%
+ {\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+ {\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot%
+ \ifboolexpr{% Test needed in notes
+ test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+ and
+ test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+ }
+ {\revsdnamepunct}%
+ {}}}%
+ {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}%
+
\newbibmacro*{author/editors/translators}{%
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
{\usebibmacro{author}}%
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 b446b548796..32e03299a05 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.114 2014/08/21 16:25:50 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.115 2016/03/18 17:16:53 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/08/21 v 2.9a biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2016/03/18 v 2.9a biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -172,9 +172,9 @@
\toggletrue{cms@bibcrossref}}%
\DeclareEntryOption{longcrossref}[false]{%
- \ifcsdef{cms@opt@doi@#1}%
- {\csuse{cms@opt@doi@#1}}
- {\blx@err@invopt{doi=#1}{}}}
+ \ifcsdef{cms@opt@lxref@#1}%
+ {\csuse{cms@opt@lxref@#1}}
+ {\blx@err@invopt{longcrossref=#1}{}}}
\DeclareBibliographyOption{booklongxref}[true]{%
\ifcsdef{cms@opt@bklxref@#1}%
@@ -2468,7 +2468,7 @@
\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
-\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
{\patchcmd{\blx@comprange@check}%
@@ -3065,7 +3065,7 @@
{\iffieldundef{xref}%
{}%
{\iftoggle{cms@bookcitexref}%
- {}%
+ {\cmsnoopcite{\thefield{xref}}}%
{\ifboolexpr{
test {\ifpunct}%
or
@@ -3076,7 +3076,7 @@
{\bibhypertarget{\thefield{xref}}%
{\cmsnoopcite{\thefield{xref}}}}}}}%
{\iftoggle{cms@bookcitexref}%
- {}%
+ {\cmsnoopcite{\thefield{crossref}}}%
{\ifboolexpr{
test {\ifpunct}%
or
@@ -3092,7 +3092,7 @@
{\iffieldundef{xref}%
{}%
{\iftoggle{cms@citecrossref}%
- {}%
+ {\cmsnoopcite{\thefield{xref}}}%
{\ifboolexpr{
test {\ifpunct}%
or
@@ -3103,7 +3103,7 @@
{\bibhypertarget{\thefield{xref}}%
{\cmsnoopcite{\thefield{xref}}}}}}}%
{\iftoggle{cms@citecrossref}%
- {}%
+ {\cmsnoopcite{\thefield{crossref}}}%
{\ifboolexpr{
test {\ifpunct}%
or