biblatex-chicago (26mar17)

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

34 files changed, 639 insertions, 198 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index b24a8fbfede..f149b139c16 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,7 +1,7 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-is designed for use with the latest version (3.4) of biblatex.  The
+is designed for use with the latest version (3.7) of biblatex.  The
 package still contains both the 15th- and 16th-edition Chicago style
 files, though I have marked the 15th-edition styles as "obsolete" and
 have moved them into a separate subdirectory, and I am concentrating
@@ -10,10 +10,10 @@ 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 2.5 is
+strongly advised for the notes & bibliography style (version 2.7 is
 designed for use with the latest biblatex).
 
-README (version 1.0rc1, 2016-06-07):
+README (version 1.0rc2, 2017-03-26):
 
 Biblatex-chicago contains three biblatex styles implementing the
 specifications of the Chicago Manual of Style, 16th edition.  The
@@ -117,7 +117,7 @@ biblatex package:
 Changelog: See the RELEASE file, and also the end of
 biblatex-chicago.pdf.
 
-Copyright (c) 2008-2016 David Fussner.  This package is
+Copyright (c) 2008-2017 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 1be42fb3ba6..f93d7845c04 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,52 @@
+Release notes for version 1.0rc2 [2017-03-26]:
+
+This is an interim release designed mainly to fix a number of subtle
+issues, pointed out by several users, that appear when you use the
+newest version of biblatex (3.7).  These were mostly concentrated in
+the date-handling code, which I believe now behaves correctly, and
+should do both with the newest biblatex and with somewhat older
+releases.  A much larger set of new features is still pending, but I
+have fixed some other bugs and added a few new options:
+
+ - J. P. E. Harper-Scott pointed out that, in ordinary British usage,
+   day numbers are presented as plain cardinals rather than ordinals.
+   The Manual itself also prefers this format, not only for
+   American-style dates but also for British ones, so I think the
+   previous behavior of the package was a bug.  I have in both styles
+   set the default presentation of British day numerals to be plain
+   cardinals, providing a new preamble option "ordinalgb" restoring
+   the previous default and printing ordinal dates when using the
+   "british" language with Babel.
+
+ - I have, in both styles, attempted to provide an improved \partedit
+   macro, the old one being inconvenient for users writing in French.
+   The new macro should work now without manual intervention to
+   provide the correct form of the preposition (de or d').  If you are
+   using the "french" option to Babel, please take care to remove any
+   hand-formatting you might have provided in these contexts.
+
+ - Jan David Hauck has both reported a bug in the \gentextcite code in
+   the author-date styles and also pointed me to its solution, as
+   provided by moewe on Stackexchange.  It turned out there were other
+   bugs in that code, now also fixed.
+
+ - User laudecir requested a way to present a "shorthand" even in the
+   first citation of a given work.  The new "shorthandfirst" option in
+   the notes & bibliography style can be set to "true" either in the
+   preamble or in individual entries, and should make this
+   functionality simpler to activate than the \shorthandcite command.
+
+ - Also in the notes & bibliography style, Stefan Björk requested a
+   way to turn off the printing of "url," "doi," and "eprint"
+   information in notes but not in the bibliography.  The new
+   "urlnotes" option, which you can set to "false" in the preamble or
+   in individual entries, provides this.  Please note that it does not
+   apply to Online entries.
+
+ - Several users pointed out the presence of warnings in .log files
+   caused by deprecated grammar in the default Sorting Schemes of both
+   styles.  These should now be fixed.
+
 Release notes for version 1.0rc1 [2016-06-07]:
 
  - The 15th-edition styles are now obsolete, and have been moved to a
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 199d3e9fa2e..bf4172f6388 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
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 30aa780e2e2..cbe226392cd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -64,7 +64,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 1.0rc1 (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 1.0rc2 (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -169,7 +169,7 @@ release.
 
 \begin{itemize}{}{}
 \item The \textsf{biblatex} package, of course!  The current version
-  --- 3.4 at the time of writing --- has received extensive testing,
+  --- 3.7 at the time of writing --- has received extensive testing,
   and contains features and bug fixes upon which my code relies.
   \textsf{Biblatex} requires several packages, and it strongly
   recommends several more:
@@ -195,8 +195,8 @@ release.
     use the following:
   \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\
     replacement by Philip Kime and François Charette, available from
-    SourceForge.  You should use the latest version, 2.5, to work with
-    \textsf{biblatex} 3.4 and \textsf{biblatex-chicago}, and it is
+    SourceForge.  You should use the latest version, 2.7, to work with
+    \textsf{biblatex} 3.7 and \textsf{biblatex-chicago}, and it is
     required for users who are either using the author-date styles or
     processing a .bib file in Unicode.  See
     \mycolor{\textsf{cms-dates-intro.pdf}} and, for example, the
@@ -362,7 +362,7 @@ release.
 \subsection{License}
 \label{sec:lppl}
 
-Copyright © 2008--2016 David Fussner.  This package is
+Copyright © 2008--2017 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
@@ -4580,13 +4580,13 @@ identify a compiler when \textsf{namec} won't do, e.g., in a
 \textsf{biblatex-chicago-notes} will print the appropriate string in
 your references.
 
-\mybigspace Use \mymarginpar{\textbf{\textbackslash partedit}} this
+\mybigspace Use \colmarginpar{\textbf{\textbackslash partedit}} this
 macro when identifying an editor whose name doesn't conveniently fit
 into the usual fields (\textsf{editor} or \textsf{namea}).  (N.B.: If
-you are writing in French and using \textsf{cms-french.lbx}, then
-currently you'll need to add either \texttt{de} or \texttt{d'} after
-this command in your .bib files to make the references come out right.
-I'm working on this.)  See chaucer:liferecords.
+you are writing in French then you no longer need to add either
+\texttt{de} or \texttt{d'} after this command in your .bib files.  The
+new version of the command should take care of this automatically for
+you.)  See chaucer:liferecords.
 
 %\enlargethispage{-\baselineskip}
 
@@ -5457,6 +5457,14 @@ or in the \textsf{options} field of individual entries.  Cf.\
 harley:ancient:cart, harley:cartography, and harley:hoc; and
 \textsf{crossref} in section~\ref{sec:entryfields}, above.
 
+\mylittlespace This \colmarginpar{\texttt{ordinalgb}} option, which
+only affects users of the \texttt{british} language, restores the
+previous package defaults, printing the \textsf{day} part of a
+\textsf{date} specification as an ordinal number: 26th March 2017.
+The new package default prints 26 March 2017, which is more in keeping
+both with standard British usage and with the recommendations of the
+\emph{Manual} (9.36).  The option is available only in the preamble.
+
 \mylittlespace Several
 \mymarginpar{\texttt{postnotepunct}\\(experimental)} users, most
 recently David Gohlke, have requested a way to alter the punctuation
@@ -5476,7 +5484,7 @@ haven't extensively tested, so I'm labeling this option experimental.
 Note also that the option only affects the \textsf{postnote} field of
 citation commands, not the \textsf{pages} field in your .bib file.
 
-% %\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace This \mymarginpar{\texttt{short}} option means that
 your text will only use the short note form, even in the first
@@ -5489,6 +5497,12 @@ citation commands which allow you to present the full reference in
 specific cases (see section \ref{sec:citecommands}).  If your
 bibliography is not complete, then you should not use this option.
 
+\mylittlespace User \colmarginpar{\texttt{shorthand-\\first}} laudecir
+requested a simpler way to print the \textsf{shorthand} even in the
+first citation of a source, simpler, that is, than remembering to use
+the \cmd{shorthandcite} command.  You can set this option to
+\texttt{true} either in the preamble or in individual entries.
+
 \mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has
 suggested that, in some fields of study, a list of shorthands
 providing full bibliographical information may replace the
@@ -5522,6 +5536,14 @@ rule intervenes to emphasize this continuation.  I haven't tested this
 code very thoroughly, and it's possible that frequent use of floats
 might interfere with it.  Let me know if it causes problems.
 
+\mylittlespace Stefan \colmarginpar{\texttt{urlnotes}} Björk, for
+specialized reasons, requested a way to turn off the printing of
+\textsf{url}, \textsf{doi}, and \textsf{eprint} information in notes
+but not in the bibliography.  As it's possible this might be of more
+general usefulness, I've provided a new option.  You can set it to
+\texttt{false} either in the preamble or in individual entries, but
+please note that it does not apply to \textsf{online} entries.
+
 \mylittlespace Stefan \colmarginpar{\texttt{xrefurl}} Björk pointed
 out that when, using the \texttt{longcrossref} or
 \texttt{booklongxref} options, you turn on the automatic abbreviation
@@ -6816,6 +6838,8 @@ preamble or in the \textsf{options} field using the
 section~\ref{sec:fields:authdate} and \texttt{booklongxref} in
 section~\ref{sec:authpreset}, below.
 
+\enlargethispage{-\baselineskip}
+
 \mybigspace This \mymarginpar{\textbf{reference}} entry type is
 aliased to \textsf{collection} by the standard \textsf{biblatex}
 styles, but I intend it to be used in cases where you need to cite a
@@ -7163,7 +7187,7 @@ undefined, and \textsf{biblatex-chicago} will do the rest. Cf.\
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91,
 14.116; polakow:afterw.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
 Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a
@@ -7734,6 +7758,8 @@ in the same year then the alphabetical suffix would appear attached to
 the \textsf{date} --- (Author [1898] 1974a) and (Author [1898] 1974b)
 --- again avoiding ambiguity.
 
+\enlargethispage{-\baselineskip}
+
 \mylittlespace The \emph{Manual} doesn't give clear instructions for
 how to cope with these situations, but
 \textsf{biblatex-chicago-authordate} provides help.  You can't
@@ -10183,13 +10209,13 @@ do, e.g., in a \textsf{note} field or the like.  In such a case,
 \textsf{biblatex-chicago} will print the appropriate string in your
 references.
 
-\mybigspace Use \mymarginpar{\textbf{\textbackslash partedit}} this
+\mybigspace Use \colmarginpar{\textbf{\textbackslash partedit}} this
 macro when identifying an editor whose name doesn't conveniently fit
 into the usual fields (\textsf{editor} or \textsf{namea}).  (N.B.: If
-you are writing in French and using \textsf{cms-french.lbx}, then
-currently you'll need to add either \texttt{de} or \texttt{d'} after
-this command in your .bib files to make the references come out right.
-I'm working on this.)  See howell:marriage.
+you are writing in French then you no longer need to add either
+\texttt{de} or \texttt{d'} after this command in your .bib files.  The
+new version of the command should take care of this automatically for
+you.)  See howell:marriage.
 
 \mybigspace As \mymarginpar{\textbf{\textbackslash
     partedit-\\andcomp}} before, but for use when an editor is also a
@@ -10998,6 +11024,14 @@ use the \cmd{citereset} command, allied possibly with the
 \textsf{biblatex}\ \texttt{citereset} option, on which see
 \textsf{biblatex.pdf} §3.1.2.1.
 
+\mylittlespace This \colmarginpar{\texttt{ordinalgb}} option, which
+only affects users of the \texttt{british} language, restores the
+previous package defaults, printing the \textsf{day} part of a
+\textsf{date} specification as an ordinal number: 26th March 2017.
+The new package default prints 26 March 2017, which is more in keeping
+both with standard British usage and with the recommendations of the
+\emph{Manual} (9.36).  The option is available only in the preamble.
+
 \mylittlespace Originally
 \mymarginpar{\texttt{postnotepunct}\\(experimental)} designed for the
 notes \&\ bibliography style, this option may in fact be more useful in
@@ -11538,7 +11572,7 @@ quotation marks in some situations, and also failures in the automatic
 capitalization routines.  Some of these problems disappeared when I
 switched to using \textsf{biblatex's} punctuation-tracking code for
 \enquote{American} styles, but some remained.  A bug report from
-J. P. E.~Harper-Scott suggested a new way of addressing the issue, and
+J.~P.~E.~Harper-Scott suggested a new way of addressing the issue, and
 newer versions of Lehman's \textsf{csquotes} package incorporate a
 full fix.  This, thankfully, doesn't require turning off any of
 Xe\LaTeX 's features, and indeed merely involves upgrading to the
@@ -11605,7 +11639,7 @@ title, particularly Unicode ones.  If you are using
 set of curly braces \{\}\ at the start of the field, but I shall look
 into this further.
 
-\enlargethispage{-4\baselineskip}
+%\enlargethispage{-4\baselineskip}
 
 \mylittlespace This release fixes the formatting errors of which I am
 aware, though users writing in French should be aware of problems with
@@ -11629,7 +11663,60 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{1.0rc1: Released \today}
+\textbf{1.0rc2: Released \today}
+
+\mylittlespace This is an interim release designed mainly to fix a
+number of subtle issues, pointed out by several users, that appear
+when you use the newest version of \textsf{biblatex} (3.7).  These
+were mostly concentrated in the date-handling code, which I believe
+now behaves correctly, and should do both with the newest
+\textsf{biblatex} and with somewhat older releases.  A much larger set
+of new features is still pending, but I have fixed some other bugs and
+added a few new options:
+
+\begin{itemize}
+\item J.~P.~E.~Harper-Scott pointed out that, in ordinary British
+  usage, day numbers are presented as plain cardinals rather than
+  ordinals.  The \emph{Manual} itself also prefers this format, not
+  only for American-style dates but also for British ones, so I think
+  the previous behavior of the package was a bug.  I have in both
+  styles set the default presentation of British day numerals to be
+  plain cardinals, providing a new preamble option
+  \mycolor{\texttt{ordinalgb}} restoring the previous default and
+  printing ordinal dates when using the \texttt{british} language with
+  \textsf{Babel}.
+\item I have, in both styles, attempted to provide an improved
+  \cmd{partedit} macro, the old one being inconvenient for users
+  writing in French.  The new macro should work now without manual
+  intervention to provide the correct form of the preposition (de or
+  d').  If you are using the \texttt{french} option to \textsf{Babel},
+  please take care to remove any hand-formatting you might have
+  provided in these contexts.
+\item Jan David Hauck has both reported a bug in the \cmd{gentextcite}
+  code in the author-date styles and also pointed me to its solution,
+  as provided by moewe on
+  \href{http://tex.stackexchange.com/questions/326472/gentextcites-multiple-books-same-author-biblatex-chicago/326628#326628}{Stackexchange}.
+  It turned out there were other bugs in that code, now also fixed.
+\item User laudecir requested a way to present a \textsf{shorthand}
+  even in the first citation of a given work.  The new
+  \mycolor{\texttt{shorthandfirst}} option in the notes \&\
+  bibliography style can be set to \texttt{true} either in the
+  preamble or in individual entries, and should make this
+  functionality simpler to activate than the \cmd{shorthandcite}
+  command.
+\item Also in the notes \&\ bibliography style, Stefan Björk requested
+  a way to turn off the printing of \textsf{url}, \textsf{doi}, and
+  \textsf{eprint} information in notes but not in the bibliography.
+  The new \mycolor{\texttt{urlnotes}} option, which you can set to
+  \texttt{false} in the preamble or in individual entries, provides
+  this.  Please note that it does not apply to \textsf{online}
+  entries.
+\item Several users pointed out the presence of warnings in .log files
+  caused by deprecated grammar in the default Sorting Schemes of both
+  styles.  These should now be fixed.
+\end{itemize}
+
+\textbf{1.0rc1: Released June 7, 2016}
 
 \mylittlespace Obsolete and Deprecated Features:\label{deprec:obsol}
 \begin{itemize}
@@ -13233,3 +13320,8 @@ To Do:
 \textbf{0.7: First public release, September 18, 2008}
 
 \end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
index 4fbf77248f8..1ceeb92d08c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
index 8eb2ad03c17..9755526ba87 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
@@ -12,6 +12,7 @@ annotation]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
 \usepackage{lmodern}
+\usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -72,7 +73,7 @@ author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features the style requires.
 For this release, you really need the current versions of
-\textsf{Biber} (2.5) and \textsf{biblatex} (3.4), which contain
+\textsf{Biber} (2.7) and \textsf{biblatex} (3.7), which contain
 features and bug-fixes on which my own code relies.  The advice that
 follows in this document assumes that you are using \textsf{Biber}; if
 you wish to continue using \textsc{Bib}\TeX\ then you need
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 2d998485b52..8b3b64796e0 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
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
index 83c67aa6b38..c12ec5bd788 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
@@ -10,6 +10,8 @@
 bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
+\usepackage{lmodern}
+\usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -19,7 +21,7 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \urlstyle{rm}
 \appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
-\hyphenation{evans-ton clem-ens mc-hugh}
+\hyphenation{evans-ton clem-ens mc-hugh ho-ro-witz}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
@@ -43,7 +45,7 @@ author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features the style requires.
 For this release, you really need the current versions of
-\textsf{Biber} (2.5) and \textsf{biblatex} (3.4), which contain
+\textsf{Biber} (2.7) and \textsf{biblatex} (3.7), which contain
 features and bug-fixes on which my own code relies.  The advice that
 follows in this document assumes that you are using \textsf{Biber}; if
 you wish to continue using \textsc{Bib}\TeX\ then you need
@@ -132,7 +134,7 @@ command, which prints an \gentextcite{author:forthcoming} name in the
 genitive case in what is otherwise a standard \cmd{textcite}.  If you
 want to change the default <\textbf{'s}> printed there you can specify
 whatever text you wish like so:
-\cmd{gentextcite[<ending>][][]\{entry:key\}}.  There is also a
+\cmd{gentext\-cite[<ending>][][]\{entry:key\}}.  There is also a
 \cmd{gentextcites} command, modified thus:
 \cmd{gentextcites[<ending>]()()[][]\{key1\}\{key2\}}.
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
index f64cf609856..817ffd4f35a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
index dc371daa6f2..47a02d5b298 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
@@ -9,6 +9,7 @@
 \usepackage[notes,strict,backend=biber,autolang=other,%
 bibencoding=latin1,booklongxref=false,annotation]{biblatex-chicago}
 \usepackage{lmodern}
+\usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -20,6 +21,7 @@ bibencoding=latin1,booklongxref=false,annotation]{biblatex-chicago}
 \usepackage{url}
 \urlstyle{rm}
 \appto\bibsetup{\sloppy}
+\hyphenation{tech-re-port}
 \protected\def\onethird{{\mbox{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}}
 \setlength{\parindent}{0pt}
@@ -125,7 +127,7 @@ answers there, please write to me at the email address in
   from the start, something only recommended by the \emph{CMS} when
   you have a full bibliography to clarify all the abbreviated
   references.  The following are the short forms of all the works
-  cited in the previous sections:
+  cited in long notes in previous sections:
   \endnote[\value{Article}]{\shortcite{garaud:gatine}.},
   \endnote[\value{Artwork}]{\shortcite{leo:madonna}.},
   \endnote[\value{Audio}]{\shortcite{schubert:muellerin}.},
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 af1bc023d14..61e0c992ecb 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
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
index da555f98f96..080d8217c41 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
@@ -7,13 +7,15 @@
 \usepackage[document]{ragged2e}
 \usepackage[notes,strict,backend=biber,autolang=other,%
 bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago}
+\usepackage{lmodern}
+\usepackage{gentium}
 %%\usepackage[osf]{mathpazo}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-\renewcommand{\sfdefault}{phv}
+%\renewcommand{\sfdefault}{phv}
 %\renewcommand{\ttdefault}{pcr}
 \usepackage{url}
 \urlstyle{rm}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
index ae614437286..85f6fc1bffb 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
index ed4bb79d52e..79f284a89d6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
@@ -12,6 +12,7 @@ annotation]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
 \usepackage{lmodern}
+\usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
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 1adf8bce28d..9cdb2dacb14 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
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
index 4664b72984c..b37af2ab4a2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
@@ -10,6 +10,8 @@
 bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
+\usepackage{lmodern}
+\usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -19,7 +21,7 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \urlstyle{rm}
 \appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
-\hyphenation{evans-ton clem-ens mc-hugh}
+\hyphenation{evans-ton clem-ens mc-hugh ho-ro-witz}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
@@ -44,7 +46,7 @@ author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features the style requires.
 For this release, you really need the current versions of
-\textsf{Biber} (2.5) and \textsf{biblatex} (3.4), which contain
+\textsf{Biber} (2.7) and \textsf{biblatex} (3.7), which contain
 features and bug-fixes on which my own code relies.  The advice that
 follows in this document assumes that you are using \textsf{Biber}; if
 you wish to continue using \textsc{Bib}\TeX\ then you need
@@ -325,7 +327,7 @@ then you can manually provide the punctuation and comment in that
 field, e.g., \autocite[4; the unrevised trans.]{stendhal:parma}.
 Without a \textsf{postnote}, you now have two choices.  You can enable
 the new \texttt{postnotepunct} package option, which allows you simply
-to type \cmd{autocite[; the unrevised trans.]\{stendhal:parma\}}
+to type \cmd{autocite[; the unrevised trans.]\{stendhal:\ parma\}}
 \citereset\autocite[; the unrevised trans.]{stendhal:parma}, or you
 can continue to use a separate \textsf{Misc} or \textsf{CustomC} entry
 containing just the text of the comment in the \textsf{title} field,
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
index 7b99b09a65c..97fd3d36f12 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -59,7 +59,7 @@
   eventdate = 	 {2008-07-01},
   nameaddon = 	 {(10:18 a.m.)},
   crossref = 	 {ellis:blog},
-  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
+  url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   title = 	 {comment on Rhian Ellis, \mkbibquote{Squatters' Rights}},
   annotation = 	 {The 16th edition suggests a format such as this for
                   presenting comments on blogs or other online
@@ -79,7 +79,7 @@
   eventdate = 	 {2008-07-01},
   nameaddon = 	 {(10:18 a.m.)},
   crossref = 	 {ellis:blog},
-  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
+  url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   title = 	 {comment on Rhian Ellis, Squatters' rights},
   annotation = 	 {authordate-trad only.  The 16th edition suggests a
                   format such as this for presenting comments on blogs
@@ -1168,7 +1168,7 @@
   journaltitle = {Ward Six},
   location = 	 {blog},
   date = 	 {2008-06-30},
-  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
+  url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   entrysubtype = {magazine},
   annotation = 	 {The 16th edition specifies an Article-like
                   presentation for blogs, the main peculiarity being
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
index a08c5150931..1183b7f9cf9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
@@ -24,7 +24,7 @@
   date = 	 {2008-06-30},
   author = 	 {AC},
   eventdate = 	 {2008-07-01},
-  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
+  url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   nameaddon = 	 {(10:18 a.m.)},
   crossref = 	 {ellis:blog},
   title = 	 {comment on Rhian Ellis, \mkbibquote{Squatters' Rights}},
@@ -895,7 +895,7 @@
   journaltitle = {Ward Six},
   location = 	 {blog},
   date = 	 {2008-06-30},
-  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
+  url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   entrysubtype = {magazine},
   annote = 	 {The 16th edition of the \emph{CMS} specifies an
                   \textsf{Article}-like presentation for blogs, the
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 296810b80e9..6cdc32a3563 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,4 +1,5 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.3.9 2016/06/07 09:29:05 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.3.10 2017/03/22 13:52:18 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
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 f864ea55b06..a44568292f9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,4 +1,5 @@
-% $Id: chicago-authordate.bbx,v 0.8.2.22 2016/06/07 08:46:51 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.24 2017/03/25 14:08:25 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.
@@ -2690,7 +2691,8 @@ bibliography style]
                 {\clearfield{urlyear}}%
                 {\iffieldsequal{urlyear}{urlendyear}%
                   {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -2709,7 +2711,8 @@ bibliography style]
                 {\clearfield{origyear}}%
                 {\iffieldsequal{origyear}{origendyear}%
                   {\clearfield{origyear}\clearfield{origendyear}}%
-                  {}}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -2728,7 +2731,8 @@ bibliography style]
               {\clearfield{eventyear}}%
               {\iffieldsequal{eventyear}{eventendyear}%
                 {\clearfield{eventyear}\clearfield{eventendyear}}%
-                {}}}}}}%
+                {}}%
+              \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -2747,7 +2751,8 @@ bibliography style]
             {\clearfield{year}}%
             {\iffieldsequal{year}{endyear}%
               {\clearfield{year}\clearfield{endyear}}%
-              {}}}}}}}%
+              {}}%
+            \usebibmacro{cms@test@labelend}}}}}}%
 
 \newbibmacro*{origfirst+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -2785,7 +2790,8 @@ bibliography style]
                 {\clearfield{urlyear}}%
                 {\iffieldsequal{urlyear}{urlendyear}%
                   {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -2804,7 +2810,8 @@ bibliography style]
                 {\clearfield{eventyear}}%
                 {\iffieldsequal{eventyear}{eventendyear}%
                   {\clearfield{eventyear}\clearfield{eventendyear}}%
-                  {}}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -2823,7 +2830,8 @@ bibliography style]
               {\clearfield{year}}%
               {\iffieldsequal{year}{endyear}%
                 {\clearfield{year}\clearfield{endyear}}%
-                {}}}}}}%
+                {}}%
+              \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -2842,7 +2850,8 @@ bibliography style]
             {\clearfield{origyear}}%
             {\iffieldsequal{origyear}{origendyear}%
               {\clearfield{origyear}\clearfield{origendyear}}%
-              {}}}}}}}%
+              {}}%
+            \usebibmacro{cms@test@labelend}}}}}}%
 
 \newbibmacro*{av+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -2880,7 +2889,8 @@ bibliography style]
                 {\clearfield{urlyear}}%
                 {\iffieldsequal{urlyear}{urlendyear}%
                   {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -2899,7 +2909,8 @@ bibliography style]
                 {\clearfield{year}}%
                 {\iffieldsequal{year}{endyear}%
                   {\clearfield{year}\clearfield{endyear}}%
-                  {}}}}}}%
+                  {}}%
+                \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -2918,7 +2929,8 @@ bibliography style]
               {\clearfield{origyear}}%
               {\iffieldsequal{origyear}{origendyear}%
                 {\clearfield{origyear}\clearfield{origendyear}}%
-                {}}}}}}%
+                {}}%
+              \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -2937,7 +2949,8 @@ bibliography style]
             {\clearfield{eventyear}}%
             {\iffieldsequal{eventyear}{eventendyear}%
               {\clearfield{eventyear}\clearfield{eventendyear}}%
-              {}}}}}}}%
+              {}}%
+            \usebibmacro{cms@test@labelend}}}}}}%
 
 \newbibmacro*{origyear+endyear}{%
   \printfield{origyear}%
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 df02300309f..b6b25b969a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-authordate.cbx,v 0.8.3.12 2016/06/07 09:26:22 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.3.13 2017/03/22 13:40: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
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
index c0b4b338168..d9a9eca34e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-dates-common.cbx,v 0.9.1.21 2016/06/07 09:00:02 dfussner Exp $
+% $Id: chicago-dates-common.cbx,v 0.9.1.31 2017/03/25 14:35:52 dfussner Exp $
+
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, and contains the
 % common code for providing inline citations (and a reference list)
@@ -29,6 +30,7 @@ citation style]
 \providetoggle{cms@authorparens}
 \providetoggle{cms@datedash}
 \providetoggle{cms@modpostnote}
+\providetoggle{cms@ukord}
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
@@ -78,8 +80,8 @@ citation style]
 \def\cms@opt@avdate@true{%
   \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
   {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
-    {\DeclareLabeldate[music,review,suppperiodical,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}%
+    {\DeclareLabeldate[music,review,suppperiodical,video]{\field{eventdate}%
+        \field{origdate} \field{date} \field{urldate}}}%
     {\DeclareLabelyear[music,review,suppperiodical,video]{\field{eventyear}%
         \field{origyear} \field{year} \field{urlyear}}}}%
   {\DeclareLabelyear[music,review,suppperiodical,video]%
@@ -114,10 +116,10 @@ citation style]
 \def\cms@opt@origdate@true{%
   \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
   {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
-    {\DeclareLabeldate{\field{origyear} \field{year}%
-        \field{eventyear} \field{urlyear}}%
-      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
-        \field{origyear} \field{urlyear}}}%
+    {\DeclareLabeldate{\field{origdate} \field{date}%
+        \field{eventdate} \field{urldate}}%
+      \DeclareLabeldate[patent]{\field{date} \field{eventdate}%
+        \field{origdate} \field{urldate}}}%
     {\DeclareLabelyear{\field{origyear} \field{year}%
         \field{eventyear} \field{urlyear}}%
       \DeclareLabelyear[patent]{\field{year} \field{eventyear}%
@@ -286,6 +288,9 @@ citation style]
 \DeclareEntryOption[boolean]{related}[true]{%
   \settoggle{cms@related}{#1}}%
 
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+  \settoggle{cms@ukord}{#1}}%
+
 % Controlling punctuation before titleaddon fields %
 
 \DeclareBibliographyOption[string]{ptitleaddon}[period]{%
@@ -406,13 +411,17 @@ citation style]
 \ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
   ctitleaddon,ptitleaddon,journalabbrev=notes}%
 
-\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldate=true}}%
-{\ExecuteBibliographyOptions{labelyear=true}}%
+\@ifpackagelater{biblatex}{2016/09/01}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldateparts=true}}%
+{\@ifpackagelater{biblatex}{2013/03/30}
+  {\ExecuteBibliographyOptions{labeldate=true}}
+  {\ExecuteBibliographyOptions{labelyear=true}}}%
 
-\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
-{\global\toggletrue{cms@datedash}}%
-{\global\togglefalse{cms@datedash}}%
+\@ifpackagelater{biblatex}{2016/09/01}% For biblatex 3.5 ff.
+{\global\togglefalse{cms@datedash}}
+{\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+  {\global\toggletrue{cms@datedash}}%
+  {\global\togglefalse{cms@datedash}}}%
 
 \DeclareDataInheritance{collection}{suppcollection}{%
   \inherit{title}{title}
@@ -491,7 +500,7 @@ citation style]
 
 % More authordate options %
 
-\DeclareSortingScheme{cms}{
+\DeclareSortingScheme{cms}{% Updated to >2.0 format
   \sort{
     \field{presort}
   }
@@ -499,16 +508,16 @@ citation style]
     \field{sortkey}
   }
   \sort{
-    \name{sortname}
-    \name{author}
-    \name{namea}
-    \name{editor}
-    \name{nameb}
-    \name{translator}
-    \name{namec}
+    \field{sortname}
+    \field{author}
+    \field{namea}
+    \field{editor}
+    \field{nameb}
+    \field{translator}
+    \field{namec}
     \field{sorttitle}
     \field{journaltitle}
-    \list{organization}
+    \field{organization}
     \field{title}
   }
   \sort{
@@ -739,7 +748,7 @@ citation style]
             togl {cms@gencite}%
             and
             (
-            test {\iflastcitekey}%
+            test {\iffinalcitedelim}%
             or
             togl {cms@genallnames}%
             )
@@ -758,7 +767,7 @@ citation style]
           togl {cms@gencite}%
           and
           (
-          test {\iflastcitekey}%
+          test {\iffinalcitedelim}%
           or
           togl {cms@genallnames}%
           )
@@ -780,7 +789,7 @@ citation style]
         togl {cms@gencite}%
         and
         (
-        test {\iflastcitekey}%
+        test {\iffinalcitedelim}%
         or
         togl {cms@genallnames}%
         )
@@ -843,7 +852,11 @@ citation style]
           \ifboolexpr{%
             togl {cms@gencite}%
             and
-            test {\iflastcitekey}%
+            (
+            test {\iffinalcitedelim}%
+            or
+            togl {cms@genallnames}%
+            )
           }%
           {\thegen}%
           {}%
@@ -860,7 +873,11 @@ citation style]
       \ifboolexpr{%
         togl {cms@gencite}%
         and
-        test {\iflastcitekey}%
+        (
+        test {\iffinalcitedelim}%
+        or
+        togl {cms@genallnames}%
+        )
       }%
       {\thegen}%
       {}%
@@ -1007,7 +1024,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}%
+              {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -1021,7 +1038,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}}%
+              {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -1035,7 +1052,7 @@ citation style]
               not togl {cms@datedash}%
             }%
             {\mbox{\bibdatedash}}%
-            {}}}}%
+            {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -1049,7 +1066,7 @@ citation style]
             not togl {cms@datedash}%
           }%
           {\mbox{\bibdatedash}}%
-          {}}}}}}%
+          {\usebibmacro{cms@test@labelend}}}}}}}%
 
 \newbibmacro*{cite:origfirst+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1084,7 +1101,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}%
+              {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -1098,7 +1115,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}}%
+              {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -1112,7 +1129,7 @@ citation style]
               not togl {cms@datedash}%
             }%
             {\mbox{\bibdatedash}}%
-            {}}}}%
+            {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -1126,7 +1143,7 @@ citation style]
             not togl {cms@datedash}%
           }%
           {\mbox{\bibdatedash}}%
-          {}}}}}}%
+          {\usebibmacro{cms@test@labelend}}}}}}}%
 
 \newbibmacro*{cite:av+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1161,7 +1178,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}%
+              {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
             {}%
@@ -1175,7 +1192,7 @@ citation style]
                 not togl {cms@datedash}%
               }%
               {\mbox{\bibdatedash}}%
-              {}}}}%
+              {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
           \iffieldundef{extrayear}%
           {}%
@@ -1189,7 +1206,7 @@ citation style]
               not togl {cms@datedash}%
             }%
             {\mbox{\bibdatedash}}%
-            {}}}}%
+            {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
         \iffieldundef{extrayear}%
         {}%
@@ -1203,7 +1220,15 @@ citation style]
             not togl {cms@datedash}%
           }%
           {\mbox{\bibdatedash}}%
-          {}}}}}}%
+          {\usebibmacro{cms@test@labelend}}}}}}}%
+
+\newbibmacro*{cms@test@labelend}{% For printing year ranges in 3.5 ff.
+  \iffieldundef{labelendyear}%
+  {}%
+  {\ifthenelse{\iffieldequalstr{labelendyear}{}\OR%
+      \iffieldsequal{labelyear}{labelendyear}}%
+    {}%
+    {\bibdatedash\printfield{labelendyear}}}}%
 
 \newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
   \ifboolexpr{%
@@ -1887,10 +1912,43 @@ citation style]
 \newcommand{\parttrans}{%
   {\bibstring{bytranslator}\space}}%
 
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\bibstring{byeditoralt}\addspace}%
-  {\bibstring{byeditor}\addspace}}%
+% \newcommand{\partedit}{%
+%   \iftoggle{cms@postposit}% Kludge to make it work in French.
+%   {\bibstring{byeditoralt}\addspace}%
+%   {\bibstring{byeditor}\addspace}}%
+
+\protected\def\partedit#1{%
+  \ifcat\noexpand~\noexpand#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addnbspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1H%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1h%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \def\cms@tempa{\part@edit@i\lbx@initnamehook{#1}%
+    \csuse{cms@tempb}#1\csundef{cms@tempb}}%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \cms@tempa%
+}%
+
+\newcommand{\part@edit@i}{\bibstring{byeditor}\addspace}%
 
 \newcommand{\partcomp}{%
   {\bibstring{bycompiler}\space}}%
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 140f6cb6310..141fb2c5d9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-notes.cbx,v 0.9.8.36 2016/06/07 08:17:10 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.8.44 2017/03/22 18:41:31 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
@@ -29,6 +30,8 @@
 \providetoggle{cms@addendum}
 \providetoggle{cms@comprange}
 \providetoggle{cms@modpostnote}
+\providetoggle{cms@url@innotes}
+\providetoggle{cms@ukord}
 
 \providetoggle{cms@headlessnote}
 \providetoggle{cms@origcite}
@@ -42,6 +45,7 @@
 \providetoggle{cms@printshhand}
 \providetoggle{cms@fullshhand}
 \providetoggle{cms@inheritshhand}
+\providetoggle{cms@firstshort}
 \providetoggle{cms@origpublished}
 \providetoggle{cms@loccit}
 \providetoggle{cms@annotation}
@@ -130,6 +134,12 @@
   }}%
   {}}%
 
+\DeclareBibliographyOption[boolean]{shorthandfirst}[true]{%
+  \settoggle{cms@firstshort}{#1}}
+
+\DeclareEntryOption[boolean]{shorthandfirst}[true]{%
+  \settoggle{cms@firstshort}{#1}}
+
 \DeclareBibliographyOption{compresspages}[true]{%
   \ifcsdef{cms@opt@crange@#1}%
   {\csuse{cms@opt@crange@#1}}%
@@ -258,8 +268,17 @@
       Please see biblatex-chicago.pdf for valid\MessageBreak
       option keys}}}%
 
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+  \settoggle{cms@ukord}{#1}}%
+
 % The field-exclusion options %
 
+\DeclareBibliographyOption[boolean]{urlnotes}[true]{%
+  \settoggle{cms@url@innotes}{#1}}%
+
+\DeclareEntryOption[boolean]{urlnotes}[true]{%
+  \settoggle{cms@url@innotes}{#1}}%
+
 \DeclareBibliographyOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}%
 \DeclareBibliographyOption{url}[true]{%
@@ -460,7 +479,7 @@
         option keys}}}%
 
 \ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
-  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct}
+  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes}
 
 % For author-date compatibility %
 
@@ -563,16 +582,24 @@
          {\usebibmacro{cite:shorthand}%
            \usebibmacro{cite:save}%
            \global\toggletrue{cms@noidem}}}}%
-    {\iftoggle{cms@allshort}%
-      {\global\toggletrue{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}%
-        \global\toggletrue{cms@printshhand}%
-        \usebibmacro{cite:short}%
-        \usebibmacro{cite:save}}%
-      {\global\toggletrue{cms@fullnote}%
-        \global\togglefalse{cms@shortnote}%
-        \usebibmacro{cite:full}%
-        \usebibmacro{cite:save}}}}%
+     {\ifboolexpr{%
+         togl{cms@firstshort}%
+         and
+         not test {\iffieldundef{shorthand}}%
+       }%
+       {\usebibmacro{cite:shorthand}%
+         \usebibmacro{cite:save}%
+         \global\toggletrue{cms@noidem}}%
+       {\iftoggle{cms@allshort}%
+         {\global\toggletrue{cms@shortnote}%
+           \global\togglefalse{cms@fullnote}%
+           \global\toggletrue{cms@printshhand}%
+           \usebibmacro{cite:short}%
+           \usebibmacro{cite:save}}%
+         {\global\toggletrue{cms@fullnote}%
+           \global\togglefalse{cms@shortnote}%
+           \usebibmacro{cite:full}%
+           \usebibmacro{cite:save}}}}}%
 
 \newbibmacro*{cite:full}{%
   \printtext[bibhypertarget]{%
@@ -1007,11 +1034,17 @@
 \DeclareCiteCommand{\headlessparenshortcite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-    \toggletrue{cms@headlessnote}%
-    \toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \clearname{labelname}%
-    \usebibmacro{cite:short}%
+    \ifboolexpr{%
+      togl{cms@firstshort}%
+      and
+      not test {\iffieldundef{shorthand}}%
+    }%
+    {\usebibmacro{cite:shorthand}}%
+    {\toggletrue{cms@headlessnote}%
+      \toggletrue{cms@shortnote}%
+      \togglefalse{cms@fullnote}%
+      \clearname{labelname}%
+      \usebibmacro{cite:short}}%
     \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
@@ -3510,14 +3543,50 @@
   {\bibstring{cbytranslator}\addspace}%
   {\bibstring{bytranslator}\addspace}}%
 
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditoralt}\addspace}%
-    {\bibstring{byeditoralt}\addspace}}%
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditor}\addspace}%
-    {\bibstring{byeditor}\addspace}}}%
+% \newcommand{\partedit}{%
+%   \iftoggle{cms@postposit}% Kludge to make it work in French.
+%   {\iftoggle{cms@fullnote}%
+%     {\bibstring{cbyeditoralt}\addspace}%
+%     {\bibstring{byeditoralt}\addspace}}%
+%   {\iftoggle{cms@fullnote}%
+%     {\bibstring{cbyeditor}\addspace}%
+%     {\bibstring{byeditor}\addspace}}}%
+
+\protected\def\partedit#1{%
+  \ifcat\noexpand~\noexpand#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addnbspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1H%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1h%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \def\cms@tempa{\part@edit@i\lbx@initnamehook{#1}%
+    \csuse{cms@tempb}#1\csundef{cms@tempb}}%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \cms@tempa%
+}%
+
+\newcommand{\part@edit@i}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbyeditor}\addspace}%
+  {\bibstring{byeditor}\addspace}}%
 
 \newcommand{\partcomp}{%
   \iftoggle{cms@fullnote}%
@@ -4796,37 +4865,39 @@
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
 
 \newbibmacro*{cite+doi+url}{% 16th ed.
-  \iffieldundef{urlyear}%
-  {}%
-  {\printurldate}% Date fix
-  \newcunit\newblock
-  \iftoggle{cms@doionly}%
-  {\iffieldundef{doi}%
+  \iftoggle{cms@url@innotes}%
+  {\iffieldundef{urlyear}%
     {}%
-    {\printfield{doi}%
-      \clearfield{url}}}%
-  {\ifboolexpr{%
-      togl {cms@doi}%
+    {\printurldate}% Date fix
+    \newcunit\newblock
+    \iftoggle{cms@doionly}%
+    {\iffieldundef{doi}%
+      {}%
+      {\printfield{doi}%
+        \clearfield{url}}}%
+    {\ifboolexpr{%
+        togl {cms@doi}%
+        and
+        not test {\iffieldundef{doi}}%
+      }%
+      {\printfield{doi}}%
+      {}}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@eprint}%
       and
-      not test {\iffieldundef{doi}}%
+      not test {\iffieldundef{eprint}}%
     }%
-    {\printfield{doi}}%
+    {\usebibmacro{eprint}}%
+    {}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@url}%
+      and
+      not test {\iffieldundef{url}}%
+    }%
+    {\printfield{url}}%
     {}}%
-  \newcunit\newblock
-  \ifboolexpr{%
-    togl {cms@eprint}%
-    and
-    not test {\iffieldundef{eprint}}%
-  }%
-  {\usebibmacro{eprint}}%
-  {}%
-  \newcunit\newblock
-  \ifboolexpr{%
-    togl {cms@url}%
-    and
-    not test {\iffieldundef{url}}%
-  }%
-  {\printfield{url}}%
   {}}%
 
 \newbibmacro*{chap+pag}{%
@@ -5411,7 +5482,7 @@
   \noinherit{origendmonth}
   \noinherit{origendday}}
 
-\DeclareSortingScheme{cms}{
+\DeclareSortingScheme{cms}{% Updated for biblatex > 2.0
   \sort{
     \field{presort}
   }
@@ -5419,16 +5490,16 @@
     \field{sortkey}
   }
   \sort{
-    \name{sortname}
-    \name{author}
-    \name{namea}
-    \name{editor}
-    \name{nameb}
-    \name{translator}
-    \name{namec}
+    \field{sortname}
+    \field{author}
+    \field{namea}
+    \field{editor}
+    \field{nameb}
+    \field{translator}
+    \field{namec}
     \field{sorttitle}
     \field{journaltitle}
-    \list{organization}
+    \field{organization}
     \field{title}
   }
   \sort{
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
index 7f20c9bff08..9e39b625faf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,13 +1,22 @@
-% $Id: cms-american.lbx,v 0.10.1.36 2016/06/01 11:02:59 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.37 2016/10/12 14:17:45 dfussner Exp $	
 
 \ProvidesFile{cms-american.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
 \DeclareBibliographyExtras{%
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc@long{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc@short{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc@long{long}}%
   \protected\def\mkbibrangeterse{%
@@ -16,6 +25,9 @@
     \lbx@cms@mkbibrangefull}}%
 
 \UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangefull%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
index 4e6e0927947..6150ec53b00 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-british.lbx,v 0.8 2016/06/01 11:06:59 dfussner Exp $	
+% $Id: cms-british.lbx,v 0.11 2017/03/22 18:35:48 dfussner Exp $	
 
 \ProvidesFile{cms-british.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -7,21 +7,47 @@
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong
   \savecommand\cms@datelongalt
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
     \lbx@cms@mkbibrangetrunc{short}}%
   \protected\def\mkbibrangefull{%
     \lbx@cms@mkbibrangefull}%
+  \protected\def\mkbibdatelong#1#2#3{%
+    \iffieldundef{#3}%
+    {}%
+    {\iftoggle{cms@ukord}%
+      {\mkbibordinal{\thefield{#3}}}%
+      {\stripzeros{\thefield{#3}}}%
+      \iffieldundef{#2}{}{\nobreakspace}}%
+    \iffieldundef{#2}%
+    {}%
+    {\mkbibmonth{\thefield{#2}}%
+      \iffieldundef{#1}{}{\space}}%
+    \iffieldbibstring{#1}%
+    {\bibstring{\thefield{#1}}}%
+    {\stripzeros{\thefield{#1}}}}% FIXME: dateeraprintpre{#1}
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
index 7383f84b5f8..531ee84f7ec 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-finnish.lbx,v 0.7 2016/06/01 11:09:39 dfussner Exp $	
+% $Id: cms-finnish.lbx,v 0.8 2017/01/20 12:11:25 dfussner Exp $	
 
 \ProvidesFile{cms-finnish.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -11,6 +11,9 @@
 \InheritBibliographyExtras{finnish}
 
 \DeclareBibliographyExtras{%
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
@@ -39,6 +42,12 @@
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
+  \protected\def\mkdaterangecomp{%  DATE FIX
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%  DATE FIX
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -50,6 +59,9 @@
   \restorecommand\lbx@fromlang
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
+  \restorecommand\mkdaterangecomp%  DATE FIX
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%
   \restorecommand\mkbibrangecomp%  DATE FIX
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
index e9447443c5f..29e3d133d9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-french.lbx,v 0.9.5.30 2016/06/01 17:16:43 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.32 2017/01/19 14:39:59 dfussner Exp $	
 
 \ProvidesFile{cms-french.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -19,9 +19,18 @@
   \protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}%
   \savecommand\cms@datelong
   \savecommand\cms@datelongalt
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull  
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -38,6 +47,9 @@
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
   \togglefalse{cms@postposit}%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%  
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
index ed7f10237df..488276ab52b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.30 2017/01/19 14:51:38 dfussner Exp $	
 
 \ProvidesFile{cms-german.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -9,6 +9,9 @@
 \InheritBibliographyExtras{german}
 
 \DeclareBibliographyExtras{%
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull  
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
@@ -37,6 +40,12 @@
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
+  \protected\def\mkdaterangecomp{%  DATE FIX
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}
   \protected\def\mkbibrangecomp{%  DATE FIX
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -48,6 +57,9 @@
   \restorecommand\lbx@fromlang
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%  
   \restorecommand\mkbibrangecomp%  DATE FIX
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
index 05f0a826771..1effa853728 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-icelandic.lbx,v 0.11 2016/06/01 11:19:41 dfussner Exp $	
+% $Id: cms-icelandic.lbx,v 0.12 2017/01/20 12:22:28 dfussner Exp $	
 
 \ProvidesFile{cms-icelandic.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -18,11 +18,20 @@
 \InheritBibliographyExtras{icelandic}
 
 \DeclareBibliographyExtras{%
-  \savecommand\cms@datelong
-  \savecommand\cms@datelongalt
-  \savecommand\mkbibrangecomp
-  \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangefull
+  \savecommand\cms@datelong%
+  \savecommand\cms@datelongalt%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkbibrangecomp%
+  \savecommand\mkbibrangeterse%
+  \savecommand\mkbibrangefull%
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -33,8 +42,11 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\cms@datelong
-  \restorecommand\cms@datelongalt
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
index 101815445d5..a21a38fb812 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.30 2017/01/19 14:51:38 dfussner Exp $	
 
 \ProvidesFile{cms-ngerman.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -9,6 +9,9 @@
 \InheritBibliographyExtras{ngerman}
 
 \DeclareBibliographyExtras{%
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull  
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
   \savecommand\mkbibrangefull
@@ -37,6 +40,12 @@
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
+  \protected\def\mkdaterangecomp{%  DATE FIX
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}
   \protected\def\mkbibrangecomp{%  DATE FIX
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -48,6 +57,9 @@
   \restorecommand\lbx@fromlang
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%  
   \restorecommand\mkbibrangecomp%  DATE FIX
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
index 848884d4d30..87fec55270e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-norsk.lbx,v 1.7 2016/06/01 11:22:00 dfussner Exp $
+% $Id: cms-norsk.lbx,v 1.8 2017/01/20 12:27:00 dfussner Exp $
 
 \ProvidesFile{cms-norsk.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -9,11 +9,20 @@
 \InheritBibliographyExtras{norsk}
 
 \DeclareBibliographyExtras{%
-  \savecommand\cms@datelong
-  \savecommand\cms@datelongalt
-  \savecommand\mkbibrangecomp
-  \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangefull
+  \savecommand\cms@datelong%
+  \savecommand\cms@datelongalt%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkbibrangecomp%
+  \savecommand\mkbibrangeterse%
+  \savecommand\mkbibrangefull%
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\cms@datelong
-  \restorecommand\cms@datelongalt
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
index 83de0f3ddd1..612ae96e0e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-norwegian.lbx,v 1.7 2016/06/01 11:03:14 dfussner Exp $
+% $Id: cms-norwegian.lbx,v 1.8 2017/01/20 13:28:24 dfussner Exp $
 
 \ProvidesFile{cms-norwegian.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -9,11 +9,20 @@
 \InheritBibliographyExtras{norwegian}
 
 \DeclareBibliographyExtras{%
-  \savecommand\cms@datelong
-  \savecommand\cms@datelongalt
-  \savecommand\mkbibrangecomp
-  \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangefull
+  \savecommand\cms@datelong%
+  \savecommand\cms@datelongalt%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkbibrangecomp%
+  \savecommand\mkbibrangeterse%
+  \savecommand\mkbibrangefull%
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\cms@datelong
-  \restorecommand\cms@datelongalt
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
index e58c034877f..72269bd99ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-nynorsk.lbx,v 1.7 2016/06/01 11:25:40 dfussner Exp $
+% $Id: cms-nynorsk.lbx,v 1.8 2017/01/20 13:31:25 dfussner Exp $
 
 \ProvidesFile{cms-nynorsk.lbx}[2016/06/01 v 3.4 biblatex localization]
 
@@ -9,11 +9,20 @@
 \InheritBibliographyExtras{nynorsk}
 
 \DeclareBibliographyExtras{%
-  \savecommand\cms@datelong
-  \savecommand\cms@datelongalt
-  \savecommand\mkbibrangecomp
-  \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangefull
+  \savecommand\cms@datelong%
+  \savecommand\cms@datelongalt%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkbibrangecomp%
+  \savecommand\mkbibrangeterse%
+  \savecommand\mkbibrangefull%
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\cms@datelong
-  \restorecommand\cms@datelongalt
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
index 6f9d26c70c8..0ccb2f673cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
@@ -11,9 +11,18 @@
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong
   \savecommand\cms@datelongalt
+  \savecommand\mkdaterangecomp
+  \savecommand\mkdaterangeterse
+  \savecommand\mkdaterangefull
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangefull
+  \savecommand\mkbibrangefull  
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\cms@datelong
-  \restorecommand\cms@datelongalt
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangeterse%
   \restorecommand\mkbibrangecomp%
   \restorecommand\mkbibrangefull%
   \restorecommand\mkbibrangeterse}%