biblatex-chicago (22mar16)

git-svn-id: svn://tug.org/texlive/trunk@40123 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 134 insertions, 35 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 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