biblatex-chicago (20apr20)

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

52 files changed, 45208 insertions, 12946 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 3d075042ee3..054ea601fe2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,52 +1,54 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-is designed for use with the latest version (3.10) of biblatex.  The
-package contains the 16th-edition Chicago style files only, as I have
-removed the long-obsolete 15th-edition styles in preparation for the
-forthcoming 17th-edition revisions.  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 2.10 is
-designed for use with the latest biblatex).
+is designed for use with the latest version (3.14) of biblatex.  The
+package contains the 17th-edition Chicago style files, and I am also
+maintaining the 16th-edition files for those for whom they remain a
+necessity.  I strongly encourage all users to move to the 17th-edition
+styles, as they have received and will continue to receive many new
+features and fixes as compared with the older styles.  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 the required backend for
+all the included styles (version 2.14 is designed for use with the
+latest biblatex).
 
-README (version 1.0rc5, 2018-01-16):
+README (version 2.0, 2020-04-20):
 
 Biblatex-chicago contains three biblatex styles implementing the
-specifications of the Chicago Manual of Style, 16th edition.  The
+specifications of the Chicago Manual of Style, 17th edition.  The
 "notes & bibliography" style was formerly available in the package
 biblatex-chicago-notes-df, and is intended primarily for writers in
 the humanities.  The "author-date" style, generally favored by writers
-in the sciences and social sciences, comes in two flavors.  The 16th
-edition of the Manual has brought the presentation of sources in this
-style much more into line with the notes & bibliography specification,
-especially regarding the formatting of titles.  If you still require
-titles to be capitalized sentence style, and article titles, for
-example, not to be enclosed in quotation marks, then you may now use
-the traditional author-date style ("authordate-trad"), which provides
-these features while in all other respects following the 16th-edition
-specifications.
+in the sciences and social sciences, comes in two flavors.  Recent
+editions of the Manual have brought the presentation of sources in
+this style much more into line with the notes & bibliography
+specification, especially regarding the formatting of titles.  If you
+still require titles to be capitalized sentence style, and article
+titles, for example, not to be enclosed in quotation marks, then you
+may now use the traditional author-date style ("authordate-trad"),
+which provides these features while in all other respects following
+the 17th-edition specifications.
 
-This is a beta release, but its feature set is already fairly
-extensive.  If you have used the package before you may, after
-perusing the RELEASE file, want to look at the changelog at the end of
-biblatex-chicago.pdf, which contains cross-references to more detailed
-explanations about how this update will affect parts of your .bib
-file.  If you are just getting started, the best way to learn the
-system is to read the Quickstart section in that same file, then read
-either cms-notes-intro.pdf or cms-dates-intro.pdf, each of which are
-fully cross-referenced and contain links to the complete reference
-guide to both styles in sections 4 or 5 of biblatex-chicago.pdf.  The
-package also contains annotated .bib files (notes-test.bib and
-dates-test.bib) which each offer over 100 entries demonstrating how to
-present a wide range of sources, nearly all of them taken from the
-Chicago Manual of Style itself, so that you can compare the output of
-your system (cms-notes-sample.tex, cms-dates-sample.tex,
-cms-trad-sample.tex) or my system (cms-notes-sample.pdf,
-cms-dates-sample.pdf, cms-trad-sample.pdf) with the actual examples in
-the Manual.
+The package is under active development, but its feature set is
+already fairly extensive.  If you have used the package before you
+may, after perusing the RELEASE file, want to look at the changelog at
+the end of biblatex-chicago.pdf, which contains cross-references to
+more detailed explanations about how this update will affect parts of
+your .bib file.  If you are just getting started, the best way to
+learn the system is to read the Quickstart section in that same file,
+then read either cms-notes-intro.pdf or cms-dates-intro.pdf, each of
+which are fully cross-referenced and contain links to the complete
+reference guide to both styles in sections 4 or 5 of
+biblatex-chicago.pdf.  The package also contains annotated .bib files
+(notes-test.bib and dates-test.bib) which each offer over 100 entries
+demonstrating how to present a wide range of sources, nearly all of
+them taken from the Chicago Manual of Style itself, so that you can
+compare the output of your system (cms-notes-sample.tex,
+cms-dates-sample.tex, cms-trad-sample.tex) or my system
+(cms-notes-sample.pdf, cms-dates-sample.pdf, cms-trad-sample.pdf) with
+the actual examples in the Manual.
 
 I have, wherever possible, attempted to maintain backward
 compatibility with the standard biblatex styles, but there are a
@@ -65,22 +67,23 @@ the head of biblatex-chicago.pdf.
 
 Installation:
 
-With the recent proliferation of files, I have adopted the directory
-structure found in biblatex.zip, so if you want to place these files
-in your TeX directory tree instead of in your working directory, I
-recommend the following, which should be familiar from the main
-biblatex package:
+If you want to place these files in your TeX directory tree instead of
+in your working directory, I recommend the following, which should be
+familiar from other packages:
 
- - The twenty files biblatex-chicago.sty, chicago-notes.cbx,
-   chicago-notes.bbx, chicago-authordate.cbx, chicago-authordate.bbx,
-   chicago-authordate-trad.cbx, chicago-authordate-trad.bbx,
-   chicago-dates-common.cbx, cms-american.lbx, cms-brazilian.lbx,
-   cms-british.lbx, cms-finnish.lbx, cms-french.lbx, cms-german.lbx,
+ - The thirty files biblatex-chicago.sty, cmsendnotes.sty,
+   chicago-notes.cbx, chicago-notes.bbx, chicago-authordate.cbx,
+   chicago-authordate.bbx, chicago-authordate-trad.cbx,
+   chicago-authordate-trad.bbx, chicago-dates-common.cbx,
+   chicago-notes16.cbx, chicago-notes16.bbx, chicago-authordate16.cbx,
+   chicago-authordate16.bbx, chicago-authordate-trad16.cbx,
+   chicago-authordate-trad16.bbx, chicago-dates-common16.cbx,
+   cms-american.lbx, cms-brazilian.lbx, cms-british.lbx,
+   cms-dutch.lbx, cms-finnish.lbx, cms-french.lbx, cms-german.lbx,
    cms-icelandic.lbx, cms-ngerman.lbx, cms-norsk.lbx,
-   cms-norwegian.lbx, cms-nynorsk.lbx, and cms-swedish.lbx are located
-   in the latex/ subdirectory, itself further subdivided into bbx/,
-   cbx/, and lbx/.  The entire contents of this latex/ directory,
-   including its subdirectories, can go in
+   cms-norwegian.lbx, cms-nynorsk.lbx, cms-swedish.lbx, and
+   cmsdocs.sty are located in the latex/ subdirectory.  The entire
+   contents of this latex/ directory can go in
    <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago, where
    <TEXMFLOCAL> is the root of your local TeX installation -- for
    example, and depending on your system, /usr/share/texmf-local,
@@ -89,21 +92,21 @@ biblatex package:
    remember to update your TeX file name database so that TeX can find
    them.
 
- - The twenty files biblatex-chicago.tex, biblatex-chicago.pdf,
+ - The twenty-one files biblatex-chicago.tex, biblatex-chicago.pdf,
    cms-notes-intro.tex, cms-notes-intro.pdf, cms-dates-intro.tex,
    cms-dates-intro.pdf, cms-trad-appendix.tex, cms-trad-appendix.pdf,
    cms-notes-sample.tex, cms-dates-sample.tex, cms-trad-sample.tex,
    cms-legal-sample.tex, cms-notes-sample.pdf, cms-dates.sample.pdf,
-   cms-trad-sample.pdf, cms-legal-sample.pdf, notes-test.bib,
-   dates-test.bib, legal-test.bib, and cmsdocs.sty can all be found in
-   the doc/ directory in the package archive, the last 18 in the
-   examples/ subdirectory.  You can place all of this in
+   cms-trad-sample.pdf, cms-legal-sample.pdf, cms-noteref-demo.tex,
+   cms-noteref-demo.pdf, notes-test.bib, dates-test.bib, and
+   legal-test.bib can all be found in the doc/ directory in the
+   package archive.  You can place all of this in
    <TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago.
 
 Changelog: See the RELEASE file, and also the end of
 biblatex-chicago.pdf.
 
-Copyright (c) 2008-2018 David Fussner.  This package is
+Copyright (c) 2008-2020 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 6c2ad051b20..428571c0fbd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,351 @@
+Release notes for version 2.0 [2020-04-20]:
+
+With this release biblatex-chicago now by default follows the 17th
+edition of the Manual.  If for any reason you need to keep using the
+16th-edition styles, they are still available by calling "notes16,"
+"authordate16," or "authordate-trad16" when you load biblatex-chicago.
+All six available styles require the latest biblatex (3.14) and also
+biber (2.14) as the backend -- other backends will no longer work
+properly in any style.  I strongly encourage you to use the
+17th-edition styles if at all possible, simply because nearly all of
+my development time has been spent on them, and they contain a great
+many fixes and enhancements that haven't made it back into the
+16th-edition styles.  In what follows you'll see what changes you'll
+need to make to update your documents for the new edition.  In truth,
+the changes between these two editions have been largely additive, so
+the actual changes required in your .bib databases or documents will
+in most cases be very few indeed.  After outlining the modifications
+you may need to make, I'll list the enhancements available in the
+various styles, including a short discussion of the changes to the
+16th-edition styles.
+
+Converting from the 16th to the 17th edition:
+
+ - The 17th edition of the Manual no longer encourages use of "ibid."
+   to replace repeated citations of the same work in the notes &
+   bibliography style, preferring instead to use the author's name
+   alone, along with any page number(s).  If you wish to continue
+   using "ibid." in that style, you need to set the new option
+   "useibid=true" when loading biblatex-chicago in your preamble.
+
+ - If you are loading the package the old-fashioned way, with biblatex
+   and the "style=" option instead of with biblatex-chicago, please be
+   aware that there are two standard packages required by
+   biblatex-chicago that aren't automatically loaded by biblatex:
+   "xstring" and "refname".  You'll need to load them in your preamble
+   yourself.
+
+ - If you've been using the "year" field to present decades like
+   "1950s", this will no longer work accurately in author-date
+   citations.  The correct way to do so now is to use one of
+   biblatex's ISO8601-2 date specifications in the "date" field
+   instead, to wit, "195X".  Generally, I've tried to make "year"
+   fields like "[1957?]" or "[ca. 1850]" continue to work properly,
+   but here too the best thing to do is to use the new "date" features
+   and present them like "1957?" or "1850~", respectively.  This will
+   ensure that both sorting and punctuation work out properly.  See
+   table 3 in biblatex-chicago.pdf, and the "date" docs in sections
+   4.2 and 5.2 of the same document.
+
+ - If you have been using the "nameaddon" field to hold time stamps
+   for online comments, then you should put the time stamp into the
+   "date" or possibly "eventdate" field, instead, using the ISO8601-2
+   format implemented by biblatex.  See the "date" and "nameaddon"
+   field docs in sections 4.2 and 5.2 of biblatex-chicago.pdf, along
+   with tables 1, 2, and 3.
+
+ - Following on from the previous item, the 17th edition of the Manual
+   includes more plentiful and more detailed instructions for
+   presenting online materials than were available in previous
+   editions.  For users of biblatex-chicago this means that there is
+   now guidance for many more sorts of material than before, so if you
+   have been improvising citations of this sort of material in
+   previous releases it will be worth checking to see whether there
+   are now clearer instructions available.  Tables 1 and 2 summarize
+   the new specifications for the notes & bibliography and author-date
+   styles, respectively.  Cf. in particular the new "commenton"
+   "relatedtype" in sections 4.2.1 and 5.2.1 of biblatex-chicago.pdf.
+   Also, the Online entry type now prints both "author" and "editor"
+   (or other editorial role) if they exist, and I've moved the
+   "addendum" field _before_ the "url", which fits better with
+   indications in the Manual.  If you've been using the "addendum"
+   field to present citations of other entries (as in older versions
+   of biblatex-chicago), please switch to the "related" mechanism,
+   which works better anyway.
+
+ - On the same subject, if you are using the notes & bibliography
+   style and are retaining the "crossref" field (instead of using the
+   "commenton" "relatedtype") in Review entries as a means of
+   presenting comments on blogs, such entries are now subject to the
+   settings of the "longcrossref" option and will appear in
+   abbreviated form in some full notes and in the bibliography, as has
+   always occurred in InCollection entries, for example.  You can set
+   "longcrossref" to "true" to get back the old behavior.
+
+ - The 17th edition generally encourages more strongly than the 16th
+   the use of only one publisher in the "publisher" field.  If you
+   decide to retain more than one, and one of them is a part of an
+   academic publishing consortium, it encourages you to specify this
+   relationship rather than merely listing the two using the keyword
+   "and" in the field.  Please see the documentation of the field in
+   sections 4.2 and 5.2 of biblatex-chicago.pdf for the rather minor
+   (and rare) changes this might mandate for your .bib files.
+
+ - The 17th-edition presentation of Music entries has added a few
+   pieces of information it seems to find desirable -- track number in
+   "chapter" and specification of a lead performer's role in, e.g.,
+   "editortype" -- though the basic structure of a 16th-edition .bib
+   entry remains unchanged.  Please see the documentation of that
+   entry type in sections 4.1 and 5.1 in biblatex-chicago.pdf.
+
+ - The 17th edition has added a couple of wrinkles to the Video type
+   specifications.  You can now put the broadcast network of a TV show
+   in the "usera" field, and you can also supply the new
+   "entrysubtype" "tvepisode" to print the series title ("booktitle")
+   _before_ the episode title ("title").  Please see the documentation
+   of the entry type in sections 4.1 and 5.1 in biblatex-chicago.pdf.
+
+ - Both Chicago styles now sentence-case the "title" field in Patent
+   entries, so you may need to put curly braces around words that
+   shouldn't appear in lowercase.
+
+ - The "pubstate" field now has a more generalized functionality,
+   while maintaining the specialized uses present in earlier releases.
+   In particular, please note now that almost anything you put in the
+   field will be printed somewhere in the entry, and in the case of
+   the author-date styles may appear in a somewhat different part of
+   the entry than that to which you may have become accustomed.  If
+   you wish to move this data back to the end of the entry in the
+   author-date styles, then the "addendum" field might be of service.
+   The documentation in sections 4.2 and 5.2 of biblatex-chicago.pdf
+   should help.
+
+Other new features common to all styles:
+
+ - Wouter Lancee has very generously provided a Dutch localization for
+   biblatex-chicago, called cms-dutch.lbx.  You can use it by
+   including "dutch" when loading babel.  Gustavo Barros has also very
+   kindly provided a much-revised version of his cms-brazilian.lbx.
+
+ - As mentioned above, this release for the first time implements
+   biblatex's elegant and long-standing support for the ISO8601-2
+   Extended Format date specification, which means there are now
+   greatly enhanced possibilities for presenting uncertain and
+   unspecified dates and date ranges, along with date eras, seasons,
+   time stamps, and time zones.  Table 3 in biblatex-chicago.pdf
+   summarizes the implementation for all Chicago styles, but see also
+   the "date" field in sections 4.2 and 5.2, along with the new
+   package options "alwaysrange", "centuryrange", "decaderange",
+   "nodatebrackets", and "noyearbrackets".
+
+ - I have also implemented year-range compression in all styles,
+   governed by the new "compressyears" option, set to "true" by
+   default.
+
+ - Constanza Cordoni requested a way to turn off the printing of the
+   3-em dash for repeated names in the bibliography or reference list,
+   and the Manual concedes that some publishers prefer this style.
+   Some of biblatex's standard styles have a "dashed" option, so for
+   compatibility purposes I've provided the same.  By default, I have
+   set it to "true" to print the name dash, but you can set
+   "dashed=false" in your preamble to repeat names instead throughout
+   your document.
+
+ - Jan David Hauck suggested I extend the field-exclusion
+   functionality beyond the package options already provided by
+   biblatex-chicago (sections 4.4.2 and 5.4.2 of
+   biblatex-chicago.pdf).  First, I made sure that all of those
+   options could be set globally, per type, and per entry.  Second, I
+   added the command \suppressbibfield, designed to
+   appear in the preamble, and which will look something like:
+
+    \suppressbibfield[entrytype,entrytype,...]{field,field,field,...}
+
+   Please see sections 4.3.1 and 5.3.1 in the pdf for the details.
+
+ - After a request by user BenVB, I have added support for the
+   biblatex "shortseries" field, which allows you to present
+   abbreviated "series" in book-like entries in all the styles.  You
+   can use the "seriesabbrev" option to control where in your document
+   these abbreviated forms will appear.  By default, the field is
+   ignored in all styles.  You can also print a list of series
+   abbreviations, rather in the manner of a list of shorthands, using
+   a command like: \printbiblist{shortseries}.  Please see
+   "shortseries" in sections 4.2 and 5.2 of biblatex-chicago.pdf.
+
+ - I have added a new preamble option, "cmsbreakurl", which attempts
+   to follow the Manual's instructions for line-breaking inside URLs.
+   It doesn't work 100% accurately, and it doesn't play well with the
+   ragged2e package, but in most circumstances it is at least closer
+   to the Chicago ideal than the biblatex defaults.  See sections
+   4.4.3 and 5.4.3 in biblatex-chicago.pdf.
+
+ - The Manual now specifies how to present Articles with a unique
+   numeric or alphanumeric ID, which you can place in the "eid" field.
+   If you've been using this field in previous releases you'll notice
+   that the ID has moved to a different place in long notes,
+   bibliography, and list of references.
+
+ - In Jurisdiction entries, the presentation of the "title" changes
+   depending on whether it appears in a stand-alone citation or as
+   part of the flow of running text, no matter whether the citation is
+   in the main body or in a note.  I have provided the \runcite
+   command, in both Chicago styles, for Jurisdiction citations that
+   appear in running text.
+
+ - N. Andrew Walsh suggested that I allow editorial roles that aren't
+   pre-defined \bibstrings to appear as-is in entries, just as the
+   standard biblatex styles do.  I have followed this advice for the
+   "editortype", "editoratype", "editorbtype", "editorctype", and
+   "nameatype" fields, making sure to capitalize the string according
+   to its context.
+
+ - I have added the "venue" field to Misc entries, both with and
+   without an "entrysubtype".  It also appears in the new Performance
+   type.
+
+ - I have added the "version" and "type" fields to Book entries to
+   help with multimedia app content.  This material fits quite well in
+   such entries but needs extra fields to present information about
+   the version of the app and also the system type on which it runs.
+   I added the "type" field to Article, Review, and Online entries for
+   presenting medium information for online multimedia.
+
+ - I have added support for biblatex's new entry type, Dataset, to
+   allow the citation of scientific databases.  See the docs in
+   sections 4.1 and 5.1 of biblatex-chicago.pdf
+
+ - I have added the "number" field to Misc entries with an
+   "entrysubtype" to help cope with the varieties of location
+   information in different archives.  See the Misc docs in sections
+   4.1 and 5.1.
+
+ - The new entry type Standard is now available to cite standards
+   published by national or international standards organizations.  If
+   you have been using the Book type for such material it might be
+   worth switching to make sure your entries are more in line with the
+   Manual's specifications.  See sections 4.1 and 5.1 of
+   biblatex-chicago.pdf for the details.
+
+ - The new entry type Performance is now available for citing live
+   performances.  You can sometimes also use a Misc entry without an
+   "entrysubtype".  Cf. sections 4.1 and 5.1.
+
+ - I have added the "eventdate" field to the Audio entry type to help
+   it cope with the presentation of podcasts, which are new to the
+   17th edition.  Please see the documentation of the entry type in
+   sections 4.1 and 5.1.
+
+ - I have added the "origdate", "eventdate", "userd", and
+   "howpublished" fields to the Artwork and Image entry types, in
+   response to additional information given in some of the Manual's
+   examples.  Please see the documentation of Artwork in sections 4.1
+   and 5.1.
+
+ - I have added the "maintitle", "mainsubtitle", and "maintitleaddon"
+   fields to the Article, Periodical, and Review entry types, where it
+   (they) will hold the the name of any larger (usually periodical)
+   publication of which a blog is a part.  This departs from standard
+   biblatex usage, but the need for two italicized titles demanded
+   something like it.
+
+ - I have added a new field-exclusion option, "urlstamp", set to
+   "true" by default, which means that any time stamp associated with
+   the "urldate" will always be printed.  You can set it to "false" in
+   the preamble either for the whole document or for specific entry
+   types, or in the "options" field of individual entries.  See the
+   docs in sections 4.4.2 and 5.4.2.
+
+ - The "howpublished" field has accumulated a series of new functions
+   in various entry types, bringing it far from its origins in
+   Booklet, Misc, and Unpublished entries.  Please see its
+   documentation in sections 4.2 and 5.2.
+
+ - In InReference, MVReference, and Reference entries biblatex-chicago
+   no longer considers any of the name fields ("author", "editor",
+   etc.) for sorting purposes in the bibliography or reference list,
+   thus leaving the "title" as the first field to be considered.  This
+   may simplify the creation of .bib database entries.
+
+New notes & bibliography features:
+
+ - In keeping with indications in the 17th edition of the Manual, I
+   have provided a means for altering the syntax when presenting
+   multi-volume works, i.e., for presenting the title of the whole
+   series ("maintitle") _before_ the title of individual volumes of
+   that series ("title" or "booktitle").  This involves the use of the
+   new "relatedtypes" "maintitle" and "maintitlenc", which may be used
+   in BookInBook, InBook, InCollection, InProceedings, Letter, MVBook,
+   MVCollection, MVProceedings, and MVReference entries.  Please see
+   the detailed documentation of this feature in section 4.2.1,
+   s.v. "relatedtype" "maintitle".
+
+ - I have implemented a new system of back references from short notes
+   to long notes to help readers find fuller information about a
+   source more quickly and conveniently, as envisaged by the Manual.
+   The feature is enabled with the "noteref" option, and there are
+   several sub-options to control where and what is printed:
+   "fullnoterefs", "noterefinterval", "noterefintro", "pagezeros",
+   "hidezeros", and "endnotesplit".  The dependent package
+   cmsendnotes.sty can assist if you use endnotes instead of footnotes
+   in this context.  It too has numerous options: "hyper",
+   "enotelinks", "noheader", "blocknotes", "split", "subheadername",
+   "headername", "runningname", and "nosubheader", alongside the new
+   commands \theendnotesbypart and \cmsintrosection.  Four new
+   citation commands complete the provisions: \shortrefcite,
+   \shorthandrefcite, \shortcite*, and \shorthandcite*.  Please see
+   section 4.4.4 of biblatex-chicago.pdf for all the details, and also
+   cms-noteref-demo.pdf for a brief example and explanation of some of
+   the functionality.
+
+ - I have ported, with modifications, the author-date package option
+   "nodates" to the notes & bibliography style.  It is set to "true"
+   by default.  In conjunction with the "nodatebrackets" and
+   "noyearbrackets" options it provides an alternative presentation of
+   uncertain dates.  See section 4.4.2.
+
+ - Pursuant to a bug report by David Purton, I have recoded the
+   various \headlesscite commands and included a new one,
+   \Headlesscite, which is the actually functional way to enforce
+   capitalization at the start of such a citation, should you need to
+   do so.
+
+New author-date features:
+
+ - The "verbc" field, which is standard but unused in the styles
+   included in biblatex, allows the user fine-grained control over if
+   and when an "extradate" letter (1976_a_) will appear after the year
+   in citations and the list of references.  See its documentation in
+   section 5.2 of biblatex-chicago.pdf.
+
+ - The new "authortitle" type and entry option allows you to provide
+   author-title citations in the text instead of author-date.  The
+   "entrysubtype" value "classical" does the same, but there may be
+   cases where using such an "entrysubtype" is impossible.  This is
+   set to "true" by default for Dataset entries.
+
+ - On the same subject, you can also use the new citation commands
+   \atcite and \atpcite to achieve the same end.  The former prints a
+   plain citation, the latter places it in parentheses.
+
+ - In the default configuration, when you use a "shorthand" field the
+   style will now sort properly by that field, which is the first
+   thing to appear in reference list entries.  If you set
+   "cmslos=false" in your preamble then this no longer applies, as the
+   "shorthand" no longer appears in the reference list.
+
+Note on the 16th-edition files:
+
+ - These have been updated for compatibility with the latest biblatex
+   and biber, and there are also a number of bug fixes included, many
+   of them already mentioned in changelog items above.  The
+   "compressyears" option is available and turned on by default, and
+   so is the "dashed" option.  Most of the new ISO8601-2 Extended
+   Format date specifications are available, also, though time stamps
+   won't be printed, as that edition of the Manual is mostly silent
+   about them.
+
+
 Release notes for version 1.0rc5 [2018-01-16]:
 
  - Recent releases of biblatex have introduced some compatibility
@@ -1067,7 +1415,7 @@ Other New Features:
    in the "location" field.  If you want to cite a comment to a blog
    or to other online material, the Review entry type, "entrysubtype"
    "magazine" will serve.  The "eventdate" dates the comment, and any
-   timestamp that is required can go in "nameaddon."  These
+   time stamp that is required can go in "nameaddon."  These
    instructions work in both styles.
 
  - Photographs are no longer presented differently from other sorts of
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 0d6c6e3b9bc..701d69be2e9 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 7e4d189b2ad..2879b923a1e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -1,7 +1,7 @@
 %
 % This file documents the biblatex-chicago package, which allows users
 % of the biblatex package to format references according to the
-% Chicago Manual of Style, 16th edition.
+% Chicago Manual of Style, 17th edition.
 %
 \documentclass[a4paper]{article}
 \usepackage[T1]{fontenc}
@@ -9,18 +9,25 @@
 \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
+\usepackage{tabularx}
+\usepackage{threeparttable}
+\usepackage{booktabs}
+\usepackage{afterpage}
+%\usepackage[showframe=true]{geometry}
 \usepackage{vmargin}
 \setpapersize{A4}
 \setmarginsrb{1.65in}{.9in}{1.75in}{.6in}{0pt}{0pt}{12pt}{24pt}
 \setlength{\marginparwidth}{1in}
-\usepackage[colorlinks,urlcolor=blue,linkcolor=blue]{hyperref}
+\setlength{\belowcaptionskip}{1em}
+\usepackage[pdftex,colorlinks,urlcolor=blue,linkcolor=blue,%
+filecolor=Teal]{hyperref}
 % \usepackage{lmodern}
 \usepackage[scaled=0.9]{ClearSans}
 \usepackage[p]{zlmtt}
 \usepackage{gentium}
 %\usepackage[osf]{mathpazo}
 %\usepackage[scaled]{helvet}
-\usepackage[pdftex]{xcolor}
+\usepackage[pdftex,hyperref,svgnames]{xcolor}
 %\usepackage[dvips]{xcolor}
 \newcommand{\mycolor}[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{multicol}
@@ -31,6 +38,11 @@
 \newcommand{\colmarginpar}[1]{\mymarginpar{\mycolor{#1}}}
 \newcommand{\mybigspace}{\vspace{\baselineskip}}
 \newcommand{\mylittlespace}{\vspace{.5\baselineskip}}
+\newcolumntype{L}{>{\raggedright}p}
+\newcolumntype{H}{>{\sffamily\bfseries}l}
+%\renewcommand{\textfraction}{0.0}
+%\renewcommand{\topfraction}{1.0}
+\setlength{\intextsep}{0pt}
 \makeatletter
 \renewcommand{\section}{\@startsection
   {section}%
@@ -60,6 +72,16 @@
   {\baselineskip}%3.25ex \@plus1ex \@minus.2ex}%
   {0mm}%
   {}}%
+\long\def\@makecaption#1#2{%
+  \vskip -3.5\abovecaptionskip
+  \sbox\@tempboxa{\sffamily\bfseries #1: #2}%
+  \ifdim \wd\@tempboxa >\hsize
+    #1: #2\par
+  \else
+    \global \@minipagefalse
+    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+  \fi
+  \vskip\belowcaptionskip}
 \makeatother
 \begin{document}
 \begin{center}
@@ -67,7 +89,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 1.0rc5 (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 2.0\\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -75,42 +97,42 @@
 \begin{multicols}{2}
 \footnotesize
 \tableofcontents
+\listoftables
 \end{multicols}
 \normalsize
 \vspace{-.5\baselineskip}
 \section{Notice}
 \label{sec:Notice}
 
-\textbf{Please be advised that this package is beta software.  The
+\textbf{This package is still under active development.  The
   \textsf{biblatex} package by Philipp Lehman, Philip Kime, Audrey
-  Boruvka, and Joseph Wright is now quite stable, but I am still in
-  the process of taking advantage of the many enhancements it has
-  accumulated in recent releases.  As it has for several years, The
-  \textsf{biblatex-chicago} package itself implements the 16th edition
-  of the \emph{Chicago Manual of Style}, which has recently been
-  replaced by the 17th edition.  This is therefore the last feature
-  release for the 16th edition, though bug-fix releases will continue
-  for a while yet.  In preparation for the switch to the 17th edition,
-  I am removing all 15th-edition files from the package, as they have
-  long since been obsolete.  I also very strongly encourage all users
-  who haven't already done so to switch to \textsf{Biber} as their
-  backend; it has long been a requirement for the author-date styles,
-  but it is now becoming indispensable for accessing all the features
-  of the notes \&\ bibliography style, as well.}
-\mylittlespace\\
-\textbf{I have tried to implement as much of the \emph{Manual's}
-  specification as possible, though undoubtedly some gaps remain.  If
-  it seems like this package could be of use to you, yet it doesn't do
-  something you need/want it to do, please feel free to let me know,
-  and of course any suggestions for solving problems more elegantly or
-  accurately would be most welcome.}
+  Boruvka, and Joseph Wright is now quite stable, but my task of
+  incorporating the many enhancements it has accumulated in recent
+  releases is ongoing.  The \textsf{biblatex-chicago} package itself
+  now implements the 17th edition of the \emph{Chicago Manual of
+    Style}, though I have made it possible to continue to use the 16th
+  edition files if that is imperative for you.  The package relies
+  heavily, in all styles, on using \textsf{biber} as its backend;
+  other backends will not work properly.}
+
+\mylittlespace \textbf{I have tried to implement as much of the
+  \emph{Manual's} specification as possible, though undoubtedly some
+  gaps remain.  If it seems like this package could be of use to you,
+  yet it doesn't do something you need/want it to do, please feel free
+  to let me know, and of course any suggestions for solving problems
+  more elegantly or accurately would be most welcome.}
 
 \mylittlespace\textbf{Important Note:} If you have used
 \textsf{biblatex-chicago} before, please make sure you have read the
 RELEASE file that came with the package.  It details the changes
 you'll need to make to your .bib database in order for it to work
-properly with this release.  If you are new to these styles, please
-read on.
+properly with this release.  I do strongly recommend that you switch
+to the new edition.  The changes, as you can see from the RELEASE
+file, in the main involve \emph{additions} to the specification, with
+required alterations to your existing .bib databases actually being
+rather rare.  If, on the other hand, you are new to these styles or to
+\textsf{biblatex} itself, please do continue reading at least the
+following section.
 
 \section{Quickstart}
 \label{quickstart}
@@ -132,13 +154,12 @@ author-date styles produce a short, in-text citation inside
 parentheses --- (Author Year) --- keyed to a list of references where
 entries start with the same name and year.
 
-%\enlargethispage{-\baselineskip}
-
 \mylittlespace The documentation you are reading covers all three of
 these Chicago styles and their variants.  I recommend that users new
 to the package read this Quickstart section first, perhaps then
 passing on to whichever of the two introductory files,
-\textsf{cms-notes-intro.pdf} or \textsf{cms-dates-intro.pdf}, is
+\href{file:cms-notes-intro.pdf}{\textsf{cms-notes-intro.pdf}} or
+\href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}}, is
 relevant to their needs, returning here afterward for more details on
 those parts of the functionality concerning which they still have
 questions.  Much of what follows is relevant to all users, but I have
@@ -153,18 +174,25 @@ author-date section, the \textsf{authordate-trad} information really
 only appears separately in section~\ref{sec:fields:authdate}, s.v.\
 \enquote{title.} Throughout the documentation, any \mycolor{green}
 text \colmarginpar{\textsf{New!}} indicates something \mycolor{new} in
-this release.
+this release, while \textcolor{Teal}{\textbf{blue-green}} text is a
+clickable link to an external document.
 
 \mylittlespace Here's a list of things you will need in order to use
 \textsf{biblatex-chicago}:
 
 \begin{itemize}{}{}
 \item The \textsf{biblatex} package, of course!  The current version
-  --- 3.10 at the time of writing --- has received extensive testing,
+  --- 3.14 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:
+  Please don't use any earlier version.  \textsf{Biblatex} requires
+  several packages, and it strongly recommends several more:
   \begin{itemize}{}{}
+  \item \textsf{biber} --- the next-generation \textsc{Bib}\TeX\
+    replacement by Philip Kime and François Charette, available from
+    SourceForge (required).  You should use the latest version, 2.14,
+    to work with \textsf{biblatex} 3.14 and \textsf{biblatex-chicago};
+    please note that any other backend will not produce accurate
+    results.
   \item e-\TeX\ (required)
   \item \textsf{etoolbox} --- available from CTAN (required)
   \item \textsf{keyval} --- a standard package (required)
@@ -173,63 +201,63 @@ this release.
   \item \textsf{babel} --- a standard package (\emph{strongly}
     recommended)
   \item \textsf{csquotes} --- available from CTAN (recommended).
-    Please upgrade to the latest version of \textsf{csquotes} (5.1b).
-  \item \textsf{bibtex8} --- a replacement for \textsc{Bib}\TeX, which
-    can, with the right com\-mand-line switches, process very large
-    .bib files.  It also does the right thing when alphabetizing
-    non-ASCII entries.  It is available from CTAN, but please be aware
-    that this database parser no longer suffices if you are using the
-    Chica\-go author-date style with any version of \textsf{biblatex}
-    from version 1.5 onward.  For that style, and to take full
-    advantage of all the features of the notes \&\ bibliography style,
-    in particular its enhanced handling of cross references, you must
-    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.10, to work
-    with \textsf{biblatex} 3.10 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
-    \textsf{cms-dates-intro.pdf} and, for example, the
-    \textsf{crossref} documentation in section~\ref{sec:entryfields},
-    below, for more details.
+    Please upgrade to the latest version of \textsf{csquotes} (5.2j).
+  \end{itemize}
+\item With the changes both to \textsf{biblatex} and to
+  \textsf{biblatex-chicago} in this release, \textsf{biblatex-chicago}
+  itself now requires two packages, which are both loaded for you if
+  you load \textsf{biblatex-chicago.sty}, but which you'll have to
+  load manually if not.  They are:
+  \begin{itemize}{}{}
+  \item \mycolor{\textsf{nameref}} --- a standard package, available
+    in CTAN.
+  \item \mycolor{\textsf{xstring}} --- also standard and available in
+    CTAN.
   \end{itemize}
 \item The line:
   \begin{quote}
-    \cmd{usepackage[notes]\{biblatex-chicago\}}
+    \verb+\usepackage[notes,backend=biber]{biblatex-chicago}+
   \end{quote}
   in your document preamble to load the notes \&\ bibliography style,
   the line:
   \begin{quote}
-    \cmd{usepackage[authordate,backend=biber]\{biblatex-chicago\}}
+    \verb+\usepackage[authordate,backend=biber]{biblatex-chicago}+
   \end{quote}
   to load the author-date style, or the line:
   \begin{quote}
-    \cmd{usepackage[authordate-trad,%
-      backend=biber]\{biblatex-chicago\}}
+    \verb+\usepackage[authordate-trad,backend=biber]{biblatex-chicago}+
   \end{quote}
 
-  to load the traditional variant of the author-date style.  Any other
-  options you usually pass to \textsf{biblatex} can be given to
-  \textsf{biblatex-chicago} instead, but loading it this way sets up a
-  large number of other parameters automatically, parameters whose
-  absence may surprise you when processing your documents.  You can
-  load the package via the usual \cmd{usepackage\{bibla\-tex\}},
-  adding either \texttt{style=chi\-cago-notes} or
-  \texttt{style=chicago-authordate}, but this is intended 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
+  to load the traditional variant of the author-date style.  If you
+  add \enquote{\texttt{16}} to any of the keys above, e.g.,
+  \begin{quote}
+    \verb+\usepackage[authordate16,backend=biber]{biblatex-chicago}+
+  \end{quote}
+  you can continue to use the 16th-edition styles, if that should
+  prove necessary.  Any other options you usually pass to
+  \textsf{biblatex} can be given to \textsf{biblatex-chicago} instead,
+  but loading it this way sets up a large number of other parameters
+  automatically, parameters whose absence may surprise you when
+  processing your documents.  You can load the package via the usual
+  \verb+\usepackage{biblatex}+, adding either
+  \texttt{style=chicago-notes} or \texttt{style=chicago-authordate},
+  but this is intended 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, and please also remember to load
+  \mycolor{\textsf{xstring}} and \mycolor{\textsf{nameref}} manually
+  if you use this latter method.
+\item You can use
+  \verb+\usepackage[notes,short,backend=biber]{biblatex-chicago}+ to
   get the short note format even in the first reference of a notes \&\
   bibliography document, letting the bibliography provide the full
   reference.
 \item If you are accustomed to using the \textsf{natbib} compatibility
   option with \textsf{biblatex}, then you can continue to do so with
   \textsf{biblatex-chicago}.  If you are using
-  \cmd{usepackage\hfill\{biblatex-chicago\}} to load the package, then the
-  option must be the plain \texttt{natbib} rather than
+  \cmd{usepackage\hfill\{biblatex-chicago\}} to load the package, then
+  the option must be the plain \texttt{natbib} rather than
   \texttt{natbib=true}.  If you use the latter, you'll get a
   \textsf{keyval} error.  Please see sections~\ref{sec:useropts} and
   \ref{sec:authuseropts}, below.
@@ -239,84 +267,104 @@ this release.
   \textsf{babel}-less setups, and also those choosing \texttt{english}
   as the main text language, should work out of the box.
   \textsf{Biblatex-chicago} also provides (at least partial) support
-  for Brazilian Portuguese, British, Finnish, French, German,
-  Icelandic, Norwegian, and Swedish.  Please see below
+  for Brazilian Portuguese, British, \mycolor{Dutch}, Finnish, French,
+  German, Icelandic, Norwegian, and Swedish.  Please see below
   (section~\ref{sec:international}) for a fuller explanation of all
   the options.
-\item \textsf{chicago-authordate.bbx, chicago-authordate.cbx,
-    chi\-cago-authordate-trad.bbx},\break
-  \textsf{chicago-authordate-trad.cbx},
-  \textsf{chicago-dates-common.cbx}, \textsf{chicago-notes.bbx},\break
-  \textsf{chi\-ca\-go-notes.cbx}, \textsf{cms-american.lbx},
-  \mycolor{\textsf{cms-brazilian.lbx}}, \textsf{cms-british.lbx},
-  \textsf{cms-fin\-nish.lbx}, \textsf{cms-french.lbx},
-  \textsf{cms-german.lbx}, \textsf{cms-icelandic.lbx},
-  \textsf{cms-ngerman.lbx},\break \textsf{cms-norsk.lbx},
-  \textsf{cms-norwegian.lbx}, \textsf{cms-nynorsk.lbx},
-  \textsf{cms-swedish.lbx}, and \textsf{bibla\-tex-chicago.sty}, all
+\item {\small \textsf{chicago-authordate.cbx,
+      chicago-authordate-trad.cbx, chicago-dates-common.cbx},
+    \textsf{chi\-ca\-go-authordate.bbx},
+    \textsf{chicago-authordate-trad.bbx}, \textsf{chicago-notes.cbx},
+    \textsf{chicago-notes.bbx},\break \textsf{cms-american.lbx},
+    \textsf{cms-brazilian.lbx}, \textsf{cms-british.lbx},
+    \mycolor{\textsf{cms-dutch.lbx}}, \textsf{cms-finnish.lbx},
+    \textsf{cms-french.lbx}, \textsf{cms-german.lbx},
+    \textsf{cms-icelandic.lbx}, \textsf{cms-ngerman.lbx},
+    \textsf{cms-norsk.lbx}, \textsf{cms-nor\-wegian.lbx},
+    \textsf{cms-nynorsk.lbx}, \textsf{cms-swedish.lbx},
+    \textsf{bibla\-tex-chicago.sty}, and \textsf{cmsdocs.sty}}, all
   from \textsf{biblatex-chicago}, installed either in a system-wide
   \TeX\ directory, or in the working directory where you keep your
-  *.tex files.  The .zip file from CTAN contains several
-  subdirectories to help keep the growing number of files organized,
-  so the files listed above can be found in the \texttt{latex/}
-  subdirectory, itself further divided into the \texttt{bbx/},
-  \texttt{cbx/}, and \texttt{lbx/} subdirectories.  If you install in
-  a system-wide directory, I suggest a standard layout using
-  \texttt{<TEXMFLOCAL>\slash
+  *.tex files.  The .zip file from CTAN contains subdirectories to
+  help keep the growing number of files organized, so the files listed
+  above can be found in the \texttt{latex/} subdirectory.  If you
+  install in a system-wide directory, I suggest a standard layout
+  using \texttt{<TEXMFLOCAL>\slash
     tex/latex/bib\-latex-contrib/biblatex-chicago}, where\
   \texttt{<TEXMFLOCAL>} is the root of your local \TeX\ installation
   --- for example, and depending on your system and preferences,
   \texttt{/usr/share/texmflocal}, \texttt{/usr/local/share/texmf}, or
   \texttt{C:\textbackslash{}Local TeX Files\textbackslash}.  Then you
-  can copy the contents of the \texttt{latex/} directory there,
-  subdirectories and all.  (If you install into your working
-  directory, then you'll need to copy the files directly there,
-  without subdirectories.)  Of course, if you choose to place them
-  anywhere in the \texttt{texmf} tree, you'll need to update the file
-  name database to make sure \TeX\ can find them.
+  can copy the contents of the \texttt{latex/} directory there.  (If
+  you install into your working directory, then you'll need to copy
+  the files directly there, without subdirectories.)  Of course, if
+  you choose to place them anywhere in the \texttt{texmf} tree, you'll
+  need to update the file name database to make sure \TeX\ can find
+  them.
+\item \textsf{chicago-authordate16.cbx, chicago-authordate-trad16.cbx,
+    chicago-dates-com\-mon16.cbx}, \textsf{chicago-authordate16.bbx},
+  \textsf{chicago-authordate-trad16.bbx},
+  \textsf{chicago-notes16.cbx}, and \textsf{chicago-notes16.bbx},
+  which, as their names suggest, allow you to continue using the
+  16th-edition specifications alongside the most recent
+  \textsf{biblatex}, if your project requires this.  They can be found
+  in the same directory as the 17th-edition equivalents.
+\item The new dependent \LaTeX\ package
+  \mycolor{\textsf{cmsendnotes.sty}}, found with the previous files.
+  It offers additional functionality for those wishing to use the new
+  \mycolor{\texttt{noteref}} option with endnotes instead of
+  footnotes.  See section~\ref{sec:noteref}, below, and also
+  \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}.
 \item The very clear and detailed documentation of the
   \textsf{biblatex} system, available in that package as
   \textsf{biblatex.pdf}.  Here the authors explain why you might want
   to use the system, the rules for constructing .bib files for it, and
   the (numerous) methods at your disposal for modifying the formatted
   output.
-\item The files \textsf{cms-notes-intro.pdf},
-  \textsf{cms-dates-intro.pdf}, and \textsf{cms-trad-appendix.pdf},\break
-  the first two of which contain introductions to some of the main
+\item The files
+  \href{file:cms-notes-intro.pdf}{\textsf{cms-notes-intro.pdf}},
+  \href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}},
+  \href{file:cms-trad-appendix.pdf}{\textsf{cms-trad-appendix.pdf}},
+  and\break
+  \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}, the
+  first two of which contain introductions to some of the main
   features of the Chicago styles, while the third documents some of
   the alterations you might need to make to your .bib files to use the
-  \texttt{trad} style.  All three are fully hyperlinked, allowing you
-  easily to jump from notes or citations to an annotated bibliography
-  or reference list, and thence to the .bib entries themselves.  If
-  you ensure that these three are in the \texttt{examples} directory
-  just below this one, marginal links there will take you to further
-  discussions here.  The file \textsf{cmsdocs.sty} contains code and
-  kludges designed specifically for compiling
-  \textsf{cms-dates-intro.tex}, \textsf{cms-notes-intro.tex} and
-  \textsf{cms-trad-appendix.tex}, so please \emph{do not} load it
-  yourself anywhere else, as it redefines and interferes with some of
-  the macros from the main package.
+  \texttt{trad} style.  The fourth gives a brief example of the usage
+  of the \mycolor{\texttt{noteref}} package option to the notes \&\
+  bibliography style.  All four are fully hyperlinked, the first three
+  in particular allowing you easily to jump from notes or citations to
+  an annotated bibliography or reference list, and thence to the .bib
+  entries themselves.  If you ensure that all four are in the same
+  directory as the document you are reading (the \TeX\ Live default),
+  marginal links there will take you to further discussions here.  The
+  file \textsf{cmsdocs.sty} contains code and kludges designed
+  specifically for compiling \textsf{cms-dates-intro.tex},
+  \textsf{cms-notes-intro.tex} and \textsf{cms-trad-appendix.tex}, so
+  please \emph{do not} load it yourself anywhere else, as it redefines
+  and interferes with some of the macros from the main package.
 \item The annotated bibliography files \textsf{notes-test.bib} and
   \textsf{dates-test.bib}, and the not-yet-annotated
-  \mycolor{\textsf{legal-test.bib}}, all of which will acquaint you
-  with many of the details on how to get started constructing your own
-  .bib files for use with the two \textsf{biblatex-chicago} styles.
-\item The files \textsf{cms-notes-sample.pdf},
-  \textsf{cms-dates-sample.pdf}, \textsf{cms-trad-sample.pdf}, and
-  \mycolor{\textsf{cms-legal-sample.pdf}}.  The first shows how my
-  system processes \textsf{notes-test.bib} and
+  \textsf{legal-test.bib}, all of which will acquaint you with many of
+  the details on how to get started constructing your own .bib files
+  for use with the three \textsf{biblatex-chicago} styles.
+\item The files
+  \href{file:cms-notes-sample.pdf}{\textsf{cms-notes-sample.pdf}},
+  \href{file:cms-dates-sample.pdf}{\textsf{cms-dates-sample.pdf}},
+  \href{file:cms-trad-sample.pdf}{\textsf{cms-trad-sample.pdf}}, and
+  \href{file:cms-legal-sample.pdf}{\textsf{cms-legal-sample.pdf}}.
+  The first shows how my system processes \textsf{notes-test.bib} and
   \textsf{cms-notes-sample.tex}, in both footnotes and bibliography,
   the second and third are the result of processing
   \textsf{dates-test.bib} with \textsf{cms-dates-sample.tex} or
   \textsf{cms-trad-sample.tex}, and the fourth processes
-  \mycolor{\textsf{legal-test.bib}} using
-  \mycolor{\textsf{cms-legal-sam\-ple.tex}}.  All of these files are in
-  \texttt{doc/examples/}, and the \textsf{sample} files, aside from
-  the last named, are mainly included for testing purposes.
+  \textsf{legal-test.bib} using \textsf{cms-legal-sam\-ple.tex}.  All
+  of these files are in \texttt{doc/}, and the \textsf{sample} files,
+  aside from the last named, are mainly included for testing purposes.
 \item The file you are reading, \textsf{biblatex-chicago.pdf}, which
   aims to be as complete a description as possible of the rules for
   creating a .bib file that will, when processed by \LaTeX\ and
-  \textsc{Bib}\TeX, at least somewhat ease the burden when you try to
+  \textsf{biber}, at least somewhat ease the burden when you try to
   implement the \emph{Chicago Manual of Style}'s specifications.
   These docs may seem frustratingly over-long, but remember that you
   only need to read the part(s) that apply to the style in which you
@@ -326,17 +374,13 @@ this release.
   preparation for the others.  If you have used a previous version of
   this package, please pay particular attention to the sections on
   Obsolete and Deprecated Features, starting on
-  page~\pageref{deprec:obsol}.  You will find the sixteen previous
+  page~\pageref{deprec:obsol}.  You will find the nineteen previous
   files in the \texttt{doc/} subdirectory once you've extracted
   \textsf{biblatex-chicago.zip}.  If you wish to place them in a
   system-wide directory, I would recommend:\,\,\,
   \texttt{<TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago},\\
   all the while remembering, of course, to update the file name
-  database afterward.  (Let me reiterate, also, that if you currently
-  have quoted material in your .bib file, and are using \cmd{enquote}
-  or the standard \LaTeX\ mechanisms there, then the simplest
-  procedure is always to use \cmd{mkbibquote} instead in order to
-  ensure that punctuation works out right.)
+  database afterward.
 \item Access to a copy of \emph{The Chicago Manual of Style} itself,
   which naturally contains incomparably more information than I can
   hope to present here.  It should always be your first port of call
@@ -346,7 +390,7 @@ this release.
 \subsection{License}
 \label{sec:lppl}
 
-Copyright © 2008--2018 David Fussner.  This package is
+Copyright © 2008--2020 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
@@ -377,28 +421,30 @@ Boruvka's \cmd{textcite} code from
 for the notes \&\ bibliography style, and her page-number-compression
 code for both styles from the
 \href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{same
-  site}.  I am very grateful to Gustavo Barros for the new Brazilian
-Portuguese localization, to Stefan Björk for the Swedish localization,
-to Antti-Juhani Kaijahano for the Finnish localization, to Baldur
-Kristinsson for providing the Icelandic localization, and to Håkon
-Malmedal for the Norwegian localizations.  Kazuo Teramoto and Gildas
-Hamel both sent patches to improve the package, and Arne Skjærholt
-provided some code to get me started on the new \cmd{gentextcite}
-commands. There may be other \LaTeX\ code I've appropriated and
-forgotten, in which case please remind me.  Finally, Charles Schaum
-and Joseph Reagle Jr.\ were both extremely generous with their help
-and advice during the development of this package, and have both
-continued indefatigably to test it and suggest needed improvements.
-They were particularly instrumental in encouraging the greatest
-possible degree of compatibility with other \textsf{biblatex} styles.
-Indeed, if the task of adapting .bib files for use with the Chicago
-style seems onerous now, you should have tried it before they got
-their hands on it.
+  site}.  The dependent package \mycolor{\textsf{cmsendnotes.sty}}
+contains code by John Lavagnino and Ulrich Dirr.  I am very grateful
+to Wouter Lancee for the new Dutch localization, to Gustavo Barros for
+the Brazilian Portuguese localization, to Stefan Björk for the Swedish
+localization, to Antti-Juhani Kaijahano for the Finnish localization,
+to Baldur Kristinsson for providing the Icelandic localization, and to
+Håkon Malmedal for the Norwegian localizations.  Kazuo Teramoto and
+Gildas Hamel both sent patches to improve the package, and Arne
+Skjærholt provided some code to get me started on the
+\cmd{gentextcite} commands. There may be other \LaTeX\ code I've
+appropriated and forgotten, in which case please remind me.  Finally,
+Charles Schaum and Joseph Reagle Jr.\ were both extremely generous
+with their help and advice during the development of this package, and
+have both continued indefatigably to test it and suggest needed
+improvements.  They were particularly instrumental in encouraging the
+greatest possible degree of compatibility with other \textsf{biblatex}
+styles.  Indeed, if the task of adapting .bib files for use with the
+Chicago style seems onerous now, you should have tried it before they
+got their hands on it.
 
 \section{Detailed Introduction}
 \label{sec:Intro}
 
-The \emph{Chicago Manual of Style}, implemented here in its 16th
+The \emph{Chicago Manual of Style}, implemented here in its 17th
 edition, has long, in America at least, been one of the most
 influential style guides for writers and publishers.  While one's
 choices are now perhaps more extensive than ever, the \emph{Manual} at
@@ -409,12 +455,10 @@ number of different kinds of source material, then your choice (or
 your publisher's choice) of the \emph{Manual} as a style guide seems
 set to be a happy one.
 
-%% %\enlargethispage{-\baselineskip}
-
 \mylittlespace These very strengths, however, also make the style
 difficult to use.  Admittedly, the \emph{Manual} emphasizes
 consistency within a work, as opposed to rigid adherence to the
-specification, at least when writer and publisher agree (14.70).
+specification, at least when writer and publisher agree (14.4).
 Sometimes a publisher demands such adherence, however, and anyone who
 has attempted to produce it may well come away with the impression
 that the specification itself is somewhat idiosyncratic in its
@@ -428,7 +472,7 @@ work from antiquity and one from the Renaissance, all of these tend to
 overburden the writer who wants to comply with the standard.  Many of
 these complexities, in truth, make the specification very nearly
 impossible to implement straightforwardly in a system like
-\textsc{Bib}\TeX\ --- options multiply, each requiring a particular
+\textsf{biblatex} --- options multiply, each requiring a particular
 sort of formatting, until one almost reaches the point of believing
 that every individual book or article should have its own entry type.
 Completeness and usability tend each to exclude the other, so the code
@@ -474,8 +518,6 @@ with this style, that you work on a copy of any .bib files that are
 important to you, until you have determined that this package does
 what you need/want it to do.
 
-% %\enlargethispage{\baselineskip}
-
 \mylittlespace When I first began working on this package, I made the
 decision to alter as little as possible the main files from Lehman's
 \textsf{biblatex}, so that my .bbx and .cbx files would use his
@@ -499,39 +541,42 @@ with \textsf{biblatex} itself, though in the section on entry fields I
 have also duplicated a lot of the information in
 \textsf{biblatex.pdf}, which I hope won't badly annoy expert users of
 the system.  Headings in \mycolor{green} \colmarginpar{\textsf{New in
-    this release}} indicate material new to this release, or
-occasionally old material that has undergone significant revision.
-Numbers in parentheses refer to sections of the \emph{Chicago Manual
-  of Style}, 16th edition.  The file \textsf{notes-test.bib} contains
-many examples from the \emph{Manual} which, when processed using
+    this release}} indicate either material new to this release or old
+material that has undergone significant revision.  Numbers in
+parentheses refer to sections of the \emph{Chicago Manual of Style},
+17th edition.  The file \textsf{notes-test.bib} contains many examples
+from the \emph{Manual} which, when processed using
 \textsf{biblatex-chicago-notes}, should produce the same output as you
 see in the \emph{Manual} itself, or at least compliant output, where
 the specifications are vague or open to interpretation, a state of
 affairs which does sometimes occur.  I have provided
-\textsf{cms-notes-sample.pdf}, which shows how my system processes
-\textsf{notes-test.bib}, and I have also included the reference keys
-from the latter file below in parentheses.
+\href{file:cms-notes-sample.pdf}{\textsf{cms-notes-sample.pdf}}, which
+shows how my system processes \textsf{notes-test.bib}, and I have also
+included the reference keys from the latter file below in parentheses.
 
 \subsection{Entry Types}
 \label{sec:entrytypes}
 
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-notes}, minus the odd \textsf{biblatex}
-alias, is as follows: \mycolor{\textbf{article}}, \textbf{artwork},
-\textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet},
-\textbf{collection}, \textbf{customc}, \textbf{image},
+alias, is as follows: \textbf{article}, \mycolor{\textbf{artwork}},
+\mycolor{\textbf{audio}}, \mycolor{\textbf{book}},
+\textbf{bookinbook}, \textbf{booklet}, \textbf{collection},
+\textbf{customc}, \mycolor{\textbf{dataset}}, \textbf{image},
 \textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
-\textbf{inreference}, \mycolor{\textbf{jurisdiction}},
-\mycolor{\textbf{legal}}, \mycolor{\textbf{legislation}},
-\textbf{letter}, \textbf{manual},\textbf{misc}, \textbf{music},
-\textbf{mvbook}, \textbf{mvcollection}, \textbf{mvproceedings},
-\textbf{mvreference}, \textbf{online} (with its alias \textbf{www}),
-\textbf{patent}, \textbf{periodical}, \textbf{proceedings},
-\textbf{reference}, \mycolor{\textbf{report}} (with its alias
-\textbf{techreport}), \mycolor{\textbf{review}}, \textbf{suppbook},
-\textbf{suppcol\-lec\-tion}, \textbf{suppperiodical}, \textbf{thesis}
-(with its aliases \textbf{mastersthesis} and \textbf{phdthesis}),
-\mycolor{\textbf{unpublished}}, and \textbf{video}.
+\mycolor{\textbf{inreference}}, \textbf{jurisdiction}, \textbf{legal},
+\textbf{legislation}, \textbf{letter}, \textbf{manual}, \textbf{misc},
+\mycolor{\textbf{music}}, \mycolor{\textbf{mvbook}},
+\mycolor{\textbf{mvcollection}}, \mycolor{\textbf{mvproceedings}},
+\mycolor{\textbf{mvreference}}, \mycolor{\textbf{online}} (with its
+alias \textbf{www}), \textbf{patent}, \mycolor{\textbf{performance}},
+\textbf{periodical}, \textbf{proceedings}, \textbf{reference},
+\textbf{report} (with its alias \textbf{techreport}),
+\mycolor{\textbf{review}}, \mycolor{\textbf{standard}},
+\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical},
+\textbf{thesis} (with its aliases \textbf{mastersthesis} and
+\textbf{phdthesis}), \textbf{unpublished}, and
+\mycolor{\textbf{video}}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -544,22 +589,20 @@ very few fields when you use \textsf{biblatex-chicago-notes}, so it
 seemed to me better to gather information pertaining to fields in the
 next section.
 
-%\enlargethispage{\baselineskip}
-
-\mybigspace The \colmarginpar{\textbf{article}} \emph{Chicago Manual of
-  Style} (14.170) recognizes three different sorts of periodical
+\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of
+  Style} (14.164) recognizes three different sorts of periodical
 publication, \enquote{journals,} \enquote{magazines,} and
-\enquote{newspapers.} The first (14.172) includes \enquote{scholarly
-  or professional periodicals available mainly by subscription,} while
-the second refers to \enquote{weekly or monthly} publications that are
-\enquote{available either by subscription or in individual issues at
-  bookstores or newsstands or online.}  \enquote{Magazines} will tend
-to be \enquote{more accessible to general readers,} and typically
-won't have a volume number.  Indeed, by fiat I declare that should you
-need to refer to a journal that identifies its issues mainly by year,
-month, or week, then for the purposes of
-\textsf{biblatex-chicago-notes} such a publication is a
-\enquote{magazine,} and not a \enquote{journal.}
+\enquote{newspapers.} The first (14.166) is \enquote{a scholarly or
+  professional periodical available mainly by subscription,} while the
+second refers to \enquote{weekly or monthly (or sometimes daily)}
+publications that are \enquote{available in individual issues at
+  libraries or bookstores or newsstands or offered online, with or
+  without a subscription.}  \enquote{Magazines} will tend to be
+\enquote{more accessible to general readers,} and typically won't have
+a volume number.  Indeed, by fiat I declare that should you need to
+refer to a journal that identifies its issues mainly by year, month,
+or week, then for the purposes of \textsf{biblatex-chicago-notes} such
+a publication is a \enquote{magazine,} and not a \enquote{journal.}
 
 \mylittlespace For articles in \enquote{journals} you can simply use
 the traditional \textsc{Bib}\TeX\ --- and indeed \textsf{biblatex} ---
@@ -568,37 +611,33 @@ the page numbers with a colon, as required by the \emph{Manual}.  If,
 however, you need to refer to a \enquote{magazine} or a
 \enquote{newspaper,} then you need to add an \textsf{entrysubtype}
 field containing the exact string \texttt{magazine} or, now, its
-synonym \mycolor{\texttt{newspaper}}.  The main formatting differences
-between a \texttt{magazine/newspaper} and a plain \textsf{article} are
-that the year isn't placed within parentheses, and that page numbers
-are set off by a comma rather than a colon.  Otherwise, the two sorts
-of reference have much in common.  (For \textsf{article}, see
-\emph{Manual} 14.175--198; batson, beattie:crime, friedman:learning,
+synonym \texttt{newspaper}.  The main formatting differences between a
+\texttt{magazine/newspaper} and a plain \textsf{article} are that the
+year isn't placed within parentheses, and that page numbers are set
+off by a comma rather than a colon.  Otherwise, the two sorts of
+reference have much in common.  (For \textsf{article}, see
+\emph{Manual} 14.168--87; batson, beattie:crime, friedman:learning,
 garaud:gatine, garrett, hlatky:hrt, kern, lewis, loften:hamlet,
 mcmillen:antebellum, rozner:liberation, saberhagen:beluga,
 warr:ellison, white:callimachus. For \textsf{entrysubtype}
-\texttt{magazine}, see 14.181, 14.199--202; assocpress:gun,
-morgenson:market, reaves:rosen, sten\-ger:privacy.)
+\texttt{magazine}, see 14.171, 14.188--200; assocpress:gun,
+morgenson:market, reaves:rosen, stenger:privacy.)
 
 \mylittlespace It gets worse.  The \emph{Manual} treats reviews (of
 books, plays, performances, etc.) as a sort of recognizable subset of
 \enquote{journals,} \enquote{magazines,} and \enquote{newspapers,}
 distinguished mainly by the way one formats the title of the review
-itself.  In \textsf{biblatex 0.7}, happily, Lehman provided a
-\textsf{review} entry type which will handle a large subset of such
-citations, though not all.  The key rule is this: if a review has a
-separate, non-generic title (gibbard; osborne:poison) in addition to
-something that reads like \enquote{review of \ldots,} then you need an
-\textsf{article} entry, with or without the \texttt{magazine}
-\textsf{entrysubtype}, depending on the sort of publication containing
-the review.  If the only title is the generic \enquote{review of
-  \ldots,} for example, then you'll need the \textsf{review} entry
-type, with or without this same \textsf{entrysubtype} toggle using
-\texttt{magazine}.  On \textsf{review} entries, see below.  (The
-curious reader will no doubt notice that the code for formatting any
-sort of review still exists in \textsf{article}, as it was initially
-designed for \textsf{biblatex 0.6}, but this new arrangement is
-somewhat simpler and therefore, I hope, better.)
+itself.  \textsf{Biblatex} provides a \textsf{review} entry type which
+will handle a large subset of such citations, though not all.  The key
+rule is this: if a review has a separate, non-generic title (gibbard;
+osborne:poison) in addition to something that reads like
+\enquote{review of \ldots,} then you need an \textsf{article} entry,
+with or without the \texttt{magazine} \textsf{entrysubtype}, depending
+on the sort of publication containing the review.  If the only title
+is the generic \enquote{review of \ldots,} for example, then you'll
+need the \textsf{review} entry type, with or without this same
+\textsf{entrysubtype} toggle using \texttt{magazine}.  On
+\textsf{review} entries, see below.
 
 \mylittlespace In the case of a review with a specific as well as a
 generic title, the former goes in the \textsf{title} field, and the
@@ -608,23 +647,27 @@ be formatted differently from the titles themselves, and
 \textsf{biblatex-chicago-notes} uses it in just this way, with the
 additional wrinkle that it can, if needed, replace the \textsf{title}
 entirely, and this in, effectively, any entry type, providing a fairly
-powerful, if somewhat complicated, tool for getting \textsc{Bib}\TeX\
+powerful, if somewhat complicated, tool for getting \textsf{biblatex}
 to do what you want.  Here, however, if all you need is a
 \textsf{titleaddon}, then you want to switch to the \textsf{review}
 type, where you can simply use the \textsf{title} field instead.
 
-\mylittlespace \textsf{Biblatex-chicago} \colmarginpar{New!} now also,
-at the behest of Bertold Schweitzer, supports the \textsf{relatedtype}
-\mycolor{\texttt{reviewof}}, which allows you to use the
-\textsf{related} mechanism to provide information about the work being
-reviewed.  This may be particularly helpful if you need to cite
-multiple reviews of the same work, but in any case the usual
-distinction between \textsf{article} and \textsf{review} entries still
-holds, with the \textsf{related} entry's \textsf{title} providing the
-\textsf{titleaddon} in the former type and the \textsf{title} in the
-latter.  Please see section \ref{sec:related} for further details.
-
-\mylittlespace No less than nine more things need explication here.
+\mylittlespace \textsf{Biblatex-chicago} also, at the behest of
+Bertold Schweitzer, supports the \textsf{relatedtype}
+\texttt{reviewof}, which allows you to use the \textsf{related}
+mechanism to provide information about the work being reviewed,
+thereby simplifying how much information you need to provide in the
+reviewing entry.  In particular, it relieves you of the need to
+construct \textsf{titleaddon} or \textsf{title} fields like:
+\texttt{review of \textbackslash mkbibemph\{Book Title\} by Author
+  Name}, as the \textsf{related} entry's \textsf{title} automatically
+provides the \textsf{titleaddon} in the \textsf{article} type and the
+\textsf{title} in the \textsf{review} type, with the \textsf{related}
+mechanism providing the connecting string.  This may be particularly
+helpful if you need to cite multiple reviews of the same work; please
+see section \ref{sec:related} for further details.
+
+\mylittlespace No less than ten more things need explication here.
 First, since the \emph{Manual} specifies that much of what goes into a
 \textsf{titleaddon} field stays unformatted --- no italics, no
 quotation marks --- this plain style is the default for such text,
@@ -640,40 +683,36 @@ article and the name of the regular column, in which case the former
 should go, as usual, in a \textsf{title} field, and the latter in
 \textsf{titleaddon}.  As with reviews proper, if there is only the
 generic title, then you want the \textsf{review} entry type.  (See
-14.203, 14.205, 14.208; morgenson:market, reaves:rosen.)
-
-\mylittlespace Third, the 16th edition of the \emph{Manual} has, I
-believe, subtly changed its recommendations in the case of
-\enquote{unsigned newspaper articles or features} (14.207).
-Unfortunately, these changes aren't entirely clear to me.  First, it
-suggests that such pieces are \enquote{best dealt with in text or
-  notes.}  If, however, \enquote{a bibliography entry should be
-  needed, the name of the newspaper stands in place of the author.}
-The examples it provides, therefore, suggest quite different
-treatments of the same material in notes and bibliography, and they
-don't at any point that I can see recommend a format for short notes.
-I've implemented these recommendations fairly literally, which means
-that in an \textsf{article} entry, \textsf{entrysubtype}
-\texttt{magazine}, or in a \textsf{review} entry,
-\textsf{entrysubtype} \texttt{magazine}, and \emph{only} in such
-entries, a missing \textsf{author} field results in the name of the
-periodical (in the \textsf{journaltitle} field) being used as the
-missing author, but \emph{only} in the bibliography and in short
-notes.  In long notes, the \textsf{title} will appear first, before
-the \textsf{journaltitle}.  Note that the use of the name of the
-newspaper as an author creates sorting issues in the bibliography,
-issues that will mostly be solved for you if you use \textsf{Biber} as
-the backend.  If you don't, or if the \textsf{journaltitle} begins
-with a definite or indefinite article with which you can't dispense,
-then you'll need a \textsf{sortkey} field to ensure that the
-bibliography entry is alphabetized correctly.  (See
-lakeforester:pushcarts and, for the sorting issue,
+14.191, 14.195--96; morgenson:market, reaves:rosen.)
+
+\mylittlespace Third, the \emph{Manual} has slightly complicated
+instructions concerning \enquote{unsigned newspaper articles or
+  features} (14.199).  First, it suggests that such pieces are
+\enquote{best dealt with in text or notes.}  If, however, \enquote{a
+  bibliography entry should be needed, the title of the newspaper
+  stands in place of the author.}  The examples it provides,
+therefore, suggest quite different treatments of the same material in
+notes and bibliography, and they don't at any point that I can see
+recommend a format for short notes.  I've implemented these
+recommendations fairly literally, which means that in an
+\textsf{article} entry, \textsf{entrysubtype} \texttt{magazine}, or in
+a \textsf{review} entry, \textsf{entrysubtype} \texttt{magazine}, and
+\emph{only} in such entries, a missing \textsf{author} field results
+in the name of the periodical (in the \textsf{journaltitle} field)
+being used as the missing author, but \emph{only} in the bibliography
+and in short notes.  In long notes, the \textsf{title} will appear
+first, before the \textsf{journaltitle}.  Note that the use of the
+name of the newspaper as an author creates sorting issues in the
+bibliography, issues that will mostly be solved for you if you use
+\textsf{Biber} as the backend.  If you don't, or if the
+\textsf{journaltitle} begins with a definite or indefinite article
+with which you can't dispense, then you'll need a \textsf{sortkey}
+field to ensure that the bibliography entry is alphabetized correctly.
+(See lakeforester:pushcarts and, for the sorting issue,
 \cmd{DeclareSortingTemplate} in section~\ref{sec:formatopts} below.)
 
-\enlargethispage{\baselineskip}
-
 \mylittlespace Fourth, Bertold Schweitzer has pointed out, following
-the \emph{Manual} (14.192), that while an \textsf{issuetitle} often
+the \emph{Manual} (14.183), that while an \textsf{issuetitle} often
 has an \textsf{editor}, it is not too unusual for a \textsf{title} to
 have, e.g., an \textsf{editor} and/or a \textsf{translator}.  In order
 to allow as many permutations as possible on this theme, I have
@@ -687,24 +726,14 @@ with the \textsf{title} otherwise.  The usual string concatenation
 rules still apply --- cf.\ \textsf{editor} and \textsf{editortype} in
 section~\ref{sec:entryfields}, below.
 
-\mylittlespace Fifth, if you've been using
-\textsf{biblatex-chicago-notes} for a while, you may remember using
-the single-letter \cmd{bibstring} mechanism in order to help
-\textsf{biblatex} decide where to capitalize a wide variety of strings
-in numerous entry fields.  This mechanism was particularly common in
-all the periodical types, but if you've had a look in
-\textsf{notes-test.bib} while following this documentation, you'll
-have noticed that it no longer appears there.  The regular whole-word
-bibstrings still work as normal, but the single-letter ones are
-obsolete, replaced by the \cmd{autocap} macro, which itself only
-occurs twice in \textsf{notes-test.bib}.  Basically, in certain
-fields, just beginning your data with a lowercase letter activates the
-mechanism for capitalizing that letter depending on its context within
-a note or bibliography entry.  Please see \textbf{\textbackslash
-  autocap} below for the details, but both the \textsf{titleaddon} and
-\textsf{note} fields are among those treating their data this way, and
-since both appear regularly in \textsf{article} entries, I thought the
-problem merited a preliminary mention here.
+\mylittlespace Fifth, in certain fields just beginning your data with
+a lowercase letter activates the mechanism for capitalizing that
+letter depending on its context within a note or bibliography entry.
+Please see \cmd{autocap} in section~\ref{sec:formatcommands} below for
+the details, but both the \textsf{titleaddon} and \textsf{note} fields
+are among those treating their data this way, and since both appear
+regularly in \textsf{article} entries, I thought the problem merited a
+mention here.
 
 \mylittlespace Sixth, if you need to cite an entire issue of any sort
 of periodical, rather than one article in an issue, then the
@@ -714,55 +743,78 @@ need.  (You can also use the \textsf{article} type, placing what would
 normally be the \textsf{issuetitle} in the \textsf{title} field and
 retaining the usual \textsf{journaltitle} field, but this arrangement
 isn't compatible with standard \textsf{biblatex}.)  The \textsf{note}
-field is where you place something like \enquote{special issue} (with
-the small \enquote{s} enabling the automatic capitalization routines),
-whether you are citing one article or the whole issue
-(conley:fifthgrade, good:wholeissue).  Indeed, this is a somewhat
-specialized use of \textsf{note}, and if you have other sorts of
-information you need to include in an \textsf{article},
-\textsf{periodical}, or \textsf{review} entry, then you shouldn't put
-it in the \textsf{note} field, but rather in \textsf{titleaddon} or
-perhaps \textsf{addendum} (brown:bremer).
-
-\mylittlespace Seventh, if you wish to cite a television or radio
-broadcast, the \textsf{article} type, \textsf{entrysubtype}
-\texttt{magazine} is the place for it.  The name of the program would
-go in \textsf{journaltitle}, with the name of the episode in
+field is where you place something like \enquote{special issue} or
+\enquote{supplement} (with the small \enquote{s} enabling the
+automatic capitalization routines), whether you are citing one article
+or the whole issue (14.178--79; conley:fifthgrade, good:wholeissue).
+Indeed, this is a somewhat specialized use of \textsf{note}, and if
+you have other sorts of information you need to include in an
+\textsf{article}, \textsf{periodical}, or \textsf{review} entry, then
+you shouldn't put it in the \textsf{note} field, but rather in
+\textsf{titleaddon} or perhaps \textsf{addendum} (brown:bremer).
+
+\mylittlespace Seventh, if you wish to cite certain kinds of
+television or radio broadcast, most notably interviews but perhaps
+also news segments or other \enquote{journalistic} material, then the
+\textsf{article} type, \textsf{entrysubtype} \texttt{magazine} is the
+place for it.  The name of the program as a whole would go in
+\textsf{journaltitle}, with the name of the episode or segment in
 \textsf{title}, and the network's name in the \textsf{usera} field.
 Of course, if the piece you are citing has only a generic name (an
 interview, for example), then the \textsf{review} type would be the
-best place for it.  (8.185, 14.221; see bundy:macneil for an example
-of how this all might look in a .bib file.  Commercial recordings of
-such material would need one of the audiovisual entry types, probably
-\textsf{audio} or \textsf{video} [friends:leia], while recordings from
-archives fit best either into \textsf{online} or into \textsf{misc}
-entries with an \textsf{entrysubtype} [coolidge:speech,
-roosevelt:speech].)
-
-\mylittlespace Eighth, the 16th edition of the \emph{Manual}
-(14.243--6) specifies that blogs and other, similar online material
-should be presented like \textsf{articles}, with \texttt{magazine}
-\textsf{entrysubtype} (ellis:blog).  The title of the specific entry
-goes in \textsf{title}, the general title of the blog goes in
-\textsf{journaltitle}, and the word \enquote{\texttt{blog}} in the
-\textsf{location} field (though you could just use special formatting
-in the \textsf{journaltitle} field itself, which may sometimes be
-necessary).  Comments on blogs, with generic titles like
-\enquote{comment on} or \enquote{reply to,} need a \textsf{review}
-entry with the same \textsf{entrysubtype}.  Such comments make
-particular use of the \textsf{eventdate} and of the \textsf{nameaddon}
-fields; please see the documentation of \textbf{review}, below.
-
-\mylittlespace Finally, the special \textsf{biblatex} field
+best place for it (8.189, 14.213; see bundy:macneil for an example
+of how this all might look in a .bib file.)  Other sorts of broadcast,
+usually accessible through commercial recordings, would need one of
+the audiovisual entry types, probably \textsf{audio}
+(danforth:podcast) or \textsf{video} (friends:leia), while recordings
+from archives fit best either into \textsf{online} or into
+\textsf{misc} entries with an \textsf{entrysubtype} (coolidge:speech,
+roosevelt:speech).
+
+\mylittlespace Eighth, the \emph{Manual} (14.208) specifies that blogs
+and other, similar online material should be presented like
+\textsf{articles}, with \texttt{magazine} \textsf{entrysubtype}
+(ellis:blog), and needn't appear in a bibliography.  The title of the
+specific entry goes in \textsf{title}, the general title of the blog
+goes in \textsf{journaltitle}, and the word \enquote{\texttt{blog}} in
+the \textsf{location} field (though you could just use special
+formatting in the \textsf{journaltitle} field itself, which may
+sometimes be necessary).  The 17th \colmarginpar{New!} edition
+specifies that \enquote{blogs that are part of a larger publication
+  should include the name of that publication.}  This usually involves
+a newspaper or magazine which also publishes various blogs on its
+website, and it means that such entries need a more general title than
+the \textsf{journaltitle}.  It's not standard \textsf{biblatex} or
+anything, but you can now put such information in \textsf{maintitle}
+(with \textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed),
+but only in \textsf{article} and \textsf{review} entries with a
+\texttt{magazine} \textsf{entrysubtype} (amlen:hoot).  To cite a whole
+blog, you'll need the \textsf{periodical} entry type, with a
+\textsf{title} instead of a \textsf{journaltitle}, along with a
+(possible) \textsf{maintitle}.  Comments on blogs, with generic titles
+like \enquote{comment on} or \enquote{reply to,} need a
+\textsf{review} entry with the same \textsf{entrysubtype}.  Such
+comments make particular use of the \textsf{eventdate} and of the
+\textsf{nameaddon} fields; please see the documentation of
+\textbf{review}, below, and also of the \textsf{relatedtype}
+\mycolor{\texttt{commenton}} in section~\ref{sec:related}.
+
+\mylittlespace Ninth, the special \textsf{biblatex} field
 \textsf{shortjournal} allows you to present shortened
 \textsf{journaltitles} in \textsf{article}, \textsf{review}, and
 \textsf{periodical} entries, as well as facilitating the creation of
 lists of journal abbreviations in the manner of a \textsf{shorthand}
-list.  Please see the documentation of \textbf{shortjournal}
-in section~\ref{sec:entryfields} for all the details on how this
-works.
+list.  Please see the documentation of \textbf{shortjournal} in
+section~\ref{sec:entryfields} for all the details on how this works.
 
-\enlargethispage{\baselineskip}
+\mylittlespace Finally, \colmarginpar{New!} the 17th edition (14.191)
+specifies that, for news sites carrying \enquote{stories as they
+  unfold, it may be appropriate to include a time stamp for an article
+  that includes one.}  You can provide this by using the standard
+\textsf{biblatex} time stamp format inside the \textsf{date} field,
+e.g., \texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers
+the standard time zone initialisms, a separate \textsf{timezone} field
+would be required if you want to provide one.
 
 \mylittlespace If you're still with me, allow me to recommend that you
 browse through \textsf{notes-test.bib} to get a feel for just how many
@@ -775,24 +827,18 @@ that I have found in my own research that the unusual and/or limit
 cases are really rather rare, and that the vast majority of sources
 won't require any knowledge of these onerous details.
 
-\mybigspace Arne \mymarginpar{\textbf{artwork}} Kjell Vikhagen has
+\mybigspace Arne \colmarginpar{\textbf{artwork}} Kjell Vikhagen
 pointed out to me that none of the standard entry types were
-straightforwardly adaptable when referring to visual artworks.  The
-\emph{Manual} doesn't give any thorough specifications for such
-references, and indeed it's unclear that it believes it necessary to
-include them in the bibliographical apparatus at all.  Still, it's
-easy to conceive of contexts in which a list of artworks studied might
-be desirable, and \textsf{biblatex} includes entry types for just this
-purpose, though the standard styles leave them undefined.  The two I
-chose to include in previous releases were \textsf{artwork} and
-\textsf{image}, the former intended for paintings, sculptures,
-etchings, and the like, the latter for photographs.  The 16th edition
-of the \emph{Manual} has modified its specifications for presenting
-photographs so that they are the same as for works in all other media.
-The \textsf{image} type, therefore, is now merely a clone of the
-\textsf{artwork} type, maintained mainly to provide backward
-compatibility for users migrating from the old specification to the
-current one.
+straightforwardly adaptable when referring to visual artworks.  It's
+unclear that the \emph{Manual} (14.235) believes it necessary to
+include them in the bibliographical apparatus at all, but it's easy
+all the same to conceive of contexts in which a list of artworks
+studied might be desirable, and \textsf{biblatex} includes entry types
+for just this purpose, though the standard styles leave them
+undefined.  \textsf{Biblatex-chicago} defines both \textsf{artwork}
+and \textsf{image}, which are in fact now clones of each other, so you
+can use either of them indifferently, the distinction existing only
+for historical reasons.
 
 \mylittlespace Constructing an entry is fairly straightforward.  As
 one might expect, the artist goes in \textsf{author} and the name of
@@ -806,27 +852,49 @@ generality.  The \textsf{type} field, as in several other entry types,
 uses \textsf{biblatex's} automatic capitalization routines, so if the
 first word only needs a capital letter at the beginning of a sentence,
 use lowercase in the .bib file and let \textsf{biblatex} handle it for
-you.  (See \emph{Manual} 3.22, 8.193; leo:madonna, bedford:photo.)
-
-\mylittlespace As a final complication, the \emph{Manual} (8.193) says
+you.  (See \emph{Manual} 3.22, 8.198; leo:madonna, bedford:photo.)
+
+\mylittlespace The \colmarginpar{New!} 17th edition of the
+\emph{Manual} has included new information in some of its examples, so
+I have added 4 new fields to the drivers.  Alongside the usual
+\textsf{date} for the creation of a work, you may also want to include
+the printing date of a particular exemplar of a photograph or a print.
+The system I have designed uses the \emph{earlier} of the
+\textsf{date} and the \textsf{origdate} to be the date of creation,
+and the \emph{later} to be the printing date.  The style will
+automatically prefix the printing date with the localized
+\cmd{bibstring} \mycolor{\texttt{printed}}, so if that's the wrong
+string entirely then you can define \textsf{userd} any way you like to
+change it.  If only \emph{one} of those two dates is available, it
+will always serve as a creation date.
+
+\mylittlespace One of the \emph{Manual's} examples is of a photograph
+published in a periodical, and information about this publication
+appears late in the entry, after the \textsf{type}.  I have included
+the \textsf{howpublished} field so that you can give information about
+the periodical (meaning that you'll have to format the title yourself
+with \cmd{mkbibemph}), and the \textsf{eventdate} field for you to
+provide the date of publication (mccurry:afghangirl).
+
+\mylittlespace As a final complication, the \emph{Manual} (8.198) says
 that \enquote{the names of works of antiquity \ldots\,are usually set
   in roman.}  If you should need to include such a work in the
 reference apparatus, you can either define an \textsf{entrysubtype}
 for an \textsf{artwork} entry --- anything will do --- or you could
 use the \textsf{misc} entry type with an \textsf{entrysubtype}.
-Fortunately, in this instance the other fields in a \textsf{misc}
-entry function pretty much as in \textsf{artwork}.
+Assuming the complicated date handling I've just outlined isn't
+required for such a work, in this instance the other fields in a
+\textsf{misc} entry function pretty much as in \textsf{artwork}.
 
-\mybigspace Following \mymarginpar{\textbf{audio}} the request of
+\mybigspace Following \colmarginpar{\textbf{audio}} the request of
 Johan Nordstrom, I have included three entry types, all undefined by
 the standard styles, designed to allow users to present audiovisual
 sources in accordance with the Chicago specifications.  The
-\emph{Manual's} presentation of such sources (14.274--280), though
-admirably brief, seems to me somewhat inconsistent; the proliferation
-of online sources has made the task yet more complex.  For the 15th
-edition I attempted to condense all the requirements into two new
-entry types, but ended up relying on three.  For the 16th edition, in
-particular, I also need to include the \textbf{online} and even the
+\emph{Manual's} presentation of such sources (14.261--68), though
+admirably brief, seems to me somewhat inconsistent, though perhaps I'm
+merely unable to spot the important regularities.  The proliferation
+of online sources has made the task yet more complex, requiring the
+inclusion of the \textbf{article}, the \textbf{online}, and even the
 \textbf{misc} entry types, which see, under the audiovisual rubric.  I
 shall attempt to delineate the main differences here, and though there
 are likely to be occasions when your choice of entry type is not
@@ -839,26 +907,34 @@ example, digital media (whether on CD or hard drive), vinyl records,
 and tapes.  The \textbf{video} type includes most visual media,
 whether it be films, TV shows, tapes and DVDs of the preceding or of
 any sort of performance (including music), or online multimedia.  The
-\emph{Manual's} treatment (14.280) of the latter suggests that online
+\emph{Manual's} treatment (14.267) of the latter suggests that online
 video excerpts, short pieces, and interviews should generally use the
-\textbf{online} type (harwood:biden, horowitz:youtube, pollan:plant).
-The \textbf{audio} type, our current concern, fills gaps in the
-others, and presents its sources in a more \enquote{book-like} manner.
-Published musical scores need this type --- unpublished ones would use
-\textsf{misc} with an \textsf{entrysubtype} (shapey:partita) --- as do
-such favorite educational formats as the slideshow and the filmstrip
-(greek:filmstrip, schubert:muellerin, verdi:corsaro).  The
-\emph{Manual} (14.277--280) sometimes uses a similar format for audio
-books (twain:audio), though, depending on the sorts of publication
-facts you wish to present, this sort of material may fall under
-\textsf{music} (auden:reading).  Dated audio recordings that are part
-of an archive, online or no, may be presented either in an
-\textsf{online} or in a \textsf{misc} entry with an
+\textbf{online} type (horowitz:youtube, pollan:plant) or the
+\textbf{article} type (harwood:biden, kessler:nyt), depending on
+whether the pieces originate from an identifiably
+\enquote{journalistic} outlet.  The \textbf{audio} type, our current
+concern, fills gaps in the others, and presents its sources in a more
+\enquote{book-like} manner.  Published musical scores need this type
+--- unpublished ones would use \textsf{misc} with an
+\textsf{entrysubtype} (shapey:partita) --- as do \mycolor{podcasts}
+and such favorite educational formats as the slideshow and the
+filmstrip (danforth:podcast, greek:film\-strip, schubert:muellerin,
+verdi:corsaro).  The \emph{Manual} (14.264) sometimes uses a similar
+format for audio books (twain:audio), though, depending on the sorts
+of publication facts you wish to present, this sort of material may
+fall under \textsf{music} (auden:reading).  Dated audio recordings
+that are part of an archive, online or no, may be presented either in
+an \textbf{online} or in a \textbf{misc} entry with an
 \textsf{entrysubtype}, the difference mainly being in just how closely
 associated the \textsf{date} will be with the \textsf{title}
-(coolidge:speech, roosevelt:speech).
-
-%\enlargethispage{\baselineskip}
+(coolidge:speech, roosevelt:speech).  Actual radio broadcasts (as
+opposed to podcasts) pose something of a conundrum.  Interviews and
+other sorts of \enquote{journalistic} material fit well into
+\textsf{article} or \textsf{review} entries (14.213), but other sorts
+of broadcast are not well represented in the \emph{Manual's} examples
+(8.189), and what little there is suggests that, counter-intuitively,
+the \textsf{video} type is the best fit, as it is well equipped to
+present broadcasts of any sort.
 
 \mylittlespace Once you've accepted the analogy of composer to
 \textsf{author}, constructing an \textsf{audio} entry should be fairly
@@ -871,14 +947,35 @@ for both books and collections, so while there will normally be an
 \textsf{date}, and a \textsf{location}, there may also be a
 \textsf{booktitle} and/or a \textsf{maintitle} --- see
 schubert:muellerin for an entry that uses all three in citing one song
-from a cycle.  If the medium in question needs specifying, the
-\textsf{type} field is the place for it.  Finally, the
-\textsf{titleaddon} field can specify functions for which
-\textsf{biblatex-chicago} provides no automated handling, e.g., a
-librettist (verdi:corsaro).
-
-\mybigspace This \mymarginpar{\textbf{book}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
+from a cycle.  (As with the \textsf{music} and \textsf{video} types,
+you can cite an individual piece separate from any large collection by
+using the \textsf{title} field and by defining an
+\textsf{entrysubtype}, which will stop \textsf{biblatex-chicago}
+italicizing your \textsf{title} in the absence of a
+\textsf{booktitle}.)  If the medium in question needs specifying, the
+\textsf{type} field is the place for it.  Please note, also, that
+while the \textsf{titleaddon} field can still specify creative or
+editorial functions for which \textsf{biblatex-chicago} provides no
+automated, localized handling, you can also now provide the string you
+need in an \textsf{editor[abc]type} field, e.g.,
+\enquote{\texttt{libretto by}} (verdi:corsaro).
+
+\mylittlespace For \colmarginpar{New!} podcasts, newly covered by the
+17th edition (14.267), the \textsf{audio} type provides the nearest
+analogue I could find, and in general most of the data should fit
+comfortably into the fields already discussed above, the episode name
+in \textsf{title} and the name of the podcast in \textsf{booktitle},
+for starters.  Two details, however, need mentioning: first, the
+\textsf{note} field as the place to specify that it is a podcast, and
+the \textsf{eventdate} field for the date of publication of the
+specific episode (\textsf{title}) cited, which appears in close
+association with that \textsf{title}.  Indeed, the \textsf{eventdate}
+field helps \textsf{biblatex-chicago} know that the \textsf{audio}
+entry is a podcast episode, and helps it construct the entry
+appropriately (danforth:podcast).
+
+\mybigspace This \colmarginpar{\textbf{book}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, and the package
 can automatically provide abbreviated references in notes and
 bibliography when you use a \textsf{crossref} or an \textsf{xref}
 field.  The functionality is not enabled by default, but you can
@@ -886,35 +983,35 @@ enable it in the preamble or in the \textsf{options} field using the
 \texttt{booklongxref} option.  Please see \textbf{crossref} in
 section~\ref{sec:entryfields} and \texttt{booklongxref} in
 section~\ref{sec:chicpreset}, below.  Cf.\ harley:ancient:cart,
-harley:cartography, and harley:hoc for how this might look.
+harley:cartography, and harley:hoc for how this might look.  The
+\textsf{book} type is useful also to present multimedia app content,
+the added fields \textsf{version} and \textsf{type} providing
+information about the app's version and about the system on which it
+runs (14.268; angry:birds).
+
+\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
 means of referring to parts of books that are considered, in other
 contexts, themselves to be books, rather than chapters, essays, or
 articles.  Such an entry can have a \textsf{title} and a
-\textsf{maintitle}, but it can also contain a \textsf{booktitle}, all
+\textsf{booktitle}, but it can also contain a \textsf{maintitle}, all
 three of which will be italicized when printed.  In general usage it
 is, therefore, rather like the traditional \textsf{inbook} type, only
 with its \textsf{title} in italics rather than in quotation marks.  As
-with the \textsf{book} type, you can automatically enable
-abbreviated references in notes and bibliography, though this isn't
-the default.  Please see \textbf{crossref} in
-section~\ref{sec:entryfields} and \texttt{booklongxref} in
-section~\ref{sec:chicpreset}, below.  (Cf.\ \emph{Manual} 14.114,
-14.127, 14.130; bernhard:boris, bernhard:ritter, and
-bernhard:themacher for the new abbreviating functionality; also
-euripides:orestes, plato:republic:gr.)
-
-\mylittlespace \textbf{NB}: The Euripides play receives slightly
-different presentations in 14.127 and 14.130.  Although the
-specification is very detailed, it doesn't eliminate all choice or
-variation.  Using a system like \textsc{Bib}\TeX\ should help to
-maintain consistency.  
+with the \textsf{book} type, you can automatically enable abbreviated
+references in notes and bibliography, though this isn't the default.
+Please see \textbf{crossref} in section~\ref{sec:entryfields} and
+\texttt{booklongxref} in section~\ref{sec:chicpreset}, below.  (Cf.\
+\emph{Manual} 14.109, 14.122, 14.124; bernhard:boris, bernhard:ritter,
+and bernhard:themacher for the abbreviating functionality; also
+euripides:orestes [treated differently in 14.122 and 14.124],
+plato:republic:gr.)
 
 \mybigspace This \mymarginpar{\textbf{booklet}} is the first of two
 entry types --- the other being \textsf{manual}, on which see below
 --- which are traditional in \textsc{Bib}\TeX\ styles, but which the
-\emph{Manual} (14.249) suggests may well be treated basically as
+\emph{Manual} (14.220) suggests may well be treated basically as
 books.  In the interests of backward compatibility,
 \textsf{biblatex-chica\-go-notes} will so format such an entry, which
 uses the \textsf{howpublished} field instead of a standard
@@ -934,25 +1031,13 @@ Please see \textbf{crossref} in section~\ref{sec:entryfields} and
 harley:ancient:cart, harley:cartography, and harley:hoc for how this
 might look.
 
-\mybigspace This \mymarginpar{\textbf{customa}} entry type is
-obsolete, and any such entries in your .bib file will trigger an
-error.  Please use the standard \textsf{biblatex} \textbf{letter} type
-instead.
-
-%\enlargethispage{\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{customb}} entry type is
-obsolete, and any such entries in your .bib file will trigger an
-error.  Please use the standard \textsf{biblatex} \textbf{bookinbook}
-type instead.
-
 \mybigspace This \mymarginpar{\textbf{customc}} entry type allows you
 to include alphabetized cross-references to other, separate entries in
 the bibliography, particularly to other names or pseudonyms, as
 recommen\-ded by the \emph{Manual}.  (This is different from the
 \textsf{crossref}, \textsf{xref}, \textsf{userf} and \textsf{related}
 mechanisms, all primarily designed to include cross-references to
-other works.  Cf.\ 14.84,86).  The lecarre:cornwell entry, for
+other works.  Cf.\ 14.81--82).  The lecarre:cornwell entry, for
 example, would allow your readers to find the more-commonly-used
 pseudonym \enquote{John Le Carré} even if they were, for some reason,
 looking under his real name \enquote{David John Moore Cornwell.}\ As I
@@ -961,37 +1046,46 @@ encouraged, bordering on required, when \enquote{a bibliography
   includes two or more works published by the same author but under
   different pseudonyms.}\ The following entries in
 \textsf{notes-test.bib} show one way of addressing this:
-crea\-sey:ashe:blast, crea\-sey:york:death, crea\-sey:mor\-ton:hide,
-ashe:crea\-sey, york:crea\-sey and mor\-ton:crea\-sey.
+creasey:ashe:blast, creasey:york:death, creasey:morton:hide,
+ashe:creasey, york:creasey and morton:creasey.
 
 \mylittlespace In these latter cases, you would need merely to place
 the pseudonym in the \textsf{author} field, and the author's real
-name, under which his or her works are presented in the bibliography,
-in the \textsf{title} field.  To make sure the cross-reference also
+name, under which their works are presented in the bibliography, in
+the \textsf{title} field.  To make sure the cross-reference also
 appears in the bibliography, you can either manually include the entry
 key in a \cmd{nocite} command, or you can put that entry key in the
-\textbf{userc} field in the main .bib entry, in which case
-\textsf{biblatex-chicago} will print the expanded abbreviation if and
-only if you cite the main entry.  (Cf.\ \textsf{userc}, below.)
-
-%%\enlargethispage{\baselineskip}
+\textbf{userc} field in the work's main .bib entry, in which case
+\textsf{biblatex-chicago} will print the cross-reference if and only
+if you cite the main work.  (Cf.\ \textsf{userc}, below.)
 
 \mylittlespace Under ordinary circumstances, \textsf{biblatex-chicago}
 will connect the two parts of the cross-reference with the word
 \enquote{\emph{See}} --- or its equivalent in the document's language
---- in italics.  If you wish to present the cross-reference
-differently, you can put the connecting word(s) into the
-\textsf{nameaddon} field.
-
-\mybigspace This \mymarginpar{\textbf{image}} entry type, left
-undefined in the standard styles, was in previous releases of
-\textsf{bibla\-tex-chicago} intended for referring to photographs, but
-the 16th edition of the \emph{Manual} has changed its specifications
-for such works, which are now treated the same as works in all other
-media.  This means that this entry type is now a clone of the
-\textsf{artwork} type, which see.  I retain it here as a convenience
-for users migrating from the old to the new specification.  (See 3.22,
-8.193; bedford:photo.)
+--- in italics.  If you wish to present it differently, you can put
+the connecting word(s) into the \textsf{nameaddon} field.
+
+\mybigspace This \colmarginpar{\textbf{dataset}} entry type, new in
+\textsf{biblatex} 3.13, allows you to cite scientific databases, for
+which the \emph{Manual} (14.257) presents some rather specific, if
+brief, instructions.  To construct your entry, you can put the name of
+the database into \textsf{author}, a \enquote{descriptive phrase or
+  record locator} in the \textsf{title} field, and if there's a
+specific accession number needed beyond the record locator you can put
+it into the \textsf{number} field, with the \textsf{type} field
+reserved to help explain what sort of \textsf{number} is involved.
+The \textsf{howpublished} field can also be used to provide extra
+descriptive detail about the \textsf{number}, if needed.  More
+generally, a \textsf{url} will locate the database as a whole and a
+\textsf{urldate} will specify the date you accessed it.  If, for some
+reason, an additional date is relevant, then the \textsf{date} field
+is available, while the \textsf{pubstate} field will appear before the
+\textsf{date} in case you need to modify the latter.  (See 14.257;
+genbank:db, nasa:db.)
+
+\mybigspace This \mymarginpar{\textbf{image}} entry type is now a
+clone of the \textsf{artwork} type, which see.  I retain it here for
+historical reasons (See 3.22, 8.198; bedford:photo.)
 
 \mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
 two standard \textsf{biblatex} types have very nearly identical
@@ -1009,7 +1103,7 @@ abbreviations in notes and bibliography when you cite multiple pieces
 from the same \textsf{collection}.  These abbreviations are activated
 by default when you use the \textsf{crossref} or \textsf{xref} field
 in \textsf{incollection} entries and in \textsf{inbook} entries,
-because although the \emph{Manual} (14.113) here specifies a
+because although the \emph{Manual} (14.108) here specifies a
 \enquote{multiauthor book,} I believe the distinction between the two
 is fine enough to encourage similar treatments.  (For more on this
 mechanism see \textbf{crossref} in section~\ref{sec:entryfields},
@@ -1019,7 +1113,7 @@ default in \textsf{letter} and \textsf{inproceedings} entries.)  If
 the part of a book to which you are referring has had a separate
 publishing history as a book in its own right, then you may wish to
 use the \textsf{bookinbook} type, instead, on which see above.  (See
-\emph{Manual} 14.111--114; \textsf{inbook}: ashbrook:brain,
+\emph{Manual} 14.106--9; \textsf{inbook}: ashbrook:brain,
 phibbs:diary, will:cohere; \textsf{incollection}: centinel:letters,
 contrib:contrib, sirosh:visualcortex; ellet:galena, keating:dearborn,
 and lippincott:chicago [and the \textsf{collection} entry
@@ -1043,7 +1137,7 @@ pretty much as in standard \textsf{biblatex}.  Indeed, the main
 differences between it and \textsf{incollection} are the lack of an
 \textsf{edition} field and the possibility that an
 \textsf{organization} may be cited alongside the \textsf{publisher},
-even though the \emph{Manual} doesn't specify its use (14.226).
+even though the \emph{Manual} doesn't specify its use (14.217).
 Please note, also, that the \textsf{crossref} and \textsf{xref}
 mechanism for shortening citations of multiple pieces from the same
 \textsf{proceedings} is operative here, just as it is in
@@ -1052,13 +1146,13 @@ mechanism for shortening citations of multiple pieces from the same
 \texttt{longcrossref} in section~\ref{sec:chicpreset} for more
 details.
 
-\mybigspace This \mymarginpar{\textbf{inreference}} entry type is
+\mybigspace This \colmarginpar{\textbf{inreference}} entry type is
 aliased to \textsf{incollection} in the standard styles, but the
 \emph{Manual} has particular requirements, so if you are citing
 \enquote{[w]ell-known reference books, such as major dictionaries and
   encyclopedias,} then this type should simplify the task of
-conforming to the specifications (14.247--248).  The main thing to
-keep in mind is that I have designed this entry type for
+conforming to the specifications (14.232--34).  The main thing to keep
+in mind is that I have designed this entry type for
 \enquote{alphabetically arranged} works, which you shouldn't cite by
 page, but rather by the name(s) of the article(s).  Because of the
 formatting required by the \emph{Manual}, we need one of
@@ -1070,10 +1164,11 @@ they appear in the work, separated by the keyword
 \textsf{biblatex-chicago-notes} will provide the appropriate prefatory
 string (\texttt{s.v.}, plural \texttt{s.vv.}), and enclose each in its
 own set of quotation marks (ency:britannica).  In a typical
-\textsf{inreference} entry, very few other fields are needed, as
-\enquote{the facts of publication are often omitted, but the edition
-  (if not the first) must be specified.}  In practice, this means a
-\textsf{title} and possibly an \textsf{edition} field.
+\textsf{inreference} entry very few other fields are needed, but
+\enquote{if a physical edition is cited, not only the edition number
+  (if not the first) but also the date the volume or set was issued
+  must be specified.}  In practice, this means a \textsf{title},
+\textsf{date}, and possibly an \textsf{edition} field.
 
 \mylittlespace There are quite a few other peculiarities to explain
 here.  First of all, you should present any well-known works
@@ -1086,36 +1181,30 @@ form, especially if, for example, you are citing different versions of
 an article appearing in different editions.
 
 \mylittlespace If the work is slightly less well known, it may be that
-full publication details are appropriate (times:guide), but this makes
-things more complicated.  In earlier releases of
-\textsf{biblatex-chicago-notes}, you would have had to format the
-\textsf{postnote} field of short notes appropriately, including the
-prefatory string and quotation marks I mentioned above.  Now you can
+full publication details are appropriate (times:guide).  Also, you can
 put an article name in the \textsf{postnote} field of
-\textsf{inreference} entries and have it formatted for you, and this
-holds for both long and short notes, which could allow you to refer
-separately to many different articles from the same reference work
-using only one .bib entry.  (In a long note, any \textsf{postnote}
-field stops the printing of the contents of \textsf{lista}.)  The only
-limitation on this system is that the \textsf{postnote} field, unlike
-\textsf{lista}, is not a \textsf{biblatex} list, and therefore for the
-formatting to work correctly you can only put one article name in it.
-Despite this limitation, I hope that the current system might simplify
-things for users who cite numerous works of reference.
-
-%\enlargethispage{-\baselineskip}
+\textsf{inreference} entries and have it properly formatted for you,
+and this holds for both long and short notes, which could allow you to
+refer separately to many different articles from the same reference
+work using only one .bib entry.  (In a long note, any
+\textsf{postnote} field stops the printing of the contents of
+\textsf{lista}.)  The only limitation on this system is that the
+\textsf{postnote} field, unlike \textsf{lista}, is not a
+\textsf{biblatex} list, and therefore for the formatting to work
+correctly you can only put one article name in it.  Despite this
+limitation, I hope that the system might simplify things for users who
+cite numerous works of reference.
 
 \mylittlespace If it seems appropriate to include such a work in the
 bibliography, be aware that the contents of the \textsf{lista} field
 will also be presented there, which may not be what you want.  A
-separate \textsf{reference} entry might solve this problem, but you
-may also need a \textsf{sortkey} field to ensure proper
-alphabetization, as \textsf{biblatex} will attempt to use an
-\textsf{editor} or \textsf{author} name, if either is present.  (Cf.\
-mla:style, a \textsf{reference} entry that uses section numbers
-instead of alphabetized headings, and \texttt{useeditor=false} in the
-\textsf{options} field instead of a \textsf{sortkey} to ensure the
-correct alphabetization.)
+separate \textsf{reference} entry might well solve this problem.  (The
+sorting issues with \textsf{inreference}, \textsf{mvreference}, and
+\textsf{reference} entries should no longer exist, as they should now
+always sort by \textsf{title} rather than by any \textsf{author},
+\textsf{editor}, or \textsf{namec} that might also be present.  If the
+\textsf{title} starts with a definite or indefinite article then a
+\textsf{sortkey} may still be necessary.)
 
 \mylittlespace Speaking of the \textsf{author}, this field holds the
 author of the specific entry (in \textsf{lista}), not the author of
@@ -1129,12 +1218,30 @@ in every other way will be treated as a normal book, often a good
 choice for unfamiliar or non-standard reference works.
 
 \mylittlespace Finally, all of these rules apply to online reference
-works, as well, for which you need to provide not only a \textsf{url}
-but also, always, a \textsf{urldate}, as these sources are in constant
-flux (wikiped:bibtex, grove:sibelius).
+works, along with a few more.  The \colmarginpar{New!} 17th edition of
+the \emph{Manual} now allows, \enquote{subject to editorial
+  discretion,} the alternative treatment of an online reference work
+which \enquote{does not have (and never had) a printed counterpart}
+(14.206, 14.233).  In effect this means that it can be treated more
+like an \textsf{online} entry than a \textsf{book}, its \textsf{title}
+therefore in plain roman rather than in italics.  You can achieve this
+in \textsf{inreference} entries by providing an \textsf{entrysubtype}
+in the entry.  Online reference works need not only a \textsf{url} but
+also, always, a \textsf{urldate} (instead of a \textsf{date)}, as
+these sources are in constant flux.  When that flux is of a
+particularly high frequency, as with Wikipedia, then a time stamp may
+also be needed.  You can provide this in the \textsf{urldate} field
+itself, using the standard \textsf{biblatex} format, e.g.,
+\texttt{2008-07-01T10:18:00}.  It is
+\colmarginpar{\texttt{urlstamp=true}} possible to turn off the
+printing of the \textsf{urltime} with the new
+\mycolor{\texttt{urlstamp}} option, which is set to \texttt{true} by
+default, but which can be changed in your preamble for the whole
+document, for specific entry types, or in the \textsf{options} field
+of specific entries (wikiped:bibtex, grove:sibelius).
 
 \mybigspace I
-\colmarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
+\mymarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
 document these three types in section~\ref{sec:legal} below, both
 because they all follow the specifications of the \emph{Bluebook}
 instead of the \emph{Manual}, and also because they are the only entry
@@ -1148,14 +1255,14 @@ this nature needs a \textsf{misc} entry, for which see below.)
 Depending on what sort of information you need to present in a
 citation, you may simply be able to get away with a standard
 \textsf{book} entry, which may then be cited by page number (see
-\emph{Manual} 14.78, 14.88; meredith:letters, adorno:benj).  If,
-however, for whatever reason, you need to give full details of a
-specific letter, then you'll need to use the \textsf{letter} entry
-type, which attempts to simplify for you the \emph{Manual}'s rather
-complicated rules for formatting such references.  (See 14.117;
-jackson:paulina:letter, white:ross:memo, white:russ [a completely
-fictitious entry to show the \textsf{crossref} mechanism], white:total
-[a \textsf{book} entry, for the bibliography]).
+14.104; meredith:letters, adorno:benj).  If, however, for whatever
+reason, you need to give full details of a specific letter, then
+you'll need to use the \textsf{letter} entry type, which attempts to
+simplify for you the \emph{Manual}'s rather complicated rules for
+formatting such references.  (See 14.111; jackson:paulina:letter,
+white:ross:memo, white:russ [a completely fictitious entry to show the
+\textsf{crossref} mechanism], white:total [a \textsf{book} entry, for
+the bibliography]).
 
 \mylittlespace To start, the name of the letter writer goes in the
 \textsf{author} field, while the \textsf{title} field contains both
@@ -1165,7 +1272,7 @@ optionally, the type of correspondence involved.  If it's a letter,
 the type needn't be given, but if it's a memorandum or report or the
 like, then this is the place to specify that fact.  Also, because the
 \textsf{origdate} field only accepts numbers, if you want to use the
-abbreviation \enquote{n.d.}  (or \cmd{bibstring\{nodate\}}) for
+abbreviation \enquote{n.d.}  (or \verb+\bibstring{nodate}+) for
 undated letters, then this is where you should put it.  If you need to
 specify where a letter was written, then you can also use this field,
 and, if both are present, remember to separate the location from the
@@ -1174,21 +1281,22 @@ Alternatively, you can put the place of writing into the
 \textsf{origlocation} field.  Most importantly, the date of the letter
 itself goes in the \textsf{origdate} field (\texttt{year-month-day}),
 which allows a full date specification, while the publishing date of
-the whole collection goes in the \textsf{date} field, instead of in
-the obsolete \textsf{origyear}.  As in other entry types, then, the
-\textsf{date} field has its ordinary meaning of \enquote{date of
-  publication.}  (You may have noticed here that the presentation of
-the \textsf{origdate} in this sort of reference is different from the
-date format required elsewhere by the \emph{Manual}.  This appears to
-result from some recent changes to the specification, and it may be
-that we could get away with choosing one or the other format for all
-occurrences [6.45], but for the moment I hope this mixed solution will
-suffice.)  Another difficulty arises when producing the short footnote
-form, which requires you to provide a \textsf{shorttitle} field of the
-form \enquote{\texttt{to Recipient},} the latter name as short as
-possible while avoiding ambiguity.  The remaining fields are fairly
-self explanatory, but do remember that the title of the published
-collection belongs in \textsf{booktitle} rather than in
+the whole collection goes in the \textsf{date} field.  As in other
+entry types, then, the \textsf{date} field has its ordinary meaning of
+\enquote{date of publication.}  (You may have noticed that the
+presentation of the \textsf{origdate} in this sort of reference uses
+the day-month-year format, unlike the month-day-year format seen
+elsewhere.  This follows a suggestion that material with \enquote{many
+  references to specific dates} may use this format [6.38, 9.35,
+14.224].  I should, I guess, make this configurable.)  Another
+difficulty arises when producing the short footnote form, which
+requires you to provide a \textsf{shorttitle} field of the form
+\enquote{\texttt{to Recipient},} the latter name as short as possible
+while avoiding ambiguity.  The \cmd{letterdatelong} command can be
+used in the \textsf{postnote} field of the citation to print the
+\textsf{origdate}, a possible aid to disambiguation.  The remaining
+fields are fairly self explanatory, but do remember that the title of
+the published collection belongs in \textsf{booktitle} rather than in
 \textsf{title}.
 
 \mylittlespace Finally, the \emph{Manual} specifies that if you cite
@@ -1196,31 +1304,29 @@ more than one letter from a given published collection, then the
 bibliography should contain only a reference to said collection,
 rather than to each individual letter, while the form of footnotes
 would remain the same.  This should be possible using
-\textsc{Bib}\TeX's standard \textsf{crossref} field, with each
-\textsf{letter} entry pointing to a \textsf{collection} or
-\textsf{book} entry, for example.  (If you are using \textsf{Biber},
-then \textsf{letter} entries correctly inherit fields from
-\textsf{book} and \textsf{collection} entries, and also from the
-\textsf{mvbook} and \textsf{mvcollection} types --- \textsf{titles}
-from the former provide a \textsf{booktitle} and from the latter a
-\textsf{maintitle}.)  I shall discuss cross references at length later
-(see esp.\ \textbf{crossref} in section~\ref{sec:entryfields}, below),
-but I should mention here that \textsf{letter} is one of the entry
-types in which a \textsf{crossref} or an \textsf{xref} field
-automatically results in special shortened forms in notes and
-bibliography if more than one piece from a single collection is cited.
-(The other entry types are \textsf{inbook}, \textsf{incollection}, and
-\textsf{inproceedings}; see 14.113 for the \emph{Manual}'s
-specification.)  This ordinarily won't be an issue for \textsf{letter}
-entries in the bibliography, as individual letters aren't included
-there, but it is operative in notes, where you can disable it by
-setting the \texttt{longcrossref=true} option, on which see
-section~\ref{sec:chicpreset}, below.  To stop individual letters
+\textsc{Bib}\TeX's and \textsf{biblatex's} standard \textsf{crossref}
+field, with each \textsf{letter} entry pointing to a
+\textsf{collection} or \textsf{book} entry, for example.  (If you are
+using \textsf{Biber}, then \textsf{letter} entries correctly inherit
+fields from \textsf{book} and \textsf{collection} entries, and also
+from the \textsf{mvbook} and \textsf{mvcollection} types ---
+\textsf{titles} from the former provide a \textsf{booktitle} and from
+the latter a \textsf{maintitle}.)  I shall discuss cross references at
+length later (see esp.\ \textbf{crossref} in
+section~\ref{sec:entryfields}, below), but I should mention here that
+\textsf{letter} is one of the entry types in which a \textsf{crossref}
+or an \textsf{xref} field automatically results in special shortened
+forms in notes and bibliography if more than one piece from a single
+collection is cited.  (The other entry types are \textsf{inbook},
+\textsf{incollection}, and \textsf{inproceedings}; see 14.108 for the
+\emph{Manual}'s specification.)  This ordinarily won't be an issue for
+\textsf{letter} entries in the bibliography, as individual letters
+aren't included there, but it is operative in notes, where you can
+disable it by setting the \texttt{longcrossref=true} option, on which
+see section~\ref{sec:chicpreset}, below.  To stop individual letters
 turning up in the bibliography, you can use the \texttt{skipbib}
 option in the \textsf{options} field.
 
-% %\enlargethispage{\baselineskip}
-
 \mybigspace This \mymarginpar{\textbf{manual}} is the second of two
 traditional \textsc{Bib}\TeX\ entry types that the \emph{Manual}
 suggests formatting as books, the other being \textsf{booklet}. As
@@ -1237,7 +1343,8 @@ use \textsf{organization} in the absence of anything else.  Of course,
 if you were to use a \textsf{book} entry for such a reference, then
 you would need to define both \textsf{author} and \textsf{publisher}
 using the name you here might have put in \textsf{organization}.  (See
-14.92; chicago:manual, dyna:browser, natrecoff:camera.)
+14.84; chicago:manual, dyna:browser, natrecoff:camera.  Cp.\ also the
+new \mycolor{\textbf{standard}} entry type.)
 
 \mybigspace As \mymarginpar{\textbf{misc}} its name suggests, the
 \textsf{misc} entry type was designed as a hold-all for citations that
@@ -1273,168 +1380,197 @@ rather than a generic one.  In these cases, you will need to enclose
 the title inside a \cmd{mkbibquote} command manually.  Cf.\
 roosevelt:speech, shapey:partita.)
 
-\mylittlespace If you are wondering what to put in
-\textsf{entrysubtype}, the answer is, currently, anything at all.  You
-no longer need to put the exact string \texttt{letter} there in order
-to move the date into closer proximity with the \textsf{title}.
-Indeed, recent reconsideration of the \emph{Manual} has suggested that
-the distinction to be drawn in this class of material hasn't to do
-with \emph{where} the date is presented but, rather, with \emph{how}
-it is presented.  As I understand the specification, it draws a
-distinction between archival material that is \enquote{letter-like}
-(letters, memoranda, reports, telegrams) and that which isn't
-(interviews, wills, contracts, speeches, or even personal
-communications you've received and which you wish to cite).  This may
-not always be the easiest distinction to draw, and in earlier releases
-of \textsf{biblatex-chicago} I ignored it, but once you've decided to
-classify it one way or the other you put the date in the
-\textsf{origdate} field for letters, etc., and into the \textsf{date}
-field for the others.
-
-\mylittlespace In effect, whether it's a \textsf{letter} entry or a
-\enquote{letter-like} \textsf{misc} entry (with
-\textsf{entrysubtype}), it is by using the \textsf{origdate} field
-that you identify when it was written, and the \textsf{origlocation},
-if needed, identifies where it was written.  Other sorts of
-\textsf{misc} entry (with \textsf{entrysubtype}) use the \textsf{date}
-field (but still the \textsf{origlocation}).  This maintains
-consistency of usage across entry types and also, I hope, improves
-compliance when using the \textsf{misc} type for citing archival
-material.  Remember, however, that without an \textsf{entrysubtype}
-the entry will be treated as traditional \textsf{misc}, and the title
-italicized.  In addition, defining \textsf{entrysubtype} activates the
-automatic capitalization mechanism in the \textsf{title} field of
-\textsf{misc} entries, on which see\,\textbf{\textbackslash autocap}
-in section~\ref{sec:formatcommands} below.  (See 14.219-220, 14.231,
-14.232-242; creel:house, dinkel:agassiz, spock:interview.)
-
-\mylittlespace As in \textsf{letter} entries, the titles of
-unpublished letters are of the form \texttt{Author to Recipi\-ent}, and
-further information can be given in the \textsf{titleaddon} field,
-including the abbreviation \enquote{\texttt{n.d.}}\ (or
-\cmd{bibstring\{nodate\}}) for undated examples.  The \textsf{note},
-\textsf{organization}, \textsf{institution}, and \textsf{location}
-fields (in ascending order of generality) allow the specification of
-which manuscript collection now holds the letter, though the
-\emph{Manual} specifies (14.238) that well-known depositories don't
-usually need a city, state or country specified.  (The traditional
-\textsf{misc} fields are all still available, also.)  Both the long
-and short note forms can use the same \textsf{title}, but in both
-cases you may need to use the \cmd{headlesscite} command to avoid the
-awkward repetition of the author's name, though that name will always
-appear in the bibliography (creel:house).  If you want to include the
-date of a letter in a short note, I have provided the
+\mylittlespace If you are presenting part of an unpublished archive,
+then constructing most of your \,.bib entry is fairly straightforward.
+\enquote{Letter-like} \textsf{misc} entries follow many of the same
+conventions as \textsf{letter} entries presenting published material.
+Titles are of the form \texttt{Author to Recipient}, and further
+information can be given in the \textsf{titleaddon} field, including
+the abbreviation \enquote{\texttt{n.d.}}\ (or
+\verb+\bibstring{nodate}+) for undated examples.  The place where a
+letter was written can go in \textsf{origlocation}, while the
+\textsf{note}, \textsf{organization}, \textsf{institution}, and
+\textsf{location} fields (in ascending order of generality) allow the
+specification of which manuscript collection now holds the letter,
+though the \emph{Manual} specifies (14.227) that well-known
+depositories don't usually need a city, state or country specified.
+(The traditional \textsf{misc} fields are all still available, also.)
+Both the long and short note forms can use the same \textsf{title},
+but in both cases you may need to use the \cmd{headlesscite} command
+to avoid the awkward repetition of the author's name, though that name
+will always appear in the bibliography (creel:house).  If the
+\textsf{misc} entry isn't a letter, remember that, as in
+\textsf{article} and \textsf{review} entries, words like
+\texttt{interview} or \texttt{memorandum} needn't be capitalized
+unless they follow a period --- the automatic capitalization routines
+(with the \textsf{title} field starting with a lowercase letter [see
+dinkel:agassiz, spock:interview, and \texttt{\textbackslash autocap}])
+will ensure correctness.  Also, please note that you can give
+additional information about the \textsf{author} in such entries by
+using the \textsf{nameaddon} field, providing your own square brackets
+if you're indicating that the \textsf{author} is pseudonymous, or
+parentheses if it's another sort of information of interest to your
+readers.
+
+\mylittlespace Now for the subtleties.  First, the \emph{Manual}
+(14.224) allows in these entries, as it does in documentation
+generally \enquote{if numerous dates occur} (9.35), for a more
+streamlined presentation of dates using the day-month-year form,
+different from the standard American month-day-year.  In
+\textsf{letter} entries you use the \textsf{origdate} field to give
+the date of individual letters, and it is always presented in the more
+streamlined form.  Here, the same field will do exactly the same
+thing, though with the added wrinkle that if you'd prefer to use the
+standard day-month-year form you can, simply by putting the date into
+the \textsf{date} field instead.  (Please choose one only in
+\textsf{misc} entries with an \textsf{entrysubtype} --- in
+\textsf{letter} entries the \textsf{date} refers to the published
+collection.) Again just as in \textsf{letter} entries, if you want to
+include the day-month-year in a short note, I have provided the
 \cmd{letterdatelong} command for inclusion in the postnote field of
 the citation command.  (The standard \textsf{biblatex} command
-\cmd{printdate} will work if you need to do the same for interviews.)
-
-%\enlargethispage{\baselineskip}
-
-\mylittlespace As with \textsf{letter} entries, the \emph{Manual}
-(14.233) suggests that bibliography entries contain only the name of
-the manuscript collection, unless only one item from that collection
-is cited.  The \textsf{crossref} field can be used, as well as the
-\texttt{skipbib} option, for preventing the individual items from
-turning up in the bibliography.  Obviously, this is a matter for your
-discretion, and if you're using only short notes (see the
-\texttt{short} option, section~\ref{sec:useropts} below), you may feel
-the need to include more information in the note if the bibliography
-doesn't contain a full reference to an individual item.
-
-\mylittlespace Finally, if the \textsf{misc} entry isn't a letter,
-remember that, as in \textsf{article} and \textsf{review} entries,
-words like \texttt{interview} or \texttt{memorandum} needn't be
-capitalized unless they follow a period --- the automatic
-capitalization routines (with the \textsf{title} field starting with a
-lowercase letter [see dinkel:agassiz, spock:interview, and
-\textbf{\textbackslash autocap}]) will ensure correctness.  In all
-this class of archived material, the \emph{Manual} (14.232) quite
-specifically requires more consistency within your own work than
-conformity to some external standard, so it is the former which you
-should pursue.  I hope that \textsf{biblatex-chicago-notes} proves
-helpful in this regard.
-
-\mybigspace The \mymarginpar{\textbf{music}} 16th edition of the
-\emph{Manual} revised its recommendations more for this type than for
-any other, so if by any chance you have been using the 15th edition
-style the notes which follow present several large changes that you'll
-need to make to your .bib files.  The good news is that some, though
-by no means all, of those changes involve considerable
-simplifications.  \textsf{Music} is one of three audiovisual entry
-types, and is intended primarily to aid in the presentation of musical
-recordings that do not have a video component, though it can also
-include audio books (auden:reading).  A DVD or VHS of an opera or
-other performance, by contrast, should use the \textbf{video} type
-instead, while an online music video will probably need an
-\textbf{online} entry.  (Cf.\ \textsf{online} and \textsf{video};
-handel:messiah, horowitz:youtube.)  Because \textsf{biblatex} --- and
-\textsc{Bib}\TeX\ before it --- were designed primarily for citing
-book-like objects, some choices needed to be made in assigning the
-various roles found on the back of a CD to the fields in a typical
-.bib entry.  I have also implemented several bibstrings to help in
-identifying these roles within entries.  If you can think of a simpler
-way to distribute the roles, please let me know, so that I can
-consider making changes before anyone gets used to the current
-equivalences.
-
-\mylittlespace These equivalences, in summary form, are:
+\cmd{printdate} will work if you prefer the standard date form.)
+
+\enlargethispage{\baselineskip}
+
+\mylittlespace Second, some material (roosevelt:speech) includes a
+venue for the event recorded in the archive, so I have added the
+\mycolor{\textsf{venue}} field, which prints \emph{before} the date,
+with the \textsf{origlocation} appearing after it.  Somewhat
+confusingly, in published letters the \textsf{origlocation} itself
+prints before the date, rather than after, so if the inconsistency
+between published and unpublished letters bothers you then you could
+conceivably use \textsf{venue} instead of \textsf{origlocation} for
+that purpose here.
+
+\mylittlespace Finally, a few further notes.  First, please be aware
+that defining an \textsf{entrysubtype} activates the automatic
+capitalization mechanism in the \textsf{title} field of \textsf{misc}
+entries, on which see\,\texttt{\textbackslash autocap} in
+section~\ref{sec:formatcommands} below.  Second, and again as with
+\textsf{letter} entries, the \emph{Manual} (14.222) suggests that
+bibliography entries contain only the name of the manuscript
+collection, unless only one item from that collection is cited.  The
+\textsf{crossref} field can be used, as well as the \texttt{skipbib}
+option, for preventing the individual items from turning up in the
+bibliography.  Obviously, this is a matter for your discretion, and if
+you're using only short notes (see the \texttt{short} option,
+section~\ref{sec:useropts} below), you may feel the need to include
+more information in the note if the bibliography doesn't contain a
+full reference to an individual item.  Third, the \emph{Manual} offers
+several examples of specific location information for pieces from an
+archive, some of which appears \emph{before} the main archive name,
+and some of which appears \emph{after} it.  I assume this may depend
+on the exact nature of the archive itself, but in any case you can try
+the \textsf{type} or \textsf{howpublished} fields for the first case
+and the \textsf{number} field for the second.  Last, in all this class
+of archived material, the \emph{Manual} (14.221) quite specifically
+requires more consistency within your own work than conformity to some
+external standard, so it is the former which you should pursue.  I
+hope that \textsf{biblatex-chicago-notes} proves helpful in this
+regard.  (See 14.211, 14.219, 14.221-231, 14.256, 14.264; creel:house,
+dinkel:agassiz, roosevelt:speech, shapey:partita, spock:interview.)
+
+\mybigspace This \colmarginpar{\textbf{music}} is one of three
+audiovisual entry types, and is intended primarily to aid in the
+presentation of musical recordings that do not have a video component,
+though it can also include audio books (auden:reading).  A DVD or VHS
+of an opera or other performance, by contrast, should use the
+\textbf{video} type instead, while an online music video will probably
+need an \textbf{online} entry.  (Cf.\ \textsf{online} and
+\textsf{video}; handel:messiah, horowitz:youtube.)  Because
+\textsf{biblatex} --- and \textsc{Bib}\TeX\ before it --- were
+designed primarily for citing book-like objects, some choices needed
+to be made in assigning the various roles found on the back of a CD to
+the fields in a typical .bib entry.  I have also implemented several
+bibstrings to help in identifying these roles within entries.  The
+17th edition of the \emph{Manual} once again revised its
+recommendations for this type, but fortunately the changes are
+additive, i.e., you can re-use 16th-edition citations but are
+encouraged to peruse the following guidelines to see if there's any
+information you might think of adding to bring your citations more
+into line with the spec.
+
+\mylittlespace These guidelines, in summary form, are:
 
 {\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
 \begin{description}
-\item[author =] composer, songwriter, or performer(s),
-  depending on whom you wish to emphasize by placing them at the head
-  of the entry.
-\item[editor, editora, editorb =] conductor, director or
+\item[author:] composer, songwriter, or performer(s), they will be
+  closely associated with the \textsf{title}, either before it at the
+  head of the entry or, at your discretion, just after it
+  (holiday:fool).
+\item[bookauthor:] Somewhat like an \textsf{author}, but it will hold
+  the name associated with a whole album rather than an individual
+  piece, should both be present, and will therefore appear in close
+  association with the \textsf{booktitle}, rather than the
+  \textsf{title} (rihanna:umbrella).
+\item[editor, editora, editorb:] conductor, director or
   performer(s).  These will ordinarily follow the \textsf{title} of
   the work, though the usual \texttt{useauthor} and \texttt{useeditor}
   options can alter the presentation within an entry.  Because these
   are non-standard roles, you will need to identify them using the
   following:
-\item[editortype, editoratype, editorbtype:] The most common roles,
-  all associated with specific bibstrings (or their absence), will be
-  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
-  oddly, \texttt{none}.  The last is particularly useful when
+\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
+  roles, all associated with specific bibstrings (or their absence),
+  will be \texttt{conductor}, \texttt{director}, \texttt{producer},
+  and, oddly, \texttt{none}.  The last is particularly useful when
   identifying the group performing a piece, as it usually doesn't need
   further specifying and this role prevents \textsf{biblatex} from
-  falling back on the default \texttt{editor} bibstring.
-\item[title, booktitle, maintitle:] As with the other audiovisual
-  types, \textsf{music} serves as an analogue both to books and to
-  collections, so the title will either be, e.g., the album title or a
-  song title, in which latter case the album title would go into
-  \textsf{booktitle}.  The \textsf{maintitle} might be necessary for
-  something like a box set of \emph{Complete Symphonies}.
+  falling back on the default \texttt{editor} bibstring.  The 17th
+  edition (14.263) also seems to favor, in some circumstances, using
+  strings to identify individual performers, e.g., \enquote{vocalist}
+  or \enquote{pianist,} so even though there's no \cmd{bibstring}
+  associated with these types you can now provide them, or anything
+  else you need, in whatever form (\enquote{vocalist} or \enquote{sung
+    by}) suits your citation.
+\item[note:] This field can also hold contributors, perhaps
+  collaborators or featured artists (holiday:fool, rihanna:umbrella).
+\item[\mycolor{title, booktitle, maintitle:}] As with the other
+  audiovisual types, \textsf{music} serves as an analogue both to
+  books and to collections, so the title will either be, e.g., the
+  album title or a song title, in which latter case the album title
+  would go into \textsf{booktitle}.  If you wish to cite a song that,
+  as may happen, isn't part of any larger collection, your entry will
+  in such a case have only a \textsf{title}, which
+  \textsf{biblatex-chicago} would normally interpret as an album
+  title.  You \colmarginpar{New!} can now define an
+  \textsf{entrysubtype} to let it know that the lone \textsf{title} is
+  in fact a song (cf.\ naraya).  The \textsf{maintitle} might be
+  necessary for something like a box set of \emph{Complete
+    Symphonies}.
+\item[\mycolor{chapter:}] The 17th edition seems more keen on having
+  track numbers for individual pieces, whether on a traditional format
+  or on a streaming service.  The \colmarginpar{New!} \textsf{chapter}
+  field is the place for this information, and
+  \textsf{biblatex-chicago} will automatically prepend the localized
+  string \texttt{track} (cf.\ holiday:fool, rihanna:umbrella).
 \item[publisher, series, number:] These three closely-associated
   fields are intended for presenting the catalog information provided
-  by the music publisher.  The 16th edition generally only requires
+  by the music publisher.  The 17th edition generally only requires
   the \textsf{series} and \textsf{number} fields (nytrumpet:art),
   which hold the record label and catalog number, respectively.
   Alternatively, \textsf{publisher} would function as a synonym for
   \textsf{series} (holiday:fool), but there may be cases when you need
-  or want to specify a publisher in addition to a label, as was the
-  general requirement in the 15th edition.  (This might happen, for
-  example, when a single publisher oversees more than one label.)  You
-  can certainly put all of this information into one of the above
-  fields, but separating it may help make the .bib entry more
-  readable.
-\item[howpublished/pubstate:] The 16th edition of the \emph{Manual}
-  (14.276) has rather helpfully eliminated any reference to the
-  specialized symbols (\texttt{\textcircledP} \&\
-  \texttt{\textcopyright}) found in the 15th edition for presenting
-  publishing information for musical recordings.  This means that the
-  \textsf{howpublished} field is obsolete, and you can remove it from
-  \textsf{music} entries in your .bib files.  The \textsf{pubstate}
-  field, therefore, can revert to its standard use for identifying
-  reprints.  In \textsf{music} entries, putting \texttt{reprint} here
-  will transform the \textsf{origdate} from a recording date for an
-  entire album into an original release date for that album, notice of
-  which will be printed towards the end of a note or bibliography
-  entry.
-\item[date, eventdate, origdate:] As though to compensate for the
-  simplification I've just mentioned, the \textsf{Manual} now states
-  that \enquote{citations without a date are generally unacceptable}
-  (14.276).  Finding a date may take some research, but they will
-  basically fall into two types, i.e., the date(s) of the recording or
-  the copyright / publishing date(s).  Recording dates go either in
+  or want to specify a publisher in addition to a label, as perhaps
+  when a single publisher oversees more than one label.  You can
+  certainly put all of this information into one of the above fields,
+  but separating it may help make the .bib entry more readable.
+\item[pubstate:] The \textsf{pubstate} field in \textsf{music} entries
+  mainly has the usual meaning it has in other entry types, for which
+  see the documentation of the field in section~\ref{sec:entryfields},
+  below.  If the field contains \texttt{reprint}, however, this has a
+  special meaning in \textsf{music} entries, where it will transform
+  the \textsf{origdate} from a recording date for an entire album into
+  an original release date for that album, notice of which will be
+  printed towards the end of a note or bibliography entry.  No
+  \texttt{reprint} \cmd{bibstring} will be printed, as only the syntax
+  of the reference will have been altered.
+\item[date, eventdate, origdate:] The 17th edition of the
+  \emph{Manual}, like the 16th, considers \textsf{music} citations
+  without a date to be \enquote{generally unacceptable} (14.263).
+  Finding a date may take some research, but they will basically fall
+  into two types, i.e., the date(s) of the recording or the copyright
+  / publishing date(s).  Recording dates go either in
   \textsf{origdate} (for complete albums) or \textsf{eventdate} (for
   individual tracks).  The copyright or publishing dates go either in
   the \textsf{date} field (which applies to the current medium you are
@@ -1452,114 +1588,379 @@ equivalences.
   In \textsf{music} entries, \textsf{userd} will be prepended to an
   \textsf{eventdate} if there is one, barring that to the
   \textsf{origdate}, barring that to a \textsf{urldate}, and absent
-  those three to the \textsf{date}.  (See floyd:atom, nytrumpet:art.)
- \item[type:] As in all the audiovisual entry types, the \textsf{type}
-  field holds the medium of the recording, e.g., vinyl, 33 rpm,
-  8-track tape, cassette, compact disc, mp3, ogg vorbis.
+  those three to the \textsf{date}.  (See floyd:atom, holiday:fool,
+  nytrumpet:art.)
+\item[type, \mycolor{howpublished}:] As in all the audiovisual entry
+  types, the \textsf{type} field holds the medium of the recording,
+  e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg
+  vorbis.  The \colmarginpar {New!} \mycolor{\textsf{howpublished}}
+  field, newly included for the 17th edition, can hold similar
+  information \enquote{for streaming audio formats and downloads}
+  (14.263). It can also, alternatively, hold the name of the streaming
+  service, e.g., Spotify (cf.\ rihanna:umbrella).
 \end{description}}
 
 The entries in \textsf{notes-test.bib} should at least give you a good
 idea of how this all works, and that file also contains an example of
 an audio book presented in a \textsf{music} entry.  If you browse the
-examples in the \emph{Manual} you will see some variations in the
-formatting choices there, from which I have made selections for
-\textsf{biblatex-chicago}.  It wasn't always clear to me that these
-variations were rules as opposed to possibilities, so I've ignored
-some of them in the code.  Arguments as to why I'm wrong will, of
-course, be entertained.  (Cf. 14.276--77; \textsf{eventdate},
+examples in the \emph{Manual} you will see the sheer variety of
+possibilities for presenting these sources, my intention being that
+judicious manipulation of\ .bib entries should allow you to make
+\textsf{biblatex-chicago} do what you want.  Please let me know if
+I've ignored something you need.  (Cf. 14.263--64; \textsf{eventdate},
 \textsf{origdate}, \textsf{userd}; auden:reading, beethoven:sonata29,
 bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
 rubinstein:chopin.)
 
-\mybigspace All \mymarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
-  \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry
-types function more or less as in standard \textsf{biblatex}.  I would
-like, however, to emphasize a couple of things.  First, each is
-aliased to the entry type that results from removing the \enquote{mv}
-from their names.  Second, assuming you are using \textsf{Biber} and
-not \textsc{Bib}\TeX, each has an important role as the target of
-cross-references from other entries, the \textsf{title} of the
-\textbf{mv*} entry \emph{always} providing a \textsf{maintitle} for
-the entry referencing it.  If you want to provide a \textsf{booktitle}
-for the referencing entry, please use another entry type, e.g.,
-\textbf{collection} for \textbf{incollection} or \textbf{book} for
-\textbf{inbook}.  (These distinctions are particularly important to
-the correct functioning of the abbreviated references that
-\textsf{biblatex-chicago}, in various circumstances, provides.  Please
-see the documentation of the \textbf{crossref} field in
-section~\ref{sec:entryfields}, below.)
+\mybigspace The \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
+  \\\textbf{mvproceedings}\\\textbf{mvreference}} 17th edition of the
+\emph{Manual} has deployed, in at least two contexts, a notable
+syntactic change in the presentation of works that form part of other,
+larger works.  Generally, the order of presentation, in
+\textsf{biblatex} terms, has always been \textsf{title} --
+\textsf{booktitle} -- \textsf{maintitle}, in increasing order of
+generality.  In the vast majority of cases this order still holds, but
+in TV episodes, for one example, the recommendation now is to present
+the name of the series (\textsf{booktitle}) \emph{before} the name of
+the episode (\textsf{title}).  The \textbf{video} type (14.265)
+provides this by using a new \textsf{entrysubtype},
+\mycolor{\texttt{tvepisode}}, which reverses the order for you in both
+long and short notes, and in the bibliography.  The other context in
+which this reversal occurs is multi-volume works (14.116--22).  Here,
+the preferred format, at least for notes, appears to be
+\textsf{maintitle} -- \textsf{[book]title} or, when all three titles
+are present, \textsf{title} -- \textsf{maintitle} --
+\textsf{booktitle}.  The \emph{Manual} doesn't carry this reordering
+through with absolute consistency, but I think it important at least
+to offer it as a possibility to users of \textsf{biblatex-chicago}.
+Reluctant as I am simply to change the data model and provide
+non-standard entry types, the least invasive method seemed, and seems,
+to me to be to modify the \textbf{mv*} entry types while maintaining
+backward compatibility with users' current deployments of these types.
+
+\mylittlespace So, while these types are no longer aliased to the
+entry type that results from removing the \enquote{mv} from their
+names, any\ .bib entries using them should, without modification,
+continue to function as they always have.  Should you wish to ignore
+the new syntax of presentation, and there are still examples in the
+\emph{Manual} which do just that, then no changes are necessary.
+These entries will still function, assuming you are using
+\textsf{Biber}, as the target of cross-references from other entries,
+the \textsf{title} of the \textbf{mv*} entry \emph{always} providing a
+\textsf{maintitle} for the entry referencing it.  (If you want to
+provide a \textsf{booktitle} for the referencing entry, please use
+another entry type, e.g., \textbf{collection} for
+\textbf{incollection} or \textbf{book} for \textbf{inbook}.  These
+distinctions are particularly important to the correct functioning of
+the abbreviated references that \textsf{biblatex-chicago}, in various
+circumstances, provides.  Please see the documentation of the
+\textbf{crossref} field in section~\ref{sec:entryfields}, below.)
+
+\mylittlespace Also unchanged is the requirement, when multi-volume
+works are presented in the reference apparatus, that any dates should
+be appropriate to the specific nature of the citation.  This means
+that a date range that is right for the presentation of a multi-volume
+work in its entirety isn't right for citing, e.g., a single volume of
+that work which appeared in one of the years contained in the date
+range.  Because child entries will by default inherit all the date
+fields from their parent (including the \textsf{endyear} of a date
+range), I have turned off the inheritance of \textsf{date} and
+\textsf{origdate} fields from all of the \textbf{mv*} entry types to
+any other entry type.  When the dates of the parent and of the child
+in such a situation are exactly the same, then this unfortunately
+requires an extra field in the child's .bib entry.  When they're not
+the same, as will, I believe, often be the case, this arrangement
+saves a lot of annoying work in the child entry to suppress
+wrongly-inherited fields.  Other sorts of parent entries aren't
+affected by this, and of course you must be using \textsf{Biber} for
+the settings to apply.
 
-\mylittlespace On the same subject, when multi-volume works are
-presented in the reference apparatus, the \emph{Manual} (14.121--27)
-requires that any dates presented should be appropriate to the
-specific nature of the citation.  In short, this means that a date
-range that is right for the presentation of a multi-volume work in its
-entirety isn't right for citing, e.g., a single volume of that work
-which appeared in one of the years contained in the date range.
-Because child entries will by default inherit all the date fields from
-their parent (including the \textsf{endyear} of a date range), I have
-turned off the inheritance of \textsf{date} and \textsf{origdate}
-fields from all of the \textbf{mv*} entry types to any other entry
-type.  When the dates of the parent and of the child in such a
-situation are exactly the same, then this unfortunately requires an
-extra field in the child's .bib entry.  When they're not the same, as
-will, I believe, often be the case, this arrangement saves a lot of
-annoying work in the child entry to suppress wrongly-inherited fields.
-Other sorts of parent entries aren't affected by this, and of course
-you must be using \textsf{Biber} for the settings to apply.  See
-harley:ancient:cart, harley:cartography, and harley:hoc for how this
-might look.
+\enlargethispage{\baselineskip}
+
+\mylittlespace Should you wish to employ the new,
+\textsf{maintitle}-first syntax, then you'll
+\colmarginpar{\texttt{maintitle}} need to use the new
+\mycolor{\texttt{maintitle}} \textsf{relatedtype}.  In its simplest
+usage, to document one volume of a multi-volume set, you would have,
+e.g., an \textsf{mvcollection} entry with \textsf{relatedtype}
+\texttt{maintitle}, and a \textsf{related} field pointing to a
+\textsf{collection} entry.  When you cite the \textsf{mvcollection}
+entry itself, you'll get a long note like \emph{MVCollTitle}, vol.\ 1,
+\emph{CollTitle}, and a short note like \emph{MVCollTitle}, vol.\ 1.,
+or, with a \textsf{postnote} field, \emph{MVCollTitle}, 1:12, as the
+specification requires.  If you wanted to cite one essay in the
+\textsf{collection}, then you would, additionally, need an
+\textsf{incollection} entry with the \texttt{maintitle}
+\textsf{relatedtype} and a \textsf{related} field pointing to the
+\textsf{mvcollection} entry already mentioned, so you're creating a
+chain of three different related entries but presenting them in one
+reference.  It's important to keep in mind here that, in effect,
+you're \emph{not} actually citing the \textsf{mvcollection} entry, but
+the one volume of it represented by the \textsf{collection} entry, or
+indeed an essay in that one volume.  Please consult the \emph{Manual}
+(14.116--22), and also see harley:ancient:cart, harley:cartography,
+and harley:hoc for the \enquote{old style} presentation with
+abbreviated cross references using the \textsf{crossref} field,
+harleymt:ancient:cart, harleymt:cartography and harleymt:hoc for the
+new presentation using the \texttt{maintitle} \textsf{relatedtype},
+and also plato:timaeus:gr for an example of a three-work
+\texttt{maintitle} chain starting with a \textsf{bookinbook} entry.
+
+\mylittlespace The documentation of the \texttt{maintitle}
+\textsf{relatedtype} in section~\ref{sec:related} contains all the
+details, but there are several things I should like to mention here.
+First, while you can happily mix these two methods of presentation in
+your documents, please don't mix them within individual entries, which
+means that if you are using a \textsf{crossref} field to an
+\textsf{mvcollection} entry in a \textsf{collection} entry, say, and
+the \textsf{collection} entry is itself the target of the
+\textsf{mvcollection} entry's \textsf{related} field, please be
+careful not to cite that \textsf{collection} entry independently, as
+it can lead to unexpected results.  (If things don't look right to
+you, try eliminating the use of \textsf{crossref} entirely from these
+\textsf{related} chains and see if that helps, then send me a bug
+report if it does.)  This restriction also means that, although the
+\emph{Manual} prefers the \textsf{maintitle}-first format in notes and
+allows either syntax in the bibliography, nonetheless with
+\textsf{biblatex-chicago} whichever syntax you choose for the notes
+will also appear in the bibliography.  Second, if you want to use a
+three-work chain to cite one part of one volume, then this is possible
+only by using the following entry types: \textsf{bookinbook},
+\textsf{inbook}, \textsf{incollection}, \textsf{inproceedings}, and
+\textsf{letter}.  All two-work chains must start with one of the
+\textsf{mv*} types.  Third, as might be apparent from the previous
+list, \textsf{mvreference} entries are special, in that their
+\textsf{related} field should point to an \textsf{inreference} entry
+if you want to cite an entry in an \enquote{alphabetically arranged
+  work}, or to a \textsf{reference} entry otherwise.
+
+\mylittlespace Fourth, please remember that, as these are citations
+not of an \textsf{mv*} entry but rather of that entry's
+\textsf{related} field, any \textsf{volumes} field in the former won't
+be printed by default.  You can change this by setting the
+\texttt{hidevolumes} option to \texttt{false} either in the preamble
+or in the \textsf{options} field of the entry referenced by the
+\textsf{mv*} entry's \textsf{related} field.  Finally, if you look at
+the \enquote{mt} variants of the harley* entries mentioned above,
+you'll see that harleymt:hoc has both subsidiary volumes included in
+its \textsf{related} field.  You can create a separate \textsf{mv*}
+entry pointing to each of it's subsidiary volumes, or you can list all
+of those volumes in one \textsf{mv*} entry's \textsf{related} field
+and \textsf{biblatex-chicago} will create separate clones for each
+volume listed, clones with a standardized entry key looking like
+\enquote{\texttt{mventrykey-singlevolumeentrykey},} which you should
+then use for your citations.  The original \texttt{mventrykey}, in
+this case, refers merely to the original \textsf{mv*} entry, as though
+it had never had a \textsf{related} field, though you do need to cite
+(or \cmd{nocite}) it somewhere in your document to make the
+single-volume clones available in your reference apparatus.  The
+mechanism's designed to save you some typing in common scenarios;
+please see all of the (multifarious) details in
+section~\ref{sec:related}, below.
 
-\paragraph*{\protect\mymarginpar{\textbf{online}}}
+\paragraph*{\protect\colmarginpar{\textbf{online}}}
 \label{sec:online}
 
-The \emph{Manual}'s scattered instructions (14.4--13, 14.166--169,
-14.184--185, 14.200, 14.223, 14.243--246) for citing online materials
-are slightly different from those suggested by standard
-\textsf{biblatex}.  Indeed, this is a case where complete backward
-compatibility with other \textsf{biblatex} styles may be impossible,
-because as a general rule the \emph{Manual} considers relevant not
-only where a source is found, but also the nature of that source,
-e.g., if it's an online edition of a book (james:ambassadors), then it
-calls for a \textsf{book} entry.  Even if you cite an intrinsically
-online source, if that source is structured more or less like a
-conventional printed periodical, then you'll probably want to use
-\textsf{article} or \textsf{review} instead of \textsf{online}
-(stenger:privacy, which cites \emph{CNN.com}).  The 16th edition's
-suggestions for blogs lend themselves well to the \textsf{article}
-type, too, while comments become, logically, \textsf{reviews}
-(14.243--6; ellis:blog, ac:comment).  Otherwise, for online documents
-not \enquote{formally published,} the \textsf{online} type is usually
-the best choice (evanston:library, powell:email).  Online videos, in
-particular short pieces or those that present excerpts of some longer
-event or work, and also online interviews, usually require this type,
-too.  (See harwood:biden, horowitz:youtube, pollan:plant, but cp.\
-weed:flatiron, a complete film, which requires a \textsf{video}
-entry.)  Online audio pieces, particularly dated ones from an archive,
-work well either with an \textsf{online} entry or with a \textsf{misc}
-entry with an \textsf{entrysubtype}; the latter will print the
-\textsf{date} in somewhat closer association with the \textsf{title}
-(coolidge:speech, roosevelt:speech).  Some online materials will, no
-doubt, make it difficult to choose an entry type, but so long as all
-locating information is present, then perhaps that is enough to
-fulfill the specification, or at least so I'd like to hope.
-
-\mylittlespace Constructing an \textsf{online} .bib file entry is much
-the same as in \textsf{biblatex}.  The \textsf{title} field would
-contain the title of the page, the \textsf{organization} field could
-hold the title or owner of the whole site.  If there is no specific
-title for a page, but only a generic one (powell:email), then such a
-title should go in \textsf{titleaddon}, not forgetting to begin that
-field with a lowercase letter so that capitalization will work out
-correctly.  It is worth remarking here, too, that the 16th edition of
-the \emph{Manual} (14.7--8) prefers, if they're available, revision
-dates to access dates when documenting online material.  See
-\textsf{urldate} and \textsf{userd}, below.
-
-%\enlargethispage{\baselineskip}
+One of the features of the 17th edition of the \emph{Manual} is the
+considerably extended, but still scattered, treatment of online
+materials (8.189--92, 14.6--18, 14.159--63, 14.175--76, 14.187,
+14.189, 14.205--10, 14.233).  The principles of that treatment have
+changed somewhat, as the \emph{Manual} now places greater emphasis on
+the \emph{location} of a source, which can in many cases outweigh, as
+far as choosing an entry type goes, the \emph{nature} of the source.
+Working out the correspondences between online sources and
+\textsf{biblatex-chicago} entry types can, therefore, be tricky, so I
+have included table~\ref{tab:online:types} summarizing the
+increasingly detailed instructions in the \emph{Manual}, along with
+some further annotations here that might help to clarify it.
+
+\afterpage{\clearpage
+
+\begin{table}[h!]
+  \caption[\hspace{-1em}\mycolor{Online Entry Types - Notes \&\ Bibliography}]%
+  {Online materials and notes \&\ bibliography entry types}
+  \label{tab:online:types}
+  \centering\small\sffamily
+  \hspace*{-6em}
+  \begin{tabularx}{160mm}{@{}>{\raggedright}p{25mm}>{\raggedright}p{20mm}p{15mm}p{26mm}X@{}}
+    \toprule
+    Online Material & Entry Type & CMS Ref. & Sample Entry &
+    Notes \\
+    \cmidrule{1-1}\cmidrule(l){2-2}\cmidrule(l){3-3}\cmidrule(l){4-4}
+    \cmidrule(l){5-5}
+    Online edition of trad.\ publ.\ matter. &&&& Use the same
+    entry type as you would choose were you citing it
+    from a printed source.\\\addlinespace[.8mm]
+    & @Book & 14.161-62 & james:ambassadors &
+    CMS prefers (scanned) original page numbers
+    to reflowable text. \\\addlinespace[.8mm]
+    & @Article @Review & 14.175 & black:infectious & If
+    no \enquote{suitable URL} is available, e.g., if it points
+    to a generic portal page rather than to an abstract,
+    use the name of the commercial database in an \textsf{addendum}
+    field instead.
+    \\\addlinespace[.8mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+    Blogs&& 14.208 &&\\\addlinespace[1.5mm]
+    \hspace{.5em} Entire & @Periodical & & amlen:wordplay & The
+    \textsf{maintitle} field holds the larger publication of which the
+    blog is a part. \\
+    \hspace{.5em} Single post & @Article & & amlen:hoot &
+    \\\addlinespace[.8mm]
+    \hspace{.5em} Comment & @Review & & viv:amlen & You can also
+    use the new \mycolor{\texttt{commenton}} \textsf{relatedtype} for
+    this. \\\addlinespace[.8mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+    Social Media & @Online &&& This includes anything --- posts, photos,
+    videos --- on these and similar sites.  In other words, the
+    \emph{location} of the material defines its treatment. \\\addlinespace[2mm]
+    \hspace{.5em} Mailing list or \hspace*{.5em} forum post & & 14.210 &
+    powell:email & Posts on private lists are to be treated as
+    \enquote{personal communications,} using @Misc w/
+    \textsf{entrysubtype}.\\\addlinespace[.8mm]
+    \hspace{.5em} Facebook&& 14.209 & diaz:surprise &\\\addlinespace[.8mm]
+    \hspace{.5em} Twitter&&& obrien:recycle &\\\addlinespace[.8mm]
+    \hspace{.5em} Instagram&&& souza:obama &\\\addlinespace[.8mm]
+    \hspace{.5em} Comments / \hspace*{.5em} replies & & 14.210
+    & braun:reply &
+    The \mycolor{\texttt{commenton}} \textsf{relatedtype} is \emph{required}
+    for this, and for the next entry, too.\\\addlinespace[.8mm]
+    && 14.209 & licis:diazcomment &\\\addlinespace[.8mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+    Online Multimedia &&&&\\\addlinespace[.8mm]
+    \hspace{.5em} Online video & @Online & 14.267 & pollan:plant &
+    This category includes TED talks and most informal videos on
+    YouTube and similar sites. \\\addlinespace[.8mm]
+    \hspace{.5em} Online video, \hspace*{.5em} from a trad.\ \hspace*{.5em}
+    journal & @Article &&
+    kessler:nyt & You can use @Online, but this requires special
+    formatting in the \textsf{note} or \textsf{titleaddon} field.
+    \\\addlinespace[.8mm]
+    \hspace{.5em} Published films in \hspace*{.5em} an archive & @Video &&
+    weed:flatiron &\\\addlinespace[.8mm]
+    \hspace{.5em} Podcasts & @Audio && danforth:podcast & Note the
+    eventdate of the individual episode.\\\addlinespace[.8mm]
+    \hspace{.5em} Archival audio & @Misc w/ \textsf{entrysubtype} & 14.264 &
+    roosevelt:speech & Can have both a venue and an origlocation.
+    \\\addlinespace[.8mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+    Streaming Media&&&& \\\addlinespace[.8mm]
+    \hspace*{.5em} TV / Film & @Video & 14.265 & mayberry:brady &
+    The streaming service is supplied by the URL.  The
+    \mycolor{\texttt{tvepisode}} entrysubtype is new in the 17th
+    edition. \\\addlinespace[.8mm]
+    \hspace*{.5em} Music & @Music & 14.263 & rihanna:umbrella &
+    The streaming service is supplied by the howpublished field.
+    \\\addlinespace[.8mm]
+    \hspace*{.5em} News / Interviews & @Article @Review & 14.213 &
+    bundy:macneil & Network information goes in the usera field.
+    \\\addlinespace[.8mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+    Websites & @Online & 14.206-7 & evanston:library stenger:privacy &
+    An online source \enquote{analogous to a traditionally printed
+    work but [which] does not have (and never had) a printed counterpart}
+    may now use an @Online entry, at your discretion.
+    \\\addlinespace[.8mm]
+    \hspace*{.5em} Reference works, \hspace*{.5em} cited by alpha-
+    \hspace*{.5em} betized entry & @InReference w/ entrysub-\par
+    type & 14.233 & wikiped:bibtex & As above, you can choose the
+    @Online treatment of the title, but it's best achieved
+    using an @InReference entry w/ entrysubtype. \\\addlinespace[.8mm]
+    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & \mycolor{@Dataset} &
+    14.257 & genbank:db & New in this release.\\\addlinespace[.8mm]
+    \bottomrule
+  \end{tabularx}
+\end{table}}
+
+\mylittlespace The basic principle, as I've cited in the penultimate
+entry of table~\ref{tab:online:types}, is that \enquote{the title of a
+  website that is analogous to a traditionally printed work but does
+  not have (and never had) a printed counterpart can be treated like
+  the titles of other websites, subject to editorial discretion}
+(14.206).  This means that an intrinsically online entry like
+stenger:privacy (citing CNN.com) need no longer be an \textsf{article}
+but can be presented in an \textsf{online} entry.  (The same principle
+applies to wikiped:bibtex, but because of the code facilitating
+presentation of alphabetized entries in reference works, it's best in
+this case to keep the \textsf{inreference} entry but add an
+\textsf{entrysubtype} so that the \textsf{title} is presented as it
+would be in an \textsf{online} entry.)  The corollary of the
+principle, as the first entry in table~\ref{tab:online:types}
+suggests, is that an online edition of a printed work will generally
+require the same entry type as that printed work itself would.  Blogs
+are, therefore, somewhat anomalous in requiring the various periodical
+types, though the \emph{Manual} does specify that if you're not sure
+whether a website is a blog, then it probably requires the
+\textsf{online} type (14.206).  Social media, on the other hand, are
+very much subject to the first principle, requiring \textsf{online}
+entries no matter whether the citation is of text, a photo, or a
+video.  Without pretending that all of the correspondences flow
+deductively from the basic principles, I hope that the table might
+simplify most of your choices.  If something remains unclear, please
+let me know and I'll see if I can improve it.
+
+\mylittlespace A few more notes are in order. I designed the
+\colmarginpar{New!} new \textsf{relatedtype}
+\mycolor{\texttt{commenton}} to facilitate citation of online
+comments, though it works slightly differently in the two entry types
+in which it is available, \textsf{online} and \textsf{review}.  In
+both types it allows you to mimic thread structure by citing a chain
+of replies to comments on posts, etc., all in a single entry, while
+also simplifying your\ .bib entries.  This simplification works
+differently depending on whether the comment itself has no specific
+title, as always in \textsf{review} entries, or does have such a
+title, as especially in \textsf{online} social media entries.  In the
+former case, the \textsf{related} apparatus allows you not to provide
+a \textsf{title} at all, but in the latter you still need a
+\textsf{title}, which will be followed by the \textsf{relatedstring}.
+In these latter entries, the \emph{only way to cite such comments} is
+by using the \texttt{commenton} \textsf{relatedtype}
+(licis:diazcomment).  If, in \textsf{online} entries, you decided
+\emph{not} to use \textsf{commenton} in an entry like braun:reply, and
+simply use a specially-crafted \textsf{titleaddon} field, you lose the
+possibility of having two dates in the entry, one for the comment and
+one for the original post, though to be fair it does end up looking
+like the example in 14.210, where it is ambiguous to which part of the
+citation the date applies.
+
+\mylittlespace As for the thread structure, I've not tested how far
+down the rabbit hole you can go, but a series of entries linked one to
+the next by this \textsf{relatedtype} will all turn up if you cite the
+first in the chain, though of course you can use the technique merely
+as a convenient way to structure and simplify your\ .bib file, without
+creating chains longer than 2 entries.  The default connecting string
+is the localized \texttt{commenton}, but you can use
+\textsf{relatedstring} to change it to \enquote{\texttt{reply to}} or
+whatever else you need.  Please see the documentation of this
+\textsf{relatedtype} in section~\ref{sec:related}, and also
+diaz:surprise and licis:diazcomment.
+
+\mylittlespace In general, constructing an \textsf{online}\ .bib file
+entry is much the same as in \textsf{biblatex}.  The \textsf{title}
+field would contain the title of the page, the \textsf{organization}
+field could hold the title or owner of the whole site.  If there is no
+specific title for a page, but only a generic one, then such a title
+should go in \textsf{titleaddon}, not forgetting to begin that field
+with a lowercase letter so that capitalization will work out
+correctly.  It is worth remarking here, too, that the \emph{Manual}
+(14.12--13) prefers, if they're available, revision dates to access
+dates when documenting online material.  Indeed, given how rapidly
+online sources may change (14.191, 14.209, 14.233), a time stamp may
+often be necessary further to specify a revision date
+(\textsf{urldate}) or the date of a comment or reply (\textsf{date}).
+This time specification should be added to the date field using
+\textsf{biblatex's} standard format, i.e.,
+\texttt{2008-07-01T10:18:00}.  If a time zone is needed, then a
+separate \textsf{timezone} or \textsf{urltimezone} field is the best
+way, as it allows you to provide the initialisms that the
+\emph{Manual} prefers (10.41, 14.191).  See \textsf{date},
+\textsf{timezone}, \textsf{urldate}, and \textsf{userd} in
+section~\ref{sec:entryfields}, below.
+
+\enlargethispage{\baselineskip}
 
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
-brief on this subject (14.230), but very clear about which information
+brief on this subject (14.258), but very clear about which information
 it wants you to present, so such entries may not work well with other
 \textsf{biblatex} styles.  The important date, as far as Chicago is
 concerned, is the filing date.  If a patent has been filed but not yet
@@ -1569,22 +1970,41 @@ granted, then you can place the filing date in either the
 bibstring \texttt{patentfiled} to it.  If the patent has been granted,
 then you put the filing date in the \textsf{origdate} field, and you
 put the date it was issued in the \textsf{date} field, to which the
-bibstring \texttt{patentissued} will automatically be prepended.  (In
-other words, you no longer need to use a hand-formatted
-\textsf{addendum} field, though you can place additional information
-in that field if desired, and it will be printed in close association
-with the dates.)  The patent number goes in the \textsf{number} field,
-and you should use the standard \textsf{biblatex} bibstrings in the
-\textsf{type} field.  Though it isn't mentioned by the \emph{Manual},
+bibstring \texttt{patentissued} will automatically be prepended.  You
+can place additional information in the \textsf{addendum} field if
+desired, and it will be printed in close association with the dates.
+The patent number goes in the \textsf{number} field, and you should
+use the standard \textsf{biblatex} bibstrings in the \textsf{type}
+field.  Though it isn't mentioned by the \emph{Manual},
 \textsf{biblatex-chicago-notes} will print the \textsf{holder} after
-the \textsf{author}, if you provide one.  Finally, the 16th edition of
-the \emph{Manual} has removed the quotation marks from around
-\textsf{patent} titles, and also capitalized them sentence-style, both
-of which seem to be the generally-accepted conventions.  The former
-requires no intervention from you, but the latter may mean revision of
-the \textsf{title} field to provide the lowercase letters manually.
-See petroff:impurity.
-
+the \textsf{author}, if you provide one.  Finally, the style
+automatically capitalizes \textsf{patent} titles sentence-style, so if
+you need to keep a word capitalized then you should wrap it in curly
+braces.  See petroff:impurity.
+
+\mybigspace The \colmarginpar{\textbf{performance}} 17th edition of
+the \emph{Manual} includes a new section (14.266) on citing live
+performances, and even though such references can usually be limited
+to the main text it may sometimes be useful to include them in notes.
+Since \textsf{biblatex} provides the \mycolor{\textbf{performance}}
+type, albeit without using it in its standard styles, I though it
+might be useful to define it for \textsf{biblatex-chicago},
+particularly as the other option for such material is the
+\textsf{misc} entry without any \textsf{entrysubtype}, and that entry
+type is already somewhat overloaded, though you can still use it if
+you wish.
+
+\mylittlespace Such entries will generally have a \textsf{title}, a
+\textsf{venue}, a \textsf{location} for the venue, and a \textsf{date}
+for the performance, along with a possible plethora of authorial
+and/or editorial roles depending on which sorts of contributor(s) you
+wish to emphasize in the citation.  The \textsf{editor[abc]} and
+\textsf{editor[abc]type} fields should be most helpful here.  I have
+included strings for \mycolor{\texttt{choreographer}} in all
+localization files, but for others you may need to provide them in the
+\textsf{editor[abc]type} fields as you wish them printed ---
+\textsf{biblatex-chicago} will automatically capitalize any that start
+with a lowercase letter.
 
 \mybigspace This \mymarginpar{\textbf{periodical}} is the standard
 \textsf{biblatex} entry type for presenting an entire issue of a
@@ -1597,19 +2017,27 @@ citing is a \enquote{newspaper} or \enquote{magazine} instead of a
 \enquote{journal.}  Also, remember that the \textsf{note} field is the
 place for identifying strings like \enquote{special issue,} with its
 initial lowercase letter to activate the automatic capitalization
-routines.  (See \emph{Manual} 14.187; good:wholeissue.)
-
-\mylittlespace It is worth noting that the special \textsf{biblatex}
-field \textsf{shortjournal} allows you to present shortened
-\textsf{journaltitles} in \textsf{article}, \textsf{review}, and
-\textsf{periodical} entries, as well as facilitating the creation of
-lists of journal abbreviations in the manner of a \textsf{shorthand}
-list.  Because the \textsf{periodical} type uses the \textsf{title}
-field instead of \textsf{journaltitle}, \textsf{biblatex-chicago}
-automatically copies any \textsf{shorttitle} field, if one is present,
-into \textsf{shortjournal}.  Please see the documentation of
-\textbf{shortjournal} in section~\ref{sec:entryfields} for all the
-details on how this works.
+routines.  (See \emph{Manual} 14.178; good:wholeissue.)
+
+\mylittlespace It is worth noting a couple of things.  First, the
+special \textsf{biblatex} field \textsf{shortjournal} allows you to
+present shortened \textsf{journaltitles} in \textsf{article},
+\textsf{review}, and \textsf{periodical} entries, as well as
+facilitating the creation of lists of journal abbreviations in the
+manner of a \textsf{shorthand} list.  Because the \textsf{periodical}
+type uses the \textsf{title} field instead of \textsf{journaltitle},
+\textsf{biblatex-chicago} automatically copies any \textsf{shorttitle}
+field, if one is present, into \textsf{shortjournal}.  Please see the
+documentation of \textbf{shortjournal} in
+section~\ref{sec:entryfields} for all the details on how this works.
+Second, the \textsf{periodical} type is the place for citing whole
+blogs, rather than individual blog posts, which require either an
+\textsf{article} or a \textsf{review} entry.  In \colmarginpar{New!}
+such citations the 17th edition (14.208) recommends that you include
+the name of any larger (usually periodical) publication of which the
+blog is a part.  The \textsf{maintitle} field (with
+\textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed) is the
+place for it. Cf.\ amlen:wordplay.
 
 \mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
 \textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
@@ -1635,13 +2063,13 @@ entry.  (See mla:style for an example of a reference work that uses
 numbered sections rather than alphabetized entries, and that appears
 in the bibliography as well.)
 
-\mybigspace This \colmarginpar{\textbf{report}} entry type is a
+\mybigspace This \mymarginpar{\textbf{report}} entry type is a
 \textsf{biblatex} generalization of the traditional \textsc{Bib}\TeX\
 type \textsf{techreport}.  Instructions for such entries are rather
-thin on the ground in the \emph{Manual} (8.183, 14.249), so I have
+thin on the ground in the \emph{Manual} (8.186, 14.220), so I have
 followed the generic advice about formatting it like a book, and hope
 that the results conform to the specification.  At least one user has
-indicated a need, now filled, for an \mycolor{\texttt{unpublished}}
+indicated a need, now filled, for an \texttt{unpublished}
 \textsf{entrysubtype}, which prints the \textsf{title} inside
 quotation marks instead of in italics, but affects nothing else.  This
 detail aside, the type's main peculiarities are the
@@ -1652,24 +2080,19 @@ and the \textsf{isrn} field containing the International Standard
 Technical Report Number of a technical report.  As in standard
 \textsf{biblatex}, if you use a \textsf{techreport} entry, then the
 \textsf{type} field automatically defaults to
-\cmd{bibstring\{techreport\}}.  As with \textsf{booklet} and
+\verb+\bibstring{techreport}+.  As with \textsf{booklet} and
 \textsf{manual}, you can also use a \textsf{book} entry, putting the
 report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
-%%\enlargethispage{\baselineskip}
-
-\mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry
-type was added to \textsf{biblatex 0.7}, and it certainly eases the
-task of coping with the \emph{Manual}'s complicated requirements for
-citing periodicals of all sorts, though it doesn't, I admit, eliminate
-all difficulties.  As its name suggests, this entry type was designed
-for reviews published in periodicals, and if you've already read the
-\textsf{article} instructions above --- if you haven't, I recommend
-doing so now --- you'll know that \textsf{review} serves as well for
-citing other sorts of material with generic titles, like letters to
-the editor, obituaries, interviews, online comments and the like.  The
-primary rule is that any piece that has only a generic title, like
+\mybigspace As \colmarginpar{\textbf{review}} its name suggests, the
+\textsf{review} entry type was designed for reviews published in
+periodicals, and if you've already read the \textsf{article}
+instructions above --- if you haven't, I recommend doing so now ---
+you'll know that \textsf{review} serves as well for citing other sorts
+of material with generic titles, like letters to the editor,
+obituaries, interviews, online comments and the like.  The primary
+rule is that any piece that has only a generic title, like
 \enquote{review of \ldots,} \enquote{interview with \ldots,} or
 \enquote{obituary of \ldots,} calls for the \textsf{review} type.  Any
 piece that also has a specific title, e.g., \enquote{\enquote{Lost in
@@ -1678,8 +2101,8 @@ piece that also has a specific title, e.g., \enquote{\enquote{Lost in
 periodical of some sort.  Were it found in a book, then the
 \textsf{incollection} type would serve your needs, and you could use
 \textsf{title} and \textsf{titleaddon} there.  While we're on the
-topic of exceptions, the \emph{Manual} includes an example --- 14.221
---- where the \enquote{Interview} part of the title is considered a
+topic of exceptions, the \emph{Manual} includes an example (14.213)
+where the \enquote{Interview} part of the title is considered a
 subtitle rather than a titleaddon, said part therefore being included
 inside the quotation marks and capitalized accordingly.  Not having
 the journal in front of me I'm not sure what prompted that decision,
@@ -1691,42 +2114,46 @@ need to determine which sort of periodical you are citing, the rules
 for which are the same as for an \textsf{article} entry.  If it is a
 \enquote{magazine} or a \enquote{newspaper}, then you need an
 \textsf{entrysubtype} \texttt{magazine}, or the synonymous
-\textsf{entrysubtype} \mycolor{\texttt{newspaper}}.  The generic title
-goes in \textsf{title} and the other fields work just as as they do in
-an \textsf{article} entry with the same \textsf{entrysubtype},
-including the substitution of the \textsf{journaltitle} for the
-\textsf{author} if the latter is missing. (See 14.202--203, 14.205,
-14.208, 14.214--217, 14.221; barcott:review, bundy:macneil,
-Clemens:letter, gourmet:052006, kozinn:review, nyt:obittrevor,
-nyt:trevorobit, unsigned:ranke, wallraff:\\word.)  If, on the other
-hand, the piece comes from a \enquote{journal,} then you don't need an
-\textsf{entrysubtype}.  The generic title goes in \textsf{title}, and
-the remaining fields work just as they do in a plain \textsf{article}
-entry.  (See 14.215; ratliff:review.)
-
-\mylittlespace \textsf{Biblatex-chicago} \colmarginpar{New!} now also,
-at the behest of Bertold Schweitzer, supports the \textsf{relatedtype}
-\mycolor{\texttt{reviewof}}, which allows you to use the
-\textsf{related} mechanism to provide information about the work being
-reviewed.  This may be particularly helpful if you need to cite
-multiple reviews of the same work, but in any case the usual
-distinction between \textsf{article} and \textsf{review} entries still
-holds, with the \textsf{related} entry's \textsf{title} providing the
-\textsf{titleaddon} in the former type and the \textsf{title} in the
-latter.  Please see section \ref{sec:related} for further details.
+\textsf{entrysubtype} \texttt{newspaper}.  The generic title goes in
+\textsf{title} and the other fields work just as as they do in an
+\textsf{article} entry with the same \textsf{entrysubtype}, including
+the substitution of the \textsf{journaltitle} for the \textsf{author}
+if the latter is missing. (See 14.190--91, 14.195--96, 14.201--4,
+14.213; barcott:review, bundy:macneil, Clemens:letter, gourmet:052006,
+kozinn:review, nyt:obittrevor, nyt:trevorobit, unsigned:ranke,
+wallraff:word.)  If, on the other hand, the piece comes from a
+\enquote{journal,} then you don't need an \textsf{entrysubtype}.  The
+generic title goes in \textsf{title}, and the remaining fields work
+just as they do in a plain \textsf{article} entry.  (See 14.202;
+ratliff:review.)
+
+\mylittlespace \textsf{Biblatex-chicago} also, at the behest of
+Bertold Schweitzer, supports the \textsf{relatedtype}
+\texttt{reviewof}, which allows you to use the \textsf{related}
+mechanism to provide information about the work being reviewed,
+thereby simplifying how much information you need to provide in the
+reviewing entry.  In particular, it relieves you of the need to
+construct \textsf{title} or \textsf{titleaddon} fields like:
+\verb+review of \mkbibemph{Book Title} by Author+, as the
+\textsf{related} entry's \textsf{title} automatically provides the
+\textsf{title} in the \textsf{review} type and the \textsf{titleaddon}
+in the \textsf{article} type, with the \textsf{related} mechanism
+providing the connecting string.  This may be particularly helpful if
+you need to cite multiple reviews of the same work; please see section
+\ref{sec:related} for further information.
 
 \mylittlespace Most of the onerous details are the same as I described
 them in the \textbf{article} section above, but I'll repeat some of
 them briefly here.  If anything in the \textsf{title} needs
 formatting, you need to provide those instructions yourself, as the
-default is completely plain.  (The \textsf{related} mechanism just
-mentioned provides this automatically.)  \textsf{Author}-less reviews
+default is completely plain.  (As just mentioned, the \textsf{related}
+mechanism provides this automatically.)  \textsf{Author}-less reviews
 are treated just like similar newspaper articles --- in short notes
 and in the bibliography the \textsf{journaltitle} replaces the author
 and heads the entry, while in long notes the \textsf{title} comes
 first.  The sorting of such entries is an issue, solved if you use
 \textsf{Biber} as your backend, and otherwise requiring manual
-intervention with a \textsf{sortkey} or the like (14.217;
+intervention with a \textsf{sortkey} or the like (14.204;
 gourmet:052006, nyt:trevorobit, unsigned:ranke, and see
 \cmd{DeclareSortingTemplate} in section~\ref{sec:formatopts}, below.).
 As in \textsf{misc} entries with an \textsf{entrysubtype}, words like
@@ -1737,33 +2164,86 @@ with this problem itself if you start the \textsf{title} field with a
 lowercase letter.  The file \textsf{notes-test.bib} and the
 documentation of \cmd{autocap} will provide guidance here.
 
-\mylittlespace One detail of the \textsf{review} type is fairly new,
-and responds to the needs of the 16th edition of the \emph{Manual}.
-As I mentioned above, blogs are best treated as \textsf{articles} with
-\texttt{magazine} \textsf{entrysubtype}, whereas comments on those
-blogs --- or on any similar sort of online content --- need the
-\textsf{review} type with the same \textsf{entrysubtype}.  What they
-will frequently also need is a date of some sort closely associated
-with the comment (14.246; ac:comment), so I have included the
+\mylittlespace One \colmarginpar{New!} detail of the \textsf{review}
+type is fairly new, and in particular has changed between the 16th and
+17th editions of the \emph{Manual}.  As I mentioned above, blogs are
+best treated as \textsf{articles} with \texttt{magazine}
+\textsf{entrysubtype}, whereas comments on those blogs --- or replies
+to those comments, etc.\ --- need the \textsf{review} type with the
+same \textsf{entrysubtype}.  (Neither need appear in the
+bibliography.)  What they also need is a date closely associated with
+the comment (14.208; ac:comment), so I have included the
 \textsf{eventdate} in \textsf{review} entries for just this purpose.
 It will be printed just after the \textsf{author} and before the
-\textsf{title}.  If you need a timestamp in addition, then the
-\textsf{nameaddon} field is the place for it, but you'll have to
-provide your own parentheses, in order to preserve the possibility of
-providing pseudonyms in square brackets that is the standard function
-of this field in all other entry types, and possibly in the the
-\textsf{review} type as well.
-
-\mylittlespace For the reasons I explained in the \textsf{article}
-docs above, I have brought the \textsf{article} and \textsf{review}
-entry types into line with most of the other types in allowing the use
-of the \textsf{namea} and \textsf{nameb} fields in order to associate
-an editor or a translator specifically with the \textsf{title}.  The
-\textsf{editor} and \textsf{translator} fields, in strict homology
-with other entry types, are associated with the \textsf{issuetitle} if
-one is present, and with the \textsf{title} otherwise.  The usual
-string concatenation rules still apply --- cf.\ \textsf{editor} and
-\textsf{editortype} in section~\ref{sec:entryfields}, below.
+\textsf{title}.  If you need a time stamp in addition, as may
+frequently be the case with multiple contributions by the same author
+to a single thread, then you should now use the standard
+\textsf{biblatex} time-stamp format (e.g.,
+\texttt{2008-07-01T10:18:00}) in the \textsf{eventdate} field itself,
+which \textsf{biblatex-chicago} will format and print appropriately.
+Please see the documentation concerning time stamps in
+section~\ref{sec:entryfields}, s.v.\ \mycolor{\textsf{date}}.  This
+change allows the \textsf{nameaddon} field to revert to its primary
+use, which is to provide extra information about the \textsf{author}.
+In blog comments, this could include the commenter's geographical
+location, which you need to enclose in parentheses, as I've removed
+the automatic square brackets from this field to allow it this more
+general usefulness.  You can, of course, still provide your own square
+brackets in \textsf{review} entries to indicate pseudonymous
+authorship, which is the standard function of \textsf{nameaddon} in
+most entry types.
+
+\mylittlespace In \colmarginpar{New!} this context I should mention a
+small change to the default behavior of \textsf{review} entries when
+they utilize a \textsf{crossref} or \textsf{xref} field, as is really
+only useful when the entry is a blog comment, as otherwise there won't
+generally be any fields worth inheriting from the reviewed entry.
+Assuming the default values of the \textsf{biblatex-chicago} option
+\texttt{longcrossref}, the driver now explicitly tests if the reviewed
+entry has already been cited, and accordingly shortens the reviewing
+citation, as the \emph{Manual} (14.208) suggests (viv:amlen).  (This
+would be incorrect for, say, a book review, so you should either not
+use a \textsf{crossref} or \textsf{xref} field there, or change the
+state of the \texttt{longcrossref} option --- cf.\ the documentation
+starting on page~\pageref{sec:crossref}, below.)  You
+\colmarginpar{\texttt{blogurl}} can, if you wish, and while we're on
+this subject, set the new preamble option \mycolor{\texttt{blogurl}}
+to allow your child comments to inherit the URL from the parent blog.
+
+\mylittlespace Also \colmarginpar{New!} new in this release is the
+\textsf{relatedtype} \mycolor{\texttt{commenton}}, which allows you to
+simplify your\ .bib entries in much the same way as the
+\texttt{reviewof} \textsf{relatedtype} does, i.e., it constructs your
+\textsf{title} field for you (which the \textsf{crossref} mechanism
+doesn't do).  It further allows you to mimic thread structure by
+citing a chain of replies to comments on blogs, etc., all in a single
+entry, while also simplifying your\ .bib entries.  I've not tested how
+far down the rabbit hole you can go, but a series of entries linked
+one to the next by this \textsf{relatedtype} will all turn up if you
+cite the first in the chain, though of course you can use the
+technique merely as a convenient way to structure and simplify your\
+.bib file, without creating chains longer than 2 entries.  The default
+connecting string is the localized \texttt{commenton}, but you can use
+\textsf{relatedstring} to change it to \enquote{\texttt{reply to}} or
+whatever else you need.  Please see the documentation of this
+\textsf{relatedtype} in section~\ref{sec:related}, and also
+ellis:blog, ac:comment, and the (fictional) ellis:reply.  Note also
+that this way of structuring your\ .bib file is by no means required
+in \textsf{review} entries, though if you want to cite replies and
+comments to social media threads, where you need the \textsf{online}
+entry type, you will need to use this \textsf{relatedtype}.
+
+\mylittlespace Two more notes.  For the reasons I explained in the
+\textsf{article} docs above, I have brought the \textsf{article} and
+\textsf{review} entry types into line with most of the other types in
+allowing the use of the \textsf{namea} and \textsf{nameb} fields in
+order to associate an editor or a translator specifically with the
+\textsf{title}.  The \textsf{editor} and \textsf{translator} fields,
+in strict homology with other entry types, are associated with the
+\textsf{issuetitle} if one is present, and with the \textsf{title}
+otherwise.  The usual string concatenation rules still apply --- cf.\
+\textsf{editor} and \textsf{editortype} in
+section~\ref{sec:entryfields}, below.
 
 \mylittlespace Finally, the special \textsf{biblatex} field
 \textsf{shortjournal} allows you to present shortened
@@ -1774,6 +2254,49 @@ the creation of lists of journal abbreviations in the manner of a
 \textbf{shortjournal} in section~\ref{sec:entryfields} for all the
 details on how this works.
 
+\mybigspace In \colmarginpar{\textbf{standard}} older releases it was
+fairly straightforward to present published national or international
+standards using a \textsf{book} entry, but with some additional
+specifications now included in the 17th edition of the \emph{Manual}
+(14.259) I think it might be helpful to provide a separate entry type.
+The \mycolor{\textbf{standard}} type has long existed in
+\textsf{biblatex}, though none of its included styles use it.  In
+\textsf{biblatex-chicago} constructing such an entry is mostly
+straightforward.  The organization responsible for the standard goes
+in \textsf{organization}, the title in \textsf{title}, and the
+\textsf{series} and \textsf{number} fields provide the ID of the
+standard.  The \textsf{date} field generally provides the publication
+date, though for some standards there may also be a later
+reaffirmation date (or similar), for which you can use the
+\textsf{eventdate}.
+
+\mylittlespace Now, for the peculiarities.  In the bibliography, the
+\textsf{organization} will appear at the head of the entry, and will
+be reprinted as the publisher.  If you wish to provide a shortened
+version for the second appearance, then the \textsf{publisher} field
+is the place for it.  In long notes, the entry starts with the
+\textsf{title}, so there the code prefers the \textsf{organization} as
+publisher, because its shortened version may not be immediately
+recognizable.  In short notes, only the \textsf{title} will appear
+(along with any \textsf{pre} or \textsf{postnote} fields, obviously).
+You can use the \textsf{author} field in addition to the
+\textsf{organization}, but this is unnecessary.  If you absolutely
+must have the \textsf{organization} or \textsf{author} appear at the
+head of long and short notes, then providing any \textsf{entrysubtype}
+whatsoever will accomplish this.  Any named \textsf{editor} or
+\textsf{namec} will, as per the specification, \emph{not} appear at
+the head of entries.  You can really only alter this by using a
+\textsf{book} entry, instead.  (Cf.\ w3c:xml.)
+
+\mylittlespace Finally, it is distinctly possible that an entry with
+two dates will need somehow to specify just what sort of dates are
+involved.  The usual \textsf{biblatex-chicago} method is the
+\textsf{userd} field, and here that field will act as a date-type for
+the \textsf{date} field itself.  For the \textsf{eventdate}, you'll
+need to use \textsf{howpublished}, which I have commandeered for this
+purpose in a few other entry types, as well.  (Cf.\ niso:bibref and
+\textbf{howpublished} in section~\ref{sec:entryfields}, below.)
+
 \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to
 use if the main focus of a reference is supplemental material in a
 book or in a collection, e.g., an introduction, afterword, or forward,
@@ -1799,15 +2322,13 @@ depending on the context.  Examples might be \enquote{\texttt{preface
 that unless you use a \cmd{bibstring} command in the \textsf{type}
 field, the resultant entry will not be portable across languages.)
 
-%\enlargethispage{-\baselineskip}
-
 \mylittlespace There are a few other rules for constructing your .bib
 entry.  The \textsf{author} field refers to the author of the
 introduction or afterword, while \textsf{bookauthor} refers to the
-author of the main text of the work, if the two differ.  For the 16th
-edition, the \emph{Manual} requires the inclusion of the page range of
-the part in question, though \emph{only} in the bibliography.  I have
-followed this advice literally, so the \textsf{pages} field of a
+author of the main text of the work, if the two differ.  The
+\emph{Manual} requires the inclusion of the page range of the part in
+question, though \emph{only} in the bibliography.  I have followed
+this advice literally, so the \textsf{pages} field of a
 \textsf{suppbook} entry won't automatically appear in a long note.  If
 you wish to include those pages in a note, then you'll need to repeat
 them in the \textsf{postnote} field of the citation command.
@@ -1818,7 +2339,7 @@ introduction or afterword for bibliographical completeness, then the
 normal \textsf{biblatex} rules apply, and you can just put their name
 in the appropriate field of a \textsf{book} entry, that is, in the
 \textsf{foreword}, \textsf{afterword}, or \textsf{introduction} field.
-(See \emph{Manual} 14.116; polakow:afterw, prose:intro).
+(See \emph{Manual} 14.110; polakow:afterw, prose:intro).
 
 \mybigspace This \mymarginpar{\textbf{suppcollection}} fulfills a
 function analogous to \textsf{suppbook}.  Indeed, I believe the
@@ -1826,19 +2347,16 @@ function analogous to \textsf{suppbook}.  Indeed, I believe the
 both types of work, so this entry type is an alias to
 \textsf{suppbook}, which see.
 
-\mybigspace This \mymarginpar{\textbf{suppperiodical}} type, new in
-\textsf{biblatex} 0.8, is intended to allow reference to
-generically-titled works in periodicals, such as regular columns or
-letters to the editor.  Previous releases of
-\textsf{biblatex-chicago-notes} provided the \textsf{review} type for
-this purpose, and now you can use either of these, as I've added
+\mybigspace This \mymarginpar{\textbf{suppperiodical}} type is
+intended to allow reference to generically-titled works in
+periodicals, such as regular columns or letters to the editor.
+\textsf{Biblatex-chicago-notes} provides the \textsf{review} type for
+this purpose, and you can use either of these, as I've added
 \textsf{suppperiodical} as an alias of \textsf{review}.  Please see
 above under \textbf{review} for the full instructions on how to
 construct a .bib entry for such a reference.
 
-%\enlargethispage{\baselineskip}
-
-\mybigspace The \colmarginpar{\textbf{unpublished}}
+\mybigspace The \mymarginpar{\textbf{unpublished}}
 \textsf{unpublished} entry type works largely as it does in standard
 \textsf{biblatex}, though it's worth remembering that you should use a
 lowercase letter at the start of your \textsf{note} field (or perhaps
@@ -1852,15 +2370,22 @@ conforming to the indications of the \emph{Manual}, and thanks to the
 prompting of Jan David Hauck, you can use the \textsf{venue},
 \textsf{eventdate}, \textsf{eventtitle}, and \textsf{eventtitleaddon}
 fields further to specify unpublished conference papers and the like
-(14.226--8; nass:address).
-
-\mybigspace This \mymarginpar{\textbf{video}} is the last of the three
-audiovisual entry types, and as its name suggests it is intended for
-citing visual media, be it films of any sort or TV shows, broadcast,
-on the Net, on VHS, DVD, or Blu-ray.  As with the \textsf{music} type
-discussed above, certain choices had to be made when associating the
-production roles found, e.g., on a DVD, to those bookish ones provided
-by \textsf{biblatex}.  Here are the main correspondences:
+(14.216--18; nass:address).
+
+\mybigspace This \colmarginpar{\textbf{video}} is the last of the
+three audiovisual entry types, and as its name suggests it is intended
+for citing visual media, be it films of any sort or TV shows, whether
+broadcast, on the Net, on VHS, DVD, or Blu-ray, though it will serve
+as well, I think, for radio broadcasts of plays or drama serials.  As
+with the \textsf{music} type discussed above, certain choices had to
+be made when associating the production roles found, e.g., on a DVD,
+to those bookish ones provided by \textsf{biblatex}.  The 17th edition
+of the \emph{Manual} once again revised its recommendations for this
+type, but fortunately the changes are additive, i.e., you can re-use
+16th-edition citations but are encouraged to peruse the following
+guidelines to see if there's any information you might think of adding
+to bring your citations more into line with the spec.  Here are the
+main guidelines:
 
 {\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
 \begin{description}
@@ -1877,46 +2402,73 @@ by \textsf{biblatex}.  Here are the main correspondences:
   usual \texttt{useauthor} and \texttt{useeditor} options can alter
   the presentation within an entry.  Because these are non-standard
   roles, you will need to identify them using the following:
-\item[editortype, editoratype, editorbtype:] The most common roles,
-  all associated with specific bibstrings (or their absence), will
-  likely be \texttt{director}, \texttt{produ\-cer}, and, oddly,
+\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
+  roles, all associated with specific bibstrings (or their absence),
+  will likely be \texttt{director}, \texttt{producer}, and, oddly,
   \texttt{none}.  The last is particularly useful if you want to
   identify performers, as they usually don't need further specifying
   and this role prevents \textsf{biblatex} from falling back on the
-  default \texttt{editor} bibstring.
+  default \texttt{editor} bibstring.  Any other roles you want to
+  emphasize, even if there is no pre-defined \cmd{bibstring}, can be
+  provided here, and will be printed as-is, contextually capitalized.
+  (Cf.\ hitchcock:nbynw.)
 \item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As
   with the other audiovisual types, \textsf{video} serves as an
   analogue both to books and to collections, so the \textsf{title} may
   be of a whole film DVD or of a TV series, or it may identify one
   episode in a series or one scene in a film.  In the latter cases,
   the title of the whole would go in \textsf{booktitle}.  The
-  \textsf{booktitleaddon} field, in a change from the 15th edition,
-  may be useful for specifying the season and/or episode number of a
-  TV series, while the \textsf{titleaddon} is for for any information
-  that needs to come between the \textsf{title} and the
-  \textsf{booktitle} (cleese:holygrail, friends:leia, handel:messiah).
-  As in the \textsf{music} type, \textsf{maintitle} may be necessary
-  for a boxed set or something similar.
+  \textsf{booktitleaddon} field is the place for specifying the season
+  and/or episode number of a TV series, while the \textsf{titleaddon}
+  is for any information that needs to come between the \textsf{title}
+  and the \textsf{booktitle} (american:crime, cleese:holygrail,
+  friends:\break leia, handel:messiah, hitchcock:nbynw,
+  mayberry:brady).  As in the \textsf{music} type, a
+  \textsf{maintitle} may be necessary for a boxed set or something
+  similar.
+\item[\mycolor{entrysubtype:}] If, for some reason, you want to cite
+  an individual episode or scene without reference to any larger unit,
+  then your entry will contain only a \textsf{title}, which
+  \textsf{biblatex-chicago} would normally interpret as the title of a
+  complete film or TV series.  In such a case, you'll need to define
+  an \textsf{entrysubtype} to let it know that the lone \textsf{title}
+  is such a sub-unit.  In quite a different syntactic transformation,
+  the 17th edition (14.265) now recommends that, when presenting
+  episodes from a TV series, the name of the series
+  (\textsf{booktitle}) comes before the episode name (\textsf{title}).
+  The exact string \mycolor{\texttt{tvepisode}} in the
+  \textsf{entrysubtype} field achieves this reversal, which includes
+  using the \textsf{booktitle} as a \textsf{sorttitle} in the
+  bibliography and also as the \textsf{labeltitle} in short notes.
+\item[\mycolor{usera:}] When citing recordings of TV shows, the 17th
+  edition now wants you to include the TV network for the original
+  broadcast, and the \mycolor{\textsf{usera}} field is the place for
+  it.  \textsf{Biblatex-chicago} has long used this field for this
+  same purpose in \textsf{article, periodical}, and \textsf{review}
+  entries with a \texttt{magazine} \textsf{entrysubtype}, so its
+  inclusion here can at least hope to benefit from that prior
+  acquaintance.  It will appear after the broadcast date, i.e., the
+  \textsf{eventdate}, and will be separated from it by the
+  \cmd{bibstring} \enquote{\texttt{on.}}
 \item[date, eventdate, origdate:] As with \textsf{music} entries, in
-  order to follow the specifications of the 16th edition of the
-  \emph{Manual}, I have had to provide three separate date fields for
-  citing \textsf{video} sources, but their uses differ somewhat
-  between the two types.  In both, the \textsf{date} will generally
-  provide the publishing or copyright date of the medium you are
-  referencing.  The \textsf{eventdate} will most commonly present
-  either the broadcast date of a particular TV program, or the
-  recording/performance date of, for example, an opera on DVD.  The
-  style will automatically prepend the bibstring \texttt{broadcast} to
-  such a date, though you can use the \textsf{userd} field to change
-  the string printed there.  (Absent an \textsf{eventdate}, the
-  \textsf{userd} field in \textsf{video} entries will modify the
-  \textsf{urldate}, and absent those two it will modify the
-  \textsf{date}.)  The \textsf{origdate} has more or less the same
-  function, and appears in the same places, as it does in standard
-  book-like entries, providing the date of first release of a film,
-  though there isn't any \texttt{reprint} string associated with it in
-  this entry type.  Cf.\ friends:leia, handel:messiah,
-  hitchcock:nbynw.
+  order to follow the specifications of the \emph{Manual}, I have had
+  to provide three separate date fields for citing \textsf{video}
+  sources, but their uses differ somewhat between the two types.  In
+  both, the \textsf{date} will generally provide the publishing or
+  copyright date of the medium you are referencing.  The
+  \textsf{eventdate} will most commonly present either the broadcast
+  date of a particular TV program, or the recording/performance date
+  of, for example, an opera on DVD.  The style will automatically
+  prepend the bibstring \texttt{broadcast} to such a date, though you
+  can use the \textsf{userd} field to change the string printed there.
+  (Absent an \textsf{eventdate}, the \textsf{userd} field in
+  \textsf{video} entries will modify the \textsf{urldate}, and absent
+  those two it will modify the \textsf{date}.)  The \textsf{origdate}
+  has more or less the same function, and appears in the same places,
+  as it does in standard book-like entries, providing the date of
+  first release of a film, though there isn't any \texttt{reprint}
+  string associated with it in this entry type.  Cf.\ friends:leia,
+  handel:messiah, hitchcock:nbynw.
 \item[type:] As in all the audiovisual entry types, the \textsf{type}
   field holds the medium of the \textsf{title}, e.g., 8 mm, VHS, DVD,
   Blu-ray, MPEG.
@@ -1924,7 +2476,7 @@ by \textsf{biblatex}.  Here are the main correspondences:
 
 As with the \textsf{music} type, entries in \textsf{notes-test.bib}
 should at least give you a good idea of how all this works.  (Cf.\
-14.279--80; loc:city, weed:flatiron.)
+14.265, 14.267; loc:city, weed:flatiron.)
 
 \subsection{Entry Fields}
 \label{sec:entryfields}
@@ -1940,23 +2492,19 @@ should allow you to find the information you need.
 
 \mybigspace As \mymarginpar{\textbf{addendum}} in standard
 \textsf{biblatex}, this field allows you to add miscellaneous
-information to the end of an entry, after publication data but, with
-the single exception of the \textsf{online} entry type, before any
-\textsf{url} or \textsf{doi} field.  In the \textsf{patent} entry type
-(which see), it will be printed in close association with the filing
-and issue dates.  In a few entry types --- \textsf{article},
-\textsf{audio}, \textsf{music}, \textsf{periodical}, \textsf{review},
-and \textsf{video} --- this information will come \emph{after} any
-\textsf{pages} or \textsf{postnote} references present in long notes,
-while in the remainder it comes \emph{before} such information,
-allowing you in particular to use the field to identify a particular
-type of book-like publication when such data won't fit well in another
-part of an entry.  In any entry type, if your data begins with a word
-that would ordinarily only be capitalized at the beginning of a
-sentence, then simply ensure that that word is in lowercase, and the
-style will take care of the rest.  Cf.\ \textsf{note}. (See
-\emph{Manual} 14.119, 14.166--168; davenport:attention,
-natrecoff:camera.)
+information to the end of an entry, after publication data but before
+any \textsf{url} or \textsf{doi} field.  In the \textsf{patent} entry
+type (which see), it will be printed in close association with the
+filing and issue dates.  In all other entry types this information
+will come \emph{after} any \textsf{pages} or \textsf{postnote}
+references present in long notes, allowing you in particular to use
+the field to identify a particular type of book-like publication when
+such data won't fit well in another part of an entry.  In any entry
+type, if your data begins with a word that would ordinarily only be
+capitalized at the beginning of a sentence, then simply ensure that
+that word is in lowercase, and the style will take care of the rest.
+Cf.\ \textsf{note}. (See \emph{Manual} 14.114, 14.159--63;
+davenport:attention, natrecoff:camera.)
 
 \mybigspace In most \mymarginpar{\textbf{afterword}} circumstances,
 this field will function as it does in standard \textsf{biblatex},
@@ -1969,67 +2517,61 @@ name given here exactly matches that of an editor and/or a translator,
 then \textsf{biblatex-chicago-notes} will concatenate these fields in
 the formatted references.
 
-%\vspace{\baselineskip}
-
 \mylittlespace As noted above, however, this field has a special
 meaning in the \textsf{suppbook} entry type, used to make an
 afterword, foreword, or introduction the main focus of a citation.  If
 it's an afterword at issue, simply define \textsf{afterword} any way
 you please, leave \textsf{foreword} and \textsf{introduction}
 undefined, and \textsf{biblatex-chicago-notes} will do the rest. Cf.\
-\textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91,
-14.116; polakow:afterw.)
+\textsf{foreword} and \textsf{introduction}. (See \emph{Manual}
+14.105, 14.110; polakow:afterw.)
 
 \paragraph*{\protect\mymarginpar{\textbf{annotation}}}
 \label{sec:annote}
 
-At the request of Emil Salim, \textsf{biblatex-chicago-notes} has,
-since version 0.9, provided a package option (see \texttt{annotation}
-below, section \ref{sec:useropts}) to allow you to produce annotated
-bibliographies.  The formatting of such a bibliography is currently
-fairly basic, though it conforms with the \emph{Manual's} minimal
-guidelines (14.59).  The default in \textsf{chicago-notes.cbx} is to
-define \cmd{DeclareFieldFormat\{an\-notation\}} using
-\cmd{par}\cmd{no\-break} \cmd{vskip} \cmd{bibitemsep}, though you can
-alter it by re-declaring the format in your preamble.  The
-page-breaking algorithms don't always give perfect results here, but
-the default formatting looks, to my eyes, fairly decent.  In addition
-to tweaking the field formatting you can also insert \cmd{par} (or
-even \cmd{vadjust\{\cmd{eject}\}}) commands into the text of your
-annotations to improve the appearance.  Please consider the
-\texttt{annotation} option a work in progress, but it is usable now.
-(N.B.: The \textsc{Bib}\TeX\ field \textsf{annote} serves as an alias
-for this.)
+At the request of Emil Salim, \textsf{biblatex-chicago-notes} provides
+a package option (see \texttt{annotation} below, section
+\ref{sec:useropts}) to allow you to produce annotated bibliographies.
+The formatting of such a bibliography is currently fairly basic,
+though it conforms with the \emph{Manual's} minimal guidelines
+(14.64).  The default in \textsf{chicago-notes.cbx} is to define
+\verb+\DeclareFieldFormat{annotation}{\par\nobreak\vskip\bibitemsep #1}+;
+if ne\-cessary you can alter it by re-declaring the format in
+your preamble.  The page-breaking algorithms don't always give perfect
+results here, but the default formatting looks, to my eyes, fairly
+decent.  In addition to tweaking the field formatting you can also
+insert \cmd{par} (or even \verb+\vadjust{\eject}+) commands into
+the text of your annotations to improve the appearance.  Please
+consider the \texttt{annotation} option a work in progress, but it is
+usable now.  (N.B.: The old \textsc{Bib}\TeX\ field \textsf{annote}
+serves as an alias for this.)
 
 \mybigspace I \mymarginpar{\textbf{annotator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
 do, even though the \emph{Manual} doesn't actually mention it.  It may
 be useful for some purposes.  Cf.\ \textsf{commentator}.
 
-%%\enlargethispage{\baselineskip}
-
 \mybigspace For \mymarginpar{\textbf{author}} the most part, I have
-implemented this field in a completely standard \textsc{Bib}\TeX\
-fashion.  Remember that corporate or organizational authors need to
-have an extra set of curly braces around them (e.g.,
-\texttt{\{\{Associated Press\}\}}\,) to prevent \textsc{Bib}\TeX\ from
-treating one part of the name as a surname (14.92, 14.212;
-assocpress:gun, chicago:man\-ual).  If there is no \textsf{author}, then
-\textsf{biblatex-chicago-notes} will, in the bibliography and long
-notes, look in sequence, for a \textsf{namea}, an \textsf{editor}, a
-\textsf{nameb}, a \textsf{translator}, or a \textsf{namec} (i.e., a
-compiler) and use that name (or those names) instead, followed by the
-appropriate identifying string (esp.\ 14.87, also 14.76, 14.126,
-14.132, 14.189; boxer:china, brown:bre\-mer, harley:cartography,
-schellinger:novel, sechzer:women, silver:gawain, soltes:geor\-gia).
-\textsf{Biblatex's} sorting algorithms will use the first of those
-names found, which should ensure correct alphabetization in the
-bibliography.  (See \cmd{DeclareSortingTemplate} in
-section~\ref{sec:formatopts}, below.)  In short notes, where the
-\textsf{labelname} is used, the order searched is somewhat augmented:
-\textsf{shortauthor, author, shorteditor, namea, editor, nameb,
-  translator, namec}.  (See \cmd{DeclareLabelname} in
-section~\ref{sec:formatopts}.)
+implemented this field in a completely standard fashion.  Remember
+that corporate or organizational authors need to have an extra set of
+curly braces around them (e.g., \texttt{\{\{Associated Press\}\}}\,)
+to prevent \textsf{biber} from treating one part of the name as a
+surname (14.84, 14.200; assocpress:gun, chicago:manual).  If there is
+no \textsf{author}, then \textsf{biblatex-chicago-notes} will, in the
+bibliography and long notes, look in sequence, for a \textsf{namea},
+an \textsf{editor}, a \textsf{nameb}, a \textsf{translator}, or a
+\textsf{namec} (i.e., a compiler) and use that name (or those names)
+instead, followed by the appropriate identifying string (esp.\ 14.103,
+also 14.76, 14.121, 14.126, 14.180; boxer:china, brown:bre\-mer,
+harley:cartography, schellinger:novel, sechzer:women, silver:gawain,
+soltes:geor\-gia).  \textsf{Biblatex's} sorting algorithms will use
+the first of those names found, which should ensure correct
+alphabetization in the bibliography.  (See
+\cmd{DeclareSortingTemplate} in section~\ref{sec:formatopts}, below.)
+In short notes, where the \textsf{labelname} is used, the order
+searched is somewhat augmented: \textsf{shortauthor, author,
+  shorteditor, namea, editor, nameb, translator, namec}.  (See
+\cmd{DeclareLabelname} in section~\ref{sec:formatopts}.)
 
 \mylittlespace In the rare cases when this substitution mechanism
 isn't appropriate, you have (at least) two options: either you can
@@ -2046,11 +2588,13 @@ present in the entry, but please remember to use the new option
 latter doesn't work as smoothly and completely as \textsf{biblatex's}
 own name toggles.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace This system of options, then, can turn off
 \textsf{biblatex-chicago-notes}'s mechanism for finding a name to
 place at the head of an entry, but it also very usefully adds the
 possibility of citing a work with an \textsf{author} by its editor,
-compiler or translator instead (14.90; eliot:pound), something that
+compiler or translator instead (14.104; eliot:pound), something that
 wasn't possible before.  For full details of how this works, see the
 \textsf{editortype} documentation below.  (Of course, in
 \textsf{collection}, \textsf{periodical} and \textsf{proceedings}
@@ -2063,7 +2607,7 @@ stead.  See those entry types for further details.)
 
 \mylittlespace \textbf{NB}: The \emph{Manual} provides specific
 instructions for formatting the names of both anonymous and
-pseudonymous authors (14.79--84).  In the former case, if no author is
+pseudonymous authors (14.79--82).  In the former case, if no author is
 known or guessed at, then it may simply be omitted
 (virginia:plantation).  The use of \enquote{Anonymous} as the name is
 \enquote{generally to be avoided,} but may in some cases be useful
@@ -2082,34 +2626,34 @@ mark indicating doubt.  As long as you have the right string in the
 \textsf{authortype} field, \textsf{biblatex-chicago-notes} will also
 do the right thing automatically in the short note form.
 
-\mylittlespace In most entry types (except \textsf{customc} and
-\textsf{review}, which see), the \textsf{nameaddon} field furnishes
-the means to cope with the case of pseudonymous authorship.  If the
-author's real name isn't known, simply put \texttt{pseud.}\,(or
-\cmd{bibstring\{pseudonym\}}) in that field (centinel:letters).  If
-you wish to give a pseudonymous author's real name, simply include it
-there, formatted as you wish it to appear, as the contents of this
-field won't be manipulated as a name by \textsf{biblatex}
-(lecarre:quest).  If you have given the author's real name in the
-\textsf{author} field, then the pseudonym goes in \textsf{nameaddon},
-in the form \texttt{Firstname Lastname,\,pseud.}\ (creasey:ashe:blast,
-creasey:morton:hide, creasey:york:death).  This latter method will
-allow you to keep all references to one author's work under different
-pseudonyms grouped together in the bibliography, as recommended by the
-\emph{Manual}, though it is now recommended that, whichever system you
-employ, you include a cross-reference from one name to the other in
-the bibliography.  You can do this using a \textsf{customc} entry
-(ashe:creasey, morton:creasey, york:creasey).
-
-% %\enlargethispage{\baselineskip}
+\mylittlespace In most entry types (except \textsf{customc}), the
+\textsf{nameaddon} field furnishes the means to cope with the case of
+pseudonymous authorship.  If the author's real name isn't known,
+simply put \texttt{pseud.}\,(or \verb+\bibstring{pseudonym}+) in that
+field (centinel:letters).  If you wish to give a pseudonymous author's
+real name, simply include it there, formatted as you wish it to
+appear, as the contents of this field won't be manipulated as a name
+by \textsf{biblatex} (lecarre:quest).  If you have given the author's
+real name in the \textsf{author} field, then the pseudonym goes in
+\textsf{nameaddon}, in the form \texttt{Firstname Lastname,\,pseud.}\
+(creasey:ashe:blast, creasey:morton:hide, creasey:york:death).  This
+latter method will allow you to keep references to one author's work
+under different pseudonyms grouped together in the bibliography, as
+recommended by the \emph{Manual}, though it is now recommended that,
+whichever system you employ, you include a cross-reference from one
+name to the other in the bibliography.  You can do this using a
+\textsf{customc} entry (ashe:creasey, morton:creasey, york:creasey).
+Please see also the entry on \textbf{nameaddon}, below, for
+circumstances where you may need to provide your own square brackets
+when presenting a pseudonym.
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
 keeping with the spirit of standard \textsf{biblatex}, if not with its
 letter.  Instead of allowing you to change the string used to identify
 an author, the field allows you to indicate when an author is
-anonymous, that is, when his or her name doesn't appear on the title
-page of the work you are citing.  As I've just detailed under
+anonymous, that is, when their name doesn't appear on the title page
+of the work you are citing.  As I've just detailed under
 \textsf{author}, the \emph{Manual} generally discourages the use of
 \enquote{Anonymous} as an author, preferring that you simply omit it.
 If, however, the name of the author is known or guessed at, then
@@ -2121,7 +2665,7 @@ yourself doesn't work right, hence this mechanism.)  The macros test
 for these \emph{exact} strings, so check your typing if you don't see
 the brackets.  Assuming the strings are correct,
 \textsf{biblatex-chicago-notes} will also automatically do the right
-thing in the short note form.  Cf.\ \textsf{author}.  (See 14.80--81;
+thing in the short note form.  Cf.\ \textsf{author}.  (See 14.79--80;
 cook:sotweed, horsley:prosodies.)
 
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
@@ -2133,7 +2677,7 @@ entry type for introductions, forewords and afterwords
 (\textsf{suppbook}) uses \textsf{bookauthor} as the author of
 \textsf{title} (polakow:afterw, prose:intro).
 
-\mybigspace This, \mymarginpar{\vspace{-12pt}\textbf{bookpagination}}
+\mybigspace This, \mymarginpar{\vspace{-8pt}\textbf{bookpagination}}
 a standard \textsf{biblatex} field, allows you automatically to prefix
 the appropriate string to information you provide in a \textsf{pages}
 field.  If you leave it blank, the default is to print no identifying
@@ -2155,7 +2699,7 @@ specification, which may be confusing if they don't produce the
 strings you expect.  Second, remember that \textsf{bookpagination}
 applies only to the \textsf{pages} field --- if you need to format a
 citation's \textsf{postnote} field, then you must use
-\textsf{pagination}, which see (10.43--44, 14.154--163).
+\textsf{pagination}, which see (10.42--43, 14.147--56).
 
 \mybigspace The \mymarginpar{\textbf{booksubtitle}} subtitle for a
 \textsf{booktitle}.  See the next entry for further information.
@@ -2173,8 +2717,8 @@ find a \textsf{booktitle} in other sorts of entries (e.g.,
 \textsf{book} or \textsf{collection}), but there it will almost
 invariably be providing information for the traditional
 \textsc{Bib}\TeX\ cross-referencing apparatus, which I discuss below
-(\textbf{crossref}).  This provision is unnecessary if you are using
-\textsf{Biber}.
+(\textbf{crossref}).  This provision is now unnecessary, assuming you
+are using \textsf{biber}.
 
 \mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the
 \textsf{booktitle}.  It will be printed in the main text font, without
@@ -2187,38 +2731,39 @@ The package and entry options \texttt{ptitleaddon} and
 customize the punctuation that appears before the
 \textsf{booktitleaddon} field.
 
-\mybigspace This \mymarginpar{\textbf{chapter}} field holds the
+\mybigspace This \colmarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
 \textsf{incollection} entry where you wish to cite a specific chapter
-of a book (ashbrook:brain).
+of a book (ashbrook:brain).  It now also holds the track number of
+individual pieces of \textsf{music}, whether on a traditional format
+or on a streaming service (holiday:fool, rihanna:umbrella).
 
 \mybigspace I \mymarginpar{\textbf{commentator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
 do, even though the \emph{Manual} doesn't actually mention it.  It may
 be useful for some purposes.  Cf.\ \textsf{annotator}.
 
-\enlargethispage{\baselineskip}
-
-\paragraph*{\protect\mymarginpar{\textbf{crossref}}}
+\paragraph*{\protect\colmarginpar{\textbf{crossref}}}
 \label{sec:crossref}
 
 This field is the standard \textsc{Bib}\TeX\ cross-referencing
 mechanism, and \textsf{biblatex} has adopted it while also introducing
-a modified one of its own (\textsf{xref}).  If you are using
+a modified one of its own (\textsf{xref}).  If you have used
 \textsc{Bib}\TeX\ (or \textsf{bibtex8)} the \textsf{crossref} field
-works exactly the same as it always has, while \textsf{xref} attempts
-to remedy some of the deficiencies of the usual mechanism by ensuring
+works much the same as it always has, while \textsf{xref} attempts to
+remedy some of the deficiencies of the usual mechanism by ensuring
 that child entries will inherit no data at all from their parents.
-Section~2.4.1.1 of \textsf{biblatex.pdf} contains useful notes on the
-intricacies of managing cross-referenced entries with these
-traditional backends, and for the most part these backends are still
-usable, if inconvenient.  The functionality, discussed below, for
-abbreviating references in \textsf{book}, \textsf{bookinbook},
-\textsf{collection}, and \textsf{proceedings} entries, and for using
-the \textsf{mv*} entry types to do so, will prove extremely difficult
-to replicate with the older backends, so if you plan on lots of
-cross-referencing in \textsf{biblatex-chicago-notes} then I strongly
-recommend you use \textsf{Biber}.
+Section~2.4.1 of \textsf{biblatex.pdf} contains useful notes on
+managing cross-referenced entries, and section~3.15 explains some of
+the limitations of the traditional backends, which offer only a small
+subset of \textsf{Biber's} features.  The functionality, discussed
+below, for abbreviating references in \textsf{book},
+\textsf{bookinbook}, \textsf{collection}, and \textsf{proceedings}
+entries, and for using the \textsf{mv*} entry types to do so, will
+prove extremely difficult to replicate with the older backends, so if
+you plan on lots of cross-referencing in
+\textsf{biblatex-chicago-notes} then I strongly recommend you use
+\textsf{Biber}.
 
 \mylittlespace (One reason for this is that when \textsf{Biber} is the
 backend, \textsf{biblatex} defines a series of inheritance rules for
@@ -2237,7 +2782,7 @@ all highly single-entry specific, are no longer inheritable; and
 any of the new \textbf{mv*} entry types.)
 
 \mylittlespace Turning now to the provision of abbreviated references
-in \textsf{biblatex-chicago-notes}, the \emph{Manual} (14.113)
+in \textsf{biblatex-chicago-notes}, the \emph{Manual} (14.108)
 specifies that if you cite several contributions to the same
 collection, all (including the collection itself) may be listed
 separately in the bibliography, which the package does automatically,
@@ -2257,24 +2802,30 @@ see just below).  Recent releases have considerably extended this
 functionality.
 
 \mylittlespace First, I added five entry types --- \textbf{book},
-\textbf{bookinbook}, \textbf{collection}, \textbf{inbook}, and
-\textbf{proceedings} --- to the list of those which use shortened
-cross references, and I added two options --- \texttt{longcrossref}
-and \texttt{booklongxref}, on which more below --- which you can use
-in the preamble or in the \textsf{options} field of an entry to enable
-or disable the automatic provision of abbreviated references.  (The
-\textsf{crossref} or \textsf{xref} field are still necessary for this
-provision, but they are no longer sufficient on their own.)  The
-\textsf{inbook} type works exactly like \textsf{incollection} or
-\textsf{inproceedings}; in previous releases, you could use
-\textsf{inbook} instead of \textsf{incollection} to avoid the
-automatic abbreviation, the two types being otherwise identical.  Now
-that you can use an option to turn off abbreviated references even in
-the presence of a \textsf{crossref} or \textsf{xref} field, I have
-thought it sensible to include this entry type alongside the others.
-(Cf.\ ellet:galena, keating:dearborn, lippincott:chicago, and
-prairie:state to see this mechanism in action in both notes and
-bibliography.)
+\textbf{bookinbook}, \textbf{collection}, \textbf{inbook},
+\textbf{proceedings}, and \mycolor{\textbf{review}} --- to the list of
+those which use shortened cross references, and I added two options
+--- \texttt{longcrossref} and \texttt{booklongxref}, on which more
+below --- which you can use in the preamble or in the \textsf{options}
+field of an entry to enable or disable the automatic provision of
+abbreviated references.  (The \textsf{crossref} or \textsf{xref} field
+are still necessary for this provision, but they are no longer
+sufficient on their own.)  The \textsf{inbook} and
+\mycolor{\textsf{review}} types work exactly like
+\textsf{incollection} or \textsf{inproceedings}; in previous releases,
+you could use \textsf{inbook} instead of \textsf{incollection} to
+avoid the automatic abbreviation, the two types being otherwise
+identical.  Now that you can use an option to turn off abbreviated
+references even in the presence of a \textsf{crossref} or
+\textsf{xref} field, I have thought it sensible to include this entry
+type alongside the others.  (Cf.\ ellet:galena, keating:dearborn,
+lippincott:chicago, and prairie:state to see this mechanism in action
+in both notes and bibliography.)  In the \mycolor{\textsf{review}}
+type the mechanism is aimed primarily at blog comments, assuming you
+don't want to use the more convenient \mycolor{\texttt{commenton}}
+\textsf{relatedtype}, which absolves you even of the need to provide a
+\textsf{title} field for such entries.  See the documentation of the
+\textsf{review} type above for the details.
 
 \mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook},
 \textbf{collection}, and \textbf{proceedings} entries fulfills a
@@ -2288,7 +2839,7 @@ differently for these four entry types than for the other 4 (see
 below).  In \textsf{notes-test.bib} you can get a feel for how this
 works by looking at bernhard:boris, bernhard:ritter,
 bernhard:themacher, harley:ancient:cart, harley:carto\-graphy, and
-har\-ley:hoc.
+harley:hoc.
 
 \mylittlespace Before discussing the new package options, I should say
 a little about some subtleties involved in this mechanism.  First, and
@@ -2300,19 +2851,17 @@ simpler if your backend is \textsf{Biber}, which allows you to provide
 \textsf{collection} entries.  Second, where and when to print
 \textsf{volume} information in these references is extremely complex,
 and I confess that I designed the tests primarily with \textsf{Biber}
-in mind.  If you can't get it to work using \textsc{Bib}\TeX, or if
-you find something that looks wrong to you, please let me know.
-Third, Andrew Goldstone long ago identified some other difficulties in
-the package's treatment of abbreviated citations, both in notes and
-bibliography, difficulties exacerbated now by the extension of the
-mechanism to book-like entries.  If you refer separately to chapters
-in a single-author \textsf{book}, then the shortened part of the
-reference, to the whole book, won't repeat the author's name before
-the title of the whole.  If, however, you refer separately to parts of
-a \textsf{collection} or \textsf{proceedings}, even when the
-\textsf{editor} of the \textsf{collection} is the same as the
-\textsf{author} of an essay in the collection, you will see the name
-repeated before the abbreviated part referencing the whole parent
+in mind.  Third, Andrew Goldstone long ago identified some other
+difficulties in the package's treatment of abbreviated citations, both
+in notes and bibliography, difficulties exacerbated now by the
+extension of the mechanism to book-like entries.  If you refer
+separately to chapters in a single-author \textsf{book}, then the
+shortened part of the reference, to the whole book, won't repeat the
+author's name before the title of the whole.  If, however, you refer
+separately to parts of a \textsf{collection} or \textsf{proceedings},
+even when the \textsf{editor} of the \textsf{collection} is the same
+as the \textsf{author} of an essay in the collection, you will see the
+name repeated before the abbreviated part referencing the whole parent
 volume.
 
 \mylittlespace Shortened references to book-like entries require, I
@@ -2341,10 +2890,8 @@ appear.  See \textbf{mvbook} in section~\ref{sec:entrytypes}, and both
 \texttt{omitxrefdate} and \texttt{xrefurl} in
 section~\ref{sec:useropts}.
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace Finally, a published collection of letters also
-requires different treatment (14.117).  If you cite more than one
+requires different treatment (14.111).  If you cite more than one
 letter from the same collection, then the \emph{Manual} specifies that
 only the collection itself should appear in the bibliography.  In
 footnotes, you can use the \textsf{letter} entry type, documented
@@ -2353,39 +2900,20 @@ well require a \textsf{book} entry.  I have, after some consideration,
 implemented the system of shortened references in \textsf{letter}
 entries, even though the \emph{Manual} doesn't explicitly require it.
 (See white:ross:memo, white:russ, and white:total, for examples of the
-\textsf{crossref} and \textsf{xref} field in action in this way, and
-please note that the second of these entries is entirely fictitious,
-provided merely for the sake of example.)  How then to keep the
-individual letters from appearing in the bibliography?  The simplest
-mechanism is probably just to use \enquote{\texttt{skipbib}} in the
+\textsf{crossref} field in action in this way, and please note that
+the second of these entries is entirely fictitious, provided merely
+for the sake of example.)  How then to keep the individual letters
+from appearing in the bibliography?  The simplest mechanism is
+probably just to use \enquote{\texttt{skipbib}} in the
 \textsf{options} field.
 
-\mylittlespace If you look closely at the .bib entries for
-white:ross:memo and white:russ, you'll see that, despite the latter
-using \textsf{xref} instead of \textsf{crossref}, the first note
-referring to it inherits data from the parent (white:total).  In the
-abbreviated note and in abbreviated bibliography entries \emph{only},
-the driver is making a separate call to the parent's .bib entry,
-formatting the information there to fill out the bare data provided by
-the child.  For the first white:ross:memo note, which contains the
-full bibliographical information for the collection as a whole, I have
-used \textsf{crossref} because this unabbreviated note no longer makes
-a separate call to the parent's entry --- or, technically, it no
-longer makes a call that prints anything at all.  This is a change
-from earlier releases of \textsf{biblatex-chicago}, so if your
-documents came to rely on the side effects of this separate citation
-for providing data that haven't been inherited by the child, please be
-aware that it no longer works as before.  (You could see this by
-citing white:russ \emph{before} white:ross:memo.)  This change only
-affects the eight entry types that provide the abbreviated
-cross-references, a provision that is dependent on the settings of two
-preamble and entry options.
-
-\mylittlespace Those \mymarginpar{\texttt{longcrossref}} options
-function, by default, asymmetrically.  The first,
-\texttt{longcrossref}, generally controls the settings for the entry
-types more-or-less authorized by the \emph{Manual}: \textsf{inbook},
-\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}.
+\mylittlespace Returning, \mymarginpar{\texttt{longcrossref}} then, to
+the package options which control whether and where the abbreviated
+references may appear, they function, by default, asymmetrically.  The
+first, \texttt{longcrossref}, generally controls the settings for the
+entry types more-or-less authorized by the \emph{Manual}:
+\textsf{inbook}, \textsf{incollection}, \textsf{inproceedings},
+\textsf{letter}, and \mycolor{\textsf{review}}.
 
 \begin{description}
 \item[\qquad false:] This is the default.  If you use
@@ -2427,8 +2955,6 @@ Please note that you can set both of these options either in the
 preamble or in the \textsf{options} field of individual entries,
 allowing you to change the settings on an entry-by-entry basis.
 
-\enlargethispage{\baselineskip}
-
 \mylittlespace Please further note that in earlier releases of
 \textsf{biblatex-chicago} I recommended against using
 \textsf{shorthand}, \textsf{reprinttitle} and/or \textsf{userf} fields
@@ -2449,28 +2975,94 @@ combination of \textsf{userf}, \textsf{shorthand}, and
 \textsf{crossref} functionality in a single entry is now possible.  If
 you come across any problems or inaccuracies, please report them.)
 
-\mybigspace This \mymarginpar{\textbf{date}} field may be used to
-specify an item's complete date of publication, in \textsc{iso}8601
-format, i.e., \texttt{yyyy-mm-dd}.  It may also be used to specify a
-date range, according to the instructions in §~2.3.8 of
-\textsf{biblatex.pdf}.  Please be aware, however, that \textsf{Biber}
-is somewhat more exacting when parsing the \textsf{date} field than
-\textsc{Bib}\TeX, so a field looking like \texttt{1968/75} will simply
-be ignored --- you need \texttt{1968/1975} instead.  If you want to
-present a more compressed year range, or more generally if only part
-of a date is required, then the \textsf{month} and \textsf{year}
-fields may be more convenient.  The latter may be particularly useful
-in some entries because it can hold more than just numerical data, in
-contrast to \textsf{date} itself.  Cf.\ the \textsf{misc} entry type
-in section~\ref{sec:entrytypes} above for how to use this field to
-distinguish between two classes of archival material.  See also
-\textsf{origdate} and \textsf{urldate}.
-
-\mylittlespace I should also point out that you can, in most entry
-types, qualify a \textsf{date} with the \textsf{userd} field, assuming
-that the entry contains no \textsf{urldate}.  For \textsf{music} and
-\textsf{video} entries there are several other requirements --- please
-see the documentation of \textsf{userd}, below.
+\mybigspace With\colmarginpar{\textbf{date}} this release I have
+implemented all of the applicable parts of \textsf{biblatex's}
+elegant, and long standing, support for the
+\mycolor{\textsc{iso}8601-2 Extended Format specification}, which
+means the package now provides greatly enhanced possibilities for
+presenting uncertain and unspecified dates and date ranges, along with
+date eras, seasons, and time stamps.  I have also implemented the
+\emph{Manual's} (9.64) guidelines for compressing year ranges, as well
+as providing a few more extras to help with some of the other tricky
+corners of the \emph{Manual's} instructions.  A combination of
+\textsf{biblatex} and \textsf{biblatex-chicago} package options allows
+you to define when, how, and where any of these extended
+specifications will appear in your documents.  I have attempted to
+provide as compliant a set of defaults as possible in
+\textsf{biblatex-chicago.sty}, but you can alter any of them according
+to your needs.  All are documented in section~\ref{sec:options},
+below, but table~\ref{ad:date:extras}, located in the author-date
+section, purports to serve as a convenient reference guide to how this
+all works.
+
+\mylittlespace There are several more general remarks about the
+\textsf{date} field that may be helpful to users.  First, I highly
+recommend familiarizing yourself with the extended date
+specifications, as in many cases they will greatly simplify the
+creation of your .bib databases.  The new
+\mycolor{\texttt{compressyears}} option (\texttt{true} by default),
+for example, takes a year range in a date field and handles the
+somewhat tricky Chicago compression rules for you, while also giving
+you a simple means of turning it off that doesn't involve combing your
+.bib file for all the \textsf{year} fields that contain your
+hand-formatted ranges.  Clearly, situations may still arise when a
+specially-crafted \textsf{year} or \textsf{origyear} field may be
+necessary, but if you can use the enhanced specifications then I
+strongly advocate doing so.  Second, the fine-grained specification of
+a time stamp is really only necessary for news stories that are
+frequently updated \enquote{as they unfold} (14.191), for online
+sources that change rapidly enough for a time stamp to be necessary
+(14.207, 14.233; wikiped:bibtex), or for online posts, particularly
+comments, that may need a time stamp for disambiguation (14.208--10).
+If you wish to specify the time zone, the \emph{Manual} (10.41)
+prefers initialisms like \enquote{EST} or \enquote{PDT,} and these are
+most easily provided using the \textsf{timezone} field, where you can
+include your own parentheses if so desired (cp.\ 14.191).  For the
+\textsf{date} field itself, a time stamp will only appear in
+\textsf{article}, \textsf{review}, \textsf{suppperiodical}, and
+\textsf{online} entries, the first three only with a \texttt{magazine}
+\textsf{entrysubtype}.  All types can print such a stamp from the
+\textsf{urldate} (controllable using the
+new\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}}
+option), while only \textsf{review} and \textsf{suppperiodical}
+entries will print this data from an \textsf{eventdate}.  If you find
+a context in which a time stamp would be useful and which isn't
+included in this discussion, please let me know.
+
+\mylittlespace Third, an incomplete time specification will be ignored
+by \textsf{biber}, so include the seconds in it, as in
+table~\ref{ad:date:extras}, safe in the knowledge that they won't, by
+default, ever appear in your documents.  Should you want that level of
+discrimination, the \textsf{biblatex} option \texttt{seconds} set to
+\texttt{true} provides it.  Fourth, in the \textsf{misc} entry type
+the \textsf{date} field can help to distinguish between two classes of
+archival material, letters and \enquote{letter-like} sources using
+\textsf{origdate} while others (interviews, wills, contracts) use
+\textsf{date}.  (See \textsf{misc} in section~\ref{sec:entrytypes} for
+the details.)  Fifth, you can in most entry types qualify a
+\textsf{date} with the \textsf{userd} field, assuming that the entry
+contains no \textsf{urldate}.  For \textsf{music} and \textsf{video}
+entries, there are several other requirements --- please see the
+documentation of \textsf{userd}, below.
+
+\mylittlespace Sixth, and finally, please note that the
+\textsf{nameaddon} field, which see, is no longer the place for time
+stamps, as it was in the 16th-edition styles.  Any such data there
+should be moved into the corresponding date field (either the
+\textsf{date} or the \textsf{eventdate}, typically).  On all these
+questions generally please cf.\ also \textsf{origdate},
+\textsf{timezone}, and \textsf{year}, below; the \texttt{alldates},
+\texttt{alltimes}, \mycolor{\texttt{alwaysrange}},
+\mycolor{\texttt{centuryrange}}, \mycolor{\texttt{compressyears}},
+\texttt{datecirca}, \texttt{dateera}, \texttt{dateeraauto},
+\texttt{dateuncertain}, \mycolor{\texttt{decaderange}},
+\mycolor{\texttt{nodatebrackets}}, \mycolor{\texttt{nodates}},
+\mycolor{\texttt{noyearbrackets}}, \texttt{timezones},
+\mycolor{\texttt{urlstamp}}, and \texttt{urltime} options in
+sections~\ref{sec:presetopts}, \ref{sec:chicpreset}, and
+\ref{sec:useropts}; and section~4.5.10 in \textsf{biblatex.pdf}
+
+\enlargethispage{\baselineskip}
 
 \mylittlespace (Users of the Chicago author-date style who wish to
 minimize the labor needed to convert a .bib database for the notes \&\
@@ -2483,18 +3075,16 @@ conversion, though I'm retaining the right to revoke this if the code
 in question demonstrably interferes with the functioning of the notes
 \&\ bibliography style.)
 
-%\enlargethispage{\baselineskip}
-
 \mybigspace This \mymarginpar{\textbf{day}} field, as of
 \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it
 in your .bib files.  Use \textsf{date} instead.
 
 \mybigspace Standard \mymarginpar{\textbf{doi}} \textsf{biblatex}
-field, providing the Digital Object Identifier of the work.  The 16th
-edition of the \emph{Manual} specifies that, given their relative
-permanence compared to URLs, \enquote{authors should include DOIs
-  rather than URLs for sources that make them readily available}
-(14.6).  (14.184; friedman:learn\-ing).  Cf.\ \textsf{url}.
+field, providing the Digital Object Identifier of the work.  The
+\emph{Manual} specifies that, given their relative permanence compared
+to URLs, \enquote{authors should prefer a DOI- or Handle-based URL
+  whenever one is available} (14.8).  (14.175; friedman:learning).
+Cf.\ \textsf{url}.
 
 \mybigspace Standard \mymarginpar{\textbf{edition}} \textsf{biblatex}
 field.  If you enter a plain cardinal number, \textsf{biblatex} will
@@ -2509,13 +3099,6 @@ generally recommends the use of abbreviations in both bibliography and
 notes, but there is room for the user's discretion in specific
 citations (emerson:nature).
 
-\mylittlespace In a previous release of
-\textsf{biblatex-chicago-notes}, I introduced the \textsf{userd} field
-to hold this non-numeric information, as \textsf{biblatex} only
-accepted an integer in the \textsf{edition} field, but this changed in
-version 0.8.  The \textsf{userd} field now has an entirely different
-function --- please see its documentation below.
-
 \mybigspace As \mymarginpar{\textbf{editor}} far as possible, I have
 implemented this field as \textsf{biblatex}'s standard styles do, but
 the requirements specified by the \emph{Manual} present certain
@@ -2560,13 +3143,14 @@ to find a name for the head of a note or a bibliography entry,
 releases of \textsf{biblatex} provide these fields as a means to
 specify additional contributors to texts in a number of editorial
 roles.  In the Chicago styles they seem most relevant for the
-audiovisual types, especially \textsf{music} and \textsf{video}, where
-they help to identify conductors, directors, producers, and
-performers.  To specify the role, use the fields \textsf{editoratype},
+audiovisual types, especially \textsf{music} and \textsf{video}, and
+now also the \mycolor{\textsf{performance}} type, in all of which they
+can help to identify conductors, directors, producers, and performers.
+To specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
-bernstein:shostakovich, handel:messiah.)
+bernstein:shostakovich, hamilton:miranda, handel:messiah.)
 
-\mybigspace Normally, \mymarginpar{\textbf{editortype}} with the
+\mybigspace Normally, \colmarginpar{\textbf{editortype}} with the
 exception of the \textsf{article} and \textsf{review} types,
 \textsf{biblatex-chicago-notes} will automatically find a name to put
 at the head of an entry, starting with an \textsf{author}, and
@@ -2590,12 +3174,23 @@ then you need to put \texttt{compiler} into the \textsf{editortype}
 field, and \textsf{biblatex} will print the correct string after the
 name in both the bibliography and in the long note form.
 
-\enlargethispage{\baselineskip}
-
-\mylittlespace There are a few details of which you need to be aware.
-Because \textsf{biblatex-chicago} has added the \textsf{namea} field,
-which gives you the ability to identify the editor specifically of a
-\textsf{title} as opposed to a \textsf{maintitle} or a
+\mylittlespace In \colmarginpar{New!} previous releases of
+\textsf{biblatex-chicago} you could only use defined \cmd{bibstrings}
+in this field, at least if you wanted anything printed.  N.~Andrew
+Walsh pointed out that the standard \textsf{biblatex} styles will just
+print the field as-is in this case, allowing them to handle a great
+many unforeseen editorial roles with comparative ease, so I've
+implemented this, too, making sure to capitalize the string if the
+context demands it.  The string you choose will differ depending on
+whether it will be printed after a name at the head of an entry or
+before a name later on in the entry, e.g., \enquote{cartographer} or
+\enquote{maps created by.}  A bit of trial and error should see you
+through.
+
+\mylittlespace There are a few more details of which you need to be
+aware.  Because \textsf{biblatex-chicago} has added the \textsf{namea}
+field, which gives you the ability to identify the editor specifically
+of a \textsf{title} as opposed to a \textsf{maintitle} or a
 \textsf{booktitle}, the name-finding algorithm checks first to see
 whether a \textsf{namea} is defined.  If it is, that name will be used
 at the head of the entry, if it isn't, or if you've set the option
@@ -2619,7 +3214,7 @@ the name of the \textsf{editor} matches, for example, that of the
 the \textsf{editor} exactly matches a \textsf{translator} and/or a
 \textsf{namec}, or alternatively if \textsf{namea} exactly matches a
 \textsf{nameb} and/or a \textsf{namec}, then \textsf{biblatex} will
-print the appropriate strings.  The \emph{Manual} specifically (14.87)
+print the appropriate strings.  The \emph{Manual} specifically (14.32)
 recommends not using these identifying strings in the short note form,
 and \textsf{biblatex-chicago-notes} follows their recommendation.  If
 you nevertheless need to provide such a string, you'll have to do it
@@ -2636,25 +3231,32 @@ unnecessary or won't work properly in the following entry types:
 \textsf{suppperiodical}.
 
 \mybigspace These
-\mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
+\colmarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
 identify the exact role of the person named in the corresponding
-\textsf{editor[a-c]} field.  Note that they are not part of the string
+\textsf{editor[a-c]} field, just as \textsf{editortype} (q.v.) does
+for the \textsf{editor}.  Note that they are not part of the string
 concatenation mechanism.  I have implemented them just as the standard
-styles do, and they have now found a use particularly in
-\textsf{music} and \textsf{video} entries.  Cf.\
-bernstein:shostakovich, handel:messiah.
+styles do, that is, if the field isn't a pre-defined \cmd{bibstring}
+it will be printed as-is, contextually capitalized.  They have found a
+use particularly in \textsf{music}, \mycolor{\textsf{performance}},
+and \textsf{video} entries.  Cf.\ bernstein:shostakovich,
+hamilton:miranda, handel:messiah.
 
-\mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
 identify a particular article.  Only applicable to the
-\textsf{article} entry type.  Not typically required by the
-\emph{Manual}.
-
-\paragraph*{\protect\mymarginpar{\textbf{entrysubtype}}}
+\textsf{article} entry type, and only to those without a
+\texttt{magazine} \textsf{entrysubtype}.  The 17th edition of the
+\emph{Manual} now specifies where to print this (14.174), and I have
+moved it in accordance with its specifications.  It replaces the
+\textsf{pages} field in long notes and bibliography, and appears after
+any specific page cited in the \textsf{postnote} field of a long note.
+
+\paragraph*{\protect\colmarginpar{\textbf{entrysubtype}}}
 \label{sec:entrysub}
 
 Standard and very powerful \textsf{biblatex} field, left undefined by
-the standard styles.  In \textsf{biblatex-chicago-notes} it has four
+the standard styles.  In \textsf{biblatex-chicago-notes} it has eight
 very specific uses, the first three of which I have designed in order
 to maintain, as much as possible, backward compatibility with the
 standard styles.  First, in \textsf{article}, \textsf{periodical}, and
@@ -2685,7 +3287,7 @@ edition, then you shouldn't use the \textsf{entrysubtype} toggle.
 Also, and the specification is reasonably clear about this, works from
 the Renaissance and later, even if cited by the traditional divisions,
 have short notes formatted normally, and therefore don't need an
-\textsf{entrysubtype} field.  (See \emph{Manual} 14.256--268;
+\textsf{entrysubtype} field.  (See \emph{Manual} 14.242--54;
 aristotle:metaphy:gr, plato:republic:gr; euripides:orestes is an
 example of a translation cited by page number in a modern edition.)
 
@@ -2695,17 +3297,38 @@ will be treated just as the standard \textsf{biblatex} styles would,
 including the use of italics for the \textsf{title}.  Any string at
 all in \textsf{entrysubtype} tells \textsf{biblatex-chicago-notes} to
 treat the source as part of an unpublished archive.  A \textsf{misc}
-entry with \textsf{entrysubtype} defined is the least formatted of all
-those specified by the \emph{Manual} --- see
+entry with an \textsf{entrysubtype} defined is the least formatted of
+all those specified by the \emph{Manual} --- see
 section~\ref{sec:entrytypes} above under \textbf{misc} for all the
 details on how these citations work.
 
-\enlargethispage{\baselineskip}
-
-\mylittlespace Fourth, and finally, the field can be defined in the
+\mylittlespace Fourth, the field can be defined in the
 \textsf{artwork} entry type in order to refer to a work from antiquity
 whose title you do not wish to be italicized.  Please see the
-documentation of \textbf{artwork} above for the details.
+documentation of \textbf{artwork} above for the details.  Fifth, you
+can define it in a \mycolor{\textbf{standard}} entry, q.v., to change
+the appearance of both long and short notes.  Sixth, you can define it
+in an \textbf{audio}, \textbf{music}, or \textbf{video} entry if such
+an entry refers to an individual unit that isn't part of any larger
+collection, the entry therefore having only a \textsf{title} and not a
+\textsf{booktitle}, a \textsf{title} that \textsf{biblatex-chicago}
+would normally interpret as the title of a larger unit (and therefore
+italicize).  Seventh, and sticking with the \textbf{video} type,
+though enacting quite a different syntactic transformation, the 17th
+edition (14.265) now recommends that, when presenting episodes from a
+TV series, the name of the series (\textsf{booktitle}) comes before
+the episode name (\textsf{title}).  The exact string
+\mycolor{\texttt{tvepisode}} in the \textsf{entrysubtype} field
+achieves this reversal, which includes using the \textsf{booktitle} as
+a \textsf{sorttitle} in the bibliography and also as the
+\textsf{labeltitle} in short notes.
+
+\mylittlespace Eighth, and finally, you can use any
+\textsf{entrysubtype} whatever in \textsf{inreference} entries in
+order to treat them as inherently online works rather than standard
+published works.  See the documentation of \textbf{online} and
+\textbf{inreference} entries in section~\ref{sec:entrytypes}, above,
+and also 14.233 and wikiped:bibtex.
 
 \mybigspace Kazuo
 \mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}}
@@ -2717,28 +3340,58 @@ so these three fields now work more or less as they do in standard
 abbreviated references to online content than conventional URLs,
 though I can find no specific reference to them in the \emph{Manual}.
 
-\mybigspace This \mymarginpar{\textbf{eventdate}} is a standard
-\textsf{biblatex} field.  In the 15th edition it was barely used, but
-in order to comply with changes in the 16th edition of the
-\emph{Manual} it can now play a significant role in \textsf{music},
-\textsf{review}, and \textsf{video} entries.  In \textsf{music}
-entries, it identifies the recording or performance date of a
-particular song (rather than of a whole disc, for which you would use
-\textsf{origdate}), whereas in \textsf{video} entries it identifies
-either the original broadcast date of a particular episode of a TV
-series or the date of a filmed musical performance.  In both these
-cases \textsf{biblatex-chicago} will automatically prepend a bibstring
---- \texttt{recorded} and \texttt{aired}, respectively --- to the
-date, but you can change this string using the new \textsf{userd}
-field, something you'll definitely want to do for filmed musical
-performances (friends:leia, handel:messiah, holiday:fool).
-
-\mylittlespace The field's use in \textsf{review} entries is somewhat
-different.  There, it helps to identify a particular comment within an
-online thread.  There isn't a particular string associated with it,
-but you can further specify a comment by placing a time\-stamp in
-parentheses in the \textsf{nameaddon} field, in case the date alone
-isn't enough (ac:comment).
+\enlargethispage{-\baselineskip}
+
+\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
+\textsf{biblatex} field which has gradually accumulated functions in
+\textsf{biblatex-chicago}.  It can now play a role in
+\mycolor{\textsf{artwork}}, \mycolor{\textsf{audio}},
+\mycolor{\textsf{image}}, \textsf{music}, \textsf{review},
+\mycolor{\textsf{standard}}, \textsf{suppperiodical},
+\textsf{unpublished}, and \textsf{video} entries.  In \textsf{artwork}
+and \textsf{image} entries it identifies the publication date of, most
+frequently, a photograph, in association with the
+\textsf{howpublished} field which identifies the periodical or other
+medium in which it was published (mccurry:afghangirl).  In
+\textsf{standard} entries it will also usually be associated with a
+\textsf{howpublished} field, allowing you to specify a later renewal
+or reaffirmation of a standard (niso:bibref).  In \textsf{audio}
+entries, it specifies the release date of a single episode of a
+podcast (danforth:podcast).  In \textsf{music} entries, it identifies
+the recording or performance date of a particular song (rather than of
+a whole disc, for which you would use \textsf{origdate}), whereas in
+\textsf{video} entries it identifies either the original broadcast
+date of a particular episode of a TV series or the date of a filmed
+musical performance.  In both these cases \textsf{biblatex-chicago}
+will automatically prepend a bibstring --- \texttt{recorded} and
+\texttt{aired}, respectively --- to the date, but you can change this
+string using the \textsf{userd} field, something you'll definitely
+want to do for filmed musical performances (friends:leia,
+handel:messiah, holiday:fool).
+
+\mylittlespace In \textsf{unpublished} entries it identifies the date
+of an event at which an unpublished work was presented, though in
+truth the \textsf{date} will do as well here (nass:address).  The
+field's use in \textsf{review} entries, finally, includes a possible
+time stamp.  In this context, an \textsf{eventdate} helps to identify
+a particular comment on, or reply to another comment on, a blog post.
+Given that many such posts by a single \textsf{author} could appear on
+the same day, you can distinguish them by putting a time specification
+in the \textsf{eventdate} field itself (ac:comment).  Please see the
+\textbf{review} type, above, for the details of how to cite these
+materials, possibly with the help of the new
+\mycolor{\texttt{commenton}} \textsf{relatedtype}.  See also the
+\textsf{date} field docs, in particular table~\ref{ad:date:extras}
+(located in the author-date section), for\colmarginpar{New!} details on
+how the \mycolor{\textsc{iso}8601-2 Extended Format specifications}
+offered by \textsf{biblatex}, including time stamps and much else
+besides, have been implemented in \textsf{biblatex-chicago}.
+
+\mybigspace This \colmarginpar{\textbf{eventtimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{eventdate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
 
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
@@ -2755,13 +3408,27 @@ from the \textsf{author}.  The \emph{Manual} has nothing to say on the
 subject, but \textsf{biblatex-chicago-notes} prints it (them), in
 parentheses, just after the author(s).
 
-%\enlargethispage{\baselineskip}
-
-\mybigspace Standard \mymarginpar{\textbf{howpublished}}
-\textsf{biblatex} field, mainly applicable in the \textsf{booklet}
-entry type, where it replaces the \textsf{publisher}.  I have also
-retained it in the \textsf{misc} and \textsf{unpublished} entry types,
-for historical reasons.
+\mybigspace Standard \colmarginpar{\textbf{howpublished}}
+\textsf{biblatex} field which, like the \textsf{eventdate} field, is
+gradually accumulating functions in \textsf{biblatex-chicago}.  In the
+\textsf{booklet} type it retains something of its traditional usage,
+replacing the \textsf{publisher}, and has a similar (somewhat
+paradoxical) place in \textsf{unpublished} entries.  In the
+\textsf{misc} and \mycolor{\textsf{performance}} types it works almost
+as a second \textsf{note} field, bringing in extra information about a
+work in close association with the \textsf{type} and \textsf{version}
+fields, while in \mycolor{\textsf{dataset}} entries its information
+will be associated with both those fields and also with the
+\textsf{number} field.  17th-edition \textsf{music} entries require a
+field to provide the medium of downloaded music and/or the name of the
+streaming service, so \textsf{howpublished} works there as an online
+double of \textsf{type} and of \textsf{publisher}.  Finally, in
+\textsf{artwork}, \textsf{image}, and \mycolor{\textsf{standard}}
+entries it serves to qualify or modify an \textsf{eventdate}, almost
+as a \textsf{userd} field modifies a \textsf{date} or
+\textsf{urldate}.  Please see the docs of those entry types for more
+information, and also bedford:photo, clark:mesopot,
+mccurry:afghangirl, niso:bibref, rihanna:umbrella.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -2769,6 +3436,8 @@ usually identify the university for which the thesis was written,
 while in a \textsf{report} entry it may identify any sort of
 institution issuing the report.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace As \mymarginpar{\textbf{introduction}} with the
 \textsf{afterword} and \textsf{foreword} fields above,
 \textsf{introduction} will in general function as it does in standard
@@ -2795,7 +3464,11 @@ typically required by the \emph{Manual}.
 field, designed for \textsf{article}, \textsf{periodical}, or
 \textsf{review} entries identified by something like \enquote{Spring}
 or \enquote{Summer} rather than by the usual \textsf{month} or
-\textsf{number} fields (brown:bremer).
+\textsf{number} fields (brown:bremer).  \textsf{Biblatex's} enhanced
+date handling allows you to specify a season in the \textsf{date}
+field, with the \enquote{months} 21--24 used for Spring, Summer,
+Autumn, and Winter, respectively.  Cf.\ table~\ref{ad:date:extras},
+below.
 
 \mybigspace The \mymarginpar{\textbf{issuesubtitle}} subtitle for an
 \textsf{issuetitle} --- see next entry.
@@ -2811,8 +3484,6 @@ proper place to identify the type of issue, e.g.,\ \texttt{special
   issue}, with the initial letter lower-cased to enable automatic
 contextual capitalization.
 
-%%\enlargethispage{\baselineskip}
-
 \mybigspace The \mymarginpar{\textbf{journalsubtitle}} subtitle for a
 \textsf{journaltitle} --- see next entry.
 
@@ -2834,30 +3505,12 @@ list of journal abbreviations.  Cf.\ the \textsf{shortjournal}
 documentation below.
 
 \mybigspace This \mymarginpar{\textbf{keywords}} field is
-\textsf{biblatex}'s extremely powerful and flexible technique for
-filtering bibliography entries, allowing you to subdivide a
-bibliography according to just about any criteria you care to invent.
-See \textsf{biblatex.pdf} (3.11.4) for thorough documentation.  In
-\textsf{biblatex-chicago}, the field can provide a convenient means to
-exclude certain entries from making their way into a bibliography.  We
-have already seen (\textbf{letter}, above) how the \emph{Manual}
-(14.117) requires, in the case of published collections of letters,
-that when more than one letter from the same collected is cited, the
-bibliography should contain only a reference to the collection as a
-whole (white:ross:memo, white:russ, white:total).  Similarly, when
-citing both an original text and its translation (see \textbf{userf},
-section~\ref{sec:related} below), the \emph{Manual} (14.109) suggests
-including the original at the end of the translation's bibliography
-entry, a procedure which requires that the original not also be
-printed as a separate bibliography entry (furet:passing:eng,
-furet:passing:fr, aristotle:metaphy:trans, aristotle:metaphy:gr).
-Finally, citations of well-known reference works (like the
-\emph{Encyclopaedia Britannica}, for example), need only be presented
-in notes, and not in the bibliography (14.247--248; ency:britannica,
-wikiped:bibtex; see \textsf{inreference}, above).  A \textsf{keywords}
-field can be a convenient way to exclude all such entries from
-appearing in a bibliography, though of course including
-\texttt{skipbib} in the \textsf{options} field works, too.
+\textsf{biblatex}'s powerful and flexible technique for filtering
+bibliography entries, allowing you to subdivide a bibliography
+according to just about any criteria you care to invent, or indeed to
+prevent entries in notes from appearing in the bibliography, as the
+\emph{Manual} sometimes recommends.  See \textsf{biblatex.pdf} (3.7)
+for thorough documentation.
 
 \mybigspace A \mymarginpar{\textbf{language}} standard
 \textsf{biblatex} field, designed to allow you to specify the
@@ -2869,8 +3522,8 @@ however, when the \emph{Manual} does specify this data, and that is
 when the title of a work is given in translation, even though no
 translation of the work has been published, something that might
 happen when a title is in a language deemed to be unparseable by a
-majority of your expected readership (14.108, 14.110, 14.194;
-pirumova, rozner:liberation).  In such a case, you should provide the
+majority of your expected readership (14.99; pirumova,
+rozner:liberation).  In such a case, you should provide the
 language(s) involved using this field, connecting multiple languages
 using the keyword \texttt{and}.  (I have retained \textsf{biblatex's}
 \cmd{bibstring} mechanism here, which means that you can use the
@@ -2904,21 +3557,19 @@ the whole list will be prefixed by the appropriate string
 \textsf{Biblatex-chicago-notes} will only print such a field in a
 \textsf{book} or an \textsf{inreference} entry, and you should look at
 the documentation of these entry types for further details.  (See
-\emph{Manual} 14.247--248; ency:britannica, grove:sibelius,
+\emph{Manual} 14.232--33; ency:britannica, grove:sibelius,
 times:guide, wikiped:bibtex.)
 
 \mybigspace This \mymarginpar{\textbf{location}} is
 \textsf{biblatex}'s version of the usual \textsc{Bib}\TeX\ field
 \textsf{address}, though the latter is accepted as an alias if that
 simplifies the modification of older .bib files.  According to the
-\emph{Manual} (14.135), a citation usually need only provide the first
+\emph{Manual} (14.129), a citation usually need only provide the first
 city listed on any title page, though a list of cities separated by
 the keyword \enquote{\texttt{and}} will be formatted appropriately.
 If the place of publication is unknown, you can use
-\cmd{autocap\{n\}.p.}\ instead (14.138).  For all cities, you should
-use the common English version of the name, if such exists (14.137).
-
-%%\enlargethispage{\baselineskip}
+\verb+\autocap{n}.p.+\ instead (14.132).  For all cities, you should
+use the common English version of the name, if such exists (14.131).
 
 \mylittlespace Three more details need explanation here.  In
 \textsf{article}, \textsf{periodical}, and \textsf{review} entries,
@@ -2926,34 +3577,47 @@ there is usually no need for a \textsf{location} field, but
 \enquote{if a journal might be confused with another with a similar
   title, or if it might not be known to the users of a bibliography,}
 then this field can present the place or institution where it is
-published (14.191, 14.203; lakeforester:pushcarts, kimluu:diethyl, and
-garrett).  For blogs cited using \textsf{article} entries, this is a
-good place to identify the nature of the source --- i.e., the word
-\enquote{blog} --- letting the style automatically provide the
-parentheses (14.246; ellis:blog).  Less predictably, it is here that
-\emph{Manual} indicates that a particular book is a reprint edition
-(14.119), so in such a case you can use the \textsf{biblatex-chicago}
-macro \cmd{reprint}, followed by a comma, a space, and the location
-(aristotle:metaphy:gr, schweitzer:bach).  (You can also now, somewhat
-more simply, just put the string \texttt{reprint} into the
-\textsf{pubstate} field to achieve the same result.  See the
-\textsf{pubstate} documentation in section~\ref{sec:related}.)  The
-\textsf{origdate} field may be used to give the original date of
-publication, and of course more complicated situations should usually
-be amenable to inclusion in the \textsf{note} field (emerson:nature).
+published (14.182, 14.191, 14.193--94; lakeforester:pushcarts,
+kimluu:diethyl, and garrett).  For blogs cited using \textsf{article}
+entries, this is a good place to identify the nature of the source ---
+i.e., the word \enquote{blog} --- letting the style automatically
+provide the parentheses (14.208; ellis:blog).  Less predictably, it is
+in the vicinity of the \textsf{location} that the \emph{Manual}
+indicates that a particular book is a reprint edition (14.114), so in
+such a case you can use the \textsf{biblatex-chicago} macro
+\cmd{reprint}, followed by a comma, a space, and the location.
+Somewhat more cleanly and simply, and more in keeping with standard
+\textsf{biblatex} usage, you can just put the string \texttt{reprint}
+into the \textsf{pubstate} field to achieve the same result.  See the
+\textsf{pubstate} documentation below (aristotle:metaphy:gr,
+schweitzer:bach).  The \textsf{origdate} field may be used to give the
+original date of publication, and of course more complicated
+situations should usually be amenable to inclusion in the
+\textsf{note} field (emerson:nature).
 
 \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a
 \textsf{maintitle} --- see next entry.
 
-\mybigspace The \mymarginpar{\textbf{maintitle}} main title for a
+\mybigspace The \colmarginpar{\textbf{maintitle}} main title for a
 multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
 (See donne:\hfill var, euripides:orestes, harley:cartography,
 lach:asia, pelikan:christian, and plato:repub\-lic:gr.)  When using a
 \textsf{crossref} field and \textsf{Biber}, the \textsf{title} of
 \textbf{mv*} entry types always becomes a \textsf{maintitle} in the
-child entry.
+child entry.  See also the documentation of the new
+\mycolor{\texttt{maintitle}} \textsf{relatedtype} in the
+\textbf{mvbook} docs in section~\ref{sec:entrytypes}, above, and in
+section~\ref{sec:related}, below.
 
-%%\enlargethispage{\baselineskip}
+\mylittlespace Because \colmarginpar{New!} the 17th edition of the
+\emph{Manual} recommends that you present not only the names of blogs
+but also the names of their parent (usually periodical) publications,
+I have added this field to \textsf{article}, \textsf{periodical}, and
+\textsf{review} entries for just this purpose.  See the documentation of
+those entry types in section~\ref{sec:entrytypes}, above, and also
+table~\ref{tab:online:types} (14.208; amlen:hoot).
+
+\enlargethispage{\baselineskip}
 
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
 \textsf{maintitle}, for which see previous entry.  Such an annex would
@@ -2993,31 +3657,38 @@ also, that you can use the \textsf{nameatype} field to redefine this
 role just as you can with \textsf{editortype}, which see.  Cf.\ also
 \textsf{nameb}, \textsf{namec}, \textsf{translator}, and the macros
 \cmd{partedit},\,\cmd{parttrans},\,\cmd{parteditandtrans},
-\cmd{partcomp},\,\cmd{part\-editandcomp}, \cmd{parttransandcomp}, and
+\cmd{partcomp},\,\cmd{parteditandcomp}, \cmd{parttransandcomp}, and
 \cmd{partedittransandcomp}, for which see
 section~\ref{sec:formatcommands}.
 
-\mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided
+\mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
 \textsf{biblatex-chicago}, it allows you, in most entry types, to
 specify that an author's name is a pseudo\-nym, or to provide either
 the real name or the pseudonym itself, if the other is being provided
 in the \textsf{author} field.  The abbreviation
 \enquote{\texttt{pseud}.}\ (always lowercase in English) is specified,
-either on its own or after the pseudo\-nym (centinel:letters,
+either on its own or after the pseudonym (centinel:letters,
 creasey:ashe:blast, creasey:morton:hide, creasey:york:death, and
-le\-carre:quest); \cmd{bibstring\{pseudonym\}} does the work for you.
+lecarre:quest); \verb+\bibstring{pseudonym}+ does the work for you.
 See under \textbf{author} above for the full details.
 
-\mylittlespace In \textsf{review} entries, I have removed the
-automatic provision of square brackets from the field, allowing it to
-be used in at least two ways.  First, if you provide your own square
-brackets, then it can have its standard function, as above.  Second,
-and new to the 16th edition of the \emph{Manual}, you can further
-specify comments to blogs and other online content using a timestamp
-(in parentheses) that supplements the \textsf{eventdate}, particularly
-when the latter is too coarse a specification to identify a comment
-unambiguously.  Cf.\ ac:comment.
+\mylittlespace In \textsf{online, review,} and \textsf{suppperiodical}
+entries, as well as in \textsf{misc} entries with an
+\textsf{entrysubtype}, I have removed the automatic provision of
+square brackets from the field, allowing it to be used in at least two
+ways.  First, if you provide your own square brackets, then it can
+have its standard function, as above.  Second you can, within
+parentheses, provide a screen name for online social media, or merely
+additional specifics about an author in a piece from an unpublished
+archive.  (The 16th edition of the \emph{Manual} recommended
+specifying comments to blogs and other online content using a time
+stamp in parentheses after the \textsf{author}, but the 17th edition
+\colmarginpar{New!} handles time stamps both differently and more
+widely, so in this case you would now put time data into the
+\textsf{date} or \textsf{eventdate} field, particularly when the date
+itself is too coarse a specification to identify a comment
+unambiguously.  Cf.\ ac:comment, obrien:recycle.)
 
 \mylittlespace In the \textsf{customc} entry type, finally, which is
 used to create alphabetized cross-references to other bibliography
@@ -3057,7 +3728,7 @@ the macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans},\,\,
 \cmd{partcomp},\,\, \cmd{parteditandcomp},\,\, \cmd{parttransandcomp}, and
 \cmd{partedittransand-\break comp} in section~\ref{sec:formatcommands}.
 
-\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (14.87)
+\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (14.103)
 specifies that works without an author may be listed under an editor,
 translator, or compiler, assuming that one is available, and it also
 specifies the strings to be used with the name(s) of compiler(s).  All
@@ -3085,8 +3756,6 @@ fields.  (See above under \textbf{editortype} for details of how you
 may, in certain circumstances, use that field, or the
 \textsf{nameatype} field, to identify a compiler.)
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace It might conceivably be necessary at some point to
 identify the compiler(s) of a \textsf{title} separate from the
 compiler(s) of a \textsf{booktitle} or \textsf{maintitle}, but for the
@@ -3123,13 +3792,17 @@ beginning of a sentence, then simply ensure that that word is in
 lowercase, and \textsf{biblatex-chicago-notes} will automatically do
 the right thing.  Cf.\ \textsf{addendum}.
 
-\mybigspace This \mymarginpar{\textbf{number}} is a standard
-\textsf{biblatex} field, containing the number of a
+\mybigspace This \colmarginpar{\textbf{number}} is a standard
+\textsf{biblatex} field, steadily accumulating uses in
+\textsf{biblatex-chicago}.  It may contain the number of a
 \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry,
 the number of a \textsf{title} in a \textsf{periodical} entry, the
-volume/number of a book in a \textsf{series}, or the (generally
-numerical) specifier of the \textsf{type} in a \textsf{report} entry.
-Generally, in an \textsf{article}, \textsf{periodical}, or
+volume/number of a book (or musical recording) in a \textsf{series},
+the (generally numerical) specifier of the \textsf{type} in a
+\textsf{report} entry, the archive location (or database accession
+number) of a \mycolor{\textsf{dataset}} entry, and the number of a
+national or international standard in a \mycolor{\textsf{standard}}
+entry.  Generally, in an \textsf{article}, \textsf{periodical}, or
 \textsf{review} entry, this will be a plain cardinal number, but in
 such entries \textsf{biblatex-chicago} now does the right thing if you
 have a list or range of numbers (unsigned:ranke).  In any
@@ -3138,14 +3811,14 @@ information, including even a reference to \enquote{2nd ser.,} for
 example, while the \textsf{series} field in such an entry will contain
 the name of the series, rather than a number.  This field is also the
 place for the patent number in a \textsf{patent} entry.  Cf.\
-\textsf{issue} and \textsf{series}.  (See \emph{Manual} 14.128--132
-and boxer:china, palmatary:pottery, wauchope:ceramics; 14.180--181 and
-beattie:crime, conley:fifthgrade, friedman:learn\-ing, garrett,
-gibbard, hlatky:hrt, mcmillen:antebellum, rozner:liberation,
-warr:el\-lison.)
+\textsf{issue} and \textsf{series}.  (Cf.\ 14.123--25 and boxer:china,
+palmatary:pottery, wauchope:ceramics; 14.171 and beattie:crime,
+conley:fifthgrade, friedman:learning, garrett, gibbard, hlatky:hrt,
+mcmillen:antebellum, rozner:liberation, and warr:ellison; 14.257 and
+genbank:db; 14.259 and niso:bibref; 14.263 and holiday:fool.)
 
 \mylittlespace \textbf{NB}: This may be an opportune place to point
-out that the \emph{Manual} (14.154) prefers arabic to roman numerals
+out that the \emph{Manual} (14.147) prefers arabic to roman numerals
 in most circumstances (chapters, volumes, series numbers, etc.), even
 when such numbers might be roman in the work cited.  The obvious
 exception is page numbers, in which roman numerals indicate that the
@@ -3168,28 +3841,33 @@ organization sponsoring a conference in a \textsf{proceedings} or
 \textsf{inproceedings} entry, and I have retained this as a
 possibility, though the \emph{Manual} is silent on the matter.
 
-\mybigspace This \mymarginpar{\textbf{origdate}} \textsf{biblatex}
+\mybigspace This \colmarginpar{\textbf{origdate}} \textsf{biblatex}
 field allows you to provide more than one full date specification for
 those references which need it.  As with the analogous \textsf{date}
 field, you provide the date (or range of dates) in \textsc{iso}8601
-format, i.e., \texttt{yyyy-mm-dd}.  In most entry types, you would use
-\textsf{origdate} to provide the date of first publication of a work,
-most usually needed only in the case of reprint editions, but also
-recommended by the \emph{Manual} for electronic editions of older
-works (14.119, 14.166, 14.169; aristotle:metaphy:gr, emerson:nature,
-james:ambassadors, schweitzer:bach).  In the \textsf{letter} and
-\textsf{misc} (with \textsf{entrysubtype}) entry types, the
-\textsf{origdate} identifies when a letter (or similar) was written.
-In such \textsf{misc} entries, some \enquote{non-letter-like}
-materials (like interviews) need the \textsf{date} field for this
-purpose, while in \textsf{letter} entries the \textsf{date} applies to
-the publication of the whole collection.  If such a published
-collection were itself a reprint, improvisation in the
-\textsf{location} field might be able to rescue the situation.  (See
-jackson:paulina:letter, white:ross:memo, white:russ, and white:total
-for how \textsf{letter} entries usually work; creel:house shows the
-field in action in a \textsf{misc} entry, while spock:interview uses
-\textsf{date}.)
+format, i.e., \texttt{yyyy-mm-dd}.  (You can also provide a time stamp
+in the field, after an uppercase \enquote{\texttt{T}}, but I foresee
+this being very rarely needed in the notes \&\ bibliography style.
+See table~\ref{ad:date:extras} for \textsf{biblatex-chicago's}
+implementation of \textsf{biblatex's} enhanced date specifications.)
+In most entry types, you would use \textsf{origdate} to provide the
+date of first publication of a work, most usually needed only in the
+case of reprint editions, but also recommended by the \emph{Manual}
+for electronic editions of older works (14.114, 14.162;
+aristotle:metaphy:gr, emerson:nature, james:ambassadors,
+schweitzer:bach).  In the \textsf{letter} and \textsf{misc} (with
+\textsf{entrysubtype}) entry types, the \textsf{origdate} identifies
+when a letter (or similar) was written.  In such \textsf{misc}
+entries, you can choose between an \textsf{origdate} and a
+\textsf{date} field for this purpose, depending on how you want the
+date formatted (day-month-year or month-day-year, respectively), while
+in \textsf{letter} entries the \textsf{date} applies to the
+publication of the whole collection.  If such a published collection
+were itself a reprint, improvisation in the \textsf{location} field
+might be able to rescue the situation.  (See jackson:paulina:letter,
+white:ross:memo, white:russ, and white:total for how \textsf{letter}
+entries usually work; creel:house shows the field in action in a
+\textsf{misc} entry, while spock:interview uses \textsf{date}.)
 
 \mylittlespace In \textsf{music} entries, you can use the
 \textsf{origdate} in two separate but related ways.  First, it can
@@ -3197,8 +3875,8 @@ identify the recording date of an entire disc, rather than of one
 track on that disc, which would go in \textsf{eventdate}.  (Compare
 holiday:fool with nytrumpet:art.)  The style will automatically
 prepend the bibstring \texttt{recorded} to the date, but you can
-change it with the new \textsf{userd} field.  Be aware, however, that
-if an entry also has an \textsf{eventdate}, then \textsf{userd} will
+change it with the \textsf{userd} field.  Be aware, however, that if
+an entry also has an \textsf{eventdate}, then \textsf{userd} will
 apply to that, instead, and you'll be forced to accept the default
 string.  Second, the \textsf{origdate} can provide the original
 release date of an album.  For this to happen, you need to put the
@@ -3206,13 +3884,18 @@ string \texttt{reprint} in the \textsf{pubstate} field, which is a
 standard mechanism across many other entry types for identifying a
 reprinted work.  (See floyd:atom.)
 
-\mylittlespace Because the \textsf{origdate} field only accepts
-numbers, some improvisation may be needed if you wish to include
-\enquote{n.d.}\ (\cmd{bibstring\{nodate\}}) in an entry.  In
-\textsf{letter} and \textsf{misc}, this information can be placed in
-\textsf{titleaddon}, but in other entry types you may need to use the
-\textsf{location} field.  (The \textsf{origyear} field usually works,
-too.)
+\mylittlespace A couple of further notes are in order.  First,
+\textsf{artwork} and \textsf{image} entries (which see) have their own
+scheme.  Here, the style uses the earlier of two dates as the creation
+date of the work while the later is the printing date of, e.g., a
+particular exemplar of a photograph or of an etching.  In such an
+entry, the \textsf{origdate} may well be a creation date.  Second,
+because the \textsf{origdate} field only accepts numbers, some
+improvisation may be needed if you wish to include \enquote{n.d.}\
+(\verb+\bibstring{nodate}+) in an entry.  In \textsf{letter} and
+\textsf{misc}, this information can be placed in \textsf{titleaddon},
+but in other entry types you may need to use the \textsf{location}
+field.  (The \textsf{origyear} field usually works, too.)
 
 \mybigspace See
 \vspace{-14.2pt}
@@ -3221,14 +3904,20 @@ too.)
 section~\ref{sec:related}, below.
 \vspace{18pt}
 
+\mybigspace This \colmarginpar{\textbf{origtimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{origdate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
+
 \mybigspace This \mymarginpar{\textbf{pages}} is the standard
 \textsf{biblatex} field for providing page references.  In many
 \textsf{article} and \textsf{review} entries you'll find this contains
 something other than a page number, e.g. a section name or edition
-specification (14.203, 14.209; kozinn:review, nyt:obittrevor,
-nyt:trevor\-obit).  Of course, the same may be true of almost any sort
+specification (14.191; kozinn:review, nyt:obittrevor,
+nyt:trevorobit).  Of course, the same may be true of almost any sort
 of entry, though perhaps with less frequency.  Curious readers may
-wish to look at brown:bremer (14.189) for an example of a
+wish to look at brown:bremer (14.180) for an example of a
 \textsf{pages} field used to facilitate reference to a two-part
 journal article.  Cf.\ \textsf{number} for more information on the
 \emph{Manual}'s preferences regarding the formatting of numerals;
@@ -3244,14 +3933,17 @@ took place a couple of years ago on
 regarding the automatic compression of page ranges, e.g., 101-{-}109
 in the .bib file or in the \textsf{postnote} field would become 101--9
 in the document.  \textsf{Biblatex} has long had the facilities for
-providing this, and though the \emph{Manual's} rules (9.60) are fairly
+providing this, and though the \emph{Manual's} rules (9.61) are fairly
 complicated, Audrey Boruvka fortunately provided in that discussion
 code that implements the specifications.  As some users may well be
 accustomed to compressing page ranges themselves in their .bib files,
 and in their \textsf{postnote} fields, I have made the activation of
 this code a package option, so setting \texttt{compresspages=true}
 when loading \textsf{biblatex-chicago} should automatically give you
-the Chicago-recommended page ranges.
+the Chicago-recommended page ranges.  \textbf{NB}: the code now
+resides in \textsf{biblatex-chicago.sty}, so if you don't load that
+package then you'll need to copy the code into your preamble for the
+option to have the desired effect.
 
 \mybigspace This, \mymarginpar{\textbf{pagination}} a standard
 \textsf{biblatex} field, allows you automatically to prefix the
@@ -3266,7 +3958,7 @@ just mentioned the two fields are equivalent.
 field, which identifies physical parts of a single logical volume in
 \textsf{book}-like entries, not in periodicals.  It has the same
 purpose in \textsf{biblatex-chicago-notes}, but because the
-\emph{Manual} (14.126) calls such a thing a \enquote{book} and not a
+\emph{Manual} (14.121) calls such a thing a \enquote{book} and not a
 \enquote{part,} the string printed in notes and bibliography will, at
 least in English, be \enquote{\texttt{bk.}\hspace{-2pt}}\ instead of
 the plain dot between volume number and part number
@@ -3284,41 +3976,64 @@ example, then you'll need to use a different field, (which in this
 case would be \textsf{number} [palmatary:pottery]).  Cf.\
 \textsf{volume}.
 
-\mybigspace Standard \mymarginpar{\textbf{publisher}}
+\mybigspace Standard \colmarginpar{\textbf{publisher}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
 keyword for connecting multiple publishers, so if a publisher's name
 contains \enquote{and,} then you should either use the ampersand (\&)
 or enclose the whole name in additional braces.  (See \emph{Manual}
-14.139--148; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
+14.133--41; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
 dunn:revolutions.)
 
-\mylittlespace There are, as one might expect, a couple of further
-subtleties involved here.  Two publishers will be separated by a
-forward slash in both notes and bibliography, and you no longer, in
-the 16th edition, need to provide hand formatting if a company issues
-\enquote{certain books through a special publishing division or under
-  a special imprint,} as these, too, should be separated by a forward
-slash.  If a book has two co-publishers, \enquote{usually in different
-  countries,} (14.147) then the simplest thing to do is to choose one,
-probably the nearest one geographically.  If you feel it necessary to
-include both, then levistrauss:savage demonstrates one way of doing
-so, using a combination of the \textsf{publisher} and
-\textsf{location} fields.  Finally, if the publisher is unknown, then
-the \emph{Manual} recommends (14.143) simply using the place (if
-known) and the date.  If for some reason you need to indicate the
-absence of a publisher, the abbreviation given by the \emph{Manual} is
-\texttt{n.p.}, though this can also stand for \enquote{no place.}
-Some style guides apparently suggest using \texttt{s.n.}\,(=
-\emph{sine nomine}) to specify the lack of a publisher, but the
-\emph{Manual} doesn't mention this.
-
-\mybigspace In addition to the functions involving reprinted titles,
-on which see \colmarginpar{\textbf{pubstate}}
-section~\ref{sec:related} below, you can now also use the
-\textsf{pubstate} field to indicate that a work is
-\enquote{forthcoming.}  Just put the exact string \texttt{forthcoming}
-into the field and the style will print \cmd{bibstring\{forth\-coming\}}
-as the \textsf{year} (author:forthcoming, contrib:contrib).
+\enlargethispage{\baselineskip}
+
+\mylittlespace There are, as one might expect, a few further
+subtleties involved here.  If you give two publishers in the field
+they will both be printed, separated by a forward slash in both notes
+and bibliography (14.90; sereny:cries).  The 17th edition generally is
+rather keener than the 16th on using just one, particularly so in the
+case when the parent company of an imprint is also listed on a title
+page, in which case only the imprint need be included in your
+apparatus (14.138).  If an academic publisher issues \enquote{certain
+  books through a special publishing division or under a special
+  imprint or as part of a publishing consortium (or joint imprint),}
+this arrangement may be specified in the \textsf{publisher} field
+(14.139; cohen:schiff).  If a book has two co-publishers \enquote{in
+  different countries} (14.140), then the simplest thing to do is to
+choose one, probably the nearest one geographically.  If you feel it
+necessary to include both, then levistrauss:savage demonstrates one
+way of doing so, using a combination of the \textsf{publisher} and
+\textsf{location} fields.  If the work is self-published, you can
+specify this in the \textsf{pubstate} field (see below), and any
+commercial self-publishing platform would go in \textsf{publisher}
+(14.137).  Books published before 1900 can, at your discretion,
+include only the place (if known) and the date (14.128).  If for some
+reason you need to indicate the absence of a publisher, the
+abbreviation given by the \emph{Manual} is \texttt{n.p.}, though this
+can also stand for \enquote{no place.}  The \emph{Manual} also
+mentions {s.n.}\,(= \emph{sine nomine}) to specify the lack of a
+publisher (10.42).
+
+\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+specifications in the 17th edition of the \emph{Manual} (esp.\
+14.137), I have tried to generalize the functioning of the
+\textsf{pubstate} field in all entry types.  The \texttt{reprint}
+string still has a special status there, being ignored in
+\textsf{video} entries and provoking a syntactic change in the
+presentation of dates in \textsf{music} entries, while in other types
+allowing the presentation of reprinted titles.  Other strings are
+divided into two types: those which \textsf{biblatex-chicago} will
+print as the \textsf{year}, which currently means \emph{only} those
+for which \textsf{biblatex} contains bibstrings indicating works soon
+to be published, i.e., \texttt{forthcoming}, \texttt{inpreparation},
+\texttt{inpress}, and \texttt{submitted}; and those, i.e., everything
+else, which will be printed before, and in close association with,
+other information about the publisher of a work.  The four in the
+first category will always be localized, as will \texttt{reprint} and
+\mycolor{\texttt{selfpublished}} (and anything else that
+\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
+category.  All other strings will be printed as-is, capitalized if
+needed, just before the publisher (author:forthcoming,
+contrib:contrib, schweitzer:bach).
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
@@ -3331,10 +4046,12 @@ section~\ref{sec:related}, below.
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
 \textsf{periodical}, or \textsf{review} entry, almost always the name
-of a publication series in \textsf{book}-like entries.  If you need to
-attach further information to the \textsf{series} name in a
-\textsf{book}-like entry, then the \textsf{number} field is the place
-for it, whether it be a volume, a number, or even something like
+of a publication series in \textsf{book}-like entries, and providing
+similar identifying information associated with a \textsf{number} in
+\textsf{music} and \mycolor{\textsf{standard}} entries.  If you need
+to attach further information to the \textsf{series} name in a
+\textsf{book}-like entry, then the \textsf{number} field is again the
+place for it, whether it be a volume, a number, or even something like
 \enquote{2nd ser.} or \enquote{\cmd{bibstring\{oldseries\}}.}  Of
 course, you can also use \cmd{bibstring\{oldseries\}} or
 \cmd{bibstring\{newseries\}} in an \textsf{article} entry, but there
@@ -3342,21 +4059,19 @@ you would place it in the \textsf{series} field itself.  (In fact, the
 \textsf{series} field in \textsf{article}, \textsf{periodical}, and
 \textsf{review} entries is one of the places where \textsf{biblatex}
 allows you just to use the plain bibstring \texttt{oldseries}, for
-example, rather than making you type \cmd{bibstring\{oldseries\}}.
+example, rather than making you type \verb+\bibstring{oldseries}+.
 The \textsf{type} field in \textsf{manual}, \textsf{patent},
 \textsf{report}, and \textsf{thesis} entries also has this
 auto-detection mechanism in place; see the discussion of
 \cmd{bibstring} below for details.)  In whatever entry type, these
 bibstrings produce the required abbreviation, which thankfully is the
 same in both notes and bibliography.  (For books and similar entries,
-see \emph{Manual} 14.128--132; boxer:china, browning:aurora,
-palmatary:pottery, plato:republic:gr, wauchope:ceramics; for
-periodicals, see 14.195; garaud:gatine, sewall:letter.)  Cf.\
+see 14.123--26; boxer:china, browning:aurora, palmatary:pottery,
+plato:republic:gr, wauchope:ceramics; for periodicals, see 14.184;
+garaud:gatine, sewall:letter; also niso:bibref, nytrumpet:art) Cf.\
 \textsf{number} for more information on the \emph{Manual}'s
 preferences regarding the formatting of numerals.
 
-\enlargethispage{-\baselineskip}
-
 \paragraph*{\protect\mymarginpar{\textbf{shortauthor}}}
 \label{sec:shortauthor}
 
@@ -3374,15 +4089,15 @@ order.  In an author-less \textsf{article} or \textsf{review} entry
 \textsf{biblatex-chicago-notes} will use the \textsf{journaltitle} as
 the author, you can use the \textsf{shortjournal} field instead, but
 you'll need to set up the \texttt{journalabbrev} option to make sure
-it's actually printed.  (See below.)  In author-less \textsf{manual}
-entries, where the \textsf{organization} will be so used, the style
-automatically uses any \textsf{shortauthor} in the short note form,
-though you may still need to help the alphabetization routines by
-providing a \textsf{sortkey} field in such cases (dyna:browser,
+it's actually printed.  (See \textsf{shortjournal}, below.)  In
+author-less \textsf{manual} entries, where the \textsf{organization}
+will be so used, the style automatically uses any \textsf{shortauthor}
+in the short note form, though it will sort by the
+\textsf{organization} in the bibliography (dyna:browser,
 gourmet:052006, lakeforester:pushcarts, nyt:trevorobit).
 
 \mylittlespace As mentioned under \textsf{editortype}, the
-\emph{Manual} (14.87) recommends against providing the identifying
+\emph{Manual} (14.32) recommends against providing the identifying
 string (e.g., ed.\ or trans.)\ in the short note form, and
 \textsf{biblatex-chicago-notes} follows their recommendation.  If you
 need to provide these strings in such a citation, then you'll have to
@@ -3417,7 +4132,7 @@ either long or short according to your package options, informing the
 reader that the work will hereafter be cited by this abbreviation.  As
 in \textsf{biblatex}, the \cmd{printshorthands} command, now for
 \textsf{Biber} users at least an alias for
-\cmd{printbib\-list\{shorthand\}}, will produce a formatted list of
+\verb+\printbiblist{shorthand}+, will produce a formatted list of
 abbreviations for reference purposes, a list which the \emph{Manual}
 suggests should be placed either in the front matter (when using
 footnotes) or before the endnotes, in case these are used.
@@ -3440,7 +4155,7 @@ command.)  Third, I have provided a package option,
 \texttt{shorthandfull}, which prints entries in the list of shorthands
 which contain full bibliographical information, effectively allowing
 you to eschew the bibliography in favor of a fortified shorthand list.
-(See 13.65, 14.54--55, and also \textsf{biblatex.pdf} for more
+(See 13.67, 14.59--60, and also \textsf{biblatex.pdf} for more
 information.)
 
 \mylittlespace Alexandre Roberts suggested a further refinement to
@@ -3473,8 +4188,6 @@ still needed, at least in the current state of
 have with this functionality to the email address at the head of this
 documentation.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace When \mymarginpar{\textbf{shorthandintro}} you include a
 \textsf{shorthand} in an entry, it will ordinarily appear the first
 time you cite the work, at the end of a long note, surrounded by
@@ -3496,7 +4209,7 @@ provide custom punctuation inside the \textsf{shorthandintro} field
 itself.
 
 \mybigspace A \mymarginpar{\textbf{shortjournal}} special
-\textsf{biblatex} field, used to provide both an abbreviated form of a
+\textsf{biblatex} field, used both to provide an abbreviated form of a
 \textsf{journaltitle} in notes and/or bibliography and to facilitate
 the creation of a list of journal abbreviations rather in the manner
 of a \textsf{shorthand} list.  As requested by user BenVB, you can now
@@ -3520,7 +4233,7 @@ three other settings:\ \texttt{true} prints the shortened fields both
 in notes and bibliography, \texttt{notes} only in notes, and
 \texttt{bib} only in the bibliography.  Should you wish to present a
 list of these abbreviations with their expansions, then you need to
-use the \cmd{printbiblist\{shortjour\-nal\}} command, perhaps with a
+use the \verb+\printbiblist{shortjournal}+ command, perhaps with a
 \texttt{title} option to differentiate the list from any
 \textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
 provided two \texttt{bibenvironments} for printing this list in foot-
@@ -3531,10 +4244,49 @@ as with \textsf{shorthands}, you'll probably want to use the option
 the (oversized) default, and perhaps provide your own title within the
 \cmd{footnote} command.  Finally, if you don't like the default
 formatting of the abbreviations in the list (bold italic), you can
-roll your own using \cmd{DeclareFieldFormat\{shortjournal\-width\}}
+roll your own using \verb+\DeclareFieldFormat{shortjournalwidth}+
 --- you can see its default definition at the top of
 \textsf{chicago-notes.bbx}.
 
+\mybigspace A \colmarginpar{\textbf{shortseries}} special
+\textsf{biblatex} field, used both to provide an abbreviated form of a
+(book) \textsf{series} in notes and/or bibliography and to facilitate
+the creation of a list of such abbreviations rather in the manner of a
+\textsf{shorthand} list.  As with the \textsf{shortjournal} field, its
+inclusion in \textsf{biblatex-chicago} was requested by user BenVB,
+and it is now available in entry types which have book-like series
+titles rather than journal-like numbers in the \textsf{series} field,
+to wit: \textsf{audio, book, bookinbook, collection, inbook,
+  incollection, inproceedings, inreference, letter, manual, music,
+  mvbook, mvcollection, mvproceedings, mvreference, reference, report,
+  standard, suppbook,} and \textsf{video}.  There are several steps to
+take in order to use the field.  First, you'll need to provide both
+\textsf{shortseries} and \textsf{series} fields in the entry, then
+you'll need to set the \mycolor{\texttt{seriesabbrev}} option either
+when loading \textsf{biblatex-chicago}, for the whole document or for
+specific entry types, or in the \textsf{options} field of individual
+.bib entries.  By default, this option is not set, so your
+\mycolor{\textsf{shortseries}} fields will be silently ignored.  There
+are three other settings:\ \texttt{true} prints the shortened fields
+both in notes and bibliography, \texttt{notes} only in notes, and
+\texttt{bib} only in the bibliography.  Should you wish to present a
+list of these abbreviations with their expansions, then you need to
+use the \verb+\printbiblist{shortseries}+ command, perhaps with a
+\texttt{title} option to differentiate the list from any
+\textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
+provided two \texttt{bibenvironments} for printing this list in foot-
+or endnotes (\mycolor{\texttt{shsernotes}} and
+\mycolor{\texttt{shserendnotes}}, respectively), to be used with the
+\texttt{env} option to \cmd{printbiblist}.  Again as with
+\textsf{shorthands}, you'll probably want to use the option
+\texttt{heading=none} when using these environments, just to turn off
+the (oversized) default, and perhaps provide your own title within the
+\cmd{footnote} command.  Finally, if you don't like the default
+formatting of the abbreviations in the list (plain roman), you can
+roll your own using \verb+\DeclareFieldFormat{shortserieswidth}+ ---
+you can see its default definition at the top of
+\textsf{chicago-notes.bbx}.
+
 \mybigspace A \mymarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
 title for short notes.  (It is also the way to hook
@@ -3542,47 +4294,46 @@ title for short notes.  (It is also the way to hook
 on which see the previous entry.)  In \textsf{biblatex-chicago-notes},
 you need to take particular care with \textsf{letter} entries, where,
 as explained above, the \emph{Manual} requires a special format
-(\enquote{\texttt{to Recipient}}).  (See 14.117;
+(\enquote{\texttt{to Recipient}}).  (See 14.111;
 jackson:paulina:letter, white:ross:memo, white:russ.)  Some
 \textsf{misc} entries (with an \textsf{entrysubtype}) also need
 special attention.  (See creel:house, where the full \textsf{title} is
 used as the \textsf{shortauthor} + \textsf{shorttitle} by using
-\cmd{headlesscite} commands.  Placing \cmd{isdot} into the
-\textsf{shortauthor} field no longer works in \textsf{biblatex} 1.6,
-so be sure to check your .bib files when you upgrade.)  Remember,
-also, that the generic titles in \textsf{review} and \textsf{misc}
-entries may not want capitalization in all contexts, so, as with the
-\textsf{title} field, if you begin a \textsf{shorttitle} with a
-lowercase letter the style will do the right thing (barcott:review,
-bundy:macneil, Clemens:letter, kozinn:review, ratliff:review,
-unsigned:ranke).
-
-%%\enlargethispage{\baselineskip}
-
-\mybigspace A \mymarginpar{\textbf{sortkey}} standard
-\textsf{biblatex} field, designed to allow you to specify how you want
-an entry alphabetized in a bibliography.  In general, if an entry
-doesn't turn up where you expect or want it, this field should provide
-the solution.  Entries with a corporate author can now omit the
-definite or indefinite article, which should help (14.85;
-cotton:manufacture, nytrumpet:art).  If you use \textsf{Biber} as your
-backend, \textsf{biblatex-chicago} also now includes the three
-supplemental name fields (\textsf{name[a-c]}) in the sorting
-algorithm, so once again you should find that this field is needed
-less than before.  Still, many entries without a name field of any
-sort, particularly those with a definite or indefinite article
-beginning the \textsf{title}, may require assistance (chaucer:alt,
-dyna:browser, gourmet:052006, greek:filmstrip, grove:sibelius,
-lakeforester:pushcarts, nyt:trevorobit, silver:ga\-wain,
-un\-signed:ran\-ke, vir\-gin\-ia:plan\-tation).  \textsf{Biblatex}
-also provides \textbf{sortname}, \textbf{sorttitle}, and
-\textbf{sortyear} for more fine-grained control.  Please consult
+\cmd{headlesscite} commands.)  Remember, also, that the generic titles
+in \textsf{review} and \textsf{misc} entries may not want
+capitalization in all contexts, so, as with the \textsf{title} field,
+if you begin a \textsf{shorttitle} with a lowercase letter the style
+will do the right thing (barcott:review, bundy:macneil,
+Clemens:letter, kozinn:review, ratliff:review, unsigned:ranke).
+
+\mybigspace Standard \mymarginpar{\textbf{sortkey} \\\textbf{sortname}
+  \\\textbf{sorttitle} \\\textbf{sortyear}} \textsf{biblatex} fields,
+designed to allow you to specify how you want an entry alphabetized in
+a bibliography.  The \textsf{sortkey} field trumps all other sorting
+information, while the others offer more fine-grained control.  In
+general, if an entry doesn't turn up where you expect or want it,
+these fields should provide the solution.  Entries with a corporate
+author can now omit the definite or indefinite article, which should
+help (14.70, 14.84; cotton:manufacture, nytrumpet:art).
+\textsf{Biblatex-chicago} also includes the three supplemental name
+fields (\textsf{name[a-c]}) in the sorting algorithm, so once again
+you should find that a \textsf{sortkey} is needed less than before.
+Still, some entries without a name field of any sort, particularly
+those with a definite or indefinite article beginning the
+\textsf{title}, may require assistance (greek:filmstrip,
+grove:sibelius, nyt:obittrevor, virginia:plantation).  Please consult
 \textsf{biblatex.pdf} and the remarks on \cmd{DeclareSortingTemplate}
 in section~\ref{sec:formatopts}, below.
 
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
 
+\mybigspace This \colmarginpar{\textbf{timezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{date}.  The \emph{Manual} prefers initialisms like
+\enquote{EST} for this purpose, and you can provide parentheses around
+it at your discretion (cp.\ 10.41 and 14.191).
+
 \mybigspace In \mymarginpar{\textbf{title}} the vast majority of
 cases, this field works just as it always has in \textsc{Bib}\TeX, and
 just as it does in \textsf{biblatex}.  Nearly every entry will have
@@ -3592,7 +4343,7 @@ specific one (centinel:letters, powell:email).  The main source of
 difficulties flows from the \emph{Manual}'s rules for formatting
 \textsf{titles}, rules which also hold for \textsf{booktitles} and
 \textsf{maintitles}.  The whole point of using a
-\textsc{Bib}\TeX-based system is for it to do the formatting for you,
+\textsf{biblatex}-based system is for it to do the formatting for you,
 and in most cases \textsf{biblatex-chicago-notes} does just that,
 surrounding titles with quotation marks, italicizing them, or
 occasionally just leaving them alone.  When, however, a title is
@@ -3609,34 +4360,37 @@ are as follows:
   \textsf{journaltitle} in all entry types; \textsf{title} of
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
   \textsf{booklet}, \textsf{collection}, \textsf{image},
-  \textsf{inbook}, \textsf{manual}, \textsf{misc} (with no
-  \textsf{entrysubtype}), \textsf{periodical}, \textsf{proceedings},
-  \textsf{report}, \textsf{suppbook}, and \textsf{suppcollection}
-  entry types.
+  \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
+  \mycolor{\textsf{performance}}, \textsf{periodical},
+  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
+  \textsf{suppbook}, and \textsf{suppcollection} entry types.
 \item[\qquad Quotation Marks:] \textsf{title} of \textsf{article},
-  \textsf{incollection}, \textsf{inproceedings}, \textsf{online},
-  \textsf{periodical}, \textsf{thesis}, and \textsf{unpublished} entry
-  types, \textsf{issuetitle} in \textsf{article}, \textsf{periodical},
-  and \textsf{review} entry types.
+  \textsf{inbook}, \textsf{incollection}, \textsf{inproceedings},
+  \textsf{online}, \textsf{periodical}, \textsf{thesis}, and
+  \textsf{unpublished} entry types, \textsf{issuetitle} in
+  \textsf{article}, \textsf{periodical}, and \textsf{review} entry
+  types.
+\item[\qquad Sentence cased:] \textsf{title} in \textsf{patent}
+  entries.
 \item[\qquad Unformatted:] \textsf{booktitleaddon},
   \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types,
   \textsf{title} of \textsf{customc}, \textsf{letter}, \textsf{misc}
-  (with an \textsf{entrysubtype}), \textsf{patent}, \textsf{review},
-  and \textsf{suppperiodical} entry types.
+  (with an \textsf{entrysubtype}), \textsf{review}, and
+  \textsf{suppperiodical} entry types.
 \item[\qquad Italics or Quotation Marks:] All of the audiovisual entry
   types --- \textsf{audio}, \textsf{music}, and \textsf{video} ---
   have to serve as analogues both to \textsf{book} and to
   \textsf{inbook}.  Therefore, if there is both a \textsf{title} and a
   \textsf{booktitle}, then the \textsf{title} will be in quotation
   marks.  If there is no \textsf{booktitle}, then the \textsf{title}
-  will be italicized.
+  will be italicized, unless you provide an \textsf{entrysubtype}.
 \end{description}
 
 Now, the rules for which entry type to use for which sort of work tend
 to be fairly straightforward, but in cases of doubt you can consult
 section \ref{sec:entrytypes} above, the examples in
 \textsf{notes-test.bib}, or go to the \emph{Manual} itself,
-8.154--195.  Assuming, then, that you want to present a title within a
+8.156--201.  Assuming, then, that you want to present a title within a
 title, and you know what sort of formatting each of the two would, on
 its own, require, then the following rules apply:
 
@@ -3645,7 +4399,7 @@ its own, require, then the following rules apply:
   quotation marks and italicized, so in such cases all you need to do
   is provide the quotation marks using \cmd{mkbibquote}, which will
   take care of any following punctuation that needs to be brought
-  within the closing quotation mark(s) (14.102; donne:var,
+  within the closing quotation mark(s) (14.94; donne:var,
   mchugh:wake).
 \item Inside a quoted title, you should present another title as it
   would appear if it were on its own, so in such cases you'll need to
@@ -3653,8 +4407,8 @@ its own, require, then the following rules apply:
   another quoted title would take single quotes --- the
   \cmd{mkbibquote} command does this for you automatically, and also,
   I repeat, takes care of any following punctuation that needs to be
-  brought within the closing quotation mark(s).  (See 14.177; garrett,
-  loften:hamlet, murphy:silent, white:calli\-machus.)
+  brought within the closing quotation mark(s).  (See 14.94--95;
+  garrett, loften:hamlet, murphy:silent, white:cal\-limachus.)
 \item Inside a plain title (most likely in a \textsf{review} entry or
   a \textsf{titleaddon} field), you should present another title as it
   would appear on its own, once again formatting it yourself using
@@ -3666,11 +4420,13 @@ The \emph{Manual} provides a few more rules, as well.  A word normally
 italicized in text should also be italicized in a quoted or plain-text
 title, but should be in roman (\enquote{reverse italics}) in an
 italicized title.  A quotation used as a (whole) title (with or
-without a subtitle) retains its quotation marks in an italicized title
-\enquote{only if it appears that way in the source,} but always
-retains them when the surrounding title is quoted or plain (14.104,
-14.177; lewis).  A word or phrase in quotation marks, but that isn't a
-quotation, retains those marks in all title types (kimluu:diethyl).
+without a subtitle) retains, according to the 16th edition, its
+quotation marks in an italicized title if it appears that way in the
+source, but I can't find similar instructions in the 17th.  Such a
+quotation always retains its quotation marks when the surrounding
+title is quoted or plain (14.94; lewis).  A word or phrase in
+quotation marks, but that isn't a quotation, retains those marks in
+all title types (kimluu:diethyl).
 
 \mylittlespace Finally, please note that in all \textsf{review} (and
 \textsf{suppperiodical}) entries, and in \textsf{misc} entries with an
@@ -3681,13 +4437,15 @@ assuming that such a \textsf{title} begins with a lowercase letter in
 your .bib database.  See\,\textbf{\textbackslash autocap} in
 section~\ref{sec:formatcommands} below for more details.
 
+\enlargethispage{-\baselineskip}
+
 \mybigspace Standard \mymarginpar{\textbf{titleaddon}}
 \textsf{biblatex} intends this field for use with additions to titles
 that may need to be formatted differently from the titles themselves,
 and \textsf{biblatex-chicago-notes} uses it in just this way, with the
 additional wrinkle that it can, if needed, replace the \textsf{title}
 entirely, and this in, effectively, any entry type, providing a fairly
-powerful, if somewhat complicated, tool for getting \textsc{Bib}\TeX\
+powerful, if somewhat complicated, tool for getting \textsf{biblatex}
 to do what you want (cf.\ centinel:letters, powell:email).  This field
 will always be unformatted, that is, neither italicized nor placed
 within quotation marks, so any formatting you may need within it
@@ -3709,8 +4467,6 @@ capitalized, a situation that is handled as you would expect;
 coolidge:speech shows both entry options for controlling the
 punctuation.)
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
 have implemented this field as \textsf{biblatex}'s standard styles do,
 but the requirements specified by the \emph{Manual} present certain
@@ -3758,74 +4514,116 @@ by the translator's name, behavior that can be controlled with the
 \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and
 \textsf{namec}.
 
-\mybigspace This \mymarginpar{\textbf{type}} is a standard
+\mybigspace This \colmarginpar{\textbf{type}} is a standard
 \textsf{biblatex} field, and in its normal usage serves to identify
 the type of a \textsf{manual}, \textsf{patent}, \textsf{report}, or
 \textsf{thesis} entry.  \textsf{Biblatex} 0.7 introduced the ability,
 in some circumstances, to use a bibstring without inserting it in a
-\cmd{bibstring} command, and in these entry types the \textsf{type}
-field works this way, allowing you simply to input, e.g.,
-\texttt{patentus} rather than \cmd{bibstring\{patentus\}}, though both
-will work.  (See petroff:im\-purity; herwign:office, murphy:silent, and
-ross:thesis all demonstrate how the \textsf{type} field may sometimes
-be automatically set in such entries by using one of the standard
-entry-type aliases).
+\cmd{bibstring} command, and in some entry types (\textsf{audio,
+  manual, music, patent, report, suppbook, suppcollection, thesis,}
+and \textsf{video}) the \textsf{type} field works this way, allowing
+you simply to input, e.g., \texttt{patentus} rather than
+\verb+\bibstring{patentus}+, though both will work.  (See
+petroff:impurity; herwign:office, murphy:silent, and ross:thesis all
+demonstrate how the \textsf{type} field may sometimes be automatically
+set in such entries by using one of the standard entry-type aliases).
+In other entry types (\textsf{artwork, image, book, online, article,
+  review,} and \textsf{suppperiodical}) \textsf{biblatex-chicago} will
+merely capitalize the contents according to context.
 
 \mylittlespace In the \textsf{suppbook} entry type, and in its alias
 \textsf{suppcollection}, you can use the \textsf{type} field to
 specify what sort of supplemental material you are citing, e.g.,
 \enquote{\texttt{preface to}} or \enquote{\texttt{post\-script to}.}
 Cf.\ \textsf{suppbook} above for the details.  (See \emph{Manual}
-14.116; polakow:af\-terw, prose:intro).
+14.110; polakow:afterw, prose:intro).
 
-\mylittlespace You can also use the \textsf{type} field in
+\mylittlespace You can use the \textsf{type} field in
 \textsf{artwork}, \textsf{audio}, \textsf{image}, \textsf{music}, and
 \textsf{video} entries to identify the medium of the work, e.g.,
 \texttt{oil on canvas}, \texttt{albumen print}, \texttt{compact disc}
-or \texttt{MPEG}.  If the first word in this field would normally only
-be capitalized at the beginning of a sentence, then leave it in
-lowercase in your .bib file and \textsf{biblatex} will automatically
-do the right thing in citations.  Cf.\ \textsf{artwork},
-\textsf{audio}, \textsf{image}, \textsf{music}, and \textsf{video},
-above, for all the details.  (See auden:reading, bedford:photo,
-cleese:holygrail, leo:madonna, nytrumpet:art.)
-
-\enlargethispage{-\baselineskip}
+or \texttt{MPEG}.  In \textsf{book} entries it will normally hold
+system information about multimedia app content (14.268), while in
+\textsf{online, article,} and \textsf{review} entries it will hold the
+medium of online multimedia (14.267).  Cf.\ under these entry types in
+section~\ref{sec:entrytypes}, above, for more details.  (See
+auden:reading, bedford:photo, cleese:holygrail, leo:madonna,
+nytrumpet:art.)
 
 \mybigspace A standard \mymarginpar{\textbf{url}} \textsf{biblatex}
 field, it holds the url of an online publication, though you can
-provide one for all entry types.  The 16th edition of the
-\textsf{Manual} expresses a strong preference for DOIs over URLs if
-the former is available --- cf.\ \textsf{doi} above, and also
-\textsf{urldate} just below.  The required \LaTeX\ package
-\textsf{url} will ensure that your documents format such references
-properly, in the text and in the reference apparatus.  It may be worth
-noting that child entries no longer inherit \textsf{url} fields from
-their parents --- the information seems entry-specific enough to
-warrant a little bit of extra typing if you need to present the same
-locator in several entries.
-
-\mybigspace A standard \mymarginpar{\textbf{urldate}}
+provide one for all entry types.  The \emph{Manual} expresses a strong
+preference for DOIs over URLs if the former is available --- cf.\
+\textsf{doi} above, and also \textsf{urldate} just below.  The
+required \LaTeX\ package \textsf{url} will ensure that your documents
+format such references properly, in the text and in the reference
+apparatus.  It may be worth noting that child entries generally won't
+inherit \textsf{url} fields from their parents --- the information
+seems entry-specific enough to warrant a little bit of extra typing if
+you need to present the same locator in several entries.  You
+\colmarginpar{\texttt{blogurl}} can, however, set the new preamble
+option \mycolor{\texttt{blogurl}} to allow your child comments
+(\textsf{review}) to inherit the URL from the parent blog
+(\textsf{article}).
+
+\mybigspace A standard \colmarginpar{\textbf{urldate}}
 \textsf{biblatex} field, it identifies exactly when you accessed a
-given url, and is given in \textsc{iso}8601 format.  The 16th edition
-of the \emph{Manual} prefers DOIs to URLs; in the latter case it
-allows the use of access dates, particularly in contexts that require
-it, but prefers that you use revision dates, if these are available.
-To enable you to specify which date is at stake, I have provided the
-\textbf{userd} field, documented below.  If an entry doesn't have a
-\textsf{userd}, then the \textsf{urldate} will be treated, as before,
-as an access date (14.6--8, 14.184; evanston:library, grove:sibelius,
-hlatky:hrt, osborne:poison, sirosh:visualcortex, wikiped:bibtex).
-
-\mybigspace A \mymarginpar{\textbf{usera}} supplemental
-\textsf{biblatex} field which functions in \textsf{biblatex-chicago}
-almost as a \enquote{\textsf{journaltitleaddon}} field.  In
-\textsf{article}, \textsf{periodical}, and \textsf{review} entries
-with \textsf{entrysubtype} \texttt{magazine}, the contents of this
-field will be placed, unformatted and between commas, after the
-\textsf{journaltitle} and before the date.  The main use is for
-identifying the broadcast network when you cite a radio or television
-program (14.221; bundy:macneil).
+given url, and is given in \textsc{iso}8601 format.  The \emph{Manual}
+prefers DOIs to URLs; in the latter case it allows the use of access
+dates, particularly in contexts that require it, but prefers that you
+use revision dates, if these are available.  To enable you to specify
+which date is at stake, I have provided the \textbf{userd} field,
+documented below.  If an entry doesn't have a \textsf{userd}, then the
+\textsf{urldate} will be treated as an access date (14.8, 14.12--13,
+14.207; evanston:library, grove:sibelius, hlatky:hrt, osborne:poison,
+sirosh:visualcortex, wikiped:bibtex).  You can \colmarginpar{New!}
+also use the field to specify a time stamp, should the date alone not
+be specific enough.  The time stamp follows the date, separated by an
+uppercase \enquote{T}, like so: \texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.
+If you wish to specify the time zone, the \emph{Manual} (10.41)
+prefers initialisms like \enquote{EST} or \enquote{PDT,} and these are
+most easily provided using the \mycolor{\texttt{urltimezone}} field,
+where you can provide your own parentheses if so desired (cp.\
+14.191).  Following the examples in the \emph{Manual}, any
+\textsf{urldate} will by default be printed in 24-hour format, though
+other time stamps use 12-hour format.  The \textsf{biblatex} option
+\texttt{urltime}, discussed in section~\ref{sec:presetopts}, allows
+you to change this in your preamble.
+
+\mylittlespace A \textsf{urldate} time stamp (and
+\mycolor{\texttt{urltimezone}}) can appear in any entry whatsoever, if
+you judge the online source to be the sort that changes rapidly enough
+for a time stamp to be necessary (14.207, 14.233; wikiped:bibtex).
+You can stop it printing by setting the new
+\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}} option to
+\texttt{false} in your preamble for the whole document or for
+specified entry types, or in the \textsf{options} field of individual
+entries.  Please see the documentation of \textbf{date}, above, and
+also table~\ref{ad:date:extras}, below, for more details about time
+stamps and other parts of \textsf{biblatex's} enhanced date
+specifications.  Table~\ref{tab:online:types} contains a summary of
+the current state of \textsf{biblatex-chicago's} handling of online
+materials.
+
+\mybigspace This \colmarginpar{\textbf{urltimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{urldate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
+
+\mybigspace A \colmarginpar{\textbf{usera}} supplemental
+\textsf{biblatex} field which in certain contexts in
+\textsf{biblatex-chicago} will identify the broadcast network when you
+cite a radio or television program.  In \textsf{article},
+\textsf{periodical}, and \textsf{review} entries with
+\textsf{entrysubtype} \texttt{magazine}, it acts almost as a
+\enquote{\textsf{journaltitleaddon}} field, and its contents will be
+placed, unformatted and between commas, after the
+\textsf{journaltitle} and before the \textsf{date}.  In \textsf{video}
+entries it comes after the \textsf{eventdate}, i.e., the date of first
+broadcast, and is separated from that date by the \cmd{bibstring}
+\enquote{\texttt{on}} (14.213, 14.265; american:crime, bundy:macneil,
+friends:leia, mayberry:brady).
 
 \mybigspace I \mymarginpar{\textbf{userc}} have implemented this
 supplemental \textsf{biblatex} field as part of Chicago's name
@@ -3842,7 +4640,7 @@ inside your document, or you can place that entry key in the
 In the latter case, \textsf{biblatex-chicago} will call \cmd{nocite}
 for you, and this method should ensure that there will be at least one
 entry in the bibliography to which the cross-reference will point.
-(See 14.84, 14.86; creasey:ashe:blast, creasey:morton:hide,
+(See 14.81--82; creasey:ashe:blast, creasey:morton:hide,
 creasey:york:death, lecarre:quest.)
 
 \mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field acts
@@ -3855,24 +4653,24 @@ date, as has long been the default in \textsf{biblatex} and in
 way, what you include in \textsf{userd} will be printed \emph{before}
 the \textsf{urldate}, so phrases like \enquote{\texttt{last modified}}
 or \enquote{\texttt{last revised}} are what the field will typically
-contain (14.7--8; wikiped:bibtex).  In the absence of a
+contain (14.12--13; wikiped:bibtex).  In the absence of a
 \textsf{urldate} you can, in most entry types, include a
 \textsf{userd} field to qualify a \textsf{date} in the same way it
 would have modified a \textsf{urldate}.
 
 \mylittlespace Because of the rather specialized needs of some
-audio-visual references, this basic sche\-ma changes for \textsf{music}
-and \textsf{video} entries.  In \textsf{music} entries where an
-\textsf{eventdate} is present, \textsf{userd} will modify that date
-instead of any \textsf{urldate} that may also be present, and it will
-modify an \textsf{origdate} if it is present and there is no
-\textsf{eventdate}.  It will modify a \textsf{date} only in the
+audio-visual references, this basic sche\-ma changes for
+\textsf{music} and \textsf{video} entries.  In \textsf{music} entries
+where an \textsf{eventdate} is present, \textsf{userd} will modify
+that date instead of any \textsf{urldate} that may also be present,
+and it will modify an \textsf{origdate} if it is present and there is
+no \textsf{eventdate}.  It will modify a \textsf{date} only in the
 absence of the other three.  In \textsf{video} entries it will modify
 an \textsf{eventdate} if it is present, and in its absence the
 \textsf{urldate}.  In the absence of those two, it can modify a
 \textsf{date}.  Please see the documentation of the \textbf{music} and
 \textbf{video} entry types, and especially of the \textsf{eventdate},
-\textsf{origdate}, and \textsf{urldate} fields, above (14.276--279;
+\textsf{origdate}, and \textsf{urldate} fields, above (14.263--65;
 nytrumpet:art).
 
 \mylittlespace In all cases, you can start the \textsf{userd} field
@@ -3891,23 +4689,34 @@ can translate the title and use that translation in your
 \textsf{title} and the translation in \textsf{usere}.  If you choose
 the latter, you may need to provide a \textsf{shorttitle} so that the
 short note form is also parseable.  Cf.\ \textbf{language}, above.
-(See 14.108--110, 14.194; kern, weresz.)
+(See 14.99; kern, weresz.)
 
 \mybigspace See \mymarginpar{\textbf{userf}}
 section~\ref{sec:related}, below.
 
-%%\enlargethispage{\baselineskip}
-
-\mybigspace Standard \mymarginpar{\textbf{venue}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
-\textsf{inproceedings} entries, but I haven't yet implemented it,
-mainly because the \emph{Manual} has nothing to say about it.  Perhaps
-the \textsf{organization} field could be used, for the moment,
-instead.  Anything in a \textsf{venue} field will be ignored.
-
-\mybigspace Standard \mymarginpar{\textbf{version}} \textsf{biblatex}
-field, currently only available in \textsf{misc} and \textsf{patent}
-entries in \textsf{biblatex-chicago-notes}.
+\textsf{inproceedings} entries, but I haven't yet implemented it
+there, mainly because the \emph{Manual} has nothing to say about it.
+Perhaps the \textsf{organization} field could be used, for the moment,
+instead.  I have implemented the field in the \textbf{misc} entry
+type, both with and without an \textsf{entrysubtype}, in the new
+\mycolor{\textbf{performance}} type, and in the \textbf{unpublished}
+type.  In all uses it will normally present the actual venue of an
+event, as opposed, e.g., to the \textsf{origlocation}, which might
+present where a letter was written or where an earlier edition was
+printed.
+
+\mybigspace Standard \colmarginpar{\textbf{version}} \textsf{biblatex}
+field, formerly only available in \textsf{artwork}, \textsf{image},
+\textsf{misc}, \textsf{music}, and \textsf{pa\-tent} entries in
+\textsf{biblatex-chicago-notes}, but now also in \textbf{book} and
+\mycolor{\textbf{performance}} entries.  In most entry types it prints
+a localized \enquote{\texttt{version}} string, but there may be
+specialist needs in \textsf{artwork} and \textsf{image} entries, so
+there you'll need to specify the type of data inside the field
+itself.  In the \textsf{book} type it is particularly needed for
+presenting multimedia app content (14.268).
 
 \mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex}
 field.  It holds the volume of a \textsf{journaltitle} in
@@ -3915,7 +4724,7 @@ field.  It holds the volume of a \textsf{journaltitle} in
 volume of a multi-volume work in many other sorts of entry.  The
 treatment and placement of \textsf{volume} information in
 \textsf{book}-like entries is rather complicated in the \emph{Manual}
-(14.121--27).  In bibliography entries, the \textsf{volume} appears
+(14.116--22).  In bibliography entries, the \textsf{volume} appears
 either before the \textsf{maintitle} or before the publication
 information.  In long notes, the same applies, but with the additional
 possibility of this information appearing \emph{after} the publication
@@ -3937,43 +4746,45 @@ that is, that \enquote{a colon separates the volume number from the
 but at the request of Clea~F.\ Rees I have made this punctuation
 customizable, using the command \cmd{postvolpunct}.\
 \mymarginpar{\cmd{postvolpunct}} By default it prints \cmd{addcolon},
-but you can use \cmd{renewcommand\{\textbackslash
-  postvolpunct\}\{\ldots\}} in your preamble to redefine it.  Cf.\
-\textsf{part}, and the command documentation in
-section~\ref{sec:formatcommands}.
-
-%%\enlargethispage{\baselineskip}
+but you can use \verb+\renewcommand{\postvolpunct}{...}+ in your
+preamble to redefine it.  Cf.\ \textsf{part}, and the command
+documentation in section~\ref{sec:formatcommands}.
 
 \mybigspace Standard \mymarginpar{\textbf{volumes}} \textsf{biblatex}
-field.  It holds the total number of volumes of a multi-volume work,
-and in the 16th edition of the \emph{Manual} no longer triggers any
-odd changes to the punctuation of short notes (14.159;
-meredith:letters).  If both a \textsf{volume} and a \textsf{volumes}
+field.  It holds the total number of volumes of a multi-volume work
+(meredith:letters).  If both a \textsf{volume} and a \textsf{volumes}
 field are present, as may occur particularly in cross-referenced
-entries, then \textsf{biblatex-chicago} will ordinarily suppress the
-\textsf{volumes} field in the list of references, except in some
-instances when a \textsf{maintitle} is present.  In this latter case,
-if the \textsf{volume} appears before the \textsf{maintitle}, the
-option \texttt{hidevolumes}, \mymarginpar{\texttt{hidevolumes}} set to
+entries or in entries using the new \mycolor{\texttt{maintitle}}
+\textsf{relatedtype}, then \textsf{biblatex-chicago} will ordinarily
+suppress the \textsf{volumes} field in your references, except in some
+instances when a \textsf{maintitle} is present.  If the
+\textsf{volume} appears before the \textsf{maintitle}, the option
+\texttt{hidevolumes}, \mymarginpar{\texttt{hidevolumes}} set to
 \texttt{true} by default, controls whether to print the
-\textsf{volumes} field after that title or not.  Set it to
-\texttt{false} either in the preamble or in the \textsf{options} field
-of your entry to have it appear after the \textsf{maintitle}.  See the
-option's documentation in section~\ref{sec:chicpreset}, below.
+\textsf{volumes} field after that title or not.  If it appears after
+the \textsf{maintitle}, as with the new \textsf{relatedtype} just
+mentioned, the same option controls whether to print the
+\textsf{volumes} field in close association with the \textsf{volume}.
+Set the option to \texttt{false} either in the preamble or in the
+\textsf{options} field of your entry to have the \textsf{volumes}
+appear in these circumstances.  Cf.\ the option's documentation in
+section~\ref{sec:chicpreset}, below.
 
 \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref}
 field provided by \textsf{biblatex}, which prevents inheritance of any
 data from the parent entry.  See \textbf{crossref}, above.
 
-\mybigspace Standard \mymarginpar{\textbf{year}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{year}} \textsf{biblatex}
 field.  It usually identifies the year of publication, though unlike
 the \textsf{date} field it allows non-numeric input, so you can put
 \enquote{n.d.}\ (or, to be language agnostic,
-\cmd{bibstring\{nodate\}}) here if required, or indeed any other sort
-of non-numerical date information.  If you can guess the date then you
-can include that guess in square brackets instead of, or after, the
-\enquote{n.d.}\ abbreviation.  Cf.\ bedford:photo, clark:mesopot,
-leo:madonna, ross:thesis.
+\verb+\bibstring{nodate}+) here if required, or indeed any other sort
+of non-numerical date information.  For many kinds of uncertain and
+unspecified dates it is now much simpler to make use of
+\textsf{biblatex's} enhanced date specifications in the \textsf{date}
+field, instead.  Please see table~\ref{ad:date:extras} for a summary
+of how \textsf{biblatex-chicago} implements these enhancements.  Cf.\
+bedford:photo, clark:mesopot, leo:madonna, ross:thesis.
 
 \subsubsection{Fields for Related Entries}
 \label{sec:related}
@@ -4047,73 +4858,67 @@ writing, be one of \texttt{american}, \texttt{brazilian},
 \texttt{norwegian}, \texttt{portuguese}, \texttt{spanish}, or
 \texttt{swedish}, to which I've added \texttt{russian}.
 
-\mybigspace The \mymarginpar{\textbf{origlocation}} 16th edition of
-the \emph{Manual} has somewhat clarified issues pertaining to the
-documentation of reprint editions and their corresponding originals
-(14.166).  In \textsf{biblatex-chicago} you can provide both an
-\textsf{origlocation} and an \textsf{origpublisher} to go along with
-the \textsf{origdate}, should you so wish, and all of this information
-will be printed in long notes and bibliography.  You can also use this
-field in a \textsf{letter} or \textsf{misc} (with
+\mybigspace This \mymarginpar{\textbf{origlocation}} field mainly
+serves to help document reprint editions and their corresponding
+originals (14.114).  In \textsf{biblatex-chicago} you can provide both
+an \textsf{origlocation} and an \textsf{origpublisher} to go along
+with the \textsf{origdate}, should you so wish, and all of this
+information will be printed in long notes and bibliography.  You can
+also use this field in a \textsf{letter} or \textsf{misc} (with
 \textsf{entrysubtype}) entry to give the place where a published or
-unpublished letter was written (14.117).  (Jonathan Robinson has
-suggested that the \textsf{origlocation} may in some circumstances
+unpublished letter was written (14.111, 14.229).  (Jonathan Robinson
+has suggested that the \textsf{origlocation} may in some circumstances
 actually be necessary for disambiguation, his example being early
 printed editions of the same material printed in the same year but in
 different cities.  The new functionality should make this simple to
 achieve.  Cf.\ \textsf{origdate} (section~\ref{sec:entryfields}),
 \textsf{origpublisher} and \textsf{pubstate}; schweitzer:bach.)
 \textbf{NB:} It is impossible to present this same information, as
-here, \emph{inside} a single entry using a \texttt{related} field,
+here, \emph{inside} a single entry using a \textsf{related} field,
 though the \textsf{relatedtype} \texttt{origpubin} presents much the
 same information \emph{after} the entry, using data extracted from a
 separate entry.
 
 \mybigspace As \mymarginpar{\textbf{origpublisher}} with the
-\textsf{origlocation} field just above, the 16th edition of the
-\emph{Manual} has clarified issues pertaining to reprint editions and
-their corresponding originals (14.166).  You can provide an
-\textsf{origpublisher} and/or an \textsf{origlocation} in addition to
-the \textsf{origdate}, and all will be presented in long notes and
-bibliography.  (Cf.\ \textsf{origdate}
-(section~\ref{sec:entryfields}), \textsf{origlocation}, and
-\textsf{pubstate}; schweitzer:bach.)  \textbf{NB:} It is impossible to
-present this same information, as here, \emph{inside} a single entry
-using a \texttt{related} field, though the \textsf{relatedtype}
-\texttt{origpubin} presents much the same information \emph{after} the
-entry, using data extracted from a separate entry.
+\textsf{origlocation} field just above, this field mainly serves to
+help document reprint editions and their corresponding originals
+(14.114).  You can provide an \textsf{origpublisher} and/or an
+\textsf{origlocation} in addition to the \textsf{origdate}, and all
+will be presented in long notes and bibliography.  (Cf.\
+\textsf{origdate} (section~\ref{sec:entryfields}),
+\textsf{origlocation}, and \textsf{pubstate}; schweitzer:bach.)
+\textbf{NB:} It is impossible to present this same information, as
+here, \emph{inside} a single entry using a \textsf{related} field,
+though the \textsf{relatedtype} \texttt{origpubin} presents much the
+same information \emph{after} the entry, using data extracted from a
+separate entry.
+
+\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+specifications in the 17th edition of the \emph{Manual} (esp.\
+14.137), I have tried to generalize the functioning of the
+\textsf{pubstate} field in all entry types.  The \texttt{reprint}
+string still has a special status there, being ignored in
+\textsf{video} entries and provoking a syntactic change in the
+presentation of dates in \textsf{music} entries (14.263; floyd:atom),
+while in other types allowing the presentation of reprinted titles.
+Other strings are divided into two types: those which
+\textsf{biblatex-chicago} will print as the \textsf{year}, which
+currently means \emph{only} those for which \textsf{biblatex} contains
+bibstrings indicating works soon to be published, i.e.,
+\texttt{forthcoming}, \texttt{inpreparation}, \texttt{inpress}, and
+\texttt{submitted}; and those, i.e., everything else, which will be
+printed before, and in close association with, other information about
+the publisher of a work.  The four in the first category will always
+be localized, as will \texttt{reprint} and
+\mycolor{\texttt{selfpublished}} (and anything else that
+\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
+category.  All other strings will be printed as-is, capitalized if
+needed, just before the publisher (author:forthcoming,
+contrib:contrib, schweitzer:bach).  \textbf{NB:} The \textsf{pubstate}
+functionality currently has no equivalent using the \textsf{related}
+field.
 
-\mybigspace Due \mymarginpar{\textbf{pubstate}} to specific
-requirements in the author-date style, I have implemented this field
-there as a way of providing accurate citations of reprinted books.  As
-the functionality seemed useful, I have also included some of it in
-\textsf{biblatex-chicago-notes}.  In previous releases you could
-identify a reprint by placing \cmd{bibstring\{reprint\}} in the
-\textsf{location} field, followed by a comma, and the style would
-print the appropriate string in notes and bibliography.  Now, if it is
-more convenient, easier to remember, or if you want to reuse your .bib
-database for the author-date style, you can simply put the string
-\texttt{reprint} into the \textsf{pubstate} field, and the package
-will take care of everything for you.  Both of these methods will now
-work just fine, but please choose only one per entry, otherwise the
-string will be printed twice.
-
-\mylittlespace There are a couple of exceptions to this basic
-functionality.  In \textsf{video} entries, no bibstring will be
-printed, as it's not appropriate there, so in effect the
-\textsf{pubstate} field will be ignored.  In \textsf{music} entries,
-the mechanism transforms the \textsf{origdate} from a recording date
-for an album into the original release date for that album.  Whereas a
-recording date will be printed in the middle of the note or
-bibliography entry, the original release date will be printed near the
-end, preceded by the appropriate string.  (Cf.\ 14.276; floyd:atom.)
-Aside from \texttt{reprint}, you can now put \texttt{forthcoming} into
-the field to present works that are about to be published
-(author:forthcoming, contrib:contrib).  Please remember that if you
-put anything else in the \textsf{pubstate} field it will silently be
-ignored, though this may change in future releases.  \textbf{NB:} The
-\textsf{pubstate} functionality currently has no equivalent using the
-\textsf{related} field.
+\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{related}} field is required to
 use \textsf{biblatex's} \textsf{related} functionality, and it should
@@ -4134,10 +4939,16 @@ related material of any sort whatsoever.
 package option \texttt{related} is set to print \textsf{related}
 entries only in the bibliography.  If you would like them to appear
 only in long notes, in both notes and bibliography, or indeed in
-neither, you can set this option, either in your preamble or in the
-\textsf{options} field of the relevant entry, to \texttt{notes},
-\texttt{true}, or \texttt{false}, respectively.  (See coolidge:speech
-and weed:flatiron.)
+neither, you can set this option, either in your preamble (globally or
+for specific entry types) or in the \textsf{options} field of the
+relevant entry, to \texttt{notes}, \texttt{true}, or \texttt{false},
+respectively (coolidge:speech and weed:flatiron).  For the three
+\textsf{relatedtypes} that construct a single entry using data
+extracted from related entries --- \mycolor{\texttt{commenton}},
+\mycolor{\textsf{maintitle}}, and \texttt{reviewof} ---
+\textsf{biblatex-chicago} will automatically set it to \texttt{true}
+for you entry by entry, as this is required to get properly-formatted
+citations in notes and bibliography.  See below for the details.
 
 \mybigspace This \mymarginpar{\textbf{relatedoptions}} field will, I
 should expect, only be needed very rarely.  If you want to set
@@ -4172,7 +4983,8 @@ string, which works better syntactically in this context.
 \textsf{biblatex} styles define six \textsf{relatedtypes}, and I have
 either simply adopted them wholesale or adapted them to the needs of
 the Chicago style, retaining the basic syntax as much as possible.  I
-have also added one to these six (see below):
+have also added three to these six (see below).  First, the standard
+types:
 
 \begin{description}
 \item[\qquad bytranslator:] This prints a full citation of a
@@ -4181,7 +4993,7 @@ have also added one to these six (see below):
     \ldots} The reference is fuller in \textsf{biblatex-chicago} than
   in the standard styles, and for the first time allows users to
   choose the \emph{Manual's} alternate method for presenting original
-  + translation (14.109; furet:related).  The old \textsf{userf}
+  + translation (14.99; furet:related).  The old \textsf{userf}
   mechanism provides the other, as does the \texttt{origpubas}
   \textsf{relatedtype} (see below).
 \item[\qquad default:] This is the macro used when no
@@ -4218,16 +5030,326 @@ have also added one to these six (see below):
   behaving oddly please let me know, including whether you are using
   \textsf{babel} [which I've tested] or \textsf{polyglossia} [which I
   haven't].)
-\item[\qquad \mycolor{reviewof:}] Philip Kime's \textsf{biblatex-apa}
-  package includes this type, and user Bertold Schweitzer suggested it
-  might be a useful addition to \textsf{biblatex-chicago}, so I've
-  added it to the standard six detailed above.  It differs from all of
-  them in that it prints the \textsf{relatedstring} (by default
-  \cmd{bibstring\{reviewof\}}) and the data from the \textsf{related}
-  entry in the middle of the parent entry, rather than at the end.  It
-  also differs from them in being available only in \textsf{article}
-  and \textsf{review} entries (along with the latter's clone,
-  \textsf{suppperiodical}).
+\end{description}
+Now, the Chicago-specific types:
+\begin{description}
+\item[\qquad \mycolor{commenton:}] I designed this new
+  \textsf{relatedtype} to facilitate citation of online comments,
+  though it works slightly differently in the two entry types in which
+  it is available, \textsf{online} and \textsf{review} (with its clone
+  \textsf{suppperiodical}) (14.208--10).  In both types it allows you
+  to mimic thread structure by citing a chain of replies to comments
+  on posts, etc., all in a single entry, while also simplifying your\
+  .bib entries.  This simplification works differently depending on
+  whether the comment itself has no specific title, as always in
+  \textsf{review} entries, or does have such a title, as especially in
+  \textsf{online} social media entries.  In the former case, as you
+  can see from ac:comment, the \textsf{related} apparatus allows you,
+  and indeed encourages you, not to provide a \textsf{title} at all,
+  as contrasted with the old system, still available of course, where
+  your \textsf{title} field contained special formatting for the title
+  of the blog on which this entry is a comment.  Note also here the
+  \textsf{eventdate} field, a requirement, with its optional time
+  stamp, which helps to differentiate multiple comments by the same
+  author posted on the same day.  The \textsf{options} field can be
+  used to prevent the entry appearing in the bibliography, and you can
+  also provide a \textsf{url} specific to the comment, though this is
+  by no means necessary.
+
+  In social media threads comments and replies may well have their own
+  title, so in such a case you still need a \textsf{title} field,
+  which will be followed by the \textsf{relatedstring}.  In such
+  \mymarginpar{NB!}  \textsf{online} entries, the \emph{only way to
+    cite these comments} is by using the \texttt{commenton}
+  \textsf{relatedtype} (licis:diazcomment).  Note that, unlike
+  \textsf{review} entries, the date, and possible time stamp, of a
+  comment should appear in the \textsf{date} field, not
+  \textsf{eventdate}.  (Other fields, like \textsf{url} and
+  \textsf{options}, have much the same uses as in \textsf{review}
+  entries.)  If, in other \textsf{online} entries, you decided
+  \emph{not} to use \textsf{commenton} in an entry like braun:reply,
+  and simply use a specially-crafted \textsf{titleaddon} field, you
+  lose the possibility of having two dates in the entry, one for the
+  comment and one for the original post, though to be fair it does end
+  up looking like the example in 14.210, where it is ambiguous to
+  which part of the citation the date applies.
+
+  As for the thread structure, I've not tested how far down the rabbit
+  hole you can go, but a series of entries linked one to the next by
+  this \textsf{relatedtype} will all turn up if you cite the first in
+  the chain, though of course you can use the technique merely as a
+  convenient way to structure and simplify your\ .bib file, without
+  creating chains longer than 2 entries.  The default connecting
+  string is the localized \texttt{commenton}, but you can use
+  \textsf{relatedstring} to change it to \enquote{\texttt{reply to}}
+  or whatever else you need.  I've tried to follow the rules for
+  abbreviating parts of the various works included in the one
+  reference, though in truth the \emph{Manual} provides no examples.
+  Depending on whether the various parts have already been cited or
+  not your references can take on quite varied appearances.  Let me
+  know if something looks wrong to you.  Cf.\ ac:comment,
+  diaz:surprise, ellis:blog, and licis:diazcomment for the use of the
+  new \textsf{relatedtype}; amlen:hoot, amlen:wordplay, and viv:amlen
+  for blogs and comments without the \textsf{related} mechanism.
+
+  There are a few other things to remember.  As with the next two
+  \textsf{relatedtypes}, \textsf{biblatex-chicago} will automatically
+  set the \texttt{related} option to \texttt{true} entry-by-entry to
+  ensure that the full data appears both in notes and in the
+  bibliography.  If your parent entry has no \textsf{title} of its
+  own, then, as with the \texttt{reviewof} \textsf{relatedtype}, it
+  will use the \textsf{related} functionality also in short notes,
+  which means that if you want to provide a \textsf{shorttitle} for
+  them then it goes in the \emph{child} entry rather than the parent.
+  Finally, the \textsf{title}-less comments are prime candidates for
+  the \texttt{shortextrafield} option, which prints a disambiguating
+  field after short notes when they would otherwise be
+  indistinguishable.  So endemic is this situation in this context
+  that I've set a default means of disambiguating them, which is the
+  \textsf{date} and \textsf{time} in \textsf{online} entries or the
+  \textsf{eventdate} and \textsf{eventtime} in \textsf{review} and
+  \textsf{suppperiodical}, though you can of course override these
+  defaults by setting the \texttt{shortextra} options yourself.  See
+  their documentation in section~\ref{sec:useropts}, below.
+\item[\qquad \mycolor{maintitle:}] The 17th edition of the
+  \emph{Manual} has deployed, in at least two contexts, a notable
+  syntactic change in the presentation of works that form part of
+  other, larger works.  Generally, the order of presentation, in
+  \textsf{biblatex} terms, has always been \textsf{title} --
+  \textsf{booktitle} -- \textsf{maintitle}, in increasing order of
+  generality.  In the vast majority of cases this order still holds,
+  but in TV episodes, for one example, the recommendation now is to
+  present the name of the series (\textsf{booktitle}) \emph{before}
+  the name of the episode (\textsf{title}). (See the \textbf{video}
+  type in section~\ref{sec:entrytypes}, above).  The other context in
+  which this reversal occurs is multi-volume works (14.116--22).
+  Here, the preferred format, at least for notes, appears to be
+  \textsf{maintitle} -- \textsf{[book]title} or, when all three titles
+  are present, \textsf{title} -- \textsf{maintitle} --
+  \textsf{booktitle}.  The \emph{Manual} doesn't carry this reordering
+  through with absolute consistency, but I think it important at least
+  to offer it as a possibility to users of \textsf{biblatex-chicago},
+  hence the new \mycolor{\texttt{maintitle}} \textsf{relatedtype},
+  which is currently the only way to achieve this reversal in this
+  context.
+
+  In its simplest usage, to document one volume of a multi-volume set,
+  you would have, e.g., an \textsf{mvcollection} entry with
+  \textsf{relatedtype} \texttt{maintitle}, and a \textsf{related}
+  field pointing to a \textsf{collection} entry.  When you cite the
+  \textsf{mvcollection} entry itself, you'll get a long note like
+  \emph{MVCollTitle}, vol.\ 1, \emph{CollTitle}, and a short note like
+  \emph{MVCollTitle}, vol.\ 1., or, with a \textsf{postnote} field,
+  \emph{MVCollTitle}, 1:12, as the specification requires.  If you
+  wanted to cite one essay in the \textsf{collection}, then you would,
+  additionally, need an \textsf{incollection} entry with the
+  \texttt{maintitle} \textsf{relatedtype} and a \textsf{related} field
+  pointing to the \textsf{mvcollection} entry already mentioned, so
+  you're creating a chain of three different related entries but
+  presenting them in one reference, i.e., (long form)
+  \enquote{InCollTitle,} in \emph{MVCollTitle}, vol.\ 1,
+  \emph{CollTitle}, and (short form) \enquote{InCollTitle.}  It's
+  important to keep in mind here that, in effect, you're \emph{not}
+  actually citing the \textsf{mvcollection} entry, but the one volume
+  of it represented by the \textsf{collection} entry, or indeed an
+  essay in that one volume.
+
+  Now, for the details, which are many.  First, any \textsf{mv*} entry
+  without the \texttt{maintitle} \textsf{relatedtype} should behave
+  just as it always has, and can still happily be used as the target
+  of \textsf{crossref} fields to supply a \textsf{maintitle} to other
+  entries.  The abbreviated references created when you have several,
+  e.g., \textsf{books crossref'd} to the same \textsf{mvbook} are
+  still available, assuming you enable them with the
+  \texttt{booklongxref} option.  You can happily mix the new and the
+  old methods of presentation in your documents, but please don't mix
+  them within individual entries, which means that if you are using a
+  \textsf{crossref} field to an \textsf{mvcollection} entry in a
+  \textsf{collection} entry, say, and the \textsf{collection} entry is
+  itself the target of the \textsf{mvcollection} entry's
+  \textsf{related} field, please be careful not to cite that
+  \textsf{collection} entry independently, as it can lead to
+  unexpected results.  (If things don't look right to you, try
+  eliminating the use of \textsf{crossref} entirely from these
+  \textsf{related} chains and see if that helps, then send me a bug
+  report if it does.)  This restriction also means that, although the
+  \emph{Manual} prefers the \textsf{maintitle}-first format in notes
+  and allows either syntax in the bibliography, nonetheless with
+  \textsf{biblatex-chicago} whichever syntax you choose for the notes
+  will also appear in the bibliography.
+
+  As for automatically abbreviating references using the
+  \texttt{maintitle} \textsf{relatedtype}, this works differently
+  depending on whether the \textsf{related} chain consists of 2 or 3
+  works.  In 2-work chains (\emph{MVCollTitle}, \emph{CollTitle}),
+  it's actually the first that needs abbreviating, and this didn't
+  look right, so these entries will always print in full.  (You can
+  still regulate how much information appears in the references to
+  individual volumes by regulating how much information appears in the
+  .bib entries for those volumes.  In the harleymt:* entries I've used
+  as examples below, the individual volumes have a \textsf{crossref}
+  field to the multi-volume work, so they inherit the
+  \textsf{publisher} and \textsf{location}, for example.  If you were
+  to omit the \textsf{crossref} field you would always get an
+  abbreviated reference which, were it to appear \emph{after} a
+  reference to the whole multi-volume work, would let that reference
+  give the complete publication details and itself behave like a
+  normal abbreviated cross reference to it.)
+
+  In 3-work chains, when you've cited more than one
+  \enquote{InCollTitle} from a given \emph{CollTitle}, you can choose
+  for the short note version of the second and third titles (with just
+  volume number rather than full \emph{CollTitle}) to appear in the
+  bibliography and in long notes after the first one.  This is
+  controlled using the same \texttt{booklongxref} option as you would
+  use to control the old automatic abbreviation mechanism.  See under
+  that option in section~\ref{sec:chicpreset}, below.
+
+  As with the other two \textsf{relatedtypes} I've added to
+  \textsf{biblatex's} standard six, the \texttt{maintitle} type is
+  somewhat restricted in its relevance.  If you want to use a
+  three-work chain to cite one part of one volume, then this is
+  possible only by starting with the following entry types:
+  \textsf{bookinbook}, \textsf{inbook}, \textsf{incollection},
+  \textsf{inproceedings}, and \textsf{letter}.  All two-work chains
+  must start with one of the \textsf{mv*} types.  As might be apparent
+  from the previous list, \textsf{mvreference} entries are special, in
+  that their \textsf{related} field should point to an
+  \textsf{inreference} entry if you want to cite an entry in an
+  \enquote{alphabetically arranged work}, or to a \textsf{reference}
+  entry otherwise.  In other words, \textsf{mvreference} entries
+  should only ever be used in 2-work chains.
+
+  It's possible it may have occurred to you that this
+  \textsf{relatedtype} could, given the presence of a many-volumed
+  collection, require rather a lot of extra entries in your\ .bib
+  files, i.e., one extra \textsf{mv*} entry for every volume of the
+  collection you wish to cite.  Borrowing an idea from the
+  \texttt{multivolume} \textsf{relatedtype}, you can put the entry
+  keys of \emph{all} the individual volumes into a single
+  \textsf{related} field in a single \textsf{mv*} entry, and
+  \textsf{biblatex-chicago} will still allow you to cite each volume
+  independently, and for each to appear independently in the
+  bibliography, too, unlike the \texttt{multivolume} mechanism.
+  Here's how it works.  When \textsf{Biber} detects more than one
+  entrykey in an \textsf{mv*} entry with \texttt{maintitle}
+  \textsf{relatedtype}, it produces a series of clones of the
+  \textsf{mv*} entry, each with the same \textsf{relatedtype} and a
+  \textsf{related} field containing exactly \emph{one} of the
+  entrykeys from the original \textsf{related} field.  It gives each
+  of these clones its own entrykey, of the form
+  \texttt{mventrykey-singlevolumeentrykey}, and it is these virtual,
+  cloned entries that you should cite.  Such entries don't exist in
+  your\ .bib file, but you can see them in your\ .bbl file, assuming
+  you've actually cited any of them.  The original
+  \texttt{mventrykey}, in this case, refers merely to the original
+  \textsf{mv*} entry, as though it had never had a \textsf{related}
+  field, so it's available for citing the multi-volume set as a whole,
+  should that be necessary.  Indeed, to make the virtual clones
+  available to \textsf{Biber} (and \textsf{biblatex}) in the first
+  place, you do need to cite (or \cmd{nocite}) the original
+  \textsf{mv*} entry somewhere in your document.
+
+  As an example of how this might look, consider the
+  three entries from \textsf{notes-test.bib}: harleymt:hoc,
+  harleymt:ancient:cart, and harleymt:cartography.  The first, an
+  \textsf{mvcollection} entry, has a \textsf{related} field containing
+  both of the others (\textsf{collec\-tion} entries), and in
+  \textsf{cms-notes-sample.tex} you'll see citations of harleymt:hoc,
+  harleymt:hoc-harleymt:ancient:cart, and
+  harleymt:hoc-harleymt:cartography,\break which are themselves
+  \textsf{mvcollection} entries.  The latter two don't exist in the\
+  .bib file, only in the\ .bbl file, where you'd see that each has a
+  \textsf{related} field pointing to the entrykey that forms the
+  second half of its own hyphenated key.  If I hadn't somewhere cited
+  harleymt:hoc then \textsf{Biber} would give up entirely because it
+  wouldn't know where to find the two hyphenated keys.
+
+  A similar problem arises when you create a three-work chain in which
+  the first, e.g., \textsf{incollection}, entry contains a
+  \textsf{related} field pointing to just such a virtual, cloned
+  entry.  In this case, if you haven't already cited (or
+  \cmd{nocite}'d) the cloned entry, \textsf{Biber} really gets,
+  understandably, confused.  As a convenience feature for this
+  situation, I have included a very slightly modified version of the
+  \texttt{maintitle} \textsf{relatedtype}, called
+  \colmarginpar{\texttt{maintitlenc}} \mycolor{\texttt{maintitlenc}},
+  the \enquote{nc} standing for \cmd{nocite}.  As you might have
+  guessed, every clone produced by an \textsf{mv*} entry with multiple
+  entrykeys in its \textsf{related} field and \texttt{maintitlenc} as
+  its \textsf{relatedtype} will automatically be \cmd{nocite}'d, and
+  will then be available for inclusion in another entry's
+  \textsf{related} field.  The \texttt{maintitlenc} type differs in no
+  other way whatever from the \texttt{maintitle} type.
+
+  In general, the \textsf{maintitle} \textsf{relatedtype} attempts to
+  follow the Chicago specification with as little intervention needed
+  from the user as possible.  To that end, \textsf{biblatex-chicago}
+  automatically sets the \texttt{related} option to \texttt{true}
+  entry-by-entry to ensure that the full data appears both in notes
+  and in the bibliography.  It also attempts to spot duplicate
+  \textsf{authors} or \textsf{editors} and to print them only when
+  needed, and in its short-note version uses the \textsf{volume} and
+  \textsf{part} information from the \textsf{related}
+  \textsf{collection} entry, say, to specify the \textsf{labeltitle}
+  which comes from the \textsf{mvcollection}.  If you want the
+  \textsf{mv*} entry's \textsf{volumes} data to appear in notes and
+  bibliography, you can do so by setting the \texttt{hidevolumes}
+  option to \texttt{false} either in the preamble or in the
+  \textsf{options} field of the entry referenced by the \textsf{mv*}
+  entry's \textsf{related} field (cf.\ harleymt:cartography).
+
+  Another, trickier intervention involves the problem of sorting
+  entries in the bibliography.  The \emph{Manual's} rules are,
+  basically, to sort by name, then title, then year, and as every
+  \textsf{mv*} entry citing the same multi-volume work will basically
+  have identical values for all three, the sorting order in the
+  bibliography will fall back on the order in which such works are
+  cited, which may not be what you want.  If the pertinent
+  \textsf{related} fields in your\ .bib file only contain one
+  entrykey, then you can use a series of \textsf{sortkey},
+  \textsf{sorttitle}, or \textsf{sortyear} fields to arrange the
+  volumes as you wish.  If you are using \textsf{Biber's} cloning
+  facilities, however, any such fields in the \textsf{mv*} entry will
+  be copied into all of its clones, so you'll be back to square one.
+  My current solution to this dilemma \mymarginpar{\textsf{sorttitle}}
+  is to treat the \textsf{sorttitle} field as special, so that in
+  \textsf{mv*} entries with \textsf{relatedtype} \texttt{maintitle} or
+  \texttt{maintitlenc} and a \textsf{related} field containing more
+  than one entrykey any \textsf{sorttitle} field is indeed copied to
+  all of the clones, but it is also modified by appending the contents
+  of the clone's \textsf{related} field to the end of it.  (If there
+  is no \textsf{sorttitle} field, then the clones will have none,
+  either.)  In effect, the alphabetical order of the entrykeys in the
+  \textsf{mv*} entry's \textsf{related} field determines the sorting
+  order of the clones each of which contains a \textsf{related} field
+  holding one of those keys.  (In the examples from
+  \textsf{notes-test.bib}, harleymt:hoc retains its original
+  \textsf{sorttitle} field, and sorts first, then
+  harleymt:hoc-harleymt:ancient:cart sorts before
+  harleymt:hoc-harleymt:cartography --- the second half of the key,
+  after the hyphen, is the relevant part, and is what appears appended
+  to the original \textsf{sorttitle} field.)  It is rather onerous, I
+  know, to be required to choose entrykeys that sort properly; if I
+  come up with something better I'll include it in a later release.
+
+  Finally, although I've tested this functionality extensively, it's
+  new and rather complicated.  If something doesn't work right please
+  let me know at the email address at the head of this documentation.
+\item[\qquad reviewof:] Philip Kime's \textsf{biblatex-apa} package
+  includes this type, and user Bertold Schweitzer suggested it might
+  be a useful addition to \textsf{biblatex-chicago}, so I've added it
+  to the standard six detailed above.  It differs from all of them,
+  and resembles \mycolor{\texttt{commenton}} and
+  \mycolor{\texttt{maintitle}}, in that it prints the
+  \textsf{relatedstring} (by default \verb+\bibstring{reviewof}+) and
+  the data from the \textsf{related} entry in the middle of the parent
+  entry, rather than at the end.  It differs from
+  \mycolor{\texttt{commenton}} in that it's not possible to create a
+  chain of such entries to mimic online thread structures.  Finally,
+  it differs from all other \textsf{relatedtypes} in being available
+  only in \textsf{article} and \textsf{review} entries (along with the
+  latter's clone, \textsf{suppperiodical}).
 
   In \textsf{article} entries it replaces the \textsf{titleaddon} with
   the \textsf{relatedstring} followed by the \textsf{title} of the
@@ -4242,18 +5364,18 @@ have also added one to these six (see below):
   This mechanism automates both the provision of the localized
   \cmd{bibstring} and also the formatting of the \textsf{title} of the
   reviewed work, and it also obviates the need to use any of the
-  \cmd{partedit} macros in this context.  You should, however,
-  remember to set the \texttt{related} option to \texttt{true} (either
-  in the preamble or in individual entries) to ensure that the full
-  data appears both in notes and in the bibliography.  Also, if the
-  mechanism doesn't work for you in a particular context, remember
-  that the standard way of presenting reviewed works is still
-  available.  Finally, this \textsf{relatedtype} has the further
-  peculiarity that, in \textsf{review} and \textsf{suppperiodical}
-  entries only, it uses the \textsf{related} functionality also in
-  short notes, which means that if you want to provide a
-  \textsf{shorttitle} for short notes then it goes in the \emph{child}
-  entry rather than the parent.
+  \cmd{partedit} macros in this context.  Further,
+  \textsf{biblatex-chicago} automatically sets the \texttt{related}
+  option to \texttt{true} entry-by-entry to ensure that the full data
+  appears both in notes and in the bibliography.  Finally, this
+  \textsf{relatedtype} has the further peculiarity that, in
+  \textsf{review} and \textsf{suppperiodical} entries only, it uses
+  the \textsf{related} functionality also in short notes, which means
+  that if you want to provide a \textsf{shorttitle} for short notes
+  then it goes in the \emph{child} entry rather than the parent.
+  Please remember, too, that the standard way of presenting reviewed
+  works is still available if the mechanism doesn't work for you in a
+  particular context.
 \end{description}
 
 \mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
@@ -4267,10 +5389,10 @@ request of Will Small, I have included a means of providing the
 original publication details of an essay or a chapter that you are
 citing from a subsequent reprint, e.g., a \emph{Collected Essays}
 volume.  In such a case, at least according to the \emph{Manual}
-(14.115), such details needn't be provided in notes, only in the
-bibliography, and then only if these details are \enquote{of
-  particular interest.}  The data would follow an introductory phrase
-like \enquote{originally published as,} making the problem strictly
+(14.181), such details needn't be provided in notes, only in the
+bibliography, and then only if these details are \enquote{of specific
+  interest.}  The data would follow an introductory phrase like
+\enquote{originally published as,} making the problem strictly
 parallel to that of including details of a work in the original
 language alongside the details of its translation.  I have addressed
 the latter problem with the \textsf{userf} field, which provides a
@@ -4292,7 +5414,7 @@ the details on how to create .bib entries for presenting your data.
 \mybigspace This \mymarginpar{\textbf{userf}} is one of the
 supplemental fields which \textsf{biblatex} provides, and is used by
 \textsf{biblatex-chicago} for a very specific purpose.  When you cite
-both a translation and its original, the \emph{Manual} (14.109)
+both a translation and its original, the \emph{Manual} (14.99)
 recommends that, in the bibliography at least, you combine references
 to both texts in one entry, though the presentation in notes is pretty
 much up to you.  In order to follow this specification, I have
@@ -4314,7 +5436,7 @@ switch in the \cmd{printbibliography} command.  In this standard case,
 the data for the translation will be printed first, followed by the
 string \texttt{originally published as}, followed by the original,
 author omitted, in what amounts to the same format that the
-\emph{Manual} uses for long footnotes (furet:pas\-sing:eng,
+\emph{Manual} uses for long footnotes (furet:passing:eng,
 furet:passing:fr).  As explained above (\textbf{origlanguage}), I have
 also included a way to modify the string printed before the original.
 In the entry for the \emph{translation}, you put the original's
@@ -4371,9 +5493,9 @@ begins with a capital letter --- and this is not infrequent --- that
 capital will always be retained.  (cf., e.g., creel:house,
 morgenson:market.)  If, on the other hand, you for some reason need
 such a field always to start with a lowercase letter, then you can try
-using the \cmd{isdot} macro at the start, which turns off the
-mechanism without printing anything itself.  Here, then, is the
-complete list of fields where this functionality is active:
+putting an empty set of curly braces\ \{\}\ at the start, which turns
+off the mechanism without printing anything itself.  Here, then, is
+the complete list of fields where this functionality is active:
 
 \begin{enumerate}
 \setlength{\parskip}{-4pt}
@@ -4413,74 +5535,23 @@ automatic provisions should at least save some typing.
 very powerful mechanism to allow \textsf{biblatex} automatically to
 provide a localized version of a string, and to determine whether that
 string needs capitalization, depending on where it falls in an entry.
-In the first release of \textsf{biblatex-chicago-notes}, the style
-relied very heavily on this macro, particularly on an extension I
-provided by defining all 26 letters of the (ASCII) alphabet as
-\texttt{bibstrings} (\cmd{bibstring\{a\}}, \cmd{bibstring\{b\}}, etc.)
-While you should continue to use the standard, whole-word bibstrings,
-\textbf{all use of the single-letter variants I formerly provided is
-  obsolete, and will generate an error}.  This functionality has been
-replaced by the \cmd{autocap} command, which does the same thing, only
-more elegantly.  For yet greater convenience I have implemented,
-following \textsf{biblatex's} example, a system automating this
-functionality in all of the entry fields where its use was, by my
-reckoning, most frequent.  This means that, when you require this
-functionality, all you need do is input the data in such a field
-starting with a lowercase letter, and \textsf{biblatex-chicago-notes}
-will do the rest with no further assistance.  In my
-\textsf{notes-test.bib} file, this mechanism in effect eliminated
-all need for the single-letter \texttt{bibstrings} and very nearly all
-need for the \cmd{autocap} command --- centinel:letters and
-powell:email being the only exceptions.  Please see
-\textbf{\textbackslash autocap} above for full details.
-
-%%\enlargethispage{\baselineskip}
-
-\mylittlespace I should also mention here that \textsf{biblatex 0.7}
-introduced functionality which sometimes allows you simply to input,
-for example, \texttt{newseries} instead of
-\cmd{bibstring\{newse\-ries\}}, the package auto-detecting when a
+\textsf{Biblatex 0.7} introduced functionality which sometimes allows
+you simply to input, for example, \texttt{newseries} instead of
+\verb+\bibstring{newseries}+, the package auto-detecting when a
 bibstring is involved and doing the right thing, though in all such
 cases either form will work.  This functionality is available in the
-\textsf{series} field of \textsf{article}, \textsf{periodical}, and
-\textsf{review} entries; in the \textsf{type} field of
-\textsf{manual}, \textsf{patent}, \textsf{report}, and \textsf{thesis}
-entries; in the \textsf{location} field of \textsf{patent} entries; in
-the \textsf{language} field in all entry types; and in the
-\textsf{nameaddon} field in \textsf{customc} entries.  There may be
-other places where \textsf{biblatex's} standard styles support this
-feature, and I shall add them when they come to my attention.
-
-\mybigspace In \mymarginpar{\textbf{\textbackslash custpunct} \\
-  \textbf{\textbackslash custpunctb}} common with other American
-citation styles, the \emph{Manual} requires that the commas and
-periods separating units of a reference go inside any quotation marks
-that happen to be present.  As of version 0.8c, \textsf{biblatex}
-contains truly remarkable code that handles this situation in very
-nearly complete generality, detecting punctuation after the closing
-quotation mark and moving it inside when necessary, and also
-controlling which punctuation marks can be printed after which other
-punctuation marks, whether quotation marks intervene or not.  This
-functionality is now mature, and \textsf{biblatex-chicago-notes}
-relies on this code to place punctuation in the \enquote{American
-  style,} rather than on complicated \cmd{DeclareFieldFormat}
-instructions that attempt to anticipate all possible permutations.
-One result of this, thankfully, is that both \cmd{custpunct} and
-\cmd{cust\-punctb} are now basically unnecessary, as their only purpose
-was to supply context-appropriate punctuation inside any quotation
-marks that users themselves provided as part of various entry fields.
-A second consequence, and I've already recommended this in previous
-releases anyway, is that users now \emph{must} use \cmd{mkbibquote}
-instead of \cmd{enquote} or the usual \LaTeX\ mechanisms inside their
-.bib files.  For further details, please see the \cmd{mkbibquote}
-entry below.
-
-\mylittlespace I have retained the code for the \cmd{custpunct}
-commands in \textsf{chicago-notes.cbx}, in case a particularly gnarly
-entry might still require them, but I have already started to re-use
-the \textsf{type} field, which formerly served as a switch for
-\cmd{custpunct}, in other contexts (see \textbf{artwork},
-\textbf{image}, and \textbf{suppbook} above).
+\textsf{series} field of \textsf{article}, \textsf{jurisdiction},
+\textsf{legislation}, \textsf{periodical}, and \textsf{review}
+entries; in the \textsf{type} field of \textsf{audio},
+\textsf{manual}, \textsf{music}, \textsf{patent}, \textsf{report},
+\textsf{suppbook}, \textsf{suppcollection}, \textsf{thesis}, and
+\textsf{video} entries; in the \textsf{location} field of
+\textsf{patent} entries; in the \textsf{language} field in all entry
+types; in the \textsf{nameaddon} field in \textsf{customc} entries;
+and in the \textsf{editor[abc]type} and \textsf{nameatype} fields in
+all entry types.  There may be other places where \textsf{biblatex's}
+standard styles support this feature, and I shall add them when they
+come to my attention.
 
 \mybigspace These \mymarginpar{\textbf{\textbackslash
     foottextcite\\\textbackslash foottextcites}} two commands look
@@ -4494,41 +5565,25 @@ way the citation part is presented by using \cmd{renewcommand} in your
 preamble.  The default definitions are: \texttt{\{\textbackslash
   addspace\textbackslash headlessparenshortcite\}} and
 \texttt{\{\textbackslash addspace\textbackslash
-  headlessparenshort\-cites\}}.  If you wanted to return to the default
+  headlessparenshortcites\}}.  If you wanted to return to the default
 behavior of previous releases of \textsf{biblatex-chicago}, for
 example, you could change the first to: \texttt{\{\textbackslash
   newcunit\textbackslash bibstring\{in\}\textbackslash
   addspace\break\textbackslash headlesscite\}}, and the second similarly,
 only using \cmd{headlesscites}.  (There is also, by the way, a
-\cmd{head\-lessparencite(s)} command if you want to retain the long
+\cmd{headlessparencite(s)} command if you want to retain the long
 citations inside the parentheses.)
 
-%\enlargethispage{\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{\textbackslash isdot}} is a
-standard \textsf{biblatex} macro, which in previous releases of
-\textsf{biblatex-chicago} could function as a convenient placeholder
-in entry fields that, for one reason or another, you may have wanted
-to have defined and yet to print nothing.  With the release of
-\textsf{biblatex} 1.6, this no longer works as before, a situation
-which has revealed a number of inconsistencies and bugs in my code,
-the rectification of which may therefore require some changes to your
-.bib files, assuming you've taken advantage of this mechanism.  I
-believe that all the situations formerly calling for this specific use
-of the macro can now be addressed by more standard means, i.e., the
-\cmd{headlesscite} commands and the \texttt{useauthor=false}
-declaration in the \textsf{options} field.  (See creel:house,
-nyt:obittrevor, sewall:letter, unsigned:ranke, and white:total.)
-
 \mybigspace I \mymarginpar{\textbf{\textbackslash letterdatelong}}
 have provided this macro mainly for use in the optional postnote field
 of the various citation commands.  When citing a letter (published or
 unpublished, \textsf{letter} or \textsf{misc}), it may be useful to
 append the date to the usual short note form in order to disambiguate
 references.  This macro simply prints the date of a letter, or indeed
-of any other sort of correspondence.  (If your main document language
-isn't English, it's better just to use the standard \textsf{biblatex}
-command \cmd{printorigdate}.)
+of any other sort of correspondence, in day-month-year order, as
+recommended by the \emph{Manual} (14.224).  (If your main document
+language isn't American, it's better just to use the standard
+\textsf{biblatex} command \cmd{printorigdate}.)
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
@@ -4549,10 +5604,10 @@ condition is not fulfilled.  A few examples from
 \mylittlespace In an \textsf{article} entry, the \textsf{title}
 contains a quoted phrase:
 
-\begin{quotation}
-  \noindent\texttt{title = \{Diethylstilbestrol and Media Coverage of the \\
-    \indent\cmd{mkbibquote}\{Morning After\} Pill\}}
-\end{quotation}
+\begin{verbatim}
+  title = {Diethylstilbestrol and Media Coverage of the
+    \mkbibquote{Morning After} Pill}
+\end{verbatim}
 
 Here, because the quoted text doesn't come at the end of title, and no
 punctuation will ever need to be drawn within the closing quotation
@@ -4563,10 +5618,9 @@ for you.)  All of these will produce the formatted
 \enquote{Diethylstilbestrol and Media Coverage of the \enquote{Morning
     After} Pill.}  Here, by contrast, is a \textsf{book title}:
 
-\begin{quotation}
-  \noindent \texttt{title = \{Annotations to
-    \cmd{mkbibquote}\{Finnegans Wake\}\}}
-\end{quotation}
+\begin{verbatim}
+  title = {Annotations to \mkbibquote{Finnegans Wake}}
+\end{verbatim}
 
 Because the quoted title within the title comes at the end of the
 field, and because this bibliographical unit will be separated from
@@ -4582,7 +5636,7 @@ to which \textsf{biblatex} defaults when \textsf{csquotes} isn't
 loaded.
 
 \mybigspace The \mymarginpar{\textbf{\textbackslash postvolpunct}}
-\emph{Manual} (14.121) unequivocally prescribes that when a
+\emph{Manual} (14.116) unequivocally prescribes that when a
 \textsf{volume} number appears immediately before a page number,
 \enquote{the abbreviation \emph{vol.}\ is omitted and a colon
   separates the volume number from the page number with no intervening
@@ -4594,24 +5648,23 @@ Rees requested a way to customize this, so I have provided the
 \cmd{postvolpunct} command, which prints the punctuation between a
 \textsf{volume} number and a page number.  It is set to \cmd{addcolon}
 by default, except when the current language of the entry is French,
-in which case it defaults to \cmd{addcolon\textbackslash addspace}.
-You can use \cmd{renewcommand\{\textbackslash
-  postvolpunct\}\{\ldots\}} in your preamble to redefine it, but
-please note that the command only applies in this limited context, not
-more generally to the punctuation that appears between, e.g., a
-\textsf{volume} and a \textsf{part} field.
-
-%\enlargethispage{-\baselineskip}
+in which case it defaults to \verb+\addcolon\addspace+.  You can use
+\verb+\renewcommand{\postvolpunct}{...}+ in your preamble to redefine
+it, but please note that the command only applies in this limited
+context, not more generally to the punctuation that appears between,
+e.g., a \textsf{volume} and a \textsf{part} field.
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash reprint}} and the
 following 7 macros all help \textsf{biblatex-chicago-notes} cope with
 the fact that many bibstrings in the Chicago system differ between
 notes and bibliography, the former sometimes using abbreviated forms
 when the latter prints them in full.  In the current case, if a book
-is a reprint, then the macro \cmd{reprint}, followed by a comma,
-should go in the \textsf{location} field before the city of
-publication (aristotle:metaphy:gr, schweit\-zer:bach).  See
-\textbf{location}, above.
+is a reprint, then the macro \cmd{reprint}, followed by a comma, could
+go in the \textsf{location} field before the city of publication.
+Simply putting \enquote{\texttt{reprint}} into the \textsf{pubstate}
+field is a simpler way to achieve the same result
+(aristotle:metaphy:gr, schweitzer:bach).  See \textsf{location} and
+\textsf{pubstate} in section~\ref{sec:entryfields}, above.
 
 \mylittlespace \textbf{NB:} The rules for employing abbreviated or
 full bibstrings in the \emph{Manual} are remarkably complex, but I
@@ -4653,8 +5706,6 @@ you are writing in French then you no longer need to add either
 new version of the command should take care of this automatically for
 you.)  See chaucer:liferecords.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace As \mymarginpar{\textbf{\textbackslash
     partedit-\\andcomp}} before, but for use when an editor is also a
 compiler.
@@ -4676,12 +5727,55 @@ compiler.
 whose name doesn't conveniently fit into the usual fields
 (\textsf{translator} and \textsf{nameb}).
 
+\mylittlespace Unlike \colmarginpar{\textbf{\textbackslash
+    suppress-\\bibfield[]\{\}}} the other commands presented here,
+this should be used in your document preamble rather than in your
+bibliographical apparatus.  Also unlike them, it has two arguments,
+the first of which is optional, the second required.  Jan David Hauck
+suggested that, in addition to the field-exclusion package options
+provided by \textsf{biblatex-chicago} (see
+section~\ref{sec:chicpreset}), I might also provide a general-purpose
+macro to clear fields from selected entry types when the package
+options aren't quite right for a user's particular needs.  The
+\mycolor{\cmd{suppressbibfield}} command does this, so that
+\verb+\suppressbibfield{note}+ clears the \textsf{note} field from
+\emph{all} entries, while \verb+\suppressbibfield[report]{note}+
+clears it only from \textsf{report} entries.  Both arguments take
+comma-separated lists, so to suppress \textsf{titleaddon} and
+\textsf{volumes} fields from \textsf{report} and \textsf{manual}
+entries, your preamble could contain
+\verb+\suppressbibfield[report,manual]{titleaddon,volumes}+.
+
+\mylittlespace A few usage notes are in order.  First, you can use as
+many calls to the command in your preamble as you wish.  Second, the
+command is a very basic user interface to \textsf{biblatex's} source
+mapping functionality (\textsf{biblatex.pdf} \S~4.5.3), so what it
+does is modify what \textsf{biber} takes from your .bib file in order
+to produce the .bbl file that \textsf{biblatex} actually reads.  As
+far as \textsf{biblatex} is concerned, the fields simply aren't there
+in the data source, so they can't appear anywhere in the
+bibliographical apparatus, whether in notes, bibliography or shorthand
+lists.  Third, because source mapping is involved, you'll need a
+complete cycle of \LaTeX-\textsf{biber}-\LaTeX\ runs to make the
+commands take effect.  Fourth, source mapping occurs at a very early
+stage in \textsf{biber's} operation, so if your field names or entry
+types are standard aliases, the command will only work on the names as
+they appear in your .bib file, not as they are aliased in the .bbl
+file.  If you have a \textsf{techreport} entry, for example, it won't
+be affected by a command that alters \textsf{report} entries, and a
+\textsf{date} field won't be affected by a command that suppresses the
+\textsf{year}.  Fifth, the code for the command resides in
+\textsf{biblatex-chicago.sty}, so if you load the styles without
+loading that package it won't be available to you.  Sixth and finally,
+the \mycolor{\cmd{suppressbibfield}} command is new and relatively
+untested, so please report any untoward behavior to me.
+
 \subsubsection{Citation Commands}
 \label{sec:citecommands}
 
 The \textsf{biblatex} package is particularly rich in citation
 commands, some of which (e.g., \cmd{supercite(s)}, \cmd{citeyear})
-provide functionality that isn't really needed by the Chi\-cago notes
+provide functionality that isn't really needed by the Chicago notes
 and bibliography style offered here.  If you are getting unexpected
 behavior when using them please have a look in your .log file ---
 there may be warnings there that alert you to undefined citation
@@ -4703,7 +5797,7 @@ to use the \cmd{cite} command within a \cmd{footnote} command, the
 solution is to use \cmd{Cite} instead.  Alternatively, don't use a
 \cmd{footnote} macro at all, rather try \cmd{footcite} or
 \cmd{autocite} with the optional prenote and postnote arguments.  Cf.\
-\cmd{Citetitle} below, and also section~3.7 of \textsf{biblatex.pdf}.
+\cmd{Citetitle} below, and also section~3.8 of \textsf{biblatex.pdf}.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash autocite}} haven't
 adapted this in the slightest, but I thought it worth pointing out
@@ -4718,11 +5812,11 @@ its multicite form, \textbf{\textbackslash autocites}.
 \cmd{cite} command works just as you would expect it to, I have also
 provided a starred version for the rare situations when you might need
 to turn off the ibidem tracking mechanism.  \textsf{Biblatex} provides
-very sophisticated algorithms for using \enquote{Ibid} in notes, so in
-general you won't find a need for this command, but in case you'd
-prefer a longer citation where you might automatically find
-\enquote{Ibid,} I've provided this.  Of course, you'll need to put it
-inside a \cmd{footnote} command manually.  (See also section
+very sophisticated algorithms for this mechanism, so in general you
+won't find a need for this command, but in case you'd prefer a longer
+citation where you might automatically find the shortest one, I've
+provided this.  Of course, you'll need to put it inside a
+\cmd{footnote} command manually.  (See also section
 \ref{sec:useropts}, below.)
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash citeauthor}} have
@@ -4730,9 +5824,9 @@ adapted this standard \textsf{biblatex} command only very slightly to
 bring it into line with \textsf{biblatex-chicago's} needs.  Its main
 usage will probably be for references to works from classical
 antiquity, when an \textsf{author's} name (abbreviated or not)
-sometimes suffices in the absence of a \textsf{title}, e.g.,
-Thuc.\ 2.40.2--3 (14.258).  You'll need to put it inside a
-\cmd{footnote} command manually.  (Cf.\ also \textsf{entrysubtype} in
+sometimes suffices in the absence of a \textsf{title}, e.g., Thuc.\
+2.40.2--3 (14.244).  You'll need to put it inside a \cmd{footnote}
+command manually.  (Cf.\ also \textsf{entrysubtype} in
 section~\ref{sec:entryfields}, above.)
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash citejournal}}
@@ -4741,10 +5835,10 @@ command provides an alternative short form when citing journal
 \textsf{volume} number instead of the article \textsf{title} after the
 \textsf{author's} name.  The \emph{Manual} suggests that this format
 might be helpful \enquote{in the absence of a full bibliography}
-(14.196).  It may also prove useful when you want to provide
+(14.185).  It may also prove useful when you want to provide
 parenthetical references to newspaper articles within the text rather
 than in the bibliography, a style endorsed by the \emph{Manual}
-(14.206).  In such a case, an article's author, if there is one, could
+(14.198).  In such a case, an article's author, if there is one, could
 form part of the running text.  As usual with these general citation
 commands, if you want the reference to appear in a footnote you need
 to put it inside a \cmd{footnote} command manually.
@@ -4764,17 +5858,15 @@ included this multicite command to enable you to present such a list,
 if the need arises.  Remember that you'll have to put it inside a
 \cmd{footnote} command manually.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace Another \mymarginpar{\textbf{\textbackslash footfullcite}}
 standard \textsf{biblatex} command, modified to work properly with
 \textsf{biblatex-chicago-notes}, and provided in case you find
 yourself in a situation where you really need the full citation in a
 footnote, but where \cmd{autocite} would print a short note or even
-\enquote{Ibid.}  This may be particularly useful if you've chosen to use all
-short notes by setting the \texttt{short} option in the arguments to
-\cmd{usepackage\{biblatex\}}, yet still feel the need for the
-occasional full citation.
+engage the ibidem mechanism.  This may be particularly useful if
+you've chosen to use all short notes by setting the \texttt{short}
+option in the arguments to \cmd{usepackage\{biblatex\}}, yet still
+feel the need for the occasional full citation.
 
 \mybigspace This, \mymarginpar{\textbf{\textbackslash fullcite}} too,
 is a standard command, and it too provides a full citation, but unlike
@@ -4797,12 +5889,12 @@ option to the command, like so:
 two further sets of square brackets, because with only one set it
 will, as with other citation commands, be interpreted as a
 \textsf{postnote}, and with two a \textsf{prenote} and a
-\textsf{postnote}.  There is a \cmd{gentext\-cites} command as well, and
+\textsf{postnote}.  There is a \cmd{gentextcites} command as well, and
 for it you may need to specify
-\cmd{gentextcites[<ending>]\\()()[][]\{entry:key1\}\{entry:key2\}},
+\cmd{gentextcites[<ending>]()()[][]\\\{entry:key1\}\{entry:key2\}},
 though if you don't have a \textsf{pre-} or \textsf{postnote} to the
 first citation you can make do with
-\cmd{gentextcites[<ending>]()\{entry:key1\}\\\{entry:key2\}}.
+\cmd{gentextcites[<ending>]()\{entry:key1\}\{entry:key2\}}.
 
 \mylittlespace The syntax of multiple authors' names in running text
 is unpredictable.  There is currently no way to add the genitival
@@ -4816,31 +5908,40 @@ attached to the last key.  By default, it only appears after the last,
 but the \texttt{genallnames} preamble and/or entry option
 set to \texttt{true} will attach the ending to each key's name(s).
 
-\mybigspace Matthew \mymarginpar{\textbf{\textbackslash headlesscite}}
+\mybigspace Matthew \mymarginpar{\textbf{\textbackslash
+    headlesscite}\\\textbf{\textbackslash
+    headlesscites}\\\mycolor{\textbf{\textbackslash Headlesscite}}}
 Lundin requested a more generalized \cmd{headlesscite} macro,
 suppressing the author's name in specific contexts while allowing
 users not to worry about whether a particular citation needs the long
 or short form, a responsibility thereby handed over to
-\textsf{biblatex's} tracking mechanisms.  This citation command
-attempts to fulfill this request.  Please note that, in the short
-form, the result will be rather like a \cmd{citetitle} command, which
-may or may not be what you want.  Note, also, that as I have provided
-only the most flexible form of the command, you'll have to wrap it in
-a \cmd{footnote} yourself.  Please see the next entry for further
+\textsf{biblatex's} tracking mechanisms.  These citation commands
+attempt to fulfill this request.  The (new) capitalized command, as
+usual, will ensure capitalization of, e.g., \enquote{ibid.}\ at the
+beginning of notes, and was made necessary by fixes to a bug
+identified by David Purton.  Please note that, in the short form, the
+result will be rather like a \cmd{citetitle} command, which may or may
+not be what you want.  Note, also, that as I have provided only the
+most flexible form of the command, you'll have to wrap it in a
+\cmd{footnote} yourself.  Please see the next entry for further
 discussion of some of the needs this command might help address.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash
-    headless-\\fullcite}} have provided this command in case you want
-to print a full citation without the author's name.  The \emph{Manual}
-(14.78, 14.88) suggests this for brevity's sake in cases where that
-name is already obvious enough from the title, and where repetition
-might seem awkward (creel:house, feydeau:farces, meredith:letters, and
-sewall:letter).  \textsf{Letter} entries --- and only such entries ---
-do this for you automatically, and of course the repetition is
-tolerated in bibliographies for the sake of alphabetization, but in
-notes this command may help achieve greater elegance, even if it isn't
-strictly necessary.  As I've provided only the most flexible form of
-the command, you'll have to wrap it in a \cmd{footnote} yourself.
+    headless-\\fullcite}\\\mycolor{\textbf{\textbackslash
+      headless-\\fullcites}}} have provided these commands in case you
+want to print a full citation without the author's name.  The
+\emph{Manual} (14.78, 14.104) suggests this for brevity's sake in
+cases where that name is already obvious enough from the title, and
+where repetition might seem awkward (creel:house, feydeau:farces,
+meredith:letters, and sewall:letter).  \textsf{Letter} entries and
+\mycolor{\textsf{standard}} entries (where the \textsf{author} is
+usually the publishing \textsf{organization}) --- and only these
+entries --- do this for you automatically, and of course the
+repetition is tolerated in bibliographies for the sake of
+alphabetization, but in notes for other entry types this command may
+help achieve greater elegance, even if it isn't strictly necessary.
+As I've provided only the most flexible form of the command, you'll
+have to wrap it in a \cmd{footnote} yourself.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash shortcite}} have
 provided this command in case, for any reason, you specifically
@@ -4849,6 +5950,13 @@ want something else.  Again, I've provided only the most flexible form
 of the command, so you'll have to wrap it in a \cmd{footnote}
 manually.
 
+\mybigspace The \colmarginpar{\textbf{\textbackslash shortcite*}}
+starred version of the command turns off page and citation tracking
+for a short note, designed particularly to prevent a
+\mycolor{\texttt{noteref}} back reference from appearing, should you
+and the code have a disagreement over just when such back references
+might be necessary.
+
 \mybigspace At \mymarginpar{\textbf{\textbackslash shorthandcite}}
 the request of Kenneth Pearce, I have included this command which
 always prints the \textsf{shorthand}, even at the first citation of a
@@ -4856,6 +5964,30 @@ given work.  Again, I've only provided the most flexible form of the
 command, so you'll need to place it inside parentheses or wrap it in a
 \cmd{footnote} manually.
 
+\mybigspace The \colmarginpar{\textbf{\textbackslash shorthandcite*}}
+starred version of the command turns off page and citation tracking
+for a \textsf{shorthand} note, designed particularly to prevent a
+\mycolor{\texttt{noteref}} back reference from appearing, should you
+and the code have a disagreement over just when such back references
+might be necessary.
+
+\mybigspace This \colmarginpar{\textbf{\textbackslash
+    shorthand-\\refcite}} command, like the next, forces the printing
+of a back reference when you are using the new package option
+\mycolor{\texttt{noteref}}, only it prints a \textsf{shorthand} note
+rather than a short note.  It's the opposite of
+\mycolor{\cmd{shorthandcite*}}.
+
+\mybigspace The \colmarginpar{\textbf{\textbackslash shortrefcite}}
+new package option \mycolor{\texttt{noteref}} provides for the
+printing of back references from short notes to their corresponding
+long notes.  \textsf{Biblatex-chicago} provides several options to
+help you control when such back references should appear, but as there
+may well be occasions when you and the code disagree, this command
+forces the printing of a short note with a back reference.  It's the
+opposite, then, of \mycolor{\cmd{shortcite*}}, which prevents such a back
+reference from appearing.
+
 \mybigspace This \mymarginpar{\textbf{\textbackslash surnamecite}}
 command is analogous to \cmd{headlesscite}, but whereas the latter
 allows you to omit an \textsf{author's} name when that name is obvious
@@ -4864,7 +5996,7 @@ shorten a full note citation in contexts where the full name(s) of the
 \textsf{author} have already been provided in the text.  In short
 notes this falls back to the standard format, but in long notes it
 simply omits the given names of the \textsf{author} and provides only
-the surname, along with the full data of the entry.  (Cf.\ 14.52.)
+the surname, along with the full data of the entry (cf.\ 14.57).
 
 \mybigspace Norman \mymarginpar{\textbf{\textbackslash textcite}} Gray
 started a discussion on
@@ -4888,7 +6020,7 @@ then the default behavior, for both \cmd{textcite} and
 \cmd{textcites}, specifies that you'll get the \textsf{author's}
 name(s) followed by a headless \emph{short} citation (or citations)
 placed within parentheses.  Such parentheses are generally discouraged
-by the \emph{Manual} (14.33), but are nonetheless somewhat better than
+by the \emph{Manual} (14.38), but are nonetheless somewhat better than
 other solutions for smoothing the syntax of sentences that include
 such a citation.  I have made the citation short, i.e., \textsf{title}
 only, because this again seems likely to be the least awkward solution
@@ -4913,7 +6045,7 @@ thought I might gather them here also for your perusal.  These
 settings are, I believe, consistent with the specification, but you
 can alter them in the options to \textsf{biblatex-chicago} in your
 preamble or by loading the package via
-\cmd{usepackage[style=chicago-notes]\{biblatex\}}, which gives you the
+\verb+\usepackage[style=chicago-notes]{biblatex}+, which gives you the
 \textsf{biblatex} defaults unless you redefine them yourself inside
 the square brackets.
 
@@ -4933,36 +6065,73 @@ for the \cmd{ifciteseen} test is enabled globally.
 for the long format when presenting dates, slightly shortened when
 presenting date ranges.
 
-%\enlargethispage{-\baselineskip}
+\mylittlespace In \colmarginpar{\texttt{alltimes=12h}} entries which
+print time stamps, they will, when the stamp is part of a
+\textsf{date}, \textsf{eventdate}, or \textsf{origdate}, appear in
+12-hour format, i.e., \enquote{4:45 p.m.}  Stamps that are part of a
+\textsf{urldate} are, by default, controlled by the
+\mycolor{\texttt{urltime}} option, which is set to
+\mycolor{\texttt{24h}}.  See that option below, and
+table~\ref{ad:date:extras}.
 
 \mylittlespace The \mymarginpar{\texttt{dateabbrev=\\false}}
 \emph{Manual} prefers to use full month names in the notes \&\
 bibliography style.
 
+\mylittlespace This \colmarginpar{\texttt{datecirca=true}} option
+enables \textsf{biblatex's} enhanced \enquote{circa} date
+specification, which given a \textsf{date} like \verb+1989~+ will
+print [ca.\ 1989].  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace This \colmarginpar{\texttt{dateuncertain=\\true}}
+option enables \textsf{biblatex's} enhanced \enquote{uncertain} date
+specification, which given a \textsf{date} like \verb+1989?+ will
+print [1989?].  A field like \verb+1989%+ is both \enquote{circa}
+\emph{and} \enquote{uncertain,} like so: [ca.\ 1989?].  Cf.\
+table~\ref{ad:date:extras}.
+
+\mylittlespace This \colmarginpar{\texttt{datezeros=false}} ensures
+that leading zeros don't appear in date specifications.
+
 \mybigspace This \mymarginpar{\texttt{ibidtracker=\\constrict}}
-enables the use of \enquote{Ibid} in notes, but only in the most
+enables the use of the ibidem mechanism in notes, but only in the most
 strictly-defined circumstances.  Whenever there might be any
 ambiguity, \textsf{biblatex} should default to printing a more
 informative reference.  Remember also that you can use the \cmd{cite*}
 command to disable this functionality in any given reference, or
 indeed one of the \texttt{fullcite} commands if you need the long note
-form for any reason.
+form for any reason.  Please see section~\ref{sec:useropts} for
+options (\texttt{noibid} and \mycolor{\texttt{useibid}}) managing how
+\textsf{biblatex-chicago} presents ibidem references, as the defaults
+have changed in the 17th edition (14.34).
 
 \mylittlespace Roger \mymarginpar{\texttt{idemtracker=\\false}} Hart
 suggested that it might be helpful, despite the \emph{Manual's}
-objections (14.30), to be able to turn on \textsf{biblatex's}
+objections (14.35), to be able to turn on \textsf{biblatex's}
 \texttt{idemtracker}.  This replaces, in notes only, authors' names
 with the string \enquote{Idem} when a work by the same author follows
 a different work by that author, two consecutive references to the
 same work by the same author generating, of course, \enquote{Ibid.}
-You can turn this on when loading \textsf{biblatex-chicago} by setting
-\texttt{idemtracker=constrict}.  It works very much like the standard
-\textsf{biblatex} styles which include this option, so that you never
-get \enquote{Idem} in long notes, but only in short ones, and
-(ideally) never when the repeated name might be somewhat ambiguous.
-Also, if you wish the localized string to be appropriately gendered,
-you need to employ the \textsf{biblatex} field \textsf{gender}, on
-which see \textsf{biblatex.pdf} §~2.3.3.
+Indeed, if you are going to use the \texttt{idemtracker}, you should
+also set the package option \mycolor{\texttt{useibid}} to
+\texttt{true}, so that you don't get a mix of \enquote{Idem} and the
+new 17th-edition ibidem behavior which doesn't print \enquote{Ibid.}
+You can turn this all on when loading \textsf{biblatex-chicago} by
+setting \texttt{idemtracker=constrict,useibid=true}.  It works very
+much like the standard \textsf{biblatex} styles which include this
+option, so that you never get \enquote{Idem} in long notes, but only
+in short ones, and (ideally) never when the repeated name might be
+somewhat ambiguous.  Also, if you wish the localized string to be
+appropriately gendered, you need to employ the \textsf{biblatex} field
+\textsf{gender}, on which see \textsf{biblatex.pdf} §~2.3.3.
+
+\mylittlespace This \colmarginpar{\texttt{labeltitle=\\true}} option
+enables \textsf{biblatex-chicago-notes} to disambiguate shortened
+citations to different sources which might otherwise be confusingly
+identical.  Though I've set it in \textsf{biblatex-chicago.sty},
+you'll need to set the \texttt{shortextrafield} option yourself in
+order for it to have any visible effect.  See the documentation of
+that option in section~\ref{sec:useropts}, below.
 
 \mylittlespace This \mymarginpar{\texttt{loccittracker\\=constrict}}
 allows the package to determine whether two consecutive citations of
@@ -4976,7 +6145,7 @@ printed in the bibliography when that number exceeds 10.  These
 numbers follow the recommendations of the \emph{Manual} (14.76), and
 they are different from those for use in notes.  With
 \textsf{biblatex} 1.6 you can no longer redefine \texttt{maxnames} and
-\texttt{minnames} in the \cmd{printbiblio\-graphy} command at the bottom
+\texttt{minnames} in the \cmd{printbibliography} command at the bottom
 of your document, so \textsf{biblatex-chicago} now does this
 automatically for you, though of course you can change them in your
 document preamble.
@@ -4987,15 +6156,19 @@ commands for controlling, among other things, the printing of
 \enquote{Ibid.}  It tracks individual pages if \LaTeX\ is in oneside
 mode, or whole spreads in twoside mode.
 
-\mylittlespace This \mymarginpar{\texttt{related=bib}} is the
-standard \textsf{biblatex} bibliography option, but I have given it
-some extra settings and also added an entry option as well.  By
-default it enables the use of \textsf{related} functionality in the
-bibliography only, not in long notes.  You can set it either in the
-preamble or in individual entries to enable the functionality in long
-notes only (\texttt{notes}), in both notes and bibliography
-(\texttt{true}), or in neither (\texttt{false}).  Cf.\
-coolidge:speech, weed:flatiron.
+\mylittlespace This \mymarginpar{\texttt{related=bib}} is the standard
+\textsf{biblatex} bibliography option, but I have given it some extra
+settings and also added entry and type options as well.  By default it
+enables the use of \textsf{related} functionality in the bibliography
+only, not in long notes.  You can set it either in the preamble or in
+individual entries to enable the functionality in long notes only
+(\texttt{notes}), in both notes and bibliography (\texttt{true}), or
+in neither (\texttt{false}).  When you use the
+\mycolor{\texttt{commenton}}, \mycolor{\texttt{maintitle}}, or
+\texttt{reviewof} \textsf{relatedtypes}, \textsf{biblatex-chicago}
+automatically sets this option to \texttt{true} on an entry-by-entry
+basis, as these \textsf{relatedtypes} require this for proper
+functioning.  Cf.\ coolidge:speech, weed:flatiron.
 
 \mylittlespace This \mymarginpar{\texttt{sortcase=\\false}} turns off
 the sorting of uppercase and lowercase letters separately, a practice
@@ -5009,13 +6182,22 @@ other backend, it reverts to the \textsf{biblatex} default
 (\texttt{nty}).  Please see the discussion of
 \cmd{DeclareSortingTemplate} just below.
 
-\mylittlespace This \colmarginpar{\texttt{uniquework=\\true}} option
-enables \textsf{biblatex-chicago-notes} to disambiguate shortened
-citations to different sources which might otherwise be confusingly
-identical.  Though I've set it in \textsf{biblatex-chicago.sty},
-you'll need to set the \mycolor{\texttt{shortextrafield}} option
-yourself in order for it to have any visible effect.  See the
-documentation of that option in section~\ref{sec:useropts}, below.
+\mylittlespace If \colmarginpar{\texttt{timezones=true}} you provide a
+timezone for a time stamp, usually using one of the \textsf{timezone}
+fields, this option ensures it will be printed.
+
+\mylittlespace In \colmarginpar{\texttt{urltime=24h}} entries with
+\textsf{urldate} fields containing time stamps, that stamp will by
+default appear in 24-hour format, i.e., \enquote{16:45.}  Cf.\
+\mycolor{\texttt{alltimes}}, above, \mycolor{\texttt{urlstamp}} in
+section~\ref{sec:chicpreset} below, and table~\ref{ad:date:extras}.
+
+\mylittlespace In
+\colmarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
+\mycolor{\textsf{standard}} entries any editors' or compilers' names
+appear after the title, according to 14.259, so these
+entry-type-specific options encode this.  You can, of course, override
+these defaults in your preamble, should you deem it necessary.
 
 \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}}
 enables automatic use of the \textsf{translator} at the head of
@@ -5036,10 +6218,10 @@ bibliography items and between items in the list of shorthands
 them to your own needs and tastes.  It may be as well you know that
 the \emph{Manual} does state a preference for two of the formatting
 options I've implemented by default: the 3-em dash as a replacement
-for repeated names in the bibliography (14.63--67, and just below);
+for repeated names in the bibliography (14.67--71, and just below);
 and the formatting of note numbers, both in the main text and at the
 bottom of the page / end of the essay (superscript in the text,
-in-line in the notes; 14.19).  The code for this last formatting is
+in-line in the notes; 14.24).  The code for this last formatting is
 also in \textsf{biblatex-chicago.sty}, and I've wrapped it in a test
 that disables it if you are using the \textsf{memoir} class, which I
 believe has its own commands for defining these parameters.  You can
@@ -5052,9 +6234,8 @@ which see below.
 three dashes separated by gaps.  He suggested an alternative, which
 I've adopted, with a minor tweak to make the dash thicker, though you
 can toy with all the parameters to find what looks right with your
-chosen font.  The default definition is:
-\cmd{renewcommand*\{\textbackslash bibname\-dash\}\{\textbackslash
-  rule[.4ex]\{3em\}\{.6pt\}\}}.
+chosen font.  The default definition is:\\
+\verb+\renewcommand*{bibnamedash}{\rule[.4ex]{3em}{.6pt}}+.
 
 \mylittlespace At \mymarginpar{\texttt{losnotes}
   \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have
@@ -5068,14 +6249,16 @@ space that I see on my system when using endnotes.  (You'll probably
 also want to use the option \texttt{heading=none} in order to get rid
 of the [oversized] default, providing your own within the
 \cmd{footnote} command.)  If you use a command like
-\cmd{printbiblist\{shortjournal\}} to print a list of journal
+\verb+\printbiblist{shortjournal}+ to print a list of journal
 abbreviations, you can use the \texttt{sjnotes} and
-\texttt{sjendnotes} \texttt{biben\-vironments} in exactly the same way.
+\texttt{sjendnotes} \texttt{bibenvironments} in exactly the same way.
 Please see the documentation of \textsf{shorthand} and
 \textsf{shortjournal} in section~\ref{sec:entryfields} above for
 further options available to you for presenting and formatting these
 two types of \texttt{biblist}.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace Formerly
 \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} available only to
 those using \textsf{Biber}, but since version 3.0 handled by
@@ -5107,29 +6290,27 @@ Code in \textsf{biblatex-chicago.sty} loads the custom scheme
 \texttt{nty}.  (You can find its definition in
 \textsf{chicago-notes.cbx}.)  The advantages of this scheme are,
 specifically, that any entry headed by one of the supplemental name
-fields (\textsf{name[a-c]}), a \textsf{manual} entry headed by an
-\textsf{organization}, or an \textsf{article} or \textsf{review} entry
-headed by a \textsf{journaltitle} won't need a \textsf{sortkey} set.
-Further, the \texttt{use<name>=false} options will remove any name
-field from the sorting order, again reducing the need for user
-intervention.
+fields (\textsf{name[a-c]}), a \textsf{manual} or a
+\mycolor{\textsf{standard}} entry headed by an \textsf{organization},
+or an \textsf{article} or \textsf{review} entry headed by a
+\textsf{journaltitle} won't need a \textsf{sortkey} set.  Further, the
+\texttt{use<name>=false} options will remove any name field from the
+sorting order, again reducing the need for user intervention.
 
 \subsubsection{{Pre-Set \textsf{chicago} Options}}
 \label{sec:chicpreset}
 
-At \mymarginpar{\texttt{bookpages=\\true}} the request
-of Scot Becker, I have included this rather specialized option, which
-controls the printing of the \textsf{pages} field in \textsf{book}
-entries.  Some bibliographic managers, apparently, place the total
-page count in that field by default, and this option allows you to
-stop the printing of this information in notes and bibliography.  It
-defaults to true, which means the field is printed, but it can be set
-to false either in the preamble, for the whole document, or on a
-per-entry basis in the \textsf{options} field (though rather than use
-this latter method it would make sense to eliminate the \textsf{pages}
-field from the affected entries).
-
-%\enlargethispage{\baselineskip}
+At \mymarginpar{\texttt{bookpages=\\true}} the request of Scot Becker,
+I have included this rather specialized option, which controls the
+printing of the \textsf{pages} field in \textsf{book} entries.  Some
+bibliographic managers, apparently, place the total page count in that
+field by default, and this option allows you to stop the printing of
+this information in notes and bibliography.  It defaults to true,
+which means the field is printed, but it can be set to false either in
+the preamble, for the whole document or for specific entry types, or
+on a per-entry basis in the \textsf{options} field (though rather than
+use this latter method it would make sense to eliminate the
+\textsf{pages} field from the affected entries).
 
 \mylittlespace This \mymarginpar{\texttt{doi=true}} option controls
 whether any \textsf{doi} fields present in the .bib file will be
@@ -5141,26 +6322,28 @@ and the \textsf{url} only if there is no \textsf{doi}.  The package
 default remains the same, however --- it defaults to true, which will
 print both \textsf{doi} and \textsf{url} if both are present.  The
 option can be set to \texttt{only} or to \texttt{false} either in the
-preamble, for the whole document, or on a per-entry basis in the
-\textsf{options} field.  In \textsf{online} entries, the \textsf{doi}
-field will always be printed, but the \texttt{only} switch will still
-eliminate any \textsf{url}.
+preamble, for the whole document or for specific entry types, or on a
+per-entry basis in the \textsf{options} field.  In \textsf{online}
+entries, the \textsf{doi} field will always be printed, but the
+\texttt{only} switch will still eliminate any \textsf{url}.
 
 \mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls
 whether any \textsf{eprint} fields present in the .bib file will be
 printed in notes and bibliography.  It defaults to true, and can be
-set to false either in the preamble, for the whole document, or on a
-per-entry basis, in the \textsf{options} field.  In \textsf{online}
-entries, the \textsf{eprint} field will always be printed.
+set to false either in the preamble, for the whole document or for
+specific entry types, or on a per-entry basis, in the \textsf{options}
+field.  In \textsf{online} entries, the \textsf{eprint} field will
+always be printed.
 
 \mylittlespace This \mymarginpar{\texttt{isbn=true}} option controls
 whether any \textsf{isan}, \textsf{isbn}, \textsf{ismn},
 \textsf{isrn}, \textsf{issn}, and \textsf{iswc} fields present in the
 .bib file will be printed in notes and bibliography.  It defaults to
 true, and can be set to false either in the preamble, for the whole
-document, or on a per-entry basis, in the \textsf{options} field.
+document or for specific entry types, or on a per-entry basis, in the
+\textsf{options} field.
 
-\mylittlespace Once \mymarginpar{\texttt{numbermonth=\\true}} again at
+\mylittlespace Once \mymarginpar{\texttt{numbermonth\\=true}} again at
 the request of Scot Becker, I have included this option, which
 controls the printing of the \textsf{month} field in all the
 periodical-type entries when a \textsf{number} field is also present.
@@ -5169,31 +6352,52 @@ publication even when a \textsf{number} is present.  When all this
 information is available the \emph{Manual} (14.180, 14.185) prints
 everything, so this option defaults to true, which means the field is
 printed, but it can be set to false either in the preamble, for the
-whole document, or on a per-entry basis in the \textsf{options} field.
+whole document or for specific entry types, or on a per-entry basis in
+the \textsf{options} field.
 
 \mylittlespace This \mymarginpar{\texttt{url=true}} option controls
 whether any \textsf{url} fields present in the .bib file will be
 printed in notes and bibliography.  It defaults to true, and can be
-set to false either in the preamble, for the whole document, or on a
-per-entry basis, in the \textsf{options} field.  Please note that, as
-in standard \textsf{biblatex}, the \textsf{url} field is always
-printed in \textsf{online} entries, regardless of the state of this
-option.
+set to false either in the preamble, for the whole document or for
+specific entry types, or on a per-entry basis, in the \textsf{options}
+field.  Please note that, as in standard \textsf{biblatex}, the
+\textsf{url} field is always printed in \textsf{online} entries,
+regardless of the state of this option.
+
+\mylittlespace This \colmarginpar{\texttt{urlstamp=true}} option
+controls whether any \textsf{urltime} fields, included as part of the
+\textsf{urldate}, will be printed in notes and bibliography.  It
+defaults to true, and can be set to false either in the preamble, for
+the whole document or for specific entry types, or on a per-entry
+basis in the \textsf{options} field.  Please note that, unlike the
+\texttt{url} option, this option \emph{does} control what is printed
+in \textsf{online} entries.
 
 \mylittlespace This \mymarginpar{\texttt{includeall=\\true}} is the
-one option that rules the six preceding, either printing all the
+one option that rules the seven preceding, either printing all the
 fields under consideration --- the default --- or excluding all of
 them.  It is set to \texttt{true} in \textsf{chicago-notes.cbx}, but
-you can change it either in the preamble for the whole document or,
-for specific fields, in the \textsf{options} field of individual
-entries.  The rationale for all of these options is the availability
-of bibliographic managers that helpfully present as much data as
-possible, in every entry, some of which may not be felt to be entirely
-necessary.  Setting \texttt{includeall} to \texttt{true} probably
-works just fine for those compiling their .bib databases by hand, but
-others may find that some automatic pruning helps clear things up, at
-least to a first approximation.  Some per-entry work afterward may
-then polish up the details.
+you can change it either in the preamble for the whole document or for
+specific entry types, or in the \textsf{options} field of individual
+entries.  The seven individual options above are similarly available
+in the same places, for finer-grained control.  The rationale for all
+of these options is the availability of bibliographic managers that
+helpfully present as much data as possible, in every entry, some of
+which may not be felt to be entirely necessary.  Setting
+\texttt{includeall} to \texttt{true} probably works just fine for
+those compiling their .bib databases by hand, but others may find that
+some automatic pruning helps clear things up, at least to a first
+approximation.  Some per-type or per-entry work afterward may then
+polish up the details.  If you find that you need control over fields
+that aren't included among these options, I have provided the
+\mycolor{\cmd{suppressbibfield}} command for your preamble, as
+suggested by Jan David Hauck.  It is in fact a user interface to the
+source mapping feature of \textsf{biblatex}, and it is something of a
+nuclear option, preventing fields from even appearing in the .bbl file
+generated by \textsf{biber} from your .bib database.  See the
+\mycolor{\cmd{suppressbibfield}} command in
+section~\ref{sec:formatcommands} and the source mapping docs in
+\textsf{biblatex.pdf} \S~4.5.3.
 
 \mylittlespace At \mymarginpar{\texttt{addendum=\\true}} the request
 of Roger Hart, I have included this option, which controls the
@@ -5203,7 +6407,7 @@ preamble, for the whole document, or on a per-entry basis, in the
 \textsf{options} field.
 
 \mylittlespace According \mymarginpar{\texttt{bookseries=\\true}} to
-the \emph{Manual} (14.128), the \textsf{series} field in book-like
+the \emph{Manual} (14.123), the \textsf{series} field in book-like
 entries \enquote{may be omitted to save space (especially in a
   footnote).}  This option allows you to control the printing of that
 field in long notes.  It defaults to true, and can be set to false
@@ -5265,15 +6469,26 @@ behavior of \textsf{inbook}, \textsf{incollection},
 \texttt{longcrossref}, below, and also the documentation of
 \textsf{crossref} in section~\ref{sec:entryfields}.
 
+\mylittlespace The \colmarginpar{\texttt{compressyears\\=true}}
+\emph{Manual} has long recommended (9.64, 14.117, 14.144), as a
+space-saving measure, the compression of year ranges when presenting
+dates.  I have, finally, implemented this in the current release, and
+have made it the default, which you can change in your document
+preamble.  Please note that the rules for compressing years are
+different from those for compressing other numbers (e.g., page
+numbers), and also that the compression code is in
+\textsf{biblatex-chicago.sty}, which will have to be loaded for this
+option to make any difference.  Cf.\ table~\ref{ad:date:extras}.
+
 \mylittlespace Roger
 \mymarginpar{\texttt{ctitleaddon=\\comma\\ptitleaddon=\\period}} Hart
 requested a way to control the punctuation printed before the
 \textsf{titleaddon}, \textsf{booktitleaddon}, and
 \textsf{maintitleaddon} fields.  By default, this is
-\cmd{addcomma\cmd{add\-space}} (\textsf{ctitleaddon}) for all
-occurrences in notes and for nearly all \textsf{book-} and
+\verb+\addcomma\addspace+ (\textsf{ctitleaddon}) for all occurrences
+in notes and for nearly all \textsf{book-} and
 \textsf{maintitleaddons} in the bibliography, while
-\cmd{addperiod\cmd{addspace}} (\textsf{ptitleaddon}) is the default
+\verb+\addperiod\addspace+ (\textsf{ptitleaddon}) is the default
 before most \textsf{titleaddons} in the bibliography.  If the
 punctuation printed isn't correct for your needs, you can set the
 relevant option either in the preamble or in individual entries.
@@ -5284,10 +6499,10 @@ keys are:
 \setlength{\parskip}{-4pt}
 \item[\qquad none] = no punctuation at all
 \item[\qquad space] = \cmd{addspace}
-\item[\qquad comma] = \cmd{addcomma\cmd{addspace}}
-\item[\qquad period] = \cmd{addperiod\cmd{addspace}}
-\item[\qquad colon] = \cmd{addcolon\cmd{addspace}}
-\item[\qquad semicolon] = \cmd{addsemicolon\cmd{addspace}}
+\item[\qquad comma] = \verb+\addcomma\addspace+
+\item[\qquad period] = \verb+\addperiod\addspace+
+\item[\qquad colon] = \verb+\addcolon\addspace+
+\item[\qquad semicolon] = \verb+\addsemicolon\addspace+
 \end{description}
 
 If you need something a little more exotic, you can directly
@@ -5299,6 +6514,17 @@ you use the \textsf{options} field in your other entries with a
 relevant option to \texttt{none} in your entry and then include the
 punctuation in the \textsf{titleaddon} field itself.
 
+\mylittlespace Constanza Cordoni \colmarginpar{\texttt{dashed=true}}
+has requested a way to turn off the 3-em dash for replacing repeated
+names in the bibliography, and the \emph{Manual} admits that some
+publishers prefer this, as the dash can carry with it certain
+inconveniences, especially for electronic formats (14.67).  Some of
+\textsf{biblatex's} standard styles have a \texttt{dashed} option, so
+for compatibility purposes I've provided the same.  By default, I have
+set it to print the name dash, but you can set
+\mycolor{\texttt{dashed=false}} in your preamble to repeat names
+instead throughout your document.
+
 \mylittlespace If \mymarginpar{\texttt{hidevolumes=\\true}} both a
 \textsf{volume} and a \textsf{volumes} field are present, as may occur
 particularly in cross-referenced entries, then
@@ -5311,19 +6537,20 @@ option, set to \texttt{true} by default, controls whether to print the
 \texttt{false} either in the preamble or in the \textsf{options} field
 of your entry to have it appear after the \textsf{maintitle}.
 
-\mylittlespace This \mymarginpar{\texttt{longcrossref=\\false}} is
-the second option, requested by Bertold Schweitzer, for controlling
+\mylittlespace This \mymarginpar{\texttt{longcrossref=\\false}} is the
+second option, requested by Bertold Schweitzer, for controlling
 whether and where \textsf{biblatex-chicago} will print abbreviated
 references when you cite more than one part of a given collection or
 series.  It controls the settings for the entry types more-or-less
 authorized by the \emph{Manual}, i.e., \textsf{inbook},
-\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}.
-The mechanism itself is enabled by multiple \textsf{crossref} or
-\textsf{xref} references to the same parent, whether that be, e.g., a
-\textsf{collection}, an \textsf{mvcollection}, a \textsf{proceedings},
-or an \textsf{mvproceedings} entry.  Given these multiple cross
-references, the presentation in the reference apparatus will be
-governed by the following options:
+\textsf{incollection}, \textsf{inproceedings}, \textsf{letter}, and
+\mycolor{\textsf{review}}.  The mechanism itself is enabled by
+multiple \textsf{crossref} or \textsf{xref} references to the same
+parent, whether that be, e.g., a \textsf{collection}, an
+\textsf{mvcollection}, a \textsf{proceedings}, or an
+\textsf{mvproceedings} entry.  Given these multiple cross references,
+the presentation in the reference apparatus will be governed by the
+following options:
 
 \begin{description}
 \item[\qquad false:] This is the default.  If you use
@@ -5350,6 +6577,20 @@ and \textsf{proceedings} entries, please see \texttt{booklongxref},
 above, and also the documentation of \textsf{crossref} in
 section~\ref{sec:entryfields}.
 
+\mylittlespace This \colmarginpar{\texttt{nodates=true}} option means
+that \textsf{biblatex-chicago} automatically provides
+\verb+\bibstring{nodate}+ in any \enquote{circa} or
+\enquote{uncertain} date specification where the user has also turned
+off the printing of brackets around the date using the
+\mycolor{\texttt{nodatebrackets}} or \mycolor{\texttt{noyearbrackets}}
+options (section~\ref{sec:useropts}; 14.145).  If you set
+\texttt{nodates=false} either in your preamble (for global coverage or
+for specific entry types) or in individual entries then the package
+will simply print the unbracketed date specification in this context.
+See table~\ref{ad:date:extras}, below.  (The bibstring expands to
+\enquote{\texttt{n.d.}} in English; please note that this option works
+quite differently in the author-date styles.)
+
 \mylittlespace This
 \mymarginpar{\texttt{shorthand\\punct\\=space}}
 option controls the punctuation that appears before the first
@@ -5364,58 +6605,102 @@ in individual entries.  The accepted option keys are:
 \setlength{\parskip}{-4pt}
 \item[\qquad none] = no punctuation at all
 \item[\qquad space] = \cmd{addspace}
-\item[\qquad comma] = \cmd{addcomma\cmd{addspace}}
-\item[\qquad period] = \cmd{addperiod\cmd{addspace}}
-\item[\qquad colon] = \cmd{addcolon\cmd{addspace}}
-\item[\qquad semicolon] = \cmd{addsemicolon\cmd{addspace}}
-\item[\qquad emdash] =
-  \cmd{addthinspace\cmd{textemdash}\cmd{addthinspace}}
-\item[\qquad endash] = \cmd{addspace\cmd{textendash}\cmd{addspace}}
+\item[\qquad comma] = \verb+\addcomma\addspace+
+\item[\qquad period] = \verb+\addperiod\addspace+
+\item[\qquad colon] = \verb+\addcolon\addspace+
+\item[\qquad semicolon] = \verb+\addsemicolon\addspace+
+\item[\qquad emdash] = \verb+\addthinspace\textemdash\addthinspace+
+\item[\qquad endash] = \verb+\addspace\textendash\addspace+
 \end{description}
 
 You can, in emergencies, directly
-\cmd{renewcommand\{\cmd{shorthandpunct}\}} in the pream\-ble, but it
-might be easier to use the \texttt{none} option to
-\texttt{shorthandpunct} and hand-craft solutions inside the
-\textsf{shorthandintro} fields of individual entries.
-
-\mylittlespace As \mymarginpar{\texttt{usecompiler=\\true}}
-\textsf{biblatex} automatically includes a \texttt{usenamec} option as
-standard, the Chicago-specific option \texttt{usecompiler} is now
-deprecated.  Please replace it your documents and .bib files with
-\texttt{usenamec}, which works much better across the board.
+\verb+\renewcommand{\shorthandpunct}+ in the pream\-ble, but it might
+be easier to use the \texttt{none} option to \texttt{shorthandpunct}
+and hand-craft solutions inside the \textsf{shorthandintro} fields of
+individual entries.
 
 \subsubsection{Style Options -- Preamble}
 \label{sec:useropts}
 
 These are parts of the specification that not everyone will wish to
-enable.  All except the fourth can be used even if you load the
-package in the old way via a call to \textsf{biblatex}, but most users
-can just place the appropriate string(s) in the options to the
+enable.  All except the fifth and eighth can be used even if you load
+the package in the old way via a call to \textsf{biblatex}, but most
+users can just place the appropriate string(s) in the options to the
 \cmd{usepackage} \texttt{\{biblatex-chicago\}} call in your preamble.
 
+\mylittlespace \textsf{Biblatex-chicago}
+\colmarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
+enhanced date specifications, one part of which is the presentation of
+decades and centuries not as year ranges but as localized strings like
+\enquote{19th c.} or \enquote{1970s.}  The
+\mycolor{\texttt{alwaysrange}} option set to \texttt{true}, either in
+your preamble or in individual entries, simply tells the package to
+present the year range instead.  This allows you to use the efficient
+enhanced notations in the \textsf{date} field (\verb+{18XX}+ or
+\verb+{197X}+) without the localized strings appearing, should you
+require it.  The two options \mycolor{\texttt{centuryrange}} and
+\mycolor{\texttt{decaderange}} limit the same effect to centuries and
+decades, respectively.  Please see table~\ref{ad:date:extras}.
+
 \mylittlespace At \mymarginpar{\texttt{annotation}} the request of
 Emil Salim, I included in \textsf{biblatex-chicago} the ability to
 produce annotated bibliographies.  If you turn this option on then the
 contents of your \textsf{annotation} (or \textsf{annote}) field will
 be printed after the bibliographical reference.  (You can also use
 external files to store annotations -- please see
-\textsf{biblatex.pdf} §~3.11.8 for details on how to do this.)  This
+\textsf{biblatex.pdf} §~3.13.8 for details on how to do this.)  This
 functionality is currently in a beta state, so before you use it
 please have a look at the documentation for the \textsf{annotation}
 field, on page~\pageref{sec:annote} above.
 
+\mylittlespace As \colmarginpar{\texttt{blogurl}} a convenience
+feature, this option, available only in the preamble, allows
+\textsf{review} entries to inherit a \textsf{url} from
+\textsf{article} entries.  The main use, as the name suggests, is when
+you want to provide the same \textsf{url} for a blog comment as you
+have for a blog post.  You'll need an extra \LaTeX - \textsf{Biber} -
+\LaTeX\ run to make sure any changes to this option take effect.
+
+\mylittlespace This \colmarginpar{\texttt{centuryrange}} option works
+just like \mycolor{\texttt{alwaysrange}}, above, but only affects
+century presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace The \colmarginpar{\texttt{cmsbreakurl}} \emph{Manual}
+gives fairly specific instructions about breaking URLs across lines
+(14.18), so I have attempted to implement them by tweaking
+\textsf{biblatex's} default settings, which are found in
+\textsf{biblatex.def}.  In truth, I haven't succeeded in getting
+\textsf{biblatex} flawlessly to follow all of the \emph{Manual's}
+instructions, nor do the changes I have made work well in all
+circumstances, being particularly unsightly if you happen to be using
+the \textsf{ragged2e} package.  For these reasons, I have made my
+changes dependent on a package option, \mycolor{\texttt{cmsbreakurl}},
+which you can set in your preamble.  I have placed all of this code in
+\textsf{biblatex-chicago.sty}, so if you load the package with a call
+to \textsf{biblatex} instead, then URL line breaking will revert to
+the \textsf{biblatex} defaults.  See
+\href{file:cms-notes-sample.pdf}{\textsf{cms-notes-sample.pdf}} for a
+lot of examples of what URLs look like when the option is set, and
+also section~\ref{sec:loading}, below.
+
 \mylittlespace When \mymarginpar{\texttt{compresspages}} set to
 \texttt{true}, any page ranges in your .bib file or in the
 \textsf{postnote} field of your citation commands will be compressed
-in accordance with the \emph{Manual's} specifications (9.60).
+in accordance with the \emph{Manual's} specifications (9.61).
 Something like 321-{-}328 in your .bib file would become 321--28 in
 your document.  See the \textsf{pages} field in
-section~\ref{sec:entryfields}, above.
+section~\ref{sec:entryfields}, above.  Please note that the code for
+this is in \textsf{biblatex-chicago.sty}, so if you load the package
+with a call to \textsf{biblatex} instead then you'll get the default
+\textsf{biblatex} compression style.
+
+\mylittlespace This \colmarginpar{\texttt{decaderange}} option works
+just like \mycolor{\texttt{alwaysrange}}, above, but only affects
+decade presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
 
 \mylittlespace The \mymarginpar{\texttt{delayvolume}} presentation of
 \textsf{volume} information in the notes \&\ bibliography style is
-complicated (\emph{Manual}, 14.121--27).  Depending on entry type and
+complicated (\emph{Manual}, 14.116--22).  Depending on entry type and
 on the presence or absence of a \textsf{booktitle} or a
 \textsf{maintitle}, \textsf{volume} data will be presented, in the
 bibliography, either before a \textsf{maintitle} or after a
@@ -5433,7 +6718,7 @@ without this option, be printed \emph{after} a \textsf{booktitle} or
 \textsf{maintitle}.  Cf.\ also \cmd{postvolpunct}, below.
 
 \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the
-\emph{Manual} (14.19) recommends specific formatting for footnote (and
+\emph{Manual} (14.24) recommends specific formatting for footnote (and
 endnote) marks, i.e., superscript in the text and in-line in foot- or
 endnotes, Charles Schaum has brought it to my attention that not all
 publishers follow this practice, even when requiring Chicago style.  I
@@ -5478,7 +6763,7 @@ documentation of \textsf{shortjournal} in
 section~\ref{sec:entryfields}, above.
 
 \mylittlespace The \mymarginpar{\texttt{juniorcomma}} \emph{Manual}
-(6.47) states that \enquote{commas are not required around \emph{Jr.}\
+(6.43) states that \enquote{commas are not required with \emph{Jr.}\
   and \emph{Sr.},} so by default \textsf{biblatex-chicago} has
 followed standard \textsf{biblatex} in using a simple space in names
 like \enquote{John Doe Jr.}  Charles Schaum has pointed out that
@@ -5502,21 +6787,49 @@ standard \textsf{biblatex} option, but to keep the coding of
 \textsf{biblatex-chicago.sty} simpler for the moment I have
 reimplemented it there, from whence it is merely passed on to
 \textsf{biblatex}.  If you load the Chicago style with
-\cmd{usepackage\{bibla\-tex-chicago\}}, then the option should simply
+\verb+\usepackage{biblatex-chicago}+, then the option should simply
 read \texttt{natbib}, rather than \texttt{natbib=true}.  The shorter
 form also works if you load the style using
-\cmd{usepackage[style=chicago\-notes]\{biblatex\}}, so I hope this
+\cmd{usepackage[style=chicago-notes]\\\{biblatex\}}, so I hope this
 requirement isn't too onerous.
 
-\mylittlespace At \mymarginpar{\texttt{noibid}} the request of an
+\mylittlespace When \colmarginpar{\texttt{nodatebrackets}\\
+  \texttt{noyearbrackets}} you use \textsf{biblatex's} enhanced date
+specifications to present an uncertain date (\verb+{1956?}+), a
+\enquote{circa} date (\verb+{1956~}+), or one that is both at the same
+time (\verb+{1956%}+), the date that by default will appear in your
+documents will have square brackets around it.  This accords with the
+\emph{Manual's} instructions concerning such dates (14.145), but that
+section also includes an alternative form, where the guessed at date
+appears, without brackets, after the \verb+\bibstring{nodate}+, e.g.,
+\enquote{\texttt{n.d., ca.\ 1750.}}  These two package options, which
+may appear in the preamble either for the whole document or for
+specific entry types, or in individual entries, allow you to control
+when these brackets will appear, while the \mycolor{\texttt{nodates}}
+option, set to \texttt{true} by default, decides whether to print
+\verb+\bibstring{nodate}+ before the date.  In truth, users of the
+notes \&\ bibliography style will probably only ever need
+\mycolor{\texttt{nodatebrackets}}, which controls most of the dates
+that will appear in your documents, with the exception of dates in
+some \textsf{article}, \textsf{review}, and \textsf{periodical}
+entries without an \textsf{entrysubtype}, which are governed by
+\mycolor{\texttt{noyearbrackets}}.  (The distribution is different in
+the author-date styles, so it's impossible to do without both
+options.)  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace At \colmarginpar{\texttt{noibid}} the request of an
 early tester, I have included this option to allow you globally to
-turn off the \texttt{ibidem} mechanism that
+turn off the \emph{ibidem} mechanism that
 \textsf{biblatex-chicago-notes} uses by default.  Some publishers, it
-would appear, require this.  Setting this option will mean that all
-possible instances of \emph{ibid.}\ will be replaced by the short note
-form.  For more fine-grained control of individual citations you'll
-probably want to use specialized citation commands, instead.  See
-section \ref{sec:citecommands}.
+would appear, require this.  Setting this option will mean that
+instead of the \emph{ibidem} mechanism you'll get the short note form.
+Please note that the 17th edition no longer recommends the use of
+\enquote{\emph{ibid.}}\ at all (14.34), so depending on the state of
+the \mycolor{\texttt{useibid}} option, below, what you'll be turning
+off may well no longer be the appearance of \emph{ibid.}\ itself.  For
+more fine-grained control of individual citations you'll probably want
+to use specialized citation commands, instead.  See section
+\ref{sec:citecommands}.
 
 \mylittlespace As \mymarginpar{\texttt{omitxrefdate}} part of the
 abbreviated cross-referencing functionality for \textsf{book},
@@ -5536,7 +6849,7 @@ 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.
+\emph{Manual} (6.38).  The option is available only in the preamble.
 
 \mylittlespace Several
 \mymarginpar{\texttt{postnotepunct}\\(experimental)} users, most
@@ -5557,11 +6870,22 @@ 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}
+\mylittlespace This \colmarginpar{\texttt{seriesabbrev}} option
+controls the printing of the \mycolor{\textsf{shortseries}} field in
+place of the \textsf{series} field in book-like entries in notes and
+bibliography.  It is \texttt{false} by default, so as shipped
+\textsf{biblatex-chicago-notes} will silently ignore such fields, but
+you can set it, either in the preamble for the whole document or for
+specific entry types, or in individual entries, to one of three other
+values: \texttt{true} prints the abbreviated form in notes and
+bibliography, \texttt{notes} in notes only, and \texttt{bib} in the
+bibliography only.  For more details, see the documentation of
+\mycolor{\textsf{shortseries}} in section~\ref{sec:entryfields},
+above.
 
 \mylittlespace This \mymarginpar{\texttt{short}} option means that
 your text will only use the short note form, even in the first
-citation of a particular work.  The \emph{Manual} (14.14) recommends
+citation of a particular work.  The \emph{Manual} (14.19) recommends
 this space-saving format only when you provide a \emph{full}
 bibliography, though even with such a bibliography you may feel it
 easier for your readers to present long first citations.  If you do
@@ -5571,33 +6895,41 @@ specific cases (see section \ref{sec:citecommands}).  If your
 bibliography is not complete, then you should not use this option.
 
 \mylittlespace N.\
-Andrew\colmarginpar{\texttt{shortextra-\\field\\shortextra-\\format\\shortextra-\\punct}}
+Andrew\mymarginpar{\texttt{shortextra-\\field\\shortextra-\\format\\shortextra-\\punct}}
 Walsh has remarked that it is quite possible for documents to cite
 works that, though perfectly distinguishable in their long form, end
 up looking identical in short notes; multiple performances of the same
 work by the same artist, for example, might end up producing such a
-situation.  While the use of a \textsf{shorthand} field could provide
-some sort of remedy, he requested a way to disambiguate short notes by
-adding a user-configurable field to the note, thereby keeping it both
-short and unique without the need to consult a list of shorthands.
-The \emph{Manual} (15.28) itself provides just such a mechanism in the
+situation.  (In \textsf{online} and \textsf{review} entries using the
+\mycolor{\texttt{commenton}} \textsf{relatedtype} this situation is so
+endemic that I've set a default method of disambiguating short notes
+there, though you can still override it with the following options.
+See section~\ref{sec:related}, above.)  While the use of a
+\textsf{shorthand} field could provide some sort of remedy, he
+requested a way to disambiguate short notes by adding a
+user-configurable field to the note, thereby keeping it both short and
+unique without the need to consult a list of shorthands.  The
+\emph{Manual} (15.29) itself provides just such a mechanism in the
 author-date specification, so I've added one to the notes \&\
 bibliography style, as well.  It consists of the standard
-\textsf{biblatex} option \texttt{uniquework}, now set to \texttt{true}
+\textsf{biblatex} option \texttt{labeltitle}, now set to \texttt{true}
 by default, along with three package options for the user to
 configure.  All three of these options are settable for the whole
 document, for individual entries, or for individual entry types.
 
-\mylittlespace The first is \mycolor{\texttt{shortextrafield}}, which
+\mylittlespace The first is \texttt{shortextrafield}, which
 \emph{must} be set in order for the mechanism to print anything at
 all.  You should set this option to the name of the field you wish to
 be printed in addition to the \textsf{author} and \textsf{labeltitle}.
-By default, it will be printed after the latter, separated from it by
-a comma.  You can manually define this punctuation by setting the
-\mycolor{\texttt{shortextrapunct}} option to one of \texttt{none,
-  space, comma, period, colon,} or \texttt{semicolon}.  You can also
-enclose the extra field in parentheses or square brackets by setting
-the \mycolor{\texttt{shortextraformat}} option to \texttt{parens} or
+(Possibilities include, but are not limited to, the 4 \textsf{*date}
+fields and the 4 \textsf{*time} fields, the latter of which will print
+the appropriate \textsf{*date} and the \textsf{*time}.)  By default,
+it will be printed after the latter, separated from it by a comma.
+You can manually define this punctuation by setting the
+\texttt{shortextrapunct} option to one of \texttt{none, space, comma,
+  period, colon,} or \texttt{semicolon}.  You can also enclose the
+extra field in parentheses or square brackets by setting the
+\texttt{shortextraformat} option to \texttt{parens} or
 \texttt{brackets}.
 
 \mylittlespace User \mymarginpar{\texttt{shorthand-\\first}} laudecir
@@ -5616,12 +6948,14 @@ list.  Please see the documentation of the \textbf{shorthand} field in
 section~\ref{sec:entryfields} above for information on further options
 available to you for presenting and formatting the list of shorthands.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace Chris Sparks \mymarginpar{\texttt{shorthandibid}}
 pointed out that \textsf{biblatex-chicago-notes} would never use
 \emph{ibid.}\ in the case of entries containing a \textsf{shorthand}
 field, but rather that consecutive references to such an entry
 continued to provide the shorthand, instead.  The \emph{Manual} isn't,
-as far as I can tell, completely clear on this question.  In 14.258,
+as far as I can tell, completely clear on this question.  In 14.244,
 discussing references to works from classical antiquity, it states
 that \enquote{when abbreviations are used, these rather than
   \emph{ibid.}\ should be used in succeeding references to the same
@@ -5632,7 +6966,7 @@ of \emph{ibid.}\ instead of the shorthand in such circumstances,
 though the default behavior remains the same as it always has.
 
 \mylittlespace This \mymarginpar{\texttt{strict}} still-experimental
-option attempts to follow the \emph{Manual}'s recommendations (14.36)
+option attempts to follow the \emph{Manual}'s recommendations (14.41)
 for formatting footnotes on the page, using no rule between them and
 the main text unless there is a run-on note, in which case a short
 rule intervenes to emphasize this continuation.  I haven't tested this
@@ -5647,6 +6981,16 @@ 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 In \colmarginpar{\texttt{useibid}} a change to previous
+recommendations, the 17th edition of the \emph{Manual}
+\enquote{discourages the use of \emph{ibid.,}}\ preferring instead a
+shortened reference with only the author's name (14.34).
+\textsf{Biblatex-chicago} now implements these recommendations by
+default, including the repetition of page references even when they're
+exactly the same as the previous note.  If you prefer to continue
+using \emph{ibid.}, then set \mycolor{\texttt{useibid=true}} in your
+document preamble and you'll get the traditional behavior.
+
 \mylittlespace Stefan \mymarginpar{\texttt{xrefurl}} Björk pointed
 out that when, using the \texttt{longcrossref} or
 \texttt{booklongxref} options, you turn on the automatic abbreviation
@@ -5658,6 +7002,851 @@ Setting this option to \textsf{true} either in the preamble or in
 individual entries will allow the \textsf{url}, \textsf{doi}, or
 \textsf{eprint} field to appear even in these abbreviated references.
 
+\subsubsection{Back References: The \mycolor{\texttt{noteref}} Option}
+\label{sec:noteref}
+
+\textsf{Biblatex} has always provided the \texttt{backref} option,
+which prints, in the bibliography, those pages on which individual
+works have been cited.  The \emph{Manual} (14.31) recommends another,
+related system, which involves, at the end of short notes,
+cross-referen\-ces to the note where the reader can find the full,
+long citation of the same source, \enquote{especially in the absence
+  of a full bibliography.}  The general idea is that, where a short
+note is \enquote{far} from the long citation, a back reference to that
+long note may prove \enquote{helpful.}  The recommended format is
+something like this: \texttt{(see chap.\ 1, n.\ 4)}.  The previous
+release of \textsf{biblatex-chicago} provided something similar only
+for certain subsets of material from the \emph{Bluebook} guidelines
+for legal citations.  That provision is very basic and has a different
+rationale, so it remains both unaltered and entirely separate.  With
+this release, in the notes \&\ bibliography style only, I have
+provided Chicago-style back references for all other entry types,
+enabled through the new \mycolor{\texttt{noteref}} preamble option.
+(Cf.\ \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}
+for a brief introduction.)
+
+\mylittlespace Before embarking on a description of this new option,
+and its many sub-options, I would like to point out that
+\textsf{biblatex} provides a number of mechanisms designed to help
+readers navigate long documents.  I have made many improvements to the
+\textsf{biblatex-chicago hyperref} interface, so electronic documents
+can, at your discretion, contain clickable links from short notes to
+long notes or, in a document with all short notes, from such notes to
+bibliography entries.  (The \mycolor{\textsf{noteref}} mechanism
+cooperates well with \textsf{hyperref}, and therefore can add another
+layer of links to those already available.)  \textsf{Biblatex} also
+offers the \texttt{refsection} and \texttt{citereset} preamble
+options, which allow you to choose how its citation trackers behave.
+Using these you can, for example, always have a long note appear for a
+given source at its first appearance in a chapter or a section,
+something which the \emph{Manual} recommends in any case, and which
+may mean that your short notes are never too \enquote{far} from a
+longer citation.  (See \textsf{biblatex.pdf, \S~3.1.2.1}.)
+
+\mylittlespace All \colmarginpar{\texttt{noteref}} the same, sometimes
+chapters or sections can get rather long, or a too-frequent
+reappearance of the long form may not be optimal for your work, so in
+such situations the \texttt{noteref} option may well prove useful.
+Its general principle is this: if a short note appears on the same
+page as its corresponding long note, or on the same double-page spread
+for \texttt{twoside} mode, then nothing will appear.  Similarly, if a
+short note appears on the same page or double-page spread as a
+previous short citation of the same source which \emph{does} have a
+\texttt{noteref}, then this subsequent short citation will once again
+\emph{not} present any \texttt{noteref}.  (This behavior is
+configurable --- please see below.)  If a back reference is to be
+printed, then the value of the \texttt{noteref} option determines what
+it will look like.  Its six possible values are:
+
+{\renewcommand{\descriptionlabel}[1]{\qquad\mycolor{\texttt{#1}}}
+\begin{description}
+\item[none:] This is the default, and will always produce a back
+  reference like this: (see n.~1).  It may well be useful when you are
+  using the \texttt{citereset} or \texttt{refsection} options and know
+  that any short note will always be in the same chapter or section of
+  the text as the full reference to which it points.
+\item[page:] This will always produce a back reference like this: (see
+  p.\ 1, n.\ 1).  It can be a tidy way of directing the reader, as
+  page numbers are usually simpler to track than sections or chapters.
+  It's also a good setting if you've set the \LaTeX\ \texttt{secnumdepth}
+  counter so that sections aren't numbered.
+\item[chapter:] This is the example provided by the \emph{Manual}, and
+  as implemented here it produces two different sorts of back
+  reference.  If the short note is in the \emph{same} chapter as the
+  long note to which it points, then by default it will only mention
+  the note number, as with the \texttt{none} switch, above.  If the
+  long reference is in a different chapter, then it prints like so:
+  (see chap.\ 1, n.\ 4).  All of the options that name an organizing
+  division of the text work the same way in footnotes, i.e., only when
+  the short note and the long note to which it refers are in different
+  \texttt{parts, chapters, sections, or subsections} will the actual
+  division type appear in the \texttt{noteref}.  If you want the
+  longer form in \emph{all} of your \texttt{noterefs}, you can set
+  \colmarginpar{\texttt{fullnoterefs}} the \textsf{biblatex-chicago}
+  option \mycolor{\texttt{fullnoterefs}} to \texttt{true} when loading
+  the package.  In endnotes, depending on which options you've chosen
+  for presenting them, you may well never get the short version of the
+  back reference.  Please see the details starting on
+  page~\pageref{sec:endnoterefs}, below.
+\item[section:] This key is particularly intended for documents, like
+  the standard \LaTeX\ \textsf{article} class, which don't offer
+  chapters, but rather start their divisions at the section level, but
+  it's perfectly usable even in a document that also uses chapters.
+  Assuming the short note and its long antecedent are in different
+  sections, the \texttt{noteref} will look like so: w/o chapter (see
+  \S~2, n.\ 6), w/\ chapter (see \S~1.2, n.\ 6).
+\item[subsection:] I'm not sure there's any need for this key, but I
+  include it for the sake of completeness.  It's usable in documents
+  both with and without chapter divisions, and assuming the short note
+  and its long antecedent are in different subsections the
+  \textsf{noteref} will look like so: w/o chapter (see \S~3.2, n.\ 5),
+  w/\ chapter (see \S~2.3.2, n.\ 5).
+\item[part:] This is, I suspect, even less likely to be useful than
+  \texttt{subsection}, but assuming the short note and its long
+  antecedent are in different parts the back reference will look like
+  so: (see pt.\ I, n.\ 4).  You'll need to be careful that note
+  numbering is continuous across chapters for this to work correctly,
+  otherwise the plain note number might well be ambiguous.  Also, if
+  you'd like the part number not to be roman, you can try putting this
+  in your preamble: \verb+\let\cmsnrpart\relax+.
+\end{description}}
+
+Several comments are in order, before moving on to the onerous
+details.  In case it's not already clear, the \texttt{noteref} option
+is only relevant if your document includes full notes, that is, if you
+aren't using the \texttt{short} option.  Even in documents that use
+long notes, it can occasionally happen that the \texttt{noteref} code
+won't be able to find a full citation of a particular source.  In this
+case, no back reference will appear, and you will find a warning in
+your\ .log file informing you about it.  (If you combine
+\texttt{short} and \texttt{noteref}, you'll see a lot of such
+warnings.)  It can happen that even the first citation of a particular
+source appears in a somewhat abbreviated form, as when multiple
+contributions to the same \textsf{collection} are present in your
+reference apparatus.  The \texttt{noteref} will point to this
+abbreviated first citation all the same, given that it is at least
+somewhat more informative than a short note.  Similarly, a
+\texttt{noteref} from a \textsf{collection} may well point to the long
+citation of an essay from that collection, as that long citation will
+contain all the details of the collection, too.  I hope this doesn't
+prove too surprising.  I should also clarify that all of the strings
+in the \texttt{noterefs} as printed above are localized, so should
+adapt to your document language reasonably smoothly, if not entirely
+idiomatically.  Finally, the code assumes that the standard \LaTeX\
+counters for parts, chapters, and sections are available, which I
+believe is almost universally the case even for classes and styles
+that redefine a lot of the relevant functionality, but I confess I
+haven't tested \texttt{noteref} at all extensively against the
+possibilities offered by CTAN, so please do let me know if something
+breaks for you.
+
+\mylittlespace I \colmarginpar{\texttt{noterefinterval}} mentioned
+above that the gap between appearances of a \texttt{noteref} for a
+given source was configurable.  What I had in mind was this option,
+along with four new citation commands which I discuss below.  The
+\mycolor{\texttt{noterefinterval}} preamble option allows you to
+define the number of references that must have intervened since the
+last \texttt{noteref} before another to the same source will appear.
+If you judge that your readers don't need a pointer on every new page
+but only after a certain number of other citations have passed, you
+can set this to a number higher than zero (the default).  You can't,
+currently, use this mechanism to make new pointers appear on the same
+page as previous ones, but you can spread them out if they appear
+too frequently for your tastes.  Also, the counter that this option
+uses is \texttt{instcount}, which will be incremented not only by new
+references but also, e.g., by uses of the \textsf{related}
+functionality to extract data from other entries.  A value of
+\texttt{15} may not delay a reappearance for exactly that many notes,
+so you will need to experiment a little to find a value that suits
+your document.
+
+\mylittlespace If \colmarginpar{\cmd{shortrefcite}\\
+  \cmd{shorthand-}\\\texttt{refcite}\\ \cmd{shortcite*}\\
+  \cmd{shorthandcite*}} you require more fine-grained control over the
+spacing between \texttt{noterefs}, or indeed if you want them to
+appear more frequently than the previous mechanisms allow, then these
+new citation commands will allow you to do so, though perhaps without
+maximum convenience.  The first two commands present, respectively,
+short notes and \textsf{shorthand} notes where the \texttt{noteref}
+will absolutely be printed (unless, of course, no full citation can be
+found).  The second two commands prevent the printing of the
+\texttt{noteref}, no matter where the resulting note appears.  All of
+them will need enclosing in a \cmd{footnote} command if you want them
+to appear in one, as I've provided only the most general form of each.
+I suppose, finally, that it would be safest to introduce these
+commands into your documents at quite a late stage in their
+preparation.
+
+\subsubsection*{Zero Sections}
+\label{sec:zero}
+
+The \LaTeX\ sectioning counters all start from zero, so if you put a
+note into material occurring \emph{before} the first \cmd{part},
+\cmd{chapter}, \cmd{section}, or \cmd{subsection} command then any
+back reference to this citation will, by default, present that zero
+(or zeros).  This may, in fact, be exactly what you want, in which
+case you can ignore the following options.  If you don't want a zero
+to appear in your \texttt{noterefs}, you can either make sure no
+citations occur in contexts that will produce them, or you can use a
+combination of the next three options to hide them.
+
+\mylittlespace This \colmarginpar{\texttt{noterefintro}} option is
+special in that it handles only zeros that occur in the \emph{first}
+position in a sectioning identifier, e.g., \S~0.x.x or chap.~0.  It's
+possible that this zero represents some sort of introductory material
+before, e.g., the numbered chapters appear.  If you say
+\texttt{noterefintro=introduction}, then instead of (see chap.~0,
+n.~1), you'll have (see intro., n.~1).  If the value of the option is
+a \cmd{bibstring} known to \textsf{biblatex}, then it will appear in
+localized, and possibly abbreviated, form, as above.  If the section
+title you want isn't a known \cmd{bibstring}, you can either define a
+new one for your language in your preamble, or you can just set the
+option to whatever it is you want to appear in such \texttt{noterefs}.
+Both will work, particularly because you don't need to worry too much
+about capitalization because the word always appears after the
+\verb+\bibstring{see}+.
+
+\enlargethispage{\baselineskip}
+
+\mylittlespace Now, it's perfectly possible for an introduction to
+have numbered sections of its own, so a citation there may produce a
+back reference like \S~0.1 or \S~0.1.0.  The rules are: 1.\ any back
+reference which is all zeros will just print the \texttt{noterefintro}
+string alone, assuming you've provided one; 2.\ any back reference that
+has the zero \emph{only} in the first place will print something like
+(see intro., \S~1, n.~1); 3.\ a back reference of the form 0.x.0 or
+0.0.x --- this can only occur if \texttt{noteref=subsection} and the
+document class provides a \cmd{chapter} command --- such a reference
+will either print the zero after the \texttt{noterefintro} string, or
+you can use the \texttt{pagezeros} option, to which I turn.
+
+\mylittlespace This \colmarginpar{\texttt{pagezeros}} boolean option
+deals with the problem of zero sections by changing such
+back references, and only such back references, to behave as though
+\texttt{noteref=page}.  In the absence of a \textsf{noterefintro}
+\emph{all} such zero citations will be so treated, but if both options
+are set then zero sections with the zero in the first position of the
+identifier will fall first under the jurisdiction of the
+\texttt{noterefintro} option, only then turning to \texttt{pagezeros}
+if there's a zero remaining that hasn't yet been eliminated by the
+first option's rules.  Some examples:
+\begin{verse}
+  \textbf{Without noterefintro:}\\
+  Any zero ---> (see p.~3, n.~1)\\
+  No zero ---> (see \S~1.2.3, n.~1)
+
+  \textbf{With noterefintro:}\\
+  1.2.3 ---> (see \S~1.2.3, n.~1)\\
+  0.0.0 ---> (see intro., n.~1)\\
+  1.1.0 ---> (see p.~24, n.1)\\
+  0.1.0 ---> (see intro., p.~2, n.~1)
+\end{verse}
+
+As you see, this produces a mixed system of back references, so you'll
+need to decide whether you and your readers might still find it
+acceptable.
+
+\mylittlespace This \colmarginpar{\texttt{hidezeros}} boolean option
+attempts, with varying degrees of success, to disguise the zeros in
+section identifiers without mixing different sorts of back reference
+in one document.  Unlike \texttt{pagezeros}, it will never modify
+identifiers where the first number is zero.  It leaves all such
+identifiers to the \texttt{noterefintro} option, so if your identifier
+looks like 0.1.0, the second zero will still appear.  The only thing
+you can do about it is to move the citation so that it isn't in a zero
+section.  The rationale is that \texttt{hidezeros} places a string ---
+by default \enquote{pref.} --- \emph{inside} the section identifier so
+that a reader knows that the citation occurred in the prefatory
+material to a particular section.  Combining this with another string
+for the prefatory material to a whole work is unattractive, and I've
+avoided it.  Here are some examples of how it looks:
+\begin{verse}
+  1.1.1 ---> (see \S~1.1.1, n.~1)\\
+  1.0.1 ---> (see \S~1.pref.1, n.~1); should this even be possible?\\
+  1.1.0 ---> (see \S~1.1.1 [pref.], n.~1)\\
+  1.0.0 ---> (see \S~1.1 [pref.], n.~1)\\
+  1.0 ---> (see \S~1.1 [pref.], n.~1)
+\end{verse}
+
+The \colmarginpar{\cmd{cmspref}} brackets and placement of the
+identifying string are hard coded, but you can change the string
+itself with a line something like this in your preamble:\\
+\verb+\renewrobustcmd{\cmspref}{\emph{pref.\@}}+ <--- \textbf{NB} the
+\verb+\@+
+after the dot\\
+The \texttt{hidezeros} method at least produces more uniform back
+references, though it perhaps sacrifices something in immediate
+readability in order to do so.  I would be glad to entertain
+suggestions for other solutions.
+
+\mylittlespace If your documentation uses footnotes, then the guide to
+the \texttt{noteref} option(s) concludes here.  I have, however, been
+determined, at least in this context, to provide for endnote users the
+same features as for footnote users, mainly because the \emph{Manual}
+caters equally to both.  Unfortunately, because footnotes are a core
+part of \LaTeX\ formats and endnotes are provided by means of extra
+packages, users of the latter will face some additional complications
+if they wish to provide Chicago-style back references.  I document
+these forthwith.
+
+\subsubsection*{Endnotes and \mycolor{\texttt{noteref}}}
+\label{sec:endnoterefs}
+
+The traditional way to provide endnotes instead of footnotes in a
+document is to use the \textsf{endnotes} package by John Lavagnino,
+and \textsf{biblatex} provides a reliable interface to that package,
+making it relatively simple to use and control (cf.\ esp.\ the
+\texttt{notetype} option in \textsf{biblatex.pdf, \S~3.1.2.1}).  The
+package does have its limitations --- on which see more below --- so I
+did have a look at its next-generation replacement, Clemens
+Niederberger's \textsf{enotez}.  This adds all the needed
+functionality, I think, and is also more future proof, relying as it
+does on the work of the \LaTeX 3 project.  The downside is that my
+\TeX nical abilities fell short of being able to make it work with the
+\mycolor{\texttt{noteref}} option, so I have instead created a new
+package \colmarginpar{\small\texttt{\textbf{cmsendnotes.sty}}} which
+combines functionality from \textsf{endnotes}, from Ulrich Dirr's
+\textsf{hyperendnotes}, and from \textsf{biblatex-chicago}.  If you
+need some functionality that \textsf{endnotes} doesn't provide, then
+you can load \mycolor{\textsf{cmsendnotes}} instead.  (I haven't
+tested any of this with the \textsf{memoir} class, which has its own
+endnote mechanism, so please let me know if it doesn't work and I'll
+try to have a look.)  The documentation that follows should clarify
+when you might want to load the new package, and also the options
+available to get \textsf{cmsendnotes} to do what you want.
+
+\mylittlespace Before we begin, I should just point out that, as usual
+with \textsf{biblatex}, you can mix foot- and endnotes in the same
+document, but if \texttt{noterefs} are going to appear in both sorts
+of note --- surely this situation is highly unlikely --- then you need
+to be careful that they refer back \emph{only} to long references in
+the \emph{same} sort of note.  A \texttt{noteref} from an endnote to a
+long citation in a footnote will be inaccurate, and vice versa, so
+careful use of the \cmd{citereset} command (as in
+\href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}) or
+perhaps of the \textsf{biblatex} \texttt{citereset} option should
+allow you to keep the two sorts of note distinct.
+
+\mylittlespace The principle to keep in mind is that back references
+to full endnotes point not to the place in the main text where you've
+cited a source, but rather to the place where that citation is
+actually printed, which may well be in another division of your
+document altogether.  If you are providing endnotes at the end of each
+chapter, or (less likely) at the end of each section of a long
+article, then this means that an endnote to a later chapter or section
+will point to the earlier chapter or section after which the full
+citation was printed.  This interacts very well with the
+\textsf{endnotes} package's \cmd{theendnotes} command, which prints,
+and then clears, all the endnotes created up to the point at which you
+call it.  Subsequent calls to \cmd{theendnotes} do the same, and short
+notes will always have a reasonably accurate sense of where their
+antecedent long note has appeared, i.e., in the endnotes to a
+particular chapter or section.  (This even has the side effect of
+making the zero section problem somewhat more tractable, as the back
+reference doesn't mind that the \cmd{endnote} command occurs in
+section 1.0, but rather that the citation appears in the notes to
+section 1.1.)
+
+\mylittlespace Similarly, if your endnotes appear all together at the
+end of an article, then you can just use the \texttt{page} option to
+\texttt{noteref}, or no option at all, and the back references will be
+both accurate and usable (assuming the notes are all numbered
+consecutively, I suppose, which seems a safe assumption).  The upshot
+is that, if you are providing endnotes in either of these scenarios,
+both of them envisaged by the \emph{Manual} (14.46), and \emph{either}
+if you don't need the \textsf{hyperref} functionality, \emph{or} if
+the somewhat restricted functionality available through the
+\textsf{endnotes} package is good enough, then you can happily ignore
+the new \textsf{cmsendnotes} package entirely.
+
+\mylittlespace If back references are, in the scenarios discussed
+above, basically working for you, but you want more elaborate
+\textsf{hyperref} functionality, then you can load the
+\textsf{cmsendnotes} package without any options instead of the
+\textsf{endnotes} package.  Please be aware, however, that
+\mymarginpar{\small\textbf{NB}} you must load \textsf{cmsendnotes}
+\emph{after} \textsf{biblatex-chicago} for it to work properly.  What
+you'll then get by default, assuming you've loaded \textsf{hyperref},
+are links from endnote numbers in the main text to the corresponding
+numbers in the endnotes section itself, and vice versa, along with
+more accurate links from the back references to particular endnotes in
+preceding sections or chapters.  There are several options available
+for changing the default appearance of your endnotes, four of which
+are package options to \textsf{cmsendnotes} and two of which are
+commands that you can redefine to your liking.
+
+\mylittlespace Two \colmarginpar{\texttt{hyper}} package options
+control the \textsf{hyperref} behavior of endnote numbers.  They are
+both set to \texttt{true} by default, if the \textsf{hyperref} package
+is loaded.  If you set the first, \texttt{hyper}, to \textsf{false}
+when loading \textsf{cmsendnotes}, there will be no hyperlinking of
+endnote numbers at all.  If you \colmarginpar{\texttt{enotelinks}} set
+the second, \texttt{enotelinks}, which I've borrowed from
+\textsf{hyperendnotes.sty}, to \texttt{false}, then only endnote
+numbers in the main text will function as links, the numbers in the
+endnote sections themselves ceasing to act as such.
+
+\mylittlespace This \colmarginpar{\texttt{noheader}} package option,
+if set to \texttt{true}, stops the printing of the usual section
+header before the endnotes themselves, in case this might help to
+solve some formatting problems in your documents.
+
+\mylittlespace This \mymarginpar{\cmd{enoteheading}} is the standard
+\textsf{endnotes} package command for defining exactly what is printed
+in the heading.  I have slightly redefined it (for reasons I shall
+explain later), but you can redefine it in your preamble if you wish,
+and that will be respected by \textsf{cmsendnotes}.
+
+\mylittlespace This \colmarginpar{\texttt{blocknotes}} package option,
+if set to \texttt{true}, presents the text of each endnote as a
+flush-left block, i.e., without the first line being indented.
+
+\mylittlespace This \colmarginpar{\cmd{enoteskip}} command, which was
+inspired by a similar provision in \textsf{hyperendnotes.sty}, sets
+the vertical space between individual endnotes.  By default it doesn't
+change basic interline space, but you can define it in your preamble
+to something like \cmd{smallskip} or \cmd{medskip} in case you want a
+bit more light inside your endnote sections.
+
+\mylittlespace So far, then, I have discussed contexts where
+\textsf{cmsendnotes.sty} only brings cosmetic changes to functionality
+which basically already works using \textsf{endnotes.sty}.  Indeed, if
+you are using either of these packages in the ways already outlined,
+then the setting of the main \mycolor{\texttt{noteref}} option defines
+how your back references will look, and
+\colmarginpar{\texttt{fullnoterefs}} the
+\mycolor{\texttt{fullnoterefs}} option will still govern the
+\mycolor{\texttt{chapter}}, \mycolor{\texttt{section}},
+\mycolor{\texttt{subsection}}, and \mycolor{\texttt{part}} values of
+the \texttt{noteref} option, just as in the general discussion above.
+In the methods discussed below, additional steps are required for
+defining how your back references will look, and the
+\texttt{fullnoterefs} option is irrelevant, as the back references
+will always appear in their fullest form.
+
+\mylittlespace The methods of endnote presentation to which I now turn
+involve, in the \emph{Manual's} words, when notes to \enquote{each
+  chapter of a book are \ldots\ grouped in the end matter} (14.46).
+Here, you would want not only a main heading for the endnotes section
+but also \enquote{a subhead bearing the chapter number or title or
+  both.}  It is perfectly possible to achieve the subdivision and
+subheading of a long endnotes section by using \textsf{endnote's}
+\cmd{addtoendnotes} command in each chapter of your document, putting
+a sectioning command of some sort in its argument, for example.  Using
+\texttt{noteref} back references in this context can be a little
+complicated, however, mainly because of the principle I explained
+above, i.e., that back references point to the place where the long
+note was printed, not to the section of the main document where the
+source was actually cited.  For our purposes, this means that, unless
+you have set \texttt{noteref} to \texttt{page} or \texttt{none},
+\textsf{biblatex-chicago} actually has to extract data from the
+sectioning command you've included in \cmd{addtoendnotes} and, most
+frequently, modify that data to make it work inside a \texttt{noteref}
+back reference in way that is both consistent and useful.  The
+\textsf{cmsendnotes} package tries to automate this process as much as
+possible so that with, in the best-case scenario, only one option
+given to the package the whole system can be made to work without
+further user intervention.  Further package options can help with
+slightly more complicated scenarios, but if your requirements are more
+complex than the automatic system can provide, then there are two ways
+to handcraft a divided endnote section: one uses traditional
+\cmd{addtoendnotes} functionality from the \textsf{endnotes} package,
+and the other uses new commands available from \textsf{cmsendnotes}.
+I believe the second handcrafted option to be slightly more convenient
+than the first, but in any case I'll start by explaining the automatic
+provisions, then move on to the two handcrafted options, leaving you
+to judge which seems best suited to your needs.
+
+\enlargethispage{-\baselineskip}
+
+\mylittlespace For \colmarginpar{\texttt{\textbf{split}}} the
+automatic subdivision of an endnotes section I have borrowed a
+concept, if not its implementation, from \textsf{enotez}, and provided
+the \textsf{cmsendnotes} option \mycolor{\texttt{split}}, which has 4
+possible values: \texttt{part}, \texttt{chapter}, \texttt{section} and
+\texttt{subsection}.  (If you don't provide a key, it defaults to
+\texttt{chapter}.)  With this option set, you need to use a new
+command for printing the endnotes, the ungainly
+\colmarginpar{\cmd{\textbf{theendnotes\-bypart}}} but I hope memorable
+\mycolor{\cmd{theendnotesbypart}}.  When you do this,
+\textsf{cmsendnotes} does something in the background that's worth
+understanding.  Ordinarily, in the standard \textsf{endnotes} package,
+any call to \cmd{theendnotes} produces an\ .ent file containing all of
+the endnote data in the document up to that point, and proceeds to
+print it.  Another call to \cmd{theendnotes} gathers the endnote data
+occurring between it and the first call, overwriting the\ .ent file,
+and again printing it, and so on.  Whenever you use any version of
+\cmd{theendnotesbypart}, \textsf{cmsendnotes} will write one\ .ent
+file per section named by the \texttt{split} option, assuming that
+said section actually contains any endnotes.  The plain
+\cmd{theendnotesbypart} command, with no further options, proceeds to
+print, in sequence, \emph{all} the\ .ent files in numerical order.  In
+the first instance, then, the value of the \texttt{split} option
+decides how your endnotes are distributed to different\ .ent files.
+These files are named after the main document suffixed with the number
+of the section, e.g., \textsf{jobname1.ent} for chapters or
+\textsf{jobname1.3.ent} for sections.
+
+\mylittlespace In the second instance, the \texttt{split} option
+governs what the subheaders of your endnotes section will contain.
+The main header is produced by a \cmd{section*} command, and by
+default it will read \texttt{\textbf{Notes}}.  The subheaders are
+produced by \cmd{subsection*} commands, and will take their name from
+the \textsf{split} option and their number from the number of the\
+.ent file currently being processed: \texttt{\textbf{Chapter 1}}
+\ldots\ \texttt{\textbf{Chapter 2}}.  The headers are localized,
+assuming you're using a language supported by
+\textsf{biblatex-chicago}.  Even if you're not using \texttt{noteref}
+back references in your document, this mechanism can still provide a
+convenient means of subdividing an endnotes section.
+
+\mylittlespace If you are using \textsf{noteref}, then the value of
+that option leads to two possible outcomes.  If set to \texttt{page}
+or \texttt{none}, any back references will point to full notes by page
+plus note number or just by note number, as usual, bearing in mind
+that the page involved is where the full note was printed, not where
+it was cited in the main body of the text.  If set to any of the other
+possible sections of your document, then the \texttt{split} option has
+a third function, which is to provide the (localized) string for the
+back reference itself --- (see chap.~1, n.~2) --- which will refer to
+a subsection of the endnotes section named \texttt{\textbf{Chapter~1}}
+rather than to the actual first chapter of the main document.  This
+setup will usually involve setting \texttt{split} to the same value as
+the \texttt{noteref} option itself, but if they differ, and
+\texttt{noteref} isn't \texttt{page} or \texttt{none}, then
+\texttt{split} takes precedence and governs the appearance of the back
+reference.
+
+\mylittlespace Let's say, then, that your document is in English and
+you've set the \textsf{biblatex-chicago} option
+\texttt{noteref=chapter}, and the \textsf{cmsendnotes} option
+\texttt{split}, then what you can expect to see, when you use
+\cmd{theendnotesbypart}, is something like this, subject to the usual
+rules for the appearance or non-appearance of \texttt{noterefs}, and
+remembering that in this context, as noted above, all
+\texttt{noterefs} will appear in their long form:
+\begin{verse}
+  \textbf{Notes}\\
+
+  \textbf{Chapter~1}\\
+  1. Book.\\
+  2. Article.\\
+  3. InCollection.\\
+
+  \textbf{Chapter~2}\\
+  1. InCollection (see chap.~1, n.~3).\\
+  2. BookInBook.\\
+  3. Article (see chap.~1, n.~2).\\
+
+  \textbf{Chapter~3}\\
+  1. BookInBook (see chap.~2, n.~2).\\
+  2. Book (see chap.~1, n.~1).
+\end{verse}
+
+It won't, unfortunately, always be this simple, but it may be a
+comfort to know that some of the complications are the same as those
+faced by users of \texttt{noteref} with footnotes, in particular
+\mymarginpar{\textbf{Zero Sections}} the zero section problem.  To
+deal with this issue you use the same options to
+\textsf{biblatex-chicago} as you would for footnotes, with one
+difference.  In the case of split endnotes, the code has to handle the
+zeros both in the \cmd{subsection*} names \emph{and} in the back
+references, which means that the \texttt{pagezeros} option is no
+longer relevant, as it can't do the right thing in section names.
+This leaves the \texttt{noterefintro} option for hiding zeros that
+start a section number, and the \texttt{hidezeros} option for zeros
+anywhere else.  These \textsf{biblatex-chicago} options work here just
+as described in the footnote section above, but with one or two
+additional caveats.
+
+\mylittlespace First, I probably shouldn't have bothered trying to
+implement the combination of \texttt{note\-refintro} and
+\texttt{hidezeros}, as any sections of a zero chapter in your document
+will appear by default with zeros intact in the text itself, unless
+measures are taken.  I did \colmarginpar{\cmd{cmsintrosec\-tion}} do
+this thing, however, and part of the implementation is a command
+\mycolor{\cmd{cmsintrosection}}, which provides the identifying string
+for subsections of the introduction.  It is set by default to \S, and
+though you can redefine it in your preamble, please remember that it
+will appear as such in both \cmd{subsection*} names and
+\texttt{noterefs}.
+
+\mylittlespace Indeed, it is the need to cater for two quite distinct
+contexts that makes the automatic provision of \textsf{noteref} back
+references in a divided endnotes section surprisingly tricky.  You
+need \colmarginpar{\cmd{introduction\-name}\\\cmd{forewordname}\\
+  \cmd{sectionname}\\ \cmd{subsection\-name}} one mechanism to take
+\texttt{chapter} and turn it into Chapter, and quite another to turn
+it into chap., bearing in mind that \cmd{bibstrings} don't work
+outside of the reference apparatus, and therefore not in
+\cmd{subsection*} names, though obviously they're perfect for the back
+references themselves.  My solution is to borrow a principle from
+\textsf{babel}, which provides for its languages commands like
+\cmd{prefacename} and \cmd{chaptername}, which print the localized
+version of the term, usually capitalized.  In the\ .lbx files that
+come with \textsf{biblatex-chicago} I have added
+\cmd{introductionname} and \cmd{forewordname}, along with
+\cmd{sectionname} and \cmd{subsectionname}, so at least the most
+common types of prefatory material, when provided to the
+\texttt{noterefintro} option, should work properly both in headings
+and in \texttt{noterefs}, and across languages.
+
+\mylittlespace So, another caveat.  Should you wish to provide a
+\texttt{noterefintro} value that isn't a standard \cmd{bibstring} or
+doesn't have a corresponding \cmd{[value]name} command, then it may
+not work well for you in one or other of the two contexts in which it
+can appear.  The code does test whether the bibstring and command
+exist, and it will capitalize anything in section headers, but
+otherwise you can just cunningly craft a string that's good in both
+contexts or you can define a \cmd{[value]name} command and a new
+\cmd{bibstring} for the value in your language, both in your preamble.
+
+\mylittlespace The \colmarginpar{\texttt{subheadername}} same caveat
+applies if you want to supply your own name for the \cmd{subsection*}
+commands that divide up the general endnotes \cmd{section*}.  Let's
+say for some reason you want subsections called \textbf{Further
+  Remarks} instead of \textbf{Chapter}.  Strings of more than one word
+are difficult for the code to manage correctly, so instead you could
+include in your preamble lines looking approximately like this:
+\begin{verbatim}
+  \NewBibliographyString{furthrem}
+  \DefineBibliographyStrings{american}%
+       {furthrem = {furth\adddotspace rem\adddot},}
+  \def\furthremname{Further Remarks}
+\end{verbatim}
+
+Then you could set \texttt{subheadername=furthrem} in the options to
+\textsf{cmsendnotes} and you'll get what you want.  It's not wildly
+convenient, but it's slightly less typing than the handcrafted options
+I discuss below, though for anything more complicated you'll probably
+need those options.
+
+\mylittlespace Before \colmarginpar{\texttt{headername}} I move on to
+the handcrafted methods, I should point out two more
+\textsf{cmsendnotes} options.  The first,
+\mycolor{\texttt{headername}}, sets the name of the main
+\cmd{section*} command at the start of the endnotes section.  It
+defaults to the usual \textsf{endnotes} package command
+\cmd{notesname}, which gives \textbf{Notes} in English.  I have kept
+this separate from the standard \cmd{enoteheading} because it needs
+slightly different treatment in a divided endnotes section.  If the
+definitions I have provided of \cmd{notesname} in the\ .lbx files that
+come with \textsf{biblatex-chicago} aren't to your liking, you can
+provide a string here instead, which is simpler to do because it
+shouldn't be turning up in any \texttt{noterefs}.  If you'd like to
+redefine any of the \cmd{*name} commands, the best place to do so is
+very near to where you actually print the endnotes, where it can
+override the definitions in the\ .lbx files (or in \textsf{babel's}
+files).  Remember, too, that you can use the
+\mycolor{\texttt{noheader}} option to turn off the printing of this
+header if you just want to provide your own sectioning command
+instead.
+
+\mylittlespace This \colmarginpar{\texttt{runningname}}
+\textsf{cmsendnotes} option controls the text that appears in running
+headers in the endnotes section of your document, should you be
+providing them.  I have followed the style of the \textsf{endnotes}
+package, so that the default reads something like: \emph{NOTES TO
+  CHAPTER 1}.  The section name and number are controlled by the other
+options already discussed, but the \enquote{Notes to} part is
+controlled by \mycolor{\texttt{runningname}}, so if your document
+isn't in English, and/or you're unhappy with the default string, you
+can change it when loading \textsf{cmsendnotes}.
+
+\mylittlespace Should \colmarginpar{\texttt{\textbf{endnotesplit}}}
+the options above not fulfil your needs, you can control more or less
+all parts of the subdivision of your endnotes section, of the running
+headers there, and of back references from short notes to full ones,
+by providing your own sectioning commands in your document.  If you
+wish to use \texttt{noteref} back references in this context, you
+\mymarginpar{\textbf{NB}} must first set the \textsf{biblatex-chicago}
+option \mycolor{\texttt{endnotesplit}} to \texttt{true}, no matter
+which of the two possible implementation methods you choose.  With the
+standard \textsf{endnotes} package you would then use the command
+\cmd{addtoendnotes}, while with \textsf{cmsendnotes} it involves
+variants of the endnote-printing command \cmd{theendnotesbypart}.
+(Please note, first, that \cmd{addtoendnotes} still works with
+\texttt{cmsendnotes}, in case that's useful to you; and second, that
+with any other endnote implementation, you'll have to consult its
+documentation to see if there's a compatible means of dividing the
+notes.)
+
+\mylittlespace First, \mymarginpar{Handcrafting
+  w/\\\texttt{cmsendnotes}} I introduce the methods provided by
+\textsf{cmsendnotes}.  The command \cmd{theendnotesbypart} has three
+variants.  The first, \mycolor{\cmd{theendnotesbypart*}}, simply
+suppresses the printing of the \texttt{headername}, so it works more
+or less like setting \texttt{noheader} in the options to
+\textsf{cmsendnotes}.  The other two involve an optional argument,
+\colmarginpar{\cmd{theendnotes\-bypart[]}} in square brackets,
+containing an individual section number, which prints the endnotes
+from that section.  This command never prints the general endnote
+section header (as controlled by the \texttt{headername} option), but
+it will print the individual
+\colmarginpar{\cmd{theendnotes\-bypart*[]}} section's subheader, as
+controlled by the \texttt{subheadername} option.  To turn that
+printing off you can either use the starred version of the command,
+i.e., \mycolor{\cmd{theendnotesbypart*[]}}, or you can set the
+\textsf{cmsendnotes} option \colmarginpar{\texttt{nosubheader}}
+\mycolor{\texttt{nosubheader}} to \texttt{true}.  A sequence of
+commands, each with one section of the document inside square
+brackets, will give you a complete endnotes section wherever you
+decide to place it, while the starred forms or \texttt{nosubheader}
+option allow you to create your own subheaders before each subsection.
+
+\mylittlespace First, \mymarginpar{\textbf{NB}} please note that what
+you need to place inside the square brackets is the \emph{number that
+  forms part of the name of the\ .ent file in your working directory.}
+In other words, it's the number \emph{before} any manipulations by the
+\textsf{cmsendnotes} package remove zeros from it.  Depending on the
+setting of your \textsf{split} option your commands may look like:
+
+\begin{verbatim}
+Chapters                             Sections
+\theendnotesbypart*[0]          \theendnotesbypart*[0.0] <-- "introname"
+\theendnotesbypart*[1]          \theendnotesbypart*[1.1]
+\theendnotesbypart*[2] etc.    \theendnotesbypart*[1.2] etc.
+\end{verbatim}
+
+When in doubt, have a look in your working directory for the\ .ent
+files produced for your document, and use the numbers from there.  (If,
+for some reason, you decide to split by \texttt{part}, you'll probably
+have roman numerals there, for example, apart from the zero.)
+
+\mylittlespace The \mymarginpar{\textbf{Sectioning}} next step is to
+provide some sort of sectioning command for the subheaders and for the
+\texttt{noteref} back references.  This is slightly complicated, but
+works the same whether you're using \textsf{cmsendnotes} or
+\textsf{endnotes}.  The basic principle is that the main name of the
+section appears in the endnotes section, while the optional name
+provided for the table of contents [toc] appears in the
+\texttt{noteref}:
+
+\begin{verbatim}
+\subsubsection[chap. 1]{Chapter 1} --> Chapter 1 ... (see chap. 1, n.1)
+\end{verbatim}
+
+You'll notice that the sectioning command isn't starred, as only
+unstarred commands provide the optional [toc] argument.  (The
+\cmd{addcontentsline} command can also be used with starred forms, but
+keeping the [toc] argument out of the actual table of contents remains
+an issue, so please read on.)  The unusual form of the [toc] argument
+would merely pollute any table of contents you want to provide, and
+the actual header in your endnotes section shouldn't have a number in
+it provided by the standard \LaTeX\ methods, so you'll have to pick a
+section type that falls underneath the thresholds of the \LaTeX\
+counters \texttt{tocdepth} and \texttt{secnumdepth}.  By default, in
+the standard \texttt{book} and \texttt{report} classes,
+\cmd{subsubsection} works for this, while in the \texttt{article}
+class you may need \cmd{paragraph}.  (You could, of course, also
+change the counters, should you wish.)
+
+\mylittlespace So, let's say you want to subdivide your endnotes
+section with subheaders containing both the chapter number and the
+chapter title, as envisaged by the \emph{Manual} (14.46).  Your
+endnotes section might start like this:
+
+\begin{verbatim}
+\section*{Notes}
+\subsubsection[intro.]{Introduction: The History of the Problem}
+\theendnotesbypart*[0]
+\subsubsection[chap. 1]{Chapter 1: Renewing the Question}
+\theendnotesbypart*[1]   (etc.)
+\end{verbatim}
+
+There remain a couple of formatting issues with this code.  The
+\textsf{endnotes} package points out that the first endnote after such
+a sectioning command won't be indented properly, so it and
+\textsf{cmsendnotes} use \verb+\mbox{}\par\vskip-\baselineskip+ after
+sectioning commands to prevent this.  Additionally, both packages
+provide code for running headers using \cmd{@mkboth}, so if you use
+such headers you can either do the same inside \cmd{makeatletter} and
+\cmd{makeatother} commands or just use \cmd{markboth}.  Taking all of
+this into account gives code looking something like this, perhaps:
+
+\begin{verbatim}
+\section*{Notes}
+\subsubsection[intro.]{Introduction: The History of the Problem
+\markboth{NOTES TO INTRODUCTION}%
+      {NOTES TO INTRODUCTION}}%
+\mbox{}\par\vskip-\baselineskip
+\theendnotesbypart*[0]
+\subsubsection[chap. 1]{Chapter 1: Renewing the Question
+\markboth{NOTES TO CHAPTER 1}%
+      {NOTES TO CHAPTER 1}}%
+\mbox{}\par\vskip-\baselineskip
+\theendnotesbypart*[1]   (etc.)
+\end{verbatim}
+
+One of the, perhaps minor, advantages of using the
+\textsf{cmsendnotes} commands for this is that they will at least all
+typically be grouped together in one place in your document, rather
+than scattered throughout, as when you use \textsf{endnotes'}
+\cmd{addtoendnotes} command, to which we now turn.
+
+\mylittlespace To \mymarginpar{Handcrafting w/ \textsf{endnotes}} use
+the \textsf{endnotes} package with its main command \cmd{theendnotes}
+to produce a subdivided endnotes section, you must first remember to
+set the \textsf{biblatex-chicago} option
+\mycolor{\texttt{endnotesplit}} to \texttt{true}, that is, assuming
+you want to provide \texttt{noteref} back references.  For splitting
+the endnotes, you \mymarginpar{\cmd{addtoendnotes}} need the
+\cmd{addtoendnotes} command, which you have to place in your document
+yourself.  Ordinarily, you'll need one such command for each relevant
+division of your text, placed just after the sectioning command
+itself, so that any endnotes that occur in the section will appear
+grouped underneath the heading you provide.  At the next section,
+another such command starts a new subsection of endnotes.
+
+\mylittlespace To provide the same endnotes section divided by chapter
+that we've already discussed above, your commands will look something
+like this:
+
+\begin{verbatim}
+\chapter*{Introduction: The History of the Problem}
+\addcontentsline{toc}{chapter}{Introduction}
+\addtoendnotes{%
+  \protect\subsubsection[intro.]{Introduction: The History of the%
+   Problem%
+    \protect\markboth{NOTES TO INTRODUCTION}%
+    {NOTES TO INTRODUCTION}}%
+   \mbox{}\par\vskip-\baselineskip} ...
+\chapter{Renewing the Question}
+\addtoendnotes{%
+  \protect\subsubsection[chap. 1]{Chapter 1: Renewing the Question%
+    \protect\markboth{NOTES TO CHAPTER 1}%
+    {NOTES TO CHAPTER 1}}%
+   \mbox{}\par\vskip-\baselineskip} ... (etc.)
+\end{verbatim}
+
+The commands you use are the same as with \cmd{theendnotesbypart[]},
+but in this context both the sectioning command \emph{and} the command
+for running headers need to be \cmd{protected}.  I would also
+recommend redefining \cmd{enoteheading} in your preamble, as the
+default definition produces too much extra vertical space before the
+first subheading.  Something like
+\verb+\def\enoteheading{\section*{Notes}}+ will do.  Finally, remember
+that you can use \textsf{cmsendnotes} (without a \texttt{split}
+option) instead of \textsf{endnotes}, if the extra \textsf{hyperref}
+functionality is important to you.  The command sequence above will
+continue to work in the same way.
+
+\mylittlespace There are tradeoffs for both systems.  With
+\textsf{endnotes}, at least the single \cmd{theendnotes} command keeps
+things simple, but you still have to keep track of which sections have
+endnotes in them, else spurious subheaders will appear.  Rooting
+around in your working directory to make sure you've printed all the\
+.ent files is annoying, but at least those represented there will be
+those which contain endnotes in the first place.  Both methods are, I
+think it's fair to say, a fair amount of labor, but they do give you
+complete control over how your endnotes section looks, and over how
+\texttt{noteref} back references within it look.  As with all new
+functionality, \texttt{noteref} and \textsf{cmsendnotes} may well
+contain bugs, so if you find any please let me know, but do please
+also send along a minimum working example so I have a chance to
+identify what's a bug in the code and what's resulted from inadequate
+documentation.
+
 \subsection{General Usage Hints}
 \label{sec:hints}
 
@@ -5672,17 +7861,17 @@ of loading the notes + bibliography style has therefore slightly
 changed.  With early versions of \textsf{bibla\-tex-chicago-notes},
 the standard way of loading the package was via a call to
 \textsf{biblatex}, e.g.:
-\begin{quote}
-  \cmd{usepackage[style=chicago-notes,strict,backend=bibtex8,\%\\
-    babel=other,bibencoding=inputenc]\{biblatex\}}
-\end{quote}
+\begin{verbatim}
+  \usepackage[style=chicago-notes,strict,backend=bibtex8,%
+    babel=other,bibencoding=inputenc]{biblatex}
+\end{verbatim}
 Now, the default way to load the style, and one that will in the
 vast majority of standard cases produce the same results as the old
 invocation, will look like this:
-\begin{quote}
-  \cmd{usepackage[notes,strict,backend=biber,autolang=other,\%\\
-    bibencoding=inputenc]\{biblatex-chicago\}}
-\end{quote}
+\begin{verbatim}
+  \usepackage[notes,strict,backend=biber,autolang=other,%
+    bibencoding=inputenc]{biblatex-chicago}
+\end{verbatim}
 
 (In point of fact, the previous \textsf{biblatex-chicago} loading
 method without the \texttt{notes} option will still work, but only
@@ -5708,15 +7897,16 @@ then you may want to revert to the old style of invocation above.
 You'll lose all the definitions in \textsf{biblatex-chicago.sty},
 including those to which I've already alluded and also the code that
 sets the note number in-line rather than superscript in endnotes or
-footnotes.  Also in this file is the code that calls
-\textsf{cms-american.lbx}, which means that you'll lose all the
-Chicago-specific bibstrings I've defined unless you provide, in your
-preamble, a \cmd{DeclareLanguageMapping} command adapted for your
+footnotes, the URL line-breaking code, and the Chicago-specific
+number- and date-range compression code.  You'll need to load the
+required packages \textsf{xstring} and \textsf{nameref} yourself, as
+\textsf{biblatex} doesn't do it for you.  Also, you'll lose the code
+that calls \textsf{cms-american.lbx}, which means that you'll lose all
+the Chicago-specific bibstrings I've defined unless you provide, in
+your preamble, a \cmd{DeclareLanguageMapping} command adapted for your
 setup, on which see section~\ref{sec:international} below and also
 §§~4.9.1 and 4.11.8 in \textsf{biblatex.pdf}.
 
-%%\enlargethispage{-\baselineskip}
-
 \mylittlespace What you \emph{will not} lose is the ability to call
 the package options \texttt{annotation, strict, short,} and
 \texttt{noibid} (section~\ref{sec:useropts}, above), in case these
@@ -5775,13 +7965,12 @@ semicolon between multiple citations, sometimes to ineradicable
 periods after long notes, bugs that were byproducts of my attempt to
 fix other end-of-entry errors.  One of the side effects of this older
 code was (wrongly) to put a period after a long note produced, e.g.,
-by a command like \cmd{footnote\{\textbackslash headlessfullcite\}},
-whereas only the \enquote{foot} cite commands (including
-\cmd{autocite} in the default \textsf{biblatex-chicago-notes} set up)
-should do so.  If you came to rely on this side effect, please note
-now that you'll have to put the period in yourself when explicitly
-calling \cmd{footnote}, like so: \cmd{footnote\{\textbackslash
-  headlessfullcite\{key\}.\}}
+by a command like \verb+\footnote{\headlessfullcite}+, whereas only
+the \enquote{foot} cite commands (including \cmd{autocite} in the
+default \textsf{biblatex-chicago-notes} set up) should do so.  If you
+came to rely on this side effect, please note now that you'll have to
+put the period in yourself when explicitly calling \cmd{footnote},
+like so: \verb+\footnote{\headlessfullcite{key}.}+
 
 \mylittlespace When you use abbreviations at the ends of fields in
 your .bib file (e.g., \enquote{\texttt{n.d.}} or
@@ -5796,43 +7985,36 @@ after the author's initials in a bibliography, usually in a
 \textsf{misc} entry (see house:papers).  If you find you need to
 provide such formatting elsewhere, please let me know.
 
-\mylittlespace Finally, allow me to reiterate what
-\textsf{biblatex.pdf} says, to wit, use \textsf{Biber} if you can.
-It's not absolutely required for the notes \&\ bibliography style, but
-it is required for an increasing amount of very useful functionality
-in all \textsf{biblatex} styles.  The \textbf{mv*} entry types, for
-example, can help streamline your .bib database, particularly when
-used as \textsf{crossref} targets, but this utility is severely
-limited if you are using one of the older backends.  If you have to
-use one of these older backends, then the \textsf{biblatex} authors
-advise using \textsf{bibtex8}, rather than standard \textsc{Bib}\TeX,
-to avoid the cryptic errors that ensue when your .bib file gets to a
-certain size.
+\mylittlespace Finally, allow me to re-emphasize that, in its current
+form, the notes \&\ bibliography style \emph{requires} the use of
+\textsf{biber} as your backend --- variants of \textsc{Bib}\TeX\
+simply cannot produce accurate output anymore, given how many features
+now depend on the more modern backend.
 
 \section{The Specification: Author-Date}
 \label{sec:authdate}
 
 The \textsf{biblatex-chicago} package contains two different
-author-date styles.  The first, \textsf{bibla\-tex-chicago-authordate},
-implements the specifications of the 16th edition of the \emph{Chicago
-  Manual of Style}.  Numbers in parentheses refer to sections of the
-\emph{Manual}, though as this latest edition now recommends \enquote{a
-  uniform treatment for the main elements of citation in both of its
-  systems of documentation} (15.2), many of these references will in
-fact be to the chapter on the notes \&\ bibliography style (chap.\
-14), which chapter is, by design, considerably more detailed than that
-devoted to the author-date style.  The second,
-\textsf{biblatex-chicago-authordate-trad}, implements that same
+author-date styles.  The first,
+\textsf{bibla\-tex-chicago-authordate}, implements the specifications
+of the 17th edition of the \emph{Chicago Manual of Style}.  Numbers in
+parentheses refer to sections of the \emph{Manual}, though many of
+these references will in fact be to the chapter on the notes \&\
+bibliography style (chapter 14), which chapter is, by design,
+considerably more detailed than that devoted to the author-date style,
+and which \textsf{biblatex-chicago-authordate} always modifies
+according to the guidelines in chapter 15.  The second author-date
+style, \textsf{biblatex-chicago-authordate-trad}, implements the same
 specification but with a markedly different style of title
 presentation, including sentence-style capitalization and an absence
 of quotation marks around the (plain-text) titles of \textsf{article}
 or \textsf{incollection} entries, \emph{inter alia}.  The
 \textsf{trad} style is so named because older versions of the
 \emph{Manual}, up to and including the 15th edition, recommended this
-plainer style for author-date titles, and the 16th edition itself
+plainer style for author-date titles, and the 17th edition itself
 suggests the possibility, when needed, of retaining such title
 presentation in combination with its own recommendations for other
-parts of the reference apparatus (15.45).  In practice, the
+parts of the reference apparatus (15.38).  In practice, the
 differences between the two styles necessitate separate discussions of
 the \textsf{title} field and one extra package option
 (\texttt{headline}), and that's about it.
@@ -5845,10 +8027,10 @@ of the specification that might be considered somehow \enquote{non
 have also duplicated a lot of the information in
 \textsf{biblatex.pdf}, which I hope won't badly annoy expert users of
 the system.  As usual, headings in \mycolor{green}
-\colmarginpar{\textsf{New in this release}} indicate material new to
-this release, or occasionally old material that has undergone
-significant revision.  The file \textsf{dates-test.bib} contains many
-examples from the \emph{Manual} which, when processed using
+\colmarginpar{\textsf{New in this release}} indicate either material
+new to this release or old material that has undergone significant
+revision.  The file \textsf{dates-test.bib} contains many examples
+from the \emph{Manual} which, when processed using
 \textsf{biblatex-chicago-authordate}, should produce the same output
 as you see in the \emph{Manual} itself, or at least compliant output,
 where the specifications are vague or open to interpretation, a state
@@ -5856,7 +8038,8 @@ of affairs which does sometimes occur.  If you are using
 \textsf{biblatex-chicago-authordate-trad} the same basically holds,
 but you'd have to keep one eye on the 15th edition of the
 \emph{Manual} (chap.\ 17) for the titles.  I have provided
-\textsf{cms-dates-sample.pdf} and \textsf{cms-trad-sample.pdf}, which
+\href{file:cms-dates-sample.pdf}{\textsf{cms-dates-sample.pdf}} and
+\href{file:cms-trad-sample.pdf}{\textsf{cms-trad-sample.pdf}}, which
 show how my system processes \textsf{dates-test.bib}, and I have also
 included the reference keys from the latter file below in parentheses.
 
@@ -5864,23 +8047,24 @@ included the reference keys from the latter file below in parentheses.
 \label{sec:types:authdate}
 
 The complete list of entry types currently available in
-\textsf{biblatex-chicago-authordate} and \textsf{authordate-trad},
+\textsf{authordate} and \textsf{authordate-trad},
 minus the odd \textsf{biblatex} alias, is as follows:
-\mycolor{\textbf{article}}, \textbf{artwork}, \textbf{audio},
+\textbf{article}, \mycolor{\textbf{artwork}}, \textbf{audio},
 \textbf{book}, \textbf{bookinbook}, \textbf{booklet},
-\textbf{collection}, \textbf{customc}, \textbf{image},
-\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
-\textbf{inreference}, \mycolor{\textbf{jurisdiction}},
-\mycolor{\textbf{legal}}, \mycolor{\textbf{legislation}},
-\textbf{letter}, \textbf{manual}, \textbf{misc}, \textbf{music},
-\textbf{mvbook}, \textbf{mvcollection}, \textbf{mvproceedings},
-\textbf{mvreference}, \textbf{online} (with its alias \textbf{www}),
-\textbf{patent}, \textbf{periodical}, \textbf{proceedings},
-\textbf{reference}, \mycolor{\textbf{report}} (with its alias
-\textbf{techreport}), \mycolor{\textbf{review}}, \textbf{suppbook},
+\textbf{collection}, \textbf{customc}, \mycolor{\textbf{dataset}},
+\textbf{image}, \textbf{inbook}, \textbf{incollection},
+\textbf{inproceedings}, \textbf{inreference}, \textbf{jurisdiction},
+\textbf{legal}, \textbf{legislation}, \textbf{letter},
+\textbf{manual}, \textbf{misc}, \textbf{music}, \textbf{mvbook},
+\textbf{mvcollection}, \textbf{mvproceedings}, \textbf{mvreference},
+\textbf{online} (with its alias \textbf{www}), \textbf{patent},
+\mycolor{\textbf{performance}}, \textbf{periodical},
+\textbf{proceedings}, \textbf{reference}, \textbf{report} (with its
+alias \textbf{techreport}), \textbf{review},
+\mycolor{\textbf{standard}}, \textbf{suppbook},
 \textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis}
 (with its aliases \textbf{mastersthesis} and \textbf{phdthesis}),
-\mycolor{\textbf{unpublished}}, and \textbf{video}.
+\textbf{unpublished}, and \textbf{video}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -5893,22 +8077,21 @@ very few fields when you use \textsf{biblatex-chicago-authordate}, so
 it seemed to me better to gather information pertaining to fields in
 the next section.
 
-\paragraph*{\protect\colmarginpar{\textbf{article}}}
+\paragraph*{\protect\mymarginpar{\textbf{article}}}
 \label{sec:ad:article}
-The \emph{Chicago Manual of Style} (14.170) recognizes three different
+The \emph{Chicago Manual of Style} (14.164) recognizes three different
 sorts of periodical publication, \enquote{journals,}
-\enquote{magazines,} and \enquote{newspapers.}  The first (14.172)
-includes \enquote{scholarly or professional periodicals available
-  mainly by subscription,} while the second refers to \enquote{weekly
-  or monthly} publications that are \enquote{available either by
-  subscription or in individual issues at bookstores or newsstands.}
+\enquote{magazines,} and \enquote{newspapers.}  The first (14.166) is
+\enquote{a scholarly or professional periodical available mainly by
+  subscription,} while the second refers to \enquote{weekly or monthly
+  (or sometimes daily)} publications that are \enquote{available in
+  individual issues at libraries or bookstores or newsstands or
+  offered online, with or without a subscription.}
 \enquote{Magazines} will tend to be \enquote{more accessible to
   general readers,} and typically won't have a volume number.  The
 following paragraphs detail how to construct your .bib entries for all
 these sorts of periodical publication.
 
-\enlargethispage{\baselineskip}
-
 \mylittlespace For articles in \enquote{journals} you can simply use
 the traditional \textsc{Bib}\TeX\ --- and indeed \textsf{biblatex} ---
 \textsf{article} entry type, which will work as expected and set off
@@ -5916,28 +8099,28 @@ the page numbers with a colon in the list of references, as required
 by the \emph{Manual}.  If, however, you wish to cite a
 \enquote{magazine} or a \enquote{newspaper}, then you need to add an
 \textsf{entrysubtype} field containing the exact string
-\texttt{magazine} or, now, its synonym \mycolor{\texttt{newspaper}}.
-The main formatting differences between a \texttt{magazine/newspaper}
-and a plain \textsf{article} are that time specifications (month, day,
+\texttt{magazine} or, now, its synonym \texttt{newspaper}.  The main
+formatting differences between a \texttt{magazine/newspaper} and a
+plain \textsf{article} are that time specifications (month, day,
 season) aren't placed within parentheses, and that page numbers are
 set off by a comma rather than a colon.  Otherwise, the two sorts of
 reference have much in common.  (For \textsf{article}, see
-\emph{Manual} 14.175--198, 15.9, 15.43--46; batson, beattie:crime,
+\emph{Manual} 14.168--87, 15.9, 15.46--49; batson, beattie:crime,
 chu:panda, connell:chronic, conway:evolution, friedman:learning,
 garaud:gatine, garrett, hlatky:hrt, kern, lewis, loften:hamlet,
 loomis:structure, rozner:liberation, schneider:mittelpleistozaene,
-terborgh:pre\-ser\-vation, wall:ra\-di\-o, warr:ellison,
-white:callima\-chus. With \textsf{entrysubtype} \texttt{maga\-zine},
-cf.\ 14.181, 14.199--202, 15.47; assocpress:gun,
-lakeforester:pushcarts, mor\-genson:\-mar\-ket, reaves:ro\-sen,
+terborgh:preservation, wall:radio, warr:ellison,
+white:callima\-chus. For \textsf{entrysubtype} \texttt{maga\-zine},
+cf.\ 14.171, 14.188--200, 15.49; assocpress:gun,
+lakeforester:pushcarts, morgenson:market, reaves:rosen,
 stenger:privacy.)
 
-\mylittlespace The \emph{Manual} now suggests that, no matter which
+\mylittlespace The \emph{Manual} suggests that, no matter which
 citation style you are using, it is \enquote{usually sufficient to
   cite newspaper and magazine articles entirely within the text}
-(15.47).  This involves giving the title of the journal and the full
+(15.49).  This involves giving the title of the journal and the full
 date of publication in a parenthetical reference, including any other
-information in the main text (14.206), thereby obviating the need to
+information in the main text (14.198), thereby obviating the need to
 present such an entry in the list of references.  To utilize this
 method in the author-date styles, in addition to a \texttt{magazine}
 \textsf{entrysubtype}, you'll need to place \texttt{cmsdate=full} into
@@ -5948,30 +8131,20 @@ but if it's a fuller entry also containing an \textsf{author} then
 you'll also need \texttt{useauthor=false} in the \textsf{options}
 field.  Other surplus fields will be ignored.  (See osborne:poison.)
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace If you are familiar with the notes \&\ bibliography
 style, you'll know that the \emph{Manual} treats reviews (of books,
 plays, performances, etc.) as a sort of recognizable subset of
 \enquote{journals,} \enquote{magazines,} and \enquote{newspapers,}
 distinguished mainly by the way one formats the title of the review
-itself.  With the 16th edition's changes to the way titles are
-presented in the \textsf{authordate} style, users need to learn how to
-present this sort of material, which involves using an entry type
-(\textsf{review}) that wasn't necessary in the 15th edition.  The key
-rule is this: if a review has a separate, non-generic title (gibbard;
-osborne:poison) in addition to something that reads like
-\enquote{review of \ldots,} then you need an \textsf{article} entry,
-with or without the \texttt{magazine} \textsf{entrysubtype}, depending
-on the sort of publication containing the review.  If the only title
-is the generic \enquote{review of \ldots,} for example, then you'll
-need the \textsf{review} entry type, with or without this same
-\textsf{entrysubtype} toggle using \texttt{magazine}.  On
-\textsf{review} entries, see below.  (The curious reader will no doubt
-notice that the code for formatting any sort of review still exists in
-\textsf{article}, as it was initially designed for \textsf{biblatex
-  0.6}, but the current arrangement is somewhat simpler and therefore,
-I hope, better.)
+itself.  The key rule is this: if a review has a separate, non-generic
+title (gibbard; osborne:poison) in addition to something that reads
+like \enquote{review of \ldots,} then you need an \textsf{article}
+entry, with or without the \texttt{magazine} \textsf{entrysubtype},
+depending on the sort of publication containing the review.  If the
+only title is the generic \enquote{review of \ldots,} for example,
+then you'll need the \textsf{review} entry type, with or without this
+same \textsf{entrysubtype} toggle using \texttt{magazine}.  On
+\textsf{review} entries, see below.
 
 \mylittlespace In the case of a review with a specific as well as a
 generic title, the former goes in the \textsf{title} field, and the
@@ -5982,23 +8155,26 @@ be formatted differently from the titles themselves, and
 the additional wrinkle that it can, if needed, replace the
 \textsf{title} entirely, and this in, effectively, any entry type,
 providing a fairly powerful, if somewhat complicated, tool for getting
-\textsc{Bib}\TeX\ to do what you want.  Here, however, if all you need
+\textsf{biblatex} to do what you want.  Here, however, if all you need
 is a generic title like \enquote{review of \ldots,} then you want to
 switch to the \textsf{review} type, where you can simply use the
 \textsf{title} field for it.
 
-\mylittlespace \textsf{Biblatex-chicago} \colmarginpar{New!} now also,
-at the behest of Bertold Schweitzer, supports the \textsf{relatedtype}
-\mycolor{\texttt{reviewof}}, which allows you to use the
-\textsf{related} mechanism to provide information about the work being
-reviewed.  This may be particularly helpful if you need to cite
-multiple reviews of the same work, but in any case the usual
-distinction between \textsf{article} and \textsf{review} entries still
-holds, with the \textsf{related} entry's \textsf{title} providing the
-\textsf{titleaddon} in the former type and the \textsf{title} in the
-latter.  Please see section \ref{sec:authrelated} for further details.
-
-\mylittlespace No less than nine more things need explication under
+\mylittlespace \textsf{Biblatex-chicago} also, at the behest of
+Bertold Schweitzer, supports the \textsf{relatedtype}
+\texttt{reviewof}, which allows you to use the \textsf{related}
+mechanism to provide information about the work being reviewed.  In
+particular, it relieves you of the need to construct
+\textsf{titleaddon} or \textsf{title} fields like: \texttt{review of
+  \textbackslash mkbibemph\{Book Title\} by Author Name}, as the
+\textsf{related} entry's \textsf{title} automatically provides the
+\textsf{titleaddon} in the \textsf{article} type and the
+\textsf{title} in the \textsf{review} type, with the \textsf{related}
+mechanism providing the connecting string.  This may be particularly
+helpful if you need to cite multiple reviews of the same work; please
+see section \ref{sec:authrelated} for further details.
+
+\mylittlespace No less than ten more things need explication under
 this heading.  First, since the \emph{Manual} specifies that what goes
 into the \textsf{titleaddon} field of \textsf{article} entries stays
 unformatted --- no italics, no quotation marks --- this plain style is
@@ -6013,25 +8189,25 @@ article and the name of the regular column, in which case the former
 should go, as usual, in a \textsf{title} field, and the latter in
 \textsf{titleaddon}.  As with reviews proper, if there is only the
 generic title, then you want the \textsf{review} entry type.  (See
-14.203, 14.205, 14.208; morgenson:market, reaves:rosen.)
-
-\mylittlespace Third, the 16th edition of the \emph{Manual} suggests
-that \enquote{unsigned newspaper articles or features are best dealt
-  with in text \ldots} (14.207).  As with newspaper or magazine
-articles in general, you can place \texttt{cmsdate=full} and
-\texttt{skipbib} into the \textsf{options} field to produce an
-augmented in-text citation whilst keeping this material out of the
-reference list.  If you do use the reference list, then the standard
-shorter citation will be sufficient, and in both cases the name of the
-periodical (in the \textsf{journaltitle} field) will be used in place
-of the missing author.  Just to clarify: in \textsf{article} or
-\textsf{review} entries, \textsf{entrysubtype} \texttt{magazine}, a
-missing \textsf{author} field results in the name of the periodical
-(in the \textsf{journaltitle} field) being used as the missing author.
+14.191, 14.195--96; morgenson:market, reaves:rosen.)
+
+\mylittlespace Third, the \emph{Manual} suggests that
+\enquote{unsigned newspaper articles or features are best dealt with
+  in text \ldots} (14.199).  As with newspaper or magazine articles in
+general, you can place \texttt{cmsdate=full} and \texttt{skipbib} into
+the \textsf{options} field to produce an augmented in-text citation
+whilst keeping this material out of the reference list.  If you do use
+the reference list, then the standard shorter citation will be
+sufficient, and in both cases the name of the periodical (in the
+\textsf{journaltitle} field) will be used in place of the missing
+author.  Just to clarify: in \textsf{article} or \textsf{review}
+entries, \textsf{entrysubtype} \texttt{magazine}, a missing
+\textsf{author} field results in the name of the periodical (in the
+\textsf{journaltitle} field) being used as the missing author.
 Without an \textsf{entrysubtype}, and assuming that no name whatsoever
 can be found to put at the head of the entry, the \textsf{title} will
 be used, not the \textsf{journaltitle}, or so I interpret the
-\emph{Manual} (14.175).  The default sorting scheme in
+\emph{Manual} (14.168).  The default sorting scheme in
 \textsf{biblatex-chicago-authordate} considers the
 \textsf{journaltitle} before the \textsf{title}, so if the latter
 heads an entry you'll need a \textsf{sortkey}, just as you will if you
@@ -6045,7 +8221,7 @@ place for it.  A shortened \textsf{title} should go, as usual, in
 lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke.)
 
 \mylittlespace Fourth, Bertold Schweitzer has pointed out, following
-the \emph{Manual} (14.192), that while an \textsf{issuetitle} often
+the \emph{Manual} (14.183), that while an \textsf{issuetitle} often
 has an \textsf{editor}, it is not too unusual for a \textsf{title} to
 have, e.g., an \textsf{editor} and/or a \textsf{translator}.  In order
 to allow as many permutations as possible on this theme, I have
@@ -6059,14 +8235,12 @@ with the \textsf{title} otherwise.  The usual string concatenation
 rules still apply --- cf.\ \textsf{editor} and \textsf{editortype} in
 section~\ref{sec:fields:authdate}, below.
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace Fifth, in certain fields, just beginning your data with
 a lowercase letter activates the mechanism for capitalizing that
-letter depending on its context within a list of references entry.
-This is less important in the author-date styles, where this
-information only turns up in the reference list and not in citations,
-but you can consult\,\textbf{\textbackslash autocap} in
+letter depending on its context within a reference list entry.  This
+is less important in the author-date styles, where this information
+only turns up in the reference list and not in citations, but you can
+consult\,\textbf{\textbackslash autocap} in
 section~\ref{sec:formatting:authdate} below for all the details.  Both
 the \textsf{titleaddon} and \textsf{note} fields are among those
 treating their data this way, and since both appear regularly in
@@ -6091,34 +8265,66 @@ information you need to include in an \textsf{article} or
 \textsf{note} field, but rather in \textsf{titleaddon} or perhaps
 \textsf{addendum} (brown:bremer).
 
-\mylittlespace Seventh, I would suggest that if you wish to cite a
-television or radio broadcast, the \textsf{article} type,
+\mylittlespace Seventh, I would suggest that if you wish to cite
+certain kinds of television or radio broadcast, most notably
+interviews but perhaps also news segments or other
+\enquote{journalistic} material, then the \textsf{article} type,
 \textsf{entrysubtype} \texttt{magazine} is the place for it.  The name
-of the program would go in \textsf{journaltitle}, with the name of the
-episode in \textsf{title}.  The network's name goes into the
-\textsf{usera} field.  (8.185, 14.221; see bundy:macneil for an
-example of how this all might look in a .bib file.  Commercial
-recordings of such material would need one of the audiovisual entry
-types, probably \textsf{audio} or \textsf{video} [friends:leia], while
-recordings from archives fit best either into \textsf{online} or into
-\textsf{misc} entries with an \textsf{entrysubtype} [coolidge:speech,
-roosevelt:speech].)
-
-\mylittlespace Eighth, the 16th edition of the \emph{Manual}
-(14.243--6) specifies that blogs and other, similar online material
-should be presented like \textsf{articles}, with \texttt{magazine}
-\textsf{entrysubtype} (ellis:blog).  The title of the specific entry
-goes in \textsf{title}, the general title of the blog goes in
+of the program as a whole would go in \textsf{journaltitle}, with the
+name of the episode in \textsf{title}.  The network's name goes into
+the \textsf{usera} field.  Of course, if the piece you are citing has
+only a generic name (an interview, for example), then the
+\textsf{review} type would be the best place for it (8.189, 14.213;
+see bundy:macneil for an example of how this all might look in a .bib
+file.)  Other sorts of broadcast, usually accessible through
+commercial recordings, would need one of the audiovisual entry types,
+probably \textsf{audio} (danforth:podcast) or \textsf{video}
+(friends:leia), while recordings from archives fit best either into
+\textsf{online} or into \textsf{misc} entries with an
+\textsf{entrysubtype} (coolidge:speech, roosevelt:speech).
+
+\mylittlespace Eighth, the \emph{Manual} (14.208, 15.51) specifies
+that blogs and other, similar online material should be presented like
+\textsf{articles}, with \texttt{magazine} \textsf{entrysubtype}
+(ellis:blog), and needn't appear in a reference list at all, if you'd
+prefer to provide relevant details in the text.  I've attempted,
+however, to make \textsf{biblatex-chicago-authordate} as useful as
+possible when managing references to such sources, so I'll outline
+these facilities here.  The title of the specific entry goes in
+\textsf{title}, the general title of the blog goes in
 \textsf{journaltitle}, and the word \enquote{\texttt{blog}} in the
 \textsf{location} field (though you could just use special formatting
 in the \textsf{journaltitle} field itself, which may sometimes be
-necessary).  Comments on blogs, with generic titles like
-\enquote{comment on} or \enquote{reply to,} need a \textsf{review}
-entry with the same \textsf{entrysubtype}.  Such comments make
-particular use of the \textsf{eventdate} and of the \textsf{nameaddon}
-fields; please see the documentation of \textbf{review}, below.
-
-\mylittlespace Finally, the special \textsf{biblatex} field
+necessary).  The 17th \colmarginpar{New!} edition specifies that
+\enquote{blogs that are part of a larger publication should include
+  the name of that publication.}  This usually involves a newspaper or
+magazine which also publishes various blogs on its website, and it
+means that such entries need a more general title than the
+\textsf{journaltitle}.  It's not standard \textsf{biblatex} or
+anything, but you can now put such information in \textsf{maintitle}
+(with \textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed),
+but only in \textsf{article} and \textsf{review} entries with a
+\texttt{magazine} \textsf{entrysubtype} (amlen:hoot).
+
+\mylittlespace The \emph{Manual} (15.51) is even more emphatic about
+whole blogs (rather than individual posts) and comments on blogs not
+appearing in reference lists, but I've kept as many options open as
+possible, including fairly simple ways you can provide all the
+information needed in text citations alone.  To cite a whole blog,
+you'll need the \textsf{periodical} entry type, with a \textsf{title}
+instead of a \textsf{journaltitle}, along with a (possible)
+\textsf{maintitle} (amlen:wordplay).  Comments on blogs, with generic
+titles like \enquote{comment on} or \enquote{reply to,} need a
+\textsf{review} entry with the same \textsf{entrysubtype} (viv:amlen).
+Such comments make particular use of the \textsf{eventdate} and
+\textsf{nameaddon} fields, and also of specialized \textbf{customc}
+entries for adding comments to in-text citations.  Please see the
+documentation of \textbf{customc}, \textbf{periodical}, and
+\textbf{review}, the \textsf{relatedtype} \mycolor{\texttt{commenton}}
+in section~\ref{sec:authrelated}, and the general discussion of online
+sources in the \textbf{online} documentation.
+
+\mylittlespace Ninth, the special \textsf{biblatex} field
 \textsf{shortjournal} allows you to present shortened
 \textsf{journaltitles} in \textsf{article}, \textsf{review}, and
 \textsf{periodical} entries, as well as facilitating the creation of
@@ -6127,7 +8333,14 @@ list.  Please see the documentation of \textbf{shortjournal} in
 section~\ref{sec:fields:authdate} for all the details on how this
 works.
 
-% %\enlargethispage{-\baselineskip}
+\mylittlespace Finally, \colmarginpar{New!} the 17th edition (14.191)
+specifies that, for news sites carrying \enquote{stories as they
+  unfold, it may be appropriate to include a time stamp for an article
+  that includes one.}  You can provide this by using the standard
+\textsf{biblatex} time stamp format inside the \textsf{date} field,
+e.g., \texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers
+the standard time zone initialisms, a separate \textsf{timezone} field
+would be required if you want to provide one.
 
 \mylittlespace If you're still with me, allow me to recommend that you
 browse through \textsf{dates-test.bib} to get a feel for just how many
@@ -6137,24 +8350,17 @@ may be that in future releases of \textsf{biblatex-chicago} I'll be
 able to simplify these procedures somewhat, but with any luck the vast
 majority of sources won't require knowledge of these onerous details.
 
-\mybigspace Arne \mymarginpar{\textbf{artwork}} Kjell Vikhagen has
-pointed out to me that none of the standard entry types were
-straightforwardly adaptable when referring to visual artworks.  The
-\emph{Manual} doesn't give any thorough specifications for such
-references, and indeed it's unclear that it believes it necessary to
-include them in the reference apparatus at all.  Still, it's easy to
-conceive of contexts in which a list of artworks studied might be
-desirable, and \textsf{biblatex} includes entry types for just this
-purpose, though the standard styles leave them undefined.  The two I
-chose to include in previous releases were \textsf{artwork} and
-\textsf{image}, the former intended for paintings, sculptures,
-etchings, and the like, the latter for photographs.  The 16th edition
-of the \emph{Manual} has modified its specifications for presenting
-photographs so that they are the same as for works in all other media.
-The \textsf{image} type, therefore, is now merely a clone of the
-\textsf{artwork} type, maintained mainly to provide backward
-compatibility for users migrating from the old specification to the
-current one.
+\mybigspace Arne \colmarginpar{\textbf{artwork}} Kjell Vikhagen pointed
+out to me that none of the standard entry types were straightforwardly
+adaptable when referring to visual artworks.  It's unclear that the
+\emph{Manual} (14.235) believes it necessary to include them in the
+reference apparatus at all, but it's easy to conceive of contexts in
+which a list of artworks studied might be desirable, and
+\textsf{biblatex} includes entry types for just this purpose, though
+the standard styles leave them undefined.  \textsf{Biblatex-chicago}
+defines both \textsf{artwork} and \textsf{image}, which are in fact
+now clones of each other, so you can use either of them indifferently,
+the distinction existing only for historical reasons.
 
 \mylittlespace As one might expect, the artist goes in \textsf{author}
 and the name of the work in \textsf{title}.  The \textsf{type} field
@@ -6167,49 +8373,86 @@ generality.  The \textsf{type} field, as in several other entry types,
 uses \textsf{biblatex's} automatic capitalization routines, so if the
 first word only needs a capital letter at the beginning of a sentence,
 use lowercase in the .bib file and let \textsf{biblatex} handle it for
-you.  (See \emph{Manual} 3.22, 8.193; leo:madonna, bedford:photo.)
-
-\mylittlespace As a final complication, the \emph{Manual} (8.193) says
+you.  (See \emph{Manual} 3.22, 8.198; leo:madonna, bedford:photo.)
+
+\mylittlespace The \colmarginpar{New!} 17th edition of the
+\emph{Manual} has included new information in some of its examples, so
+I have added 4 new fields to the driver.  Alongside the usual
+\textsf{date} for the creation of a work, you may also want to include
+the printing date of a particular exemplar of a photograph or a print.
+The system I have designed uses the \emph{earlier} of the
+\textsf{date} and the \textsf{origdate} to be the date of creation,
+and the \emph{later} to be the printing date.  The style will
+automatically prefix the printing date with the localized
+\cmd{bibstring} \mycolor{\texttt{printed}}, so if that's the wrong
+string entirely then you can define \textsf{userd} any way you like to
+change it.  If only \emph{one} of those two dates is available, it
+will always serve as a creation date.  Any date specification provided
+will always appear in full somewhere in the reference list entry,
+though sometimes that could be the plain year at the head of the
+entry.  This system, which is unlike other entry types, helps to avoid
+ambiguities in some situations.
+
+\mylittlespace One of the \emph{Manual's} examples is of a photograph
+published in a periodical, and information about this publication
+appears late in the entry, after the \textsf{type}.  I have included
+the \textsf{howpublished} field so that you can give information about
+the periodical (meaning that you'll have to format the title yourself
+with \cmd{mkbibemph}), and the \textsf{eventdate} field for you to
+provide the date of publication (mccurry:afghangirl).
+
+\mylittlespace Depending on the presence or absence of these three
+date fields, and also on how you've set the \texttt{cmsdate} option,
+any of the three can appear in citations and at the head of reference
+list entries, allowing you to order entries by creation date, printing
+date, or publication date.  See the documentation of \textbf{date} on
+page~\pageref{sec:ad:date}, below, for all the complicated details.
+Please note, when choosing your date presentation, that these new
+fields ostensibly replace most of the possible uses of the
+\textsf{pubstate} field in \textsf{artwork} entries, though this field
+continues to function here more or less as before, should you still
+require it.
+
+\mylittlespace As a final complication, the \emph{Manual} (8.198) says
 that \enquote{the names of works of antiquity \ldots\,are usually set
   in roman.}  If you should need to include such a work in the
 reference apparatus, you can either define an \textsf{entrysubtype}
 for an \textsf{artwork} entry --- anything will do --- or you could
-use the \textsf{image} type, or you could try the \textsf{misc} entry
-type with an \textsf{entrysubtype}.  Fortunately, in this instance the
-other fields in a \textsf{misc} entry function pretty much as in
-\textsf{artwork} or \textsf{image}.
+try the \textsf{misc} entry type with an \textsf{entrysubtype}.
+Assuming the complicated date handling I've just outlined isn't
+required for such a work, in this instance the other fields in a
+\textsf{misc} entry function pretty much as in \textsf{artwork}.
 
-\mybigspace Following \mymarginpar{\textbf{audio}} the request of
+\mybigspace Following \colmarginpar{\textbf{audio}} the request of
 Johan Nordstrom, I have included three entry types, all undefined by
 the standard styles, designed to allow users to present audiovisual
 sources in accordance with the Chicago specifications.  The
-\emph{Manual's} presentation of such sources (14.263--273, 15.53),
-though admirably brief, seems to me somewhat inconsistent; the
-proliferation of online sources has made the task yet more complex.
-For the 15th edition I attempted to condense all the requirements into
-two entry types, but ended up relying on three.  For the 16th edition,
-in particular, I also need to include the \textbf{online} and even the
-\textbf{misc} entry types, which see, under the audiovisual rubric.  I
-shall attempt to delineate the main differences here, and though there
-are likely to be occasions when your choice of entry type is not
-obvious, at the very least \textsf{biblatex-chicago} should help you
-maintain consistency.
-
-\mylittlespace For users of the author-date styles, the 16th edition
-of the \emph{Manual} (15.53) \enquote{recommends a more comprehensive
-  approach to dating audiovisual materials than in previous editions,}
-meaning that nearly all such entries will have some sort of dating
-information and will therefore fit better stylistically with other
-references.  In particular, \enquote{the date of the original
-  recording should be privileged in the citation.}  Guidance for
-supplying dates for this class of material will be found below under
-the different entry types in use, though it will also be worthwhile to
-look at the documentation of \textsf{date}, \textsf{eventdate},
-\textsf{origdate}, and \textsf{urldate}, in
+\emph{Manual's} presentation of such sources (14.261--68, 15.57),
+though admirably brief, seems to me somewhat inconsistent, though
+perhaps I'm merely unable to spot the important regularities.  The
+proliferation of online sources has made the task yet more complex,
+requiring the inclusion of the \textbf{article}, the \textbf{online},
+and even the \textbf{misc} entry types, which see, under the
+audiovisual rubric.  I shall attempt to delineate the main differences
+here, and though there are likely to be occasions when your choice of
+entry type is not obvious, at the very least \textsf{biblatex-chicago}
+should help you maintain consistency.
+
+\mylittlespace For users of the author-date styles, the 17th edition
+of the \emph{Manual} continues to emphasize the need to provide dating
+information for audiovisual materials (14.263), meaning that nearly
+all such entries will have some such information and will therefore
+fit better, stylistically, with other author-date references.  In
+particular, it continues to recommend that \enquote{the date of the
+  original recording should be privileged in the citation} (15.57).
+Guidance for supplying dates for this class of material will be found
+below under the different entry types in use, though it will also be
+worthwhile to look at the documentation of \textsf{date},
+\textsf{eventdate}, \textsf{origdate}, and \textsf{urldate}, in
 section~\ref{sec:fields:authdate}, below.  The \emph{Manual} continues
 to suggest, also, that \enquote{it is often more appropriate to list
   such materials in running text and group them in a separate section
-  or discography}.
+  or discography.}
 
 \mylittlespace The \textbf{music} type is intended for all musical
 recordings that do not have a video component.  This means, for
@@ -6217,23 +8460,34 @@ example, digital media (whether on CD or hard drive), vinyl records,
 and tapes.  The \textbf{video} type includes most visual media,
 whether it be films, TV shows, tapes and DVDs of the preceding or of
 any sort of performance (including music), or online multimedia.  The
-\emph{Manual's} treatment (14.280) of the latter suggests that online
+\emph{Manual's} treatment (14.267) of the latter suggests that online
 video excerpts, short pieces, and interviews should generally use the
-\textbf{online} type (harwood:biden, horowitz:youtube, pollan:plant).
-The \textbf{audio} type, our current concern, fills gaps in the
-others, and presents its sources in a more \enquote{book-like} manner.
-Published musical scores need this type --- unpublished ones would use
-\textsf{misc} with an \textsf{entrysubtype} (shapey:partita) --- as do
-such favorite educational formats as the slideshow and the filmstrip
-(greek:filmstrip, schubert:muellerin, verdi:corsaro).  The
-\emph{Manual} (14.277--280) sometimes uses a similar format for audio
-books (twain:audio), though, depending on the sorts of publication
-facts you wish to present, this sort of material may fall under
-\textsf{music} (auden:reading).  Dated audio recordings that are part
-of an archive, online or no, may be presented either in an
-\textsf{online} or in a \textbf{misc} entry with an
-\textsf{entrysubtype}, the latter sometimes requiring extra formatting
-in the \textsf{title} field (coolidge:speech, roosevelt:speech).
+\textbf{online} type (horowitz:youtube, pollan:plant) or the
+\textbf{article} type (harwood:biden, kessler:nyt), depending on
+whether the pieces originate from an identifiably
+\enquote{journalistic} outlet.  The \textbf{audio} type, our current
+concern, fills gaps in the others, and presents its sources in a more
+\enquote{book-like} manner.  Published musical scores need this type
+--- unpublished ones would use \textsf{misc} with an
+\textsf{entrysubtype} (shapey:partita) --- as do \mycolor{podcasts}
+and such favorite educational formats as the slideshow and the
+filmstrip (danforth:podcast, greek:film\-strip, schubert:muellerin,
+verdi:corsaro).  The \emph{Manual} (14.264) sometimes uses a similar
+format for audio books (twain:audio), though, depending on the sorts
+of publication facts you wish to present, this sort of material may
+fall under \textsf{music} (auden:reading).  Dated audio recordings
+that are part of an archive, online or no, may be presented either in
+an \textbf{online} or in a \textbf{misc} entry with an
+\textsf{entrysubtype}, the difference mainly being in just how closely
+associated the \textsf{date} will be with the \textsf{title}
+(coolidge:speech, roosevelt:speech).  Actual radio broadcasts (as
+opposed to podcasts) pose something of a conundrum.  Interviews and
+other sorts of \enquote{journalistic} material fit well into
+\textsf{article} or \textsf{review} entries (14.213), but other sorts
+of broadcast are not well represented in the \emph{Manual's} examples
+(8.189), and what little there is suggests that, counter-intuitively,
+the \textsf{video} type is the best fit, as it is well equipped to
+present broadcasts of any sort.
 
 \mylittlespace Once you've accepted the analogy of composer to
 \textsf{author}, constructing an \textsf{audio} entry should be fairly
@@ -6246,22 +8500,49 @@ for both books and collections, so while there will normally be an
 \textsf{date}, and a \textsf{location}, there may also be a
 \textsf{booktitle} and/or a \textsf{maintitle} --- see
 schubert:muellerin for an entry that uses all three in citing one song
-from a cycle.  If the medium in question needs specifying, the
-\textsf{type} field is the place for it.  Finally, the
-\textsf{titleaddon} field can specify functions for which
-\textsf{biblatex-chicago} provides no automated handling, e.g., a
-librettist (verdi:corsaro).
+from a cycle.  (As with the \textsf{music} and \textsf{video} types,
+you can cite an individual piece separate from any large collection by
+using the \textsf{title} field and by defining an
+\textsf{entrysubtype}, which will stop \textsf{biblatex-chicago}
+italicizing your \textsf{title} in the absence of a
+\textsf{booktitle}.)  If the medium in question needs specifying, the
+\textsf{type} field is the place for it.  Please note, also, that
+while the \textsf{titleaddon} field can still specify creative or
+editorial functions for which \textsf{biblatex-chicago} provides no
+automated, localized handling, you can also now provide the string you
+need in an \textsf{editor[abc]type} field, e.g.,
+\enquote{\texttt{libretto by}} (verdi:corsaro).
+
+\mylittlespace For \colmarginpar{New!} podcasts, newly covered by the
+17th edition (14.267), the \textsf{audio} type provides the nearest
+analogue I could find, and in general most of the data should fit
+comfortably into the fields already discussed above, the episode name
+in \textsf{title} and the name of the podcast in \textsf{booktitle},
+for starters.  Two details, however, need mentioning: first, the
+\textsf{note} field as the place to specify that it is a podcast, and
+the \textsf{eventdate} field for the date of publication of the
+specific episode (\textsf{title}) cited, which appears in close
+association with that \textsf{title}.  Indeed, the \textsf{eventdate}
+field helps \textsf{biblatex-chicago} know that the \textsf{audio}
+entry is a podcast episode, and helps it construct the entry
+appropriately (danforth:podcast).
+
+\enlargethispage{\baselineskip}
 
-\mybigspace This \mymarginpar{\textbf{book}} is the standard
+\mybigspace This \colmarginpar{\textbf{book}} is the standard
 \textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
-can provide automatically abbreviated references in the reference list
+can automatically provide abbreviated references in the reference list
 when you use a \textsf{crossref} or an \textsf{xref} field.  The
 functionality is not enabled by default, but you can enable it in the
 preamble or in the \textsf{options} field using the
 \texttt{booklongxref} option.  Please see \textbf{crossref} in
 section~\ref{sec:fields:authdate} and \texttt{booklongxref} in
 section~\ref{sec:authpreset}, below.  Also, cf.\ harley:ancient:cart,
-harley:cartography, and harley:hoc for how this might look.
+harley:cartography, and harley:hoc for how this might look.  The
+\textsf{book} type is useful also to present multimedia app content,
+the added fields \textsf{version} and \textsf{type} providing
+information about the app's version and about the system on which it
+runs (14.268, 15.57; angry:birds).
 
 \mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
 means of referring to parts of books that are considered, in other
@@ -6275,21 +8556,16 @@ marks.  As with the \textsf{book} type, you can enable automatically
 abbreviated references in the reference list, though this isn't the
 default.  Please see \textbf{crossref} in
 section~\ref{sec:fields:authdate} and \texttt{booklongxref} in
-section~\ref{sec:preset:authdate}, below.  (Cf.\ \emph{Manual} 14.114,
-14.127, 14.130; bernhard:boris, bernhard:ritter, and
+section~\ref{sec:preset:authdate}, below.  (Cf.\ \emph{Manual} 14.109,
+14.122, 14.124; bernhard:boris, bernhard:ritter, and
 bernhard:themacher for the abbreviating functionality; also
-euripides:orestes, plato:republic:gr.)
-
-\mylittlespace \textbf{NB}: The Euripides play receives slightly
-different presentations in 14.127 and 14.130.  Although the
-specification is very detailed, it doesn't eliminate all choice or
-variation.  Using a system like \textsc{Bib}\TeX\ should help to
-maintain consistency.
+euripides:orestes [treated differently in 14.122 and 14.124],
+plato:republic:gr.)
 
 \mybigspace This \mymarginpar{\textbf{booklet}} is the first of two
 entry types --- the other being \textsf{manual}, on which see below
 --- which are traditional in \textsc{Bib}\TeX\ styles, but which the
-\emph{Manual} (14.249) suggests may well be treated basically as
+\emph{Manual} (14.220) suggests may well be treated basically as
 books.  In the interests of backward compatibility,
 \textsf{biblatex-chica\-go-authordate} will so format such an entry,
 which uses the \textsf{howpublished} field instead of a standard
@@ -6309,89 +8585,104 @@ Please see \textbf{crossref} in section~\ref{sec:fields:authdate} and
 harley:ancient:cart, harley:cartography, and harley:hoc for how this
 might look.
 
-\mybigspace This \mymarginpar{\textbf{customa}} entry type is
-obsolete, and any such entries in your .bib file will trigger an
-error.  Please use the standard \textsf{biblatex} \textbf{letter} type
-instead.
-
-%%\enlargethispage{-\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{customb}} entry type is
-obsolete, and any such entries in your .bib file will trigger an
-error.  Please use the standard \textsf{biblatex} \textbf{bookinbook}
-type instead.
-
-\mybigspace This \mymarginpar{\textbf{customc}} entry type allows you
+\mybigspace This \colmarginpar{\textbf{customc}} entry type allows you
 to include alphabetized cross-references to other, separate entries in
 the bibliography, particularly to other names or pseudonyms, as
 recommen\-ded by the \emph{Manual}.  (This is different from the usual
 \textsf{crossref}, \textsf{xref}, \textsf{userf}, and \textsf{related}
 mechanisms, all primarily designed to include cross-references to
-other works.  Cf.\ 14.84,86).  In the 15th edition's specification of
-the author-date style, it allowed you, in particular, to include the
-expansions of abbreviations and shorthands --- usually of corporate
-\textsf{authors} --- \emph{inside} the list of references itself,
-rather than in the list of shorthands.  The 16th edition of the
-\emph{Manual} (15.36), however, has a different specification for such
-corporate authors.  As in the old specification, the shorthand appears
-in citations and at the head of the entry in the list of references,
-but its expansion now appears within parentheses \emph{directly after}
-the shorthand, i.e., \emph{within} the same entry.  This means you no
-longer need the \textsf{customc} entry for shorthands of this sort.
-(See \textsf{shorthand}, below; bsi:abbreviation, iso:electrodoc.)
-
-\mylittlespace I should add immediately that, as I read the
-specification (14.84,86, 15.34), the alphabetized cross-references
+other works.  Cf.\ 14.81--82, 15.35).  I should add immediately that,
+as I read the specification, the alphabetized cross-references
 provided by \textsf{customc} are particularly encouraged, bordering on
 required, when a reference list \enquote{includes two or more works
   published by the same author but under different pseudonyms.}  The
 following entries in \textsf{dates-test.bib} show one way of
-addressing this: crea\-sey:ashe:blast, crea\-sey:york:death,
-crea\-sey:mor\-ton:hide, ashe:crea\-sey, york:crea\-sey and
-mor\-ton:crea\-sey.  In these latter cases, you would need merely to
-place the pseudo\-nym in the \textsf{author} field, and the author's
-real name, under which his or her works are presented in the
-bibliography, in the \textsf{title} field.  To make sure the
-cross-reference also appears in the bibliography, you can either
-manually include the entry key in a \cmd{nocite} command, or you can
-put that entry key in the \textbf{userc} field in the main .bib entry,
-in which case \textsf{biblatex-chicago} will print the expanded
-abbreviation if and only if you cite the main entry.  (Cf.\
-\textsf{userc}, below.)
+addressing this: creasey:ashe:blast, creasey:york:death,
+creasey:morton:hide, ashe:creasey, york:creasey and morton:creasey.
+In these latter cases, you would need merely to place the pseudonym in
+the \textsf{author} field, and the author's real name, under which his
+or her works are presented in the bibliography, in the \textsf{title}
+field.  To make sure the cross-reference also appears in the
+bibliography, you can either manually include the entry key in a
+\cmd{nocite} command, or you can put that entry key in the
+\textbf{userc} field in the work's main .bib entry, in which case
+\textsf{biblatex-chicago} will print the cross-reference if and only
+if you cite the main work.  (Cf.\ \textsf{userc}, below.)
 
 \mylittlespace Under ordinary circumstances, \textsf{biblatex-chicago}
 will connect the two parts of the cross-reference with the word
 \enquote{\emph{See}} --- or its equivalent in the document's language
---- in italics.  If you wish to present the cross-reference
-differently, you can put the connecting word(s) into the
-\textsf{nameaddon} field.
+--- in italics.  If you wish to present it differently, you can put
+the connecting word(s) into the \textsf{nameaddon} field.
 
 \mylittlespace Finally, you may need to use this entry type if you
 wish to include a comment inside the parentheses of a citation, as
-specified by the \emph{Manual} (15.23).  If you have a
+specified by the \emph{Manual} (15.24).  If you have a
 \textsf{postnote}, then you can manually provide the punctuation and
 comment there, e.g., \cmd{autocite[4; the unrevised
   trans.]\{stendhal:parma\}}.  Without a \textsf{postnote}, you have
-two solutions.  You can enable the \texttt{postnotepunct} option, which
-allows you simply to type \cmd{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, \textsf{entrysubtype}
-\texttt{classical}, and \textsf{options} \texttt{skipbib}.  An
-\cmd{autocites} command calling both the main text and the comment
-then does the trick, e.g.,
-\cmd{autocites\{chica\-go:manual\}\{chicago:comment\}}.  Cf.\
+two solutions.  You can enable the \texttt{postnotepunct} option,
+which allows you simply to type \cmd{autocite[; the unrevised
+  trans.]\{stendhal:parma\}}, or you can use a separate
+\textsf{customc} entry containing just the text of the comment in the
+\textsf{title} field, \textsf{entrysubtype} \texttt{classical}, and
+\textsf{options} \texttt{skipbib}.  An \cmd{autocites} command calling
+both the main text and the comment then does the trick, e.g.,
+\cmd{autocites\{chicago:manual\}\{chicago:comment\}}.  Cf.\
 \texttt{postnotepunct} in section~\ref{sec:authuseropts}, below.
 
-\mybigspace This \mymarginpar{\textbf{image}} entry type, left
-undefined in the standard styles, was in previous releases of
-\textsf{bibla\-tex-chicago} intended for referring to photographs, but
-the 16th edition of the \emph{Manual} has changed its specifications
-for such works, which are now treated the same as works in all other
-media.  This means that this entry type is now a clone of the
-\textsf{artwork} type, which see.  I retain it here as a convenience
-for users migrating from the old to the new specification.  (See 3.22,
-8.193; bedford:photo.)
+\mylittlespace For \colmarginpar{New!} its 17th edition, the
+\emph{Manual} has provided a more detailed treatment of online
+comments, whether on blogs, mailing lists, or social media posts
+(15.50--52).  Such comments \enquote{are cited only in the text, in
+  reference to the related post,} an arrangement most easily created
+using \textsf{customc} entries referencing the main post.  The new
+\mycolor{\texttt{commenton}} \texttt{relatedtype} in \textsf{online}
+and \textsf{review} entries attempts to automate this for you,
+creating a separate \textsf{customc} entry to be used in an
+\cmd{autocites} command together with the comment's own entry.  Please
+see the details of this in the \textbf{online} and \textbf{review}
+entry types, below, and in the \mycolor{\texttt{commenton}} docs in
+section~\ref{sec:authrelated}.  Cf.\ also ac:comment, diaz:surprise,
+ellis:blog, licis:diazcomment, and the associated
+automatically-created entries ellis:blog-customc and
+diaz:surprise-customc.
+
+\mybigspace This \colmarginpar{\textbf{dataset}} entry type, new in
+\textsf{biblatex} 3.13, allows you to cite scientific databases, for
+which the \emph{Manual} (14.257) presents some rather specific, if
+brief, instructions.  To construct your entry, you can put the name of
+the database into \textsf{author}, a \enquote{descriptive phrase or
+  record locator} in the \textsf{title} field, and if there's a
+specific accession number needed beyond the record locator you can put
+it into the \textsf{number} field, with the \textsf{type} field
+reserved to help explain what sort of \textsf{number} is involved.
+The \textsf{howpublished} field can also be used to provide extra
+descriptive detail about the \textsf{number}, if needed.  More
+generally, a \textsf{url} will locate the database as a whole and a
+\textsf{urldate} will specify the date you accessed it.  If, for some
+reason, an additional date is relevant, then the \textsf{date} field
+is available, while the \textsf{pubstate} field will appear before the
+\textsf{date} in case you need to modify the latter.  (See 14.257;
+genbank:db, nasa:db.)  Given that usually the only relevant date in
+such entries is the access date, which means that they would usually
+have \enquote{n.d.}\ at the head of reference-list entries and in
+citations, I have thought it sensible to treat
+\mycolor{\textsf{dataset}} entries by default as author-title instead
+of author-date in citations, and to stop the printing of
+\enquote{n.d.}\ in reference lists just as in \textsf{misc} entries.
+You can shorten the component parts of the author-title citation using
+the usual \textsf{shortauthor}, \textsf{shorthand}, and/or
+\textsf{shorttitle} fields, and you can also restore author-date
+formatting to these entries by setting the
+\mycolor{\texttt{authortitle}} option to \texttt{false} either in
+individual entries or in the preamble for all examples of the entry
+type.
+
+
+\mybigspace This \mymarginpar{\textbf{image}} entry type is now a
+clone of the \textsf{artwork} type, which see.  I retain it here for
+historical reasons (See 3.22, 8.198; bedford:photo.)
 
 \mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
 two standard \textsf{biblatex} types have very nearly identical
@@ -6403,27 +8694,23 @@ while the second would hold \enquote{a contribution to a collection
   which forms a self-contained unit with a distinct author and its own
   title.}  The \textsf{title} of both sorts will be placed within
 quotation marks, and in general you can use either type for most
-material falling into these categories.  There was an important
-difference between them, as in previous releases of
-\textsf{biblatex-chicago} it was only in \textsf{incollection} entries
-that I implemented the \emph{Manual's} recommendations for
-space-saving abbreviations in the reference list when you cite
-multiple pieces from the same \textsf{collection}.  These
-abbreviations are activated by default when you use the
-\textsf{crossref} or \textsf{xref} field in \textsf{incollection}
-entries \emph{and} in \textsf{inbook} entries, because although the
-\emph{Manual} (14.113) here specifies a \enquote{multiauthor book,} at
-least for the notes \&\ bibliography style, I believe the distinction
-between the two is fine enough, and the author-date discussion in
-15.37 general enough, to encourage similar treatments.  (For more on
-this mechanism see \textbf{crossref} in
-section~\ref{sec:fields:authdate}, below, and the option
+material falling into these categories.  I have, in both types,
+implemented the \emph{Manual's} recommendations for space-saving
+abbreviations in the reference list when you cite multiple pieces from
+the same \textsf{collection}.  These abbreviations are activated by
+default when you use the \textsf{crossref} or \textsf{xref} field in
+\textsf{incollection} entries \emph{and} in \textsf{inbook} entries,
+because although the \emph{Manual} (15.42) here specifies a
+\enquote{multiauthor book,} I believe the distinction between the two
+is fine enough, and the discussion general enough, to encourage
+similar treatments.  (For more on this mechanism see \textbf{crossref}
+in section~\ref{sec:fields:authdate}, below, and the option
 \texttt{longcrossref} in section~\ref{sec:authpreset}.  Please note
 that it is also active by default in \textsf{letter} and
 \textsf{inproceedings} entries.)  If the part of a book to which you
 are referring has had a separate publishing history as a book in its
 own right, then you may wish to use the \textsf{bookinbook} type,
-instead, on which see above.  (See \emph{Manual} 14.111--114, 15.37;
+instead, on which see above.  (See \emph{Manual} 14.106--9, 15.42;
 \textsf{inbook}:\,ashbrook:brain, phibbs:diary, will:cohere;
 \textsf{incollection}:\,centi\-nel:letters, contrib:contrib,
 sirosh:visualcortex; ellet:galena, keating:dearborn, and
@@ -6431,20 +8718,20 @@ lippincott:chicago [and the \textsf{collection} entry prairie:state]
 demonstrate the use of the \textsf{crossref} field with its attendant
 abbreviations in the list of references.)
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when
 referring to a chapter, one use either a chapter number or the
 inclusive page numbers, not both.  In-text citations, of course,
 require any \textsf{postnote} field to specify if it is a whole
 chapter to which you are referring.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works
 pretty much as in standard \textsf{biblatex}.  Indeed, the main
 differences between it and \textsf{incollection} are the lack of an
 \textsf{edition} field and the possibility that an
 \textsf{organization} may be cited alongside the \textsf{publisher},
-even though the \emph{Manual} doesn't specify its use (14.226).
+even though the \emph{Manual} doesn't specify its use (14.217).
 Please note, also, that the \textsf{crossref} and \textsf{xref}
 mechanism for shortening citations of multiple pieces from the same
 \textsf{proceedings} is operative here, just as it is in
@@ -6453,19 +8740,18 @@ mechanism for shortening citations of multiple pieces from the same
 \texttt{longcrossref} in section~\ref{sec:authpreset}, below, for more
 details.
 
-\paragraph*{\protect\mymarginpar{\textbf{inreference}}}
+\paragraph*{\protect\colmarginpar{\textbf{inreference}}}
 \label{sec:ad:inreference}
 This entry type is aliased to \textsf{incollection} in the standard
-styles, but the \emph{Manual's} requirements for the notes \&\
-bibliography style prompted a thoroughgoing revision.  Unfortunately,
-instructions for the author-date style are considerably less copious,
-so parts of what follows are my best guess at following the
-specification (14.247--248).
-
-\mylittlespace One thing, at least, seems clear.  If your reference
-work can easily or conveniently be presented like a regular book, that
-is, with an author or editor, a year of publication, and a title, and
-if you you will be citing it by page or section number, then you
+styles, but the \emph{Manual's} requirements prompted a thoroughgoing
+revision.  Instructions for the author-date style are not copious, so
+what follows is my best guess at following the specification
+(14.232--34).
+
+\mylittlespace Please first note that if your reference work can
+easily or conveniently be presented like a regular author-date book,
+that is, with an author or editor, a year of publication, and a title,
+and if you will be citing it by page or section number, then you
 should almost certainly simply choose the \textsf{book} entry type for
 your .bib entry. (Cf.\ mla:style, schellinger:novel, times:guide.  The
 latter was presented as an \textsf{inreference} entry for the notes
@@ -6474,29 +8760,31 @@ also present references to alphabetized headings [see below], at least
 in the list of references, then it seemed better just to choose a
 \textsf{book} entry for the author-date styles.)
 
-\mylittlespace If you simply cannot make your source fit the template
-for a \textsf{book}, then you may need to use the \textsf{inreference}
-type, the main feature of which is the \textsf{lista} field, which you
-use to present citations from \enquote{alphabetically arranged} works
-by named article rather than by page number.  You should present these
-article names just as they appear in the work, separated by the
-keyword \enquote{\texttt{and}} if there is more than one, and
-\textsf{biblatex-chicago-authordate} will provide the appropriate
-prefatory string (\texttt{s.v.}, plural \texttt{s.vv.}), and enclose
-each in its own set of quotation marks (times:guide).  More relevant
-to the author-date styles is the fact that the \textsf{postnote} field
-works the same way in \textsf{inreference} entries, the only
-limitation on this system being that this field, unlike
-\textsf{lista}, is not a list, and therefore for the formatting to
-work correctly you can only put one article name in it.  In the case
-of \enquote{[w]ell-known reference books, such as major dictionaries
-  and encyclopedias,} you are encouraged not to include them in the
-list of references, so the \textsf{lista} field actually may be of
-less use than this special formatting of \textsf{postnote}.  You may
-want to look at ency:britannica, where only a (carefully-formatted)
-\textsf{shorttitle} and an \textsf{options} field are necessary to
-allow you to produce in-text citations that look like (\emph{Ency.\
-  Brit.}\ 15th ed., s.v. \enquote{Article}).
+\mylittlespace If your source simply doesn't fit the standard
+author-date template for a \textsf{book}, most especially if it is a
+\enquote{well-known} reference work, then you may need to use the
+\textsf{inreference} type, the main feature of which is the
+\textsf{lista} field, which you use to present citations from
+\enquote{alphabetically arranged} works by named article rather than
+by page number.  You should present these article names just as they
+appear in the work, separated by the keyword \enquote{\texttt{and}} if
+there is more than one, and \textsf{biblatex-chicago-authordate} will
+provide the appropriate prefatory string (\texttt{s.v.}, plural
+\texttt{s.vv.}), and enclose each in its own set of quotation marks
+(times:guide).  More relevant to the author-date styles is the fact
+that the \textsf{postnote} field works the same way in
+\textsf{inreference} entries, the only limitation on this system being
+that this field, unlike \textsf{lista}, is not a list, and therefore
+for the formatting to work correctly you can only put one article name
+in it.  In the case of \enquote{[w]ell-known reference books, such as
+  major dictionaries and encyclopedias,} you are encouraged not to
+include them in the list of references, so the \textsf{lista} field
+actually may be of less use than this special formatting of
+\textsf{postnote}.  You may want to look at ency:britannica, where
+only a (carefully-formatted) \textsf{shorttitle}, a \textsf{year}, and
+an \textsf{options} field are necessary to allow you to produce
+in-text citations that look like (\emph{Ency.\ Brit.}, 15th ed. 1985,
+s.v. \enquote{Article}).
 
 \mylittlespace If it seems appropriate to include such a work in the
 list of references, perhaps because the work is not so well known that
@@ -6504,32 +8792,47 @@ a short citation will be parseable by your readers, or perhaps because
 it is an online work, which requires you to provide a \textsf{urldate}
 (see below), be aware that the contents of the \textsf{lista} field
 will also be presented there, which may not be what you want.  A
-separate \textsf{inreference} or \textsf{reference} entry might solve
-this problem, but you may also need a \textsf{sortkey} field to ensure
-proper alphabetization, as \textsf{biblatex} will attempt to use an
-\textsf{editor} or \textsf{author} name, if either is present.  In a
-typical \textsf{inreference} entry, very few fields are needed, as
-\enquote{the facts of publication are often omitted, but the edition
-  (if not the first) must be specified.}  In practice, this means a
-\textsf{title} and possibly an \textsf{edition} field.  The
-\textsf{author} field holds the author of the specific article (in
-\textsf{lista}), not the author of the \textsf{title} as a whole.
-This name will be printed in parentheses after the entry's name
-(grove:sibelius).
-
-\mylittlespace All of these rules apply to online reference works, as
-well, for which you need to provide not only a \textsf{url} but also,
-always, a \textsf{urldate}, as these sources are in constant flux
-(wikiped:bibtex, grove:sibelius).  The author-date styles will
-automatically use this as the identifying date in citations and the
-list of references, assuming a more conventional \textsf{date} isn't
-available.  Please note, however, that the automatic provision of the
-\enquote{n.d.} abbreviation, in the absence of any sort of date
-whatsoever, has been turned off for \textsf{inreference} entries, as
-for \textsf{misc} and \textsf{reference} entries.
+separate \textsf{inreference} or \textsf{reference} entry might well
+solve this problem.  In a typical \textsf{inreference} entry very few
+fields are needed, but \enquote{if a physical edition is cited, not
+  only the edition number (if not the first) but also the date the
+  volume or set was issued must be specified.}  In practice, this
+means a \textsf{title}, \textsf{date}, and possibly an
+\textsf{edition} field.  The \textsf{author} field holds the author of
+the specific article (in \textsf{lista}), not the author of the
+\textsf{title} as a whole.  This name will be printed in parentheses
+after the alphabetized entry's title (grove:sibelius).
+
+\mylittlespace Finally, all of these rules apply to online reference
+works, along with a few more.  The \colmarginpar{New!} 17th edition of
+the \emph{Manual} now allows, \enquote{subject to editorial
+  discretion,} the alternative treatment of an online reference work
+which \enquote{does not have (and never had) a printed counterpart}
+(14.206, 14.233).  In effect this means that it can be treated more
+like an \textsf{online} entry than a \textsf{book}, its \textsf{title}
+therefore in plain roman rather than in italics.  You can achieve this
+in \textsf{inreference} entries by providing an \textsf{entrysubtype}
+in the entry.  Online reference works need not only a \textsf{url} but
+also, always, a \textsf{urldate} (instead of a \textsf{date)}, as
+these sources are in constant flux.  When that flux is of a
+particularly high frequency, as with Wikipedia, then a time stamp may
+also be needed.  You can provide this in the \textsf{urldate} field
+itself, using the standard \textsf{biblatex} format, e.g.,
+\texttt{2008-07-01T10:18:00}.  It is
+\colmarginpar{\texttt{urlstamp=true}} possible to turn off the
+printing of the \textsf{urltime} with the new
+\mycolor{\texttt{urlstamp}} option, which is set to \texttt{true} by
+default, but which can be changed in your preamble for the whole
+document, for specific entry types, or in the \textsf{options} field
+of specific entries (wikiped:bibtex, grove:sibelius).  In keeping with
+the rules of the 17th edition, changed since the 16th, any
+\textsf{inreference} entry with no date, or with only an access date,
+as opposed to a revision date or another, more traditional publishing
+date, will use the \texttt{nodate} abbreviation at the head of the
+entry and in citations (15.44, 15.50).
 
 \mybigspace I
-\colmarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
+\mymarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
 document these three types in section~\ref{sec:legal} below, both
 because they all follow the specifications of the \emph{Bluebook}
 instead of the \emph{Manual}, and also because they are the only entry
@@ -6540,17 +8843,17 @@ author-date styles.
 to be used for citing letters, memoranda, or similar texts, but
 \emph{only} when they appear in a published collection.  (Unpublished
 material of this nature needs a \textsf{misc} entry, for which see
-below.)  The author-date specification (15.40), however, recommends
+below.)  The author-date specification (15.43), however, recommends
 against individual letters appearing in a list of references,
 suggesting instead that you put the whole published collection in a
 \textsf{book} entry and use a notice in the text to specify the letter
 (white:total).
 
 \mylittlespace If you absolutely must include individual letters in
-the list of references, for whatever reason, then the instructions
-above for the notes \&\ bibliography style in
-section~\ref{sec:entrytypes}, s.v.\ \enquote{\textsf{letter,}} should
-get you started.  There are a few wrinkles, related to date
+the list of references, for whatever reason, then please consult the
+instructions above for the notes \&\ bibliography style in
+section~\ref{sec:entrytypes}, s.v.\ \enquote{\textsf{letter,}} which
+cover all the details.  There are a few wrinkles, related to date
 specifications, that I shall attempt to clarify here.  If you look at
 white:ross:memo and white:russ, you'll see two letters from the same
 published collection, both written in the same year.  You can simply
@@ -6559,23 +8862,13 @@ absence of a \textsf{date} (or an \textsf{eventdate}) \textsf{Biber}
 and \textsf{biblatex} will use the \textsf{origyear} as the
 \textsf{labelyear}, putting it at the head of the entry and in the
 citation, and also ensuring that the letters \texttt{a,b,c} are
-appended to disambiguate the two sources.  You no longer need anything
-in the \textsf{options} field at all, thanks to the way
-\cmd{DeclareLabeldate} works through the possibilities and finds a
-date to head the entry.  In this case, it works because we are using
-the \textsf{xref} mechanism to refer to the whole published collection
-(white:total), so a separate citation of that entry provides the
-\textsf{date} for the shortened cross-reference included in the list
-of references, and the \textsf{letter} entry never sees that
-\textsf{date} at all.
-
-%\enlargethispage{\baselineskip}
-
-\mylittlespace If this all seems clear as mud, I'm not surprised, but
-let me suggest that you experiment with the different date settings to
-see what kinds of effects they have on the final result, and also read
-the documentation of the \textsf{date} field in
-section~\ref{sec:fields:authdate} below.
+appended to disambiguate the two sources.  In this case, it works
+because we are using the \textsf{xref} mechanism to refer to the whole
+published collection (white:total), so a separate citation of that
+entry provides the \textsf{date} for the shortened cross-reference
+included in the list of references, and the \textsf{letter} entry
+never sees that \textsf{date} at all.  (Cf.\ also the documentation of
+the \textsf{date} field in section~\ref{sec:fields:authdate} below.)
 
 \mybigspace This \mymarginpar{\textbf{manual}} is the second of two
 traditional \textsc{Bib}\TeX\ entry types that the \emph{Manual}
@@ -6586,11 +8879,13 @@ main peculiarity being that, in the absence of a named author, the
 \textsf{organization} producing the manual will be provided both as
 author and as publisher.  (You can give a shortened form of the
 \textsf{organization} in the \textsf{shortauthor} field for text
-citations, if needed.)  Of course, if you were to use a \textsf{book}
-entry for such a reference, then you would need to define both
-\textsf{author} and \textsf{publisher} using the name you here might
-have put in \textsf{organization}.  (See 14.92; chicago:manual,
-dyna:browser, natrecoff:camera.)
+citations, if needed, or use the \textsf{shorthand} field.)  Of
+course, if you were to use a \textsf{book} entry for such a reference,
+then you would need to define both \textsf{author} and
+\textsf{publisher} using the name you here might have put in
+\textsf{organization}.  (See 14.84; chicago:manual, dyna:browser,
+natrecoff:camera.  Cp.\ also the new \mycolor{\textbf{standard}} entry
+type.)
 
 \paragraph*{\protect\mymarginpar{\textbf{misc}}}
 \label{sec:ad:misc}
@@ -6612,51 +8907,70 @@ possible.)
 \textsf{misc} type provides a means for citing unpublished letters,
 memoranda, private contracts, wills, interviews, and the like, making
 it something of an unpublished analogue to the \textsf{letter},
-\textsf{article}, and \textsf{review} entry types (which see).
-Typically, such an entry will cite part of an archive, and equally
-typically the text cited won't have a specific title, but only a
-generic one, whereas an \textsf{unpublished} entry will ordinarily
-have a specific author and title, and won't come from a named archive.
-The \textsf{misc} type with an \textsf{entrysubtype} defined is the
-least formatted of all those specified by the \emph{Manual}, so titles
-are in plain text by default.  It is quite possible, though somewhat
-unusual, for archival material to have a specific title, rather than a
-generic one.  In these cases, you will need to enclose the title
-inside a \cmd{mkbibquote} command manually.  Cf.\ roosevelt:speech,
-shapey:partita.  As a rule, and as with the \textsf{letter} type, the
-\emph{Manual} (15.49) suggests that the list of references will
+\textsf{article}, and \textsf{review} entry types (which see).  It
+also works well for presenting online audio pieces, particularly dated
+ones, like speeches.  Typically, such an entry will cite part of an
+archive, and equally typically the text cited won't have a specific
+title, but only a generic one, whereas an \textsf{unpublished} entry
+will ordinarily have a specific author and title, and won't come from
+a named archive.  The \textsf{misc} type with an \textsf{entrysubtype}
+defined is the least formatted of all those specified by the
+\emph{Manual}, so titles are in plain text by default.  (It is quite
+possible, though somewhat unusual, for archival material to have a
+specific title, rather than a generic one.  In these cases, you will
+need to enclose the title inside a \cmd{mkbibquote} command manually.
+Cf.\ roosevelt:speech, shapey:partita.)
+
+\mylittlespace If you are presenting part of an unpublished archive,
+then it's worth remembering that, as with the \textsf{letter} type,
+the \emph{Manual} (15.54) suggests that the list of references will
 usually contain only the name of the whole archived collection, with
 more specific information about individual items provided in the text,
 outside the parentheses.  If, on the other hand, \enquote{only one
   item from a collection has been mentioned in text, the entry may
-  begin with the writer's name (if known).}  (See 14.219-220, 14.231,
-14.232-242; house:papers cites a whole archive, while creel:house,
+  begin with the writer's name (if known).}  (See 14.211--12, 14.219,
+14.221--31; house:papers cites a whole archive, while creel:house,
 dinkel:agassiz, and spock:interview cite individual pieces.)
 
 \mylittlespace As far as constructing your .bib entry goes, you should
-first know that, like the \textsf{inreference} and \textsf{reference}
-types, the absence of any date will not result in the \enquote{n.d.}
-abbreviation automatically being provided.  As for presenting the
-date, the \emph{Manual} draws a distinction between archival material
-that is \enquote{letter-like} (letters, memoranda, reports, telegrams)
-and that which isn't (interviews, wills, contracts, or even personal
-communications you've received and which you wish to cite).  This may
-not always be the easiest distinction to draw, and in previous
-releases of \textsf{biblatex-chicago} I have been ignoring it, but
-once you've decided to classify it one way or the other you put the
-date in the \textsf{origdate} field for letters, etc.\ (creel:house),
-and into the \textsf{date} field for the others (spock:interview).  As
-with the \textsf{letter} type, if the only date present is an
-\textsf{origdate}, you don't need to set the \texttt{cmsdate} option
-in your .bib entry to make sure that that year appears at the head of
-the entry (and in citations) --- this happens automatically.  (Cf.\
-particularly the documentation in section~\ref{sec:fields:authdate}
-below, s.v.\ \enquote{date}, and also the \textsf{letter} type above
-for some of the date-related complications that can arise, and how you
-can address them with judicious use of the \textsf{options},
-\textsf{date}, and \textsf{origdate} fields.)
-
-%\enlargethispage{\baselineskip}
+first know that the absence of any date will not result in the
+\enquote{n.d.}\ abbreviation automatically being provided.  Indeed, no
+date at all will be required for entries referring to entire archival
+collections.  In such entries, you may wish to use the word
+\enquote{\texttt{classical}} as your \textsf{entrysubtype}, which will
+have no effect on the list of references but will change the look of
+the in-text citations (house:papers).  Instead of any date, the
+citation will include the \textsf{title}, separated from the
+\textsf{author's} name by a space, e.g., (House Papers).  This same
+arrangement, happily, allows you easily to cite individual books of
+the Bible, and also certain other sacred texts (14.238--41; genesis).
+Please see under \textsf{entrysubtype} in
+section~\ref{sec:fields:authdate} below for all the details of the
+\texttt{classical} toggle.
+
+\mylittlespace As for presenting the date of individual items, the
+\emph{Manual} (14.224) allows in these entries, as it does in
+documentation generally \enquote{if numerous dates occur} (9.35), for
+a more streamlined presentation of dates using the day-month-year
+form, different from the standard American month-day-year.  In
+\textsf{letter} entries you use the \textsf{origdate} field to give
+the date of individual letters, and it is always presented in the more
+streamlined form.  Here, the same field will do exactly the same
+thing, though with the added wrinkle that if you'd prefer to use the
+standard day-month-year form you can, simply by putting the date into
+the \textsf{date} field instead.  (Please choose one only in
+\textsf{misc} entries with an \textsf{entrysubtype} --- in
+\textsf{letter} entries the \textsf{date} refers to the published
+collection.)  As with the \textsf{letter} type, if the only date
+present is an \textsf{origdate}, you don't need to set the
+\texttt{cmsdate} option in your .bib entry to make sure that that year
+appears at the head of the entry (and in citations) --- this happens
+automatically.  (Cf.\ particularly the documentation in
+section~\ref{sec:fields:authdate} below, s.v.\ \enquote{date}, and
+also the \textsf{letter} type above for some of the date-related
+complications that can arise, and how you can address them with
+judicious use of the \textsf{options}, \textsf{date}, and
+\textsf{origdate} fields.)
 
 \mylittlespace As in \textsf{letter} entries, the titles of
 unpublished letters are of the form \texttt{Author to Recipi\-ent},
@@ -6666,152 +8980,180 @@ letter was written.  Interviews or similar pieces will have a
 different sort of title, but all types will use the \textsf{note},
 \textsf{organization}, \textsf{institution}, and \textsf{location}
 fields (in ascending order of generality) to identify the archive,
-though the \emph{Manual} specifies (14.238) that well-known
+though the \emph{Manual} specifies (14.227) that well-known
 depositories don't usually need a city, state or country specified.
 (The traditional \textsf{misc} fields are all still available, also.)
 
-\mylittlespace When your .bib entry refers to an entire archived
-collection, then you may wish to use the word
-\enquote{\texttt{classical}} as your \textsf{entrysubtype}, which will
-have no effect on the list of references but will change the look of
-the in-text citations (house:papers).  Instead of any date, the
-citation will include the \textsf{title}, separated from the
-\textsf{author's} name by a space, e.g., (House Papers).  This same
-arrangement, happily, allows you easily to cite individual books of
-the Bible, and also certain other sacred texts (14.252--55; genesis).
-Please see under \textsf{entrysubtype} in
-section~\ref{sec:fields:authdate} below for all the details of the
-\texttt{classical} toggle.
+\mylittlespace There are a few more subtleties involved here.  Some
+material (roosevelt:speech) includes a venue for the event recorded in
+the archive, so I have added the \mycolor{\textsf{venue}} field, which
+prints \emph{before} the date, with the \textsf{origlocation}
+appearing after it.  Somewhat confusingly, in published letters the
+\textsf{origlocation} itself prints before the date, rather than
+after, so if the inconsistency between published and unpublished
+letters bothers you then you could conceivably use \textsf{venue}
+instead of \textsf{origlocation} for that purpose here.  Also, the
+\emph{Manual} offers several examples of specific location information
+\emph{within} an archive, some of which appears \emph{before} the main
+archive name, and some of which appears \emph{after} it.  I assume
+this may depend on the exact nature of the archive itself, but in any
+case you can try the \textsf{type} or \textsf{howpublished} fields for
+the first case and the \textsf{number} field for the second.
 
 \mylittlespace In all this class of archived material, the
-\emph{Manual} (14.232) quite specifically requires more consistency
+\emph{Manual} (14.221) quite specifically requires more consistency
 within your own work than conformity to some external standard, so it
 is the former which you should pursue.  I hope that
 \textsf{biblatex-chicago} proves helpful in this regard.
 
-\mybigspace The \mymarginpar{\textbf{music}} 16th edition of the
-manual has revised its recommendations more for this type than for any
-other, so the notes which follow present several large changes that
-you'll need to make to your .bib files.  The good news is that some,
-though by no means all, of those changes involve considerable
-simplifications.  \textbf{Music} is one of three audiovisual entry
-types, and is intended primarily to aid in the presentation of musical
-recordings that do not have a video component, though it can also
-include audio books (auden:reading).  A DVD or VHS of an opera or
-other performance, by contrast, should use the \textbf{video} type
-instead (handel:messiah).  Because \textsf{biblatex} --- and
-\textsc{Bib}\TeX\ before it --- were designed primarily for citing
-book-like objects, some choices needed to be made in assigning the
-various roles found on the back of a CD to the fields in a typical
-.bib entry.  I have also implemented several bibstrings to help in
-identifying these roles within entries.  If you can think of a simpler
-way to distribute the roles, please let me know, so that I can
-consider making changes before anyone gets used to the current
-equivalences.
-
-\mylittlespace These equivalences, in summary form, are:
+\mybigspace This \colmarginpar{\textbf{music}} is one of three
+audiovisual entry types, and is intended primarily to aid in the
+presentation of musical recordings that do not have a video component,
+though it can also include audio books (auden:reading).  A DVD or VHS
+of an opera or other performance, by contrast, should use the
+\textbf{video} type instead, while an online music video will probably
+need an \textbf{online} entry.  (Cf.\ \textsf{online} and
+\textsf{video}; handel:messiah, horowitz:youtube.)  Because
+\textsf{biblatex} --- and \textsc{Bib}\TeX\ before it --- were
+designed primarily for citing book-like objects, some choices needed
+to be made in assigning the various roles found on the back of a CD to
+the fields in a typical .bib entry.  I have also implemented several
+bibstrings to help in identifying these roles within entries.  The
+17th edition of the \emph{Manual} once again revised its
+recommendations for this type, but fortunately the changes are
+additive, i.e., you can re-use 16th-edition citations but are
+encouraged to peruse the following guidelines to see if there's any
+information you might think of adding to bring your citations more
+into line with the spec.
+
+\mylittlespace These guidelines, in summary form, are:
 
 {\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
 \begin{description}
 \item[author =] composer, songwriter, or performer(s),
   depending on whom you wish to emphasize by placing them at the head
   of the entry.
+\item[bookauthor:] Somewhat like an \textsf{author}, but it will hold
+  the name associated with a whole album rather than an individual
+  piece, should both be present, and will therefore appear in close
+  association with the \textsf{booktitle} rather than at the head of
+  the entry.
 \item[editor, editora, editorb =] conductor, director or
   performer(s).  These will ordinarily follow the \textsf{title} of
   the work, though the usual \texttt{useauthor} and \texttt{useeditor}
   options can alter the presentation within an entry.  Because these
   are non-standard roles, you will need to identify them using the
   following:
-\item[editortype, editoratype, editorbtype:] The most common roles,
-  all associated with specific bibstrings (or their absence), will be
-  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
-  oddly, \texttt{none}.  The last is particularly useful when
+\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
+  roles, all associated with specific bibstrings (or their absence),
+  will be \texttt{conductor}, \texttt{director}, \texttt{producer},
+  and, oddly, \texttt{none}.  The last is particularly useful when
   identifying the group performing a piece, as it usually doesn't need
   further specifying and this role prevents \textsf{biblatex} from
-  falling back on the default \texttt{editor} bibstring.
-\item[title, booktitle, maintitle:] As with the other audiovisual
-  types, \textsf{music} serves as an analogue both to books and to
-  collections, so the title will either be, e.g., the album title or a
-  song title, in which latter case the album title would go into
-  \textsf{booktitle}.  The \textsf{maintitle} might be necessary for
-  something like a box set of \emph{Complete Symphonies}.
+  falling back on the default \texttt{editor} bibstring.  The 17th
+  edition (15.57) also seems to favor, in some circumstances, using
+  strings to identify individual performers, e.g., \enquote{vocalist}
+  or \enquote{pianist,} so even though there's no \cmd{bibstring}
+  associated with these types you can now provide them, or anything
+  else you need, in whatever form (\enquote{vocalist} or \enquote{sung
+    by}) suits your citation.
+\item[note:] This field can also hold contributors, perhaps
+  collaborators or featured artists (holiday:fool, rihanna:umbrella).
+\item[\mycolor{title, booktitle, maintitle:}] As with the other
+  audiovisual types, \textsf{music} serves as an analogue both to
+  books and to collections, so the title will either be, e.g., the
+  album title or a song title, in which latter case the album title
+  would go into \textsf{booktitle}.  If you wish to cite a song that,
+  as may happen, isn't part of any larger collection, your entry will
+  in such a case have only a \textsf{title}, which
+  \textsf{biblatex-chicago} would normally interpret as an album
+  title.  You \colmarginpar{New!} can now define an
+  \textsf{entrysubtype} to let it know that the lone \textsf{title} is
+  in fact a song (cf.\ naraya).  The \textsf{maintitle} might be
+  necessary for something like a box set of \emph{Complete
+    Symphonies}.
+\item[\mycolor{chapter:}] The 17th edition seems more keen on having
+  track numbers for individual pieces, whether on a traditional format
+  or on a streaming service.  The \colmarginpar{New!} \textsf{chapter}
+  field is the place for this information, and
+  \textsf{biblatex-chicago} will automatically prepend the localized
+  string \texttt{track} (cf.\ holiday:fool, rihanna:umbrella).
 \item[publisher, series, number:] These three closely-associated
   fields are intended for presenting the catalog information provided
-  by the music publisher.  The 16th edition generally only requires
+  by the music publisher.  The 17th edition generally only requires
   the \textsf{series} and \textsf{number} fields (nytrumpet:art),
   which hold the record label and catalog number, respectively.
   Alternatively, \textsf{publisher} would function as a synonym for
   \textsf{series} (holiday:fool), but there may be cases when you need
-  or want to specify a publisher in addition to a label, as was the
-  general requirement in the 15th edition.  (This might happen, for
-  example, when a single publisher oversees more than one label.)  You
-  can certainly put all of this information into one of the above
-  fields, but separating it may help make the .bib entry more
-  readable.
-\item[howpublished/pubstate:] The 16th edition of the \emph{Manual}
-  (14.276, 15.53) has rather helpfully eliminated any reference to the
-  specialized symbols (\texttt{\textcircledP} \&\
-  \texttt{\textcopyright}) found in the 15th edition for presenting
-  publishing information for musical recordings.  This means that the
-  \textsf{howpublished} field is obsolete, and you can remove it from
-  \textsf{music} entries in your .bib files.  The \textsf{pubstate}
-  field, therefore, can revert to its standard use for identifying
-  reprints.  In \textsf{music} entries, putting \texttt{reprint} here
-  will transform the \textsf{origdate} from a recording date for an
-  entire album into an original release date for that album, notice of
-  which will be printed towards the end of a reference list entry,
-  always assuming that the \textsf{origdate} hasn't already appeared
-  at the head of the entry and in citations.
-\item[date, eventdate, origdate:] As though to compensate for the
-  simplification I've just mentioned, the \textsf{Manual} now
-  \enquote{recommends a more comprehensive approach to dating
-    audiovisual materials than in previous editions} (15.53).  Indeed,
-  \enquote{citations without a date are generally unacceptable}
-  (14.276), while if there is more than one date \enquote{the date of
-    the original recording should be privileged} (15.53).  Finding
-  these dates may take some research, but they will basically fall
-  into two types, i.e., the date of the recording or the copyright /
-  publishing date.  Recording dates go either in \textsf{origdate}
-  (for complete albums) or \textsf{eventdate} (for individual tracks).
-  The current copyright or publishing date goes in the \textsf{date}
-  field, while the original release date goes in \textsf{origdate}.
-  You may have noticed that the \textsf{origdate} has two slightly
-  different uses --- you can tell \textsf{biblatex-chicago} which sort
-  you intend by using the string \texttt{reprint} in the
-  \textsf{pubstate} field, which transforms the \textsf{origdate} from
-  a recording date into an original release date.  The style will
-  automatically use the \textsf{eventdate} or the \textsf{origdate} in
-  citations and at the head of the list of references, falling back on
-  a \textsf{date} or even a \textsf{urldate} in their absence.  It
-  will also prepend the bibstring \texttt{recorded} to any part of the
-  \textsf{eventdate} that doesn't appear at the head of the list of
-  references or, in the absence of the \textsf{pubstate} mechanism, to
-  the \textsf{origdate}, or indeed to both.  You can modify what is
+  or want to specify a publisher in addition to a label, as perhaps
+  when a single publisher oversees more than one label.  You can
+  certainly put all of this information into one of the above fields,
+  but separating it may help make the .bib entry more readable.
+\item[pubstate:] The \textsf{pubstate} field in \textsf{music} entries
+  mainly has the usual meaning it has in other entry types, for which
+  see the documentation of the field in
+  section~\ref{sec:fields:authdate}, below.  If the field contains
+  \texttt{reprint}, however, this has a special meaning in
+  \textsf{music} entries, where it will transform the
+  \textsf{origdate} from a recording date for an entire album into an
+  original release date for that album, notice of which will be
+  printed towards the end of a reference list entry, always assuming
+  that the \textsf{origdate} hasn't already appeared at the head of
+  the entry and in citations.  No \texttt{reprint} \cmd{bibstring}
+  will be printed, as only the syntax of the reference will have been
+  altered.
+\item[date, eventdate, origdate:] The 17th edition of the
+  \emph{Manual}, like the 16th, considers \textsf{music} citations
+  without a date to be \enquote{generally unacceptable} (14.263),
+  while if there is more than one date \enquote{the date of the
+    original recording should be privileged} (15.57).  Finding these
+  dates may take some research, but they will basically fall into two
+  types, i.e., the date of the recording or the copyright / publishing
+  date.  Recording dates go either in \textsf{origdate} (for complete
+  albums) or \textsf{eventdate} (for individual tracks).  The current
+  copyright or publishing date goes in the \textsf{date} field, while
+  the original release date goes in \textsf{origdate}.  You may have
+  noticed that the \textsf{origdate} has two slightly different uses
+  --- you can tell \textsf{biblatex-chicago} which sort you intend by
+  using the string \texttt{reprint} in the \textsf{pubstate} field,
+  which transforms the \textsf{origdate} from a recording date into an
+  original release date.  The style will automatically use the
+  \textsf{eventdate} or the \textsf{origdate} in citations and at the
+  head of the list of references, falling back on a \textsf{date} or
+  even a \textsf{urldate} in their absence.  It will also prepend the
+  bibstring \texttt{recorded} to any part of the \textsf{eventdate}
+  that doesn't appear at the head of the list of references or, in the
+  absence of the \textsf{pubstate} mechanism, to the
+  \textsf{origdate}, or indeed to both.  You can modify what is
   printed here using the \textsf{userd} field, which acts as a sort of
   date type modifier.  In \textsf{music} entries, \textsf{userd} will
   be prepended to an \textsf{eventdate} if there is one, barring that
   to the \textsf{origdate}, barring that to a \textsf{urldate}, and
-  absent those three to a \textsf{date}.  (See holiday:fool,
-  nytrumpet:art.)
-\item[type:] As in all the audiovisual entry types, the \textsf{type}
-  field holds the medium of the recording, e.g., vinyl, 33 rpm,
-  8-track tape, cassette, compact disc, mp3, ogg vorbis.
+  absent those three to a \textsf{date}.  (See floyd:atom,
+  holiday:fool, nytrumpet:art.)
+\item[type, \mycolor{howpublished}:] As in all the audiovisual entry
+  types, the \textsf{type} field holds the medium of the recording,
+  e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg
+  vorbis.  The \colmarginpar {New!} \mycolor{\textsf{howpublished}}
+  field, newly included for the 17th edition, can hold similar
+  information \enquote{for streaming audio formats and downloads}
+  (14.263, 15.57). It can also, alternatively, hold the name of the
+  streaming service, e.g., Spotify (cf.\ rihanna:umbrella).
 \end{description}}
 
-The entries in \textsf{dates-test.bib} should at least give you a good
+The entries in \textsf{notes-test.bib} should at least give you a good
 idea of how this all works, and that file also contains an example of
 an audio book presented in a \textsf{music} entry.  If you browse the
-examples in the \emph{Manual} you will see some variations in the
-formatting choices there, from which I have made selections for
-\textsf{biblatex-chicago}.  It wasn't always clear to me that these
-variations were rules as opposed to possibilities, so I've ignored
-some of them in the code.  Arguments as to why I'm wrong will, of
-course, be entertained.  (Cf. 14.276--77, 15.53; \textsf{eventdate},
-\textsf{origdate}, \textsf{userd}; \cmd{DeclareLabeldate} in
-section~\ref{sec:authformopts} and \texttt{avdate} in
-section~\ref{sec:authpreset}; auden:reading, beethoven:sonata29,
-bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
-rubinstein:chopin.)
+examples in the \emph{Manual} you will see the sheer variety of
+possibilities for presenting these sources, my intention being that
+judicious manipulation of\ .bib entries should allow you to make
+\textsf{biblatex-chicago} do what you want.  Please let me know if
+I've ignored something you need.  (Cf. 14.263--64, 15.57;
+\textsf{eventdate}, \textsf{origdate}, \textsf{userd};
+\cmd{DeclareLabeldate} in section~\ref{sec:authformopts} and
+\texttt{avdate} in section~\ref{sec:authpreset}; auden:reading,
+beethoven:sonata29, bernstein:shostakovich, floyd:atom, holiday:fool,
+nytrumpet:art, rubinstein:chopin.)
 
 \mybigspace All \mymarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
   \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry
@@ -6830,11 +9172,9 @@ the abbreviated references that \textsf{biblatex-chicago}, in various
 circumstances, provides.  Please see the documentation of the
 \textbf{crossref} field in section~\ref{sec:fields:authdate}, below.)
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace On the same subject, when multi-volume works are
-presented in the reference apparatus, the \emph{Manual} (14.121--27,
-15.39) requires that any dates presented should be appropriate to the
+presented in the reference apparatus, the \emph{Manual} (14.116--22,
+15.41) requires that any dates presented should be appropriate to the
 specific nature of the citation.  In short, this means that a date
 range that is right for the presentation of a multi-volume work in its
 entirety isn't right for citing, e.g., a single volume of that work
@@ -6852,77 +9192,302 @@ Other sorts of parent entries aren't affected by this.  See
 harley:ancient:cart, harley:cartography, and harley:hoc for how this
 might look.
 
-\mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s
-scattered instructions (14.4--13, 14.166--169, 14.184--185, 14.200,
-14.223, 14.243--246, 15.4, 15.9) for citing online materials are
-slightly different from those suggested by standard \textsf{biblatex}.
-Indeed, this is a case where complete backward compatibility with
-other \textsf{biblatex} styles may be impossible, because as a general
-rule the \emph{Manual} considers relevant not only where a source is
-found, but also the nature of that source, e.g., if it's an online
-edition of a book (james:ambassadors), then it calls for a
-\textsf{book} entry.  Even if you cite an intrinsically online source,
-if that source is structured more or less like a conventional printed
-periodical, then you'll probably want to use \textsf{article} or
-\textsf{review} instead of \textsf{online} (stenger:privacy, which
-cites \emph{CNN.com}).  The 16th edition's suggestions for blogs lend
-themselves well to the \textsf{article} type, too, while comments
-become, logically, \textsf{reviews} (14.243--6; ellis:blog,
-ac:comment).  Otherwise, for online documents not \enquote{formally
-  published,} the \textsf{online} type is usually the best choice
-(evanston:library, powell:email).  Online videos, in particular short
-pieces or those that present excerpts of some longer event or work,
-and also online interviews, usually require this type, too.  (See
-harwood:biden, horowitz:youtube, pollan:plant, but cp.\ weed:flatiron,
-a complete film, which requires a \textsf{video} entry.)  Online audio
-pieces, particularly dated ones from an archive, work well either with
-an \textsf{online} entry or with a \textsf{misc} entry with an
-\textsf{entrysubtype}: (coolidge:speech, roosevelt:speech.)  Some
-online materials will, no doubt, make it difficult to choose an entry
-type, but so long as all locating information is present, then perhaps
-that is enough to fulfill the specification, or at least so I'd like
-to hope.
-
-\mylittlespace Constructing an \textsf{online} .bib file entry is much
-the same as in \textsf{biblatex}.  The \textsf{title} field would
-contain the title of the page, the \textsf{organization} field could
-hold the title or owner of the whole site.  If there is no specific
-title for a page, but only a generic one (powell:email), then such a
-title should go in \textsf{titleaddon}, not forgetting to begin that
-field with a lowercase letter so that capitalization will work out
-correctly.  It is worth remarking here, too, that the 16th edition of
-the \emph{Manual} (14.7--8) prefers, if they're available, revision
-dates to access dates when documenting online material.  See
-\textsf{urldate} and \textsf{userd}, below.
+\mylittlespace Finally, in order to cope with parts of the notes \&\
+bibliography specification I have fairly thoroughly revised the
+\textbf{mv*} types there for the 17th edition.  The author-date
+specification is, as I read it, simpler, so I haven't revised these
+types here.  If you should happen to leave a stray \texttt{maintitle
+  relatedtype} in an entry when switching specifications that entry
+will use the \texttt{multivolume relatedtype} instead, which will very
+likely not be what you want.
+
+\mybigspace One \colmarginpar{\textbf{online}} of the features of the
+17th edition of the \emph{Manual} is the considerably extended, but
+still scattered, treatment of online materials (8.189--92, 14.6--18,
+14.159--63, 14.175--76, 14.187, 14.189, 14.205--10, 14.233, 15.4,
+15.9, 15.49--52, 15.57).  The principles of that treatment have
+changed somewhat, as the \emph{Manual} now places greater emphasis on
+the \emph{location} of a source, which can in many cases outweigh, as
+far as choosing an entry type goes, the \emph{nature} of the source.
+Working out the correspondences between online sources and
+\textsf{biblatex-chicago} entry types can, therefore, be tricky, so I
+have included table~\ref{tab:online:adtypes} summarizing the
+increasingly detailed instructions in the \emph{Manual}, along with
+some further annotations here that might help to clarify it.
+
+\afterpage{\clearpage
+
+\begin{table}[h!]
+  \caption[\hspace{-1em}\mycolor{Online Entry Types - Author-Date}]%
+  {Online materials and author-date entry types}
+  \label{tab:online:adtypes}
+  \centering\small\sffamily
+  \hspace*{-6em}
+  \begin{tabularx}{160mm}{@{}>{\raggedright}p{25mm}>{\raggedright}p{20mm}p{15mm}p{26mm}X@{}}
+    \toprule
+    Online Material & Entry Type & CMS Ref. & Sample Entry &
+    Notes \\
+    \cmidrule{1-1}\cmidrule(l){2-2}\cmidrule(l){3-3}\cmidrule(l){4-4}
+    \cmidrule(l){5-5}
+    Online edition of trad.\ publ.\ matter. &&&& Use the same
+    entry type as you would choose were you citing it
+    from a printed source.\\\addlinespace[.6mm]
+    & @Book & 14.161-62 & james:ambassadors &
+    CMS prefers (scanned) original page nos. \\\addlinespace[.6mm]
+    & @Article @Review & 14.175 15.47-49 & black:infectious & If
+    no \enquote{suitable URL} is available, e.g., if it points
+    to a generic portal page rather than to an abstract,
+    use the name of the commercial database in an addendum
+    field instead.
+    \\\addlinespace[.6mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
+    Blogs&& 15.51 &&\\\addlinespace[1.5mm]
+    \hspace{.5em} Single post & @Article & & amlen:hoot & The
+    \textsf{maintitle} field holds the larger publication of which the
+    blog is a part.\\\addlinespace[.6mm]
+    \hspace{.5em} Whole Blog & @Periodical & & amlen:wordplay & This \&\
+    the next usually not in the ref.\ list.
+    \\\addlinespace[.6mm]
+    \hspace{.5em} Comment & @Review & & viv:amlen & The
+    \mycolor{\texttt{commenton}} \textsf{relatedtype} helps manage these,
+    in or out of the reference list. \\\addlinespace[.6mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
+    Social Media & @Online & 15.52 && This includes anything ---
+    posts, photos, videos --- on these and similar sites; the
+    \emph{location} of the material defines its treatment. \\\addlinespace[2mm]
+    \hspace{.5em} Mailing list or \hspace*{.5em} forum post & & 14.210 &
+    powell:email & Posts on private lists are to be treated as
+    \enquote{personal communications,} using @Misc w/
+    \textsf{entrysubtype}.\\\addlinespace[.6mm]
+    \hspace{.5em} Facebook&& 14.209 & diaz:surprise &\\\addlinespace[.6mm]
+    \hspace{.5em} Twitter&&& obrien:recycle &\\\addlinespace[.6mm]
+    \hspace{.5em} Instagram&&& souza:obama &\\\addlinespace[.6mm]
+    \hspace{.5em} Comments / \hspace*{.5em} replies & & 14.210
+    & braun:reply &This and the next are usually not included in the
+    reference list. The
+    \mycolor{\texttt{commenton}} \textsf{relatedtype} helps manage them,
+    in or out of that list.
+    \\
+    && 14.209 & licis:diazcomment &\\\addlinespace[.6mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
+    Online Multimedia && 15.57 &&\\\addlinespace[.6mm]
+    \hspace{.5em} Online video & @Online & 14.267 & pollan:plant &
+    This category includes TED talks and most informal videos on
+    YouTube and similar sites. \\\addlinespace[.6mm]
+    \hspace{.5em} Online video, \hspace*{.5em} from a trad.\ \hspace*{.5em}
+    journal & @Article &&
+    kessler:nyt & You can use @Online, but this requires special
+    formatting in the \textsf{note} or \textsf{titleaddon} field.
+    \\\addlinespace[.6mm]
+    \hspace{.5em} Published films in \hspace*{.5em} an archive & @Video &&
+    weed:flatiron &\\\addlinespace[.6mm]
+    \hspace{.5em} Podcasts & @Audio && danforth:podcast & Note the
+    eventdate of the individual episode.\\\addlinespace[.6mm]
+    \hspace{.5em} Archival audio & @Misc w/ \textsf{entrysubtype} & 14.264 &
+    roosevelt:speech & Can have both a venue and an origlocation.
+    \\\addlinespace[.6mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
+    Streaming Media&&&& \\\addlinespace[.6mm]
+    \hspace*{.5em} TV / Film & @Video & 14.265 & mayberry:brady &
+    The streaming service is supplied by the URL.  The
+    \mycolor{\texttt{tvepisode}} entrysubtype is new in the 17th
+    edition. \\\addlinespace[.6mm]
+    \hspace*{.5em} Music & @Music & 14.263 & rihanna:umbrella &
+    The streaming service is supplied by the howpublished field.
+    \\\addlinespace[.6mm]
+    \hspace*{.5em} News / Interviews & @Article @Review & 14.213 &
+    bundy:macneil & Network information goes in the usera field.
+    \\\addlinespace[.6mm]
+    \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
+    Websites & @Online & 14.206-7 15.50 & evanston:library stenger:privacy &
+    An online source \enquote{analogous
+    to a traditionally printed
+    work but [which] does not have (and never had) a printed counterpart}
+    may now use an @Online entry, at your discretion.
+    If you only have an access date, \enquote{n.d.}\ will appear as
+    the publication date.
+    \\\addlinespace[.6mm]
+    \hspace*{.5em} Reference works, \hspace*{.5em} cited by alpha-
+    \hspace*{.5em} betized entry & @InReference w/ entrysub-\par
+    type & 14.233 & wikiped:bibtex & As above, you can choose the
+    @Online treatment of the title, but it's best achieved
+    using an @InReference entry w/ entrysubtype. \\\addlinespace[.6mm]
+    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & \mycolor{@Dataset} &
+    14.257 & genbank:db & Treated as author-title by
+    default.\\\addlinespace[.6 mm]
+    \bottomrule
+  \end{tabularx}
+\end{table}}
+
+\mylittlespace The basic principle, as I've cited in the penultimate
+entry of table~\ref{tab:online:adtypes}, is that \enquote{the title of a
+  website that is analogous to a traditionally printed work but does
+  not have (and never had) a printed counterpart can be treated like
+  the titles of other websites, subject to editorial discretion}
+(14.206).  This means that an intrinsically online entry like
+stenger:privacy (citing CNN.com) need no longer be an \textsf{article}
+but can be presented in an \textsf{online} entry.  (The same principle
+applies to wikiped:bibtex, but because of the code facilitating
+presentation of alphabetized entries in reference works, it's best in
+this case to keep the \textsf{inreference} entry but add an
+\textsf{entrysubtype} so that the \textsf{title} is presented as it
+would be in an \textsf{online} entry.)  The corollary of the
+principle, as the first entry in table~\ref{tab:online:adtypes}
+suggests, is that an online edition of a printed work will generally
+require the same entry type as that printed work itself would.  Blogs
+are, therefore, somewhat anomalous in requiring the various periodical
+types, though the \emph{Manual} does specify that if you're not sure
+whether a website is a blog, then it probably requires the
+\textsf{online} type (14.206).  Social media, on the other hand, are
+very much subject to the first principle, requiring \textsf{online}
+entries no matter whether the citation is of text, a photo, or a
+video.  Without pretending that all of the correspondences flow
+deductively from the basic principles, I hope that the table might
+simplify most of your choices.  If something remains unclear, please
+let me know and I'll see if I can improve it.
 
 \enlargethispage{\baselineskip}
 
+\mylittlespace A few more notes are in order. I designed the
+\colmarginpar{New!} new \textsf{relatedtype}
+\mycolor{\texttt{commenton}} to facilitate citation of online
+comments, and it is available in two entry types, \textsf{online} and
+\textsf{review}.  In both types the \emph{Manual} (15.51--52)
+recommends that such material appear \emph{only} in the text and not
+in the reference list, but I have attempted to simplify the
+presentation of such material wherever you want it to appear.
+Following the specifications, then, the default when you use
+\mycolor{\texttt{commenton}} is for
+\textsf{biblatex-chicago-authordate} to modify how your .bib entry
+appears in the .bbl file by setting both \texttt{skipbib} and
+\texttt{cmsdate=full} in the \textsf{options} field, so that nothing
+appears in the reference list and citations present the full date and
+possibly also a time stamp (see below).  Further, the style sets the
+\mycolor{\textsf{verbc}} field so that these entries don't interfere
+with the provision of extra date letters --- the full date and time
+should be enough to individuate separate comments.  Finally, the style
+creates a new \textsf{customc} entry in your .bbl file which you can
+cite after your initial \mycolor{\texttt{commenton}} entry using
+\cmd{autocites} and which will, as a comment to your initial entry,
+say whether it's a comment or a reply or what have you, and then
+giving the short citation of that upon which it is a comment.
+
+\mylittlespace As an example, take the Facebook post diaz:surprise,
+which does appear in the reference list.  The entry licis:diazcomment
+presents a comment on this post using the \textsf{relatedtype}
+\mycolor{\texttt{commenton}}, so \textsf{biblatex-chicago-authordate}
+creates a new entry, diaz:surprise-customc, which won't appear in your
+.bib file (which is never altered) but in the .bbl file that
+\textsf{biber} produces to supply \textsf{biblatex} with the data for
+its citations.  A command like
+\verb+\autocites{licis:diazcomment}{diaz:surprise-customc}+ will
+produce a citation like (Licis, February 24, 2016; comment on D\'iaz
+2016).  You can alter the string connecting the two citations (by
+default \verb+\bibstring{commenton}+) by using the
+\textsf{relatedstring} field in the first of them (cf.\
+powell:comment).  (Note how minimal the .bib entry of a comment using
+this system can be --- \textsf{author}, \textsf{related},
+\textsf{relatedtype}, and \textsf{date} are pretty much the only
+fields required.)
+
+\mylittlespace Those who want \textsf{online} comments to appear in
+the reference list can still use the \mycolor{\texttt{commenton}}
+\textsf{relatedtype}, and the same citation of the commented piece
+will appear there, connected by the same string that the
+\textsf{customc} entry provides.  Here, though, you can also provide a
+separate \textsf{title} for the comment, and/or a separate
+\textsf{url} for it, should they exist, which will be printed
+before/after the citation of the commented piece, respectively.  (In
+\textsf{review} entries, which use the same \textsf{relatedtype}, only
+the generic title is available, as is always the case with such
+entries.)  If you manually set either (or both) of the
+\texttt{cmsdate} or the \texttt{skipbib} options in your entry then
+\textsf{biblatex-chicago} will assume you want to hand-craft that
+entry without its intervention, though it will still provide the
+virtual \textsf{customc} entry in your .bbl file, as that may still
+prove convenient.  Note also that any \mycolor{\textsf{verbc}} field
+you provide will never be altered by the package.
+
+\mylittlespace In general, constructing an \textsf{online}\ .bib file
+entry is much the same as in \textsf{biblatex}.  The \textsf{title}
+field would contain the title of the page, the \textsf{organization}
+field could hold the title or owner of the whole site.  If there is no
+specific title for a page, but only a generic one, then such a title
+should go in \textsf{titleaddon}, not forgetting to begin that field
+with a lowercase letter so that capitalization will work out
+correctly.  It is worth remarking here, too, that the \emph{Manual}
+(15.50) strongly prefers, if they're available, revision dates to
+access dates when documenting online material.  If there is only a
+\textsf{urldate} in an entry, and that date is an access date (i.e.,
+there's no \textsf{userd} field), then \enquote{n.d.} will appear in
+citations and at the head of the entry in the reference list.
+Moreover, given how rapidly online sources can change (14.191, 14.209,
+14.233), a time stamp may often be necessary further to specify a
+revision date (\textsf{urldate}) or the date of a comment or reply
+(\textsf{date}).  This time specification should be added to the date
+field using \textsf{biblatex's} standard format, i.e.,
+\texttt{2008-07-01T10:18:00}.  If a time zone is needed, then a
+separate \textsf{timezone} or \textsf{urltimezone} field is the best
+way, as it allows you to provide the initialisms that the
+\emph{Manual} prefers (10.41, 14.191).  On all of this please see
+\textsf{date}, \mycolor{\textsf{timezone}}, \textsf{urldate},
+\textsf{userd}, and \mycolor{\textsf{verbc}} in
+section~\ref{sec:fields:authdate}, below.  Cf.\ also the documentation
+of the \mycolor{\texttt{commenton}} \textsf{relatedtype} in
+section~\ref{sec:authrelated}.
+
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
-brief on the subject of patents (15.50), but very clear about which
+brief on the subject of patents (15.55), but very clear about which
 information it wants you to present, so such entries may not work well
-with other \textsf{biblatex} styles.  In a change to previous
-practice, the 16th edition of Chicago's author-date style prefers the
-\emph{later} of the two possible dates to appear in citations and at
-the head of the entry in the list of references.  If a patent has been
-filed but not yet granted, then you can place the filing date in
-either the \textsf{date} field or the \textsf{origdate} field, and
-\textsf{biblatex-chicago-authordate} will automatically prepend the
-bibstring \texttt{patentfiled} to it.  If the patent has been granted,
-then you put the filing date in the \textsf{origdate} field, and you
-put the date it was issued in the \textsf{date} field, to which the
-bibstring \texttt{patentissued} will automatically be prepended, and
-it is this later date that will head the entry and appear in
-citations.  The patent number goes in the \textsf{number} field, and
-you should use the standard \textsf{biblatex} bibstrings in the
-\textsf{type} field.  Though it isn't mentioned by the \emph{Manual},
-\textsf{biblatex-chicago-authordate} will print the \textsf{holder}
-after the \textsf{author}, if you provide one.  Finally, the 16th
-edition of the \emph{Manual} capitalizes the \textsf{title}
-sentence-style, which seems to be the generally-accepted convention,
-across both Chicago styles.  As I've removed all of the automatic
-down-casing code from previous editions, you may need manually to
-revise the \textsf{title} field to provide the lowercase letters.  See
-petroff:impurity.
+with other \textsf{biblatex} styles.  Chicago's author-date style
+prefers the \emph{later} of the two possible dates to appear in
+citations and at the head of the entry in the list of references.  If
+a patent has been filed but not yet granted, then you can place the
+filing date in either the \textsf{date} field or the \textsf{origdate}
+field, and \textsf{biblatex-chicago-authordate} will automatically
+prepend the bibstring \texttt{patentfiled} to it.  If the patent has
+been granted, then you put the filing date in the \textsf{origdate}
+field, and you put the date it was issued in the \textsf{date} field,
+to which the bibstring \texttt{patentissued} will automatically be
+prepended, and it is this later date that will head the entry and
+appear in citations.  The patent number goes in the \textsf{number}
+field, and you should use the standard \textsf{biblatex} bibstrings in
+the \textsf{type} field.  Though it isn't mentioned by the
+\emph{Manual}, \textsf{biblatex-chicago-authordate} will print the
+\textsf{holder} after the \textsf{author}, if you provide one.
+Finally, the style capitalizes the \textsf{title} sentence-style,
+which seems to be the generally-accepted convention across all Chicago
+specifications.  If you need to keep a word capitalized then you
+should wrap it in curly braces.  See petroff:impurity.
+
+\mybigspace The \colmarginpar{\textbf{performance}} 17th edition of
+the \emph{Manual} includes a new section (14.266) on citing live
+performances, and even though such references can usually be limited
+to the main text (cf.\ 15.57) it may sometimes be useful to include
+them in a reference list.  Since \textsf{biblatex} provides the
+\mycolor{\textbf{performance}} type, albeit without using it in its
+standard styles, I though it might be useful to define it for
+\textsf{biblatex-chicago}, particularly as the other option for such
+material is the \textsf{misc} entry without any \textsf{entrysubtype},
+and that entry type is already somewhat overloaded, though you can
+still use it if you wish.
+
+\mylittlespace Such entries will generally have a \textsf{title}, a
+\textsf{venue}, a \textsf{location} for the venue, and a \textsf{date}
+for the performance, along with a possible plethora of authorial
+and/or editorial roles depending on which sorts of contributor(s) you
+wish to emphasize in the citation.  The \textsf{editor[abc]} and
+\textsf{editor[abc]type} fields should be most helpful here.  I have
+included strings for \mycolor{\texttt{choreographer}} in all
+localization files, but for others you may need to provide them in the
+\textsf{editor[abc]type} fields as you wish them printed ---
+\textsf{biblatex-chicago} will automatically capitalize any that start
+with a lowercase letter.  For the author-date styles it will probably
+be convenient to allow one of these names to appear at the head of the
+entry and in citations, as this will facilitate the appearance of the
+\textsf{extradate} to distinguish, e.g., multiple performances of the
+same work or performances of different works by the same producer or
+choreographer.
 
 \mybigspace This \mymarginpar{\textbf{periodical}} is the standard
 \textsf{biblatex} entry type for presenting an entire issue of a
@@ -6938,17 +9503,32 @@ initial lowercase letter to activate the automatic capitalization
 routines, though this isn't strictly necessary in the author-date
 styles.  (See \emph{Manual} 14.187; good:wholeissue.)
 
-\mylittlespace It is worth noting that the special \textsf{biblatex}
-field \textsf{shortjournal} allows you to present shortened
-\textsf{journaltitles} in \textsf{article}, \textsf{review}, and
-\textsf{periodical} entries, as well as facilitating the creation of
-lists of journal abbreviations in the manner of a \textsf{shorthand}
-list.  Because the \textsf{periodical} type uses the \textsf{title}
-field instead of \textsf{journaltitle}, \textsf{biblatex-chicago}
-automatically copies any \textsf{shorttitle} field, if one is present,
-into \textsf{shortjournal}.  Please see the documentation of
-\textbf{shortjournal} in section~\ref{sec:fields:authdate} for all the
-details on how this works.
+\mylittlespace It is worth noting two things.  First, the special
+\textsf{biblatex} field \textsf{shortjournal} allows you to present
+shortened \textsf{journaltitles} in \textsf{article}, \textsf{review},
+and \textsf{periodical} entries, as well as facilitating the creation
+of lists of journal abbreviations in the manner of a
+\textsf{shorthand} list.  Because the \textsf{periodical} type uses
+the \textsf{title} field instead of \textsf{journaltitle},
+\textsf{biblatex-chicago} automatically copies any \textsf{shorttitle}
+field, if one is present, into \textsf{shortjournal}.  Please see the
+documentation of \textbf{shortjournal} in
+section~\ref{sec:fields:authdate} for all the details on how this
+works.  Second, although the 17th edition recommends that references
+to whole blogs, as opposed to individual blog posts, need appear only
+in the text (15.51), using the \textsf{periodical} type for such
+material can help with this, in or out of the reference list.  The
+\colmarginpar{New!} new \mycolor{\texttt{authortitle}} entry option
+will ensure the presence of the name of the blog (as opposed to the
+non-existent date) in citations, and you could also use a
+\cmd{citeurl} command to give the URL in the text (or a note).
+Alternately, you could let the entry appear in the reference list and
+cite it in the usual way.  In that list the \emph{Manual} (14.208)
+recommends that you include the name of any larger (usually
+periodical) publication of which the blog is a part.  The
+\textsf{maintitle} field (with \textsf{mainsubtitle} and
+\textsf{maintitleaddon}, if needed) is the place for it. Cf.\
+amlen:wordplay.
 
 \mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
 \textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
@@ -6972,15 +9552,13 @@ an alphabetized entry, and the fact that any \textsf{postnote} field
 will be printed verbatim, rather than formatted as an alphabetized
 entry.  (Cf.\ \textsf{inreference}, above.)
 
-%\enlargethispage{-\baselineskip}
-
-\mybigspace This \colmarginpar{\textbf{report}} entry type is a
+\mybigspace This \mymarginpar{\textbf{report}} entry type is a
 \textsf{biblatex} generalization of the traditional \textsc{Bib}\TeX\
 type \textsf{techreport}.  Instructions for such entries are rather
-thin on the ground in the \emph{Manual} (8.183, 14.249), so I have
+thin on the ground in the \emph{Manual} (8.186, 14.220), so I have
 followed the generic advice about formatting it like a book, and hope
 that the results conform to the specification.  At least one user has
-indicated a need, now filled, for an \mycolor{\texttt{unpublished}}
+indicated a need, now filled, for an \texttt{unpublished}
 \textsf{entrysubtype}, which prints the \textsf{title} inside
 quotation marks (or, in \textsf{authordate-trad}, in plain roman)
 instead of in italics, but affects nothing else.  This detail aside,
@@ -6990,34 +9568,28 @@ the kind of report in question, and the \textsf{isrn} field containing
 the International Standard Technical Report Number of a technical
 report.  As in standard \textsf{biblatex}, if you use a
 \textsf{techreport} entry, then the \textsf{type} field automatically
-defaults to \cmd{bibstring\{techreport\}}.  As with \textsf{booklet}
+defaults to \verb+\bibstring{techreport}+.  As with \textsf{booklet}
 and \textsf{manual}, you can also use a \textsf{book} entry, putting
 the report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
-\mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry
-type wasn't, strictly speaking, necessary for the 15th edition
-author-date specification.  With the major changes to the presentation
-of the title fields in the 16th edition, however, it has become
-necessary for \textsf{authordate} users, if not
-\textsf{authordate-trad} users, to familiarize themselves with it as a
-means of coping with the \emph{Manual}'s complicated requirements for
-citing periodicals of all sorts.  As its name suggests, this entry
-type was designed for reviews published in periodicals, and if you've
-already read the \textsf{article} instructions above --- if you
-haven't, I recommend doing so now --- you'll know that \textsf{review}
-serves as well for citing other sorts of material with generic titles,
-like letters to the editor, obituaries, interviews, online comments
-and the like.  The primary rule is that any piece that has only a
-generic title, like \enquote{review of \ldots,} \enquote{interview
-  with \ldots,} or \enquote{obituary of \ldots,} calls for the
-\textsf{review} type.  Any piece that also has a specific title, e.g.,
-\enquote{\enquote{Lost in \textsc{Bib}\TeX,} an interview with
-  \ldots,} requires an \textsf{article} entry.  (This assumes the text
-is found in a periodical of some sort.  Were it found in a book, then
-the \textsf{incollection} type would serve your needs, and you could
-use \textsf{title} and \textsf{titleaddon} there.  While we're on the
-topic of exceptions, the \emph{Manual} includes an example --- 14.221
+\mybigspace As \colmarginpar{\textbf{review}} its name suggests, the
+\textsf{review} entry type was designed for reviews published in
+periodicals, and if you've already read the \textsf{article}
+instructions above --- if you haven't, I recommend doing so now ---
+you'll know that \textsf{review} serves as well for citing other sorts
+of material with generic titles, like letters to the editor,
+obituaries, interviews, online comments and the like.  The primary
+rule is that any piece that has only a generic title, like
+\enquote{review of \ldots,} \enquote{interview with \ldots,} or
+\enquote{obituary of \ldots,} calls for the \textsf{review} type.  Any
+piece that also has a specific title, e.g., \enquote{\enquote{Lost in
+    \textsc{Bib}\TeX,} an interview with \ldots,} requires an
+\textsf{article} entry.  (This assumes the text is found in a
+periodical of some sort.  Were it found in a book, then the
+\textsf{incollection} type would serve your needs, and you could use
+\textsf{title} and \textsf{titleaddon} there.  While we're on the
+topic of exceptions, the \emph{Manual} includes an example --- 14.213
 --- where the \enquote{Interview} part of the title is considered a
 subtitle rather than a titleaddon, said part therefore being included
 inside the quotation marks and capitalized accordingly.  Not having
@@ -7030,18 +9602,18 @@ need to determine which sort of periodical you are citing, the rules
 for which are the same as for an \textsf{article} entry.  If it is a
 \enquote{magazine} or a \enquote{newspaper}, then you need an
 \textsf{entrysubtype} \texttt{magazine}, or the synonymous
-\textsf{entrysubtype} \mycolor{\texttt{newspaper}}.  The generic title
-goes in \textsf{title} and the other fields work just as as they do in
-an \textsf{article} entry with the same \textsf{entrysubtype},
-including the substitution of the \textsf{journaltitle} for the
-\textsf{author} if the latter is missing. (See 14.202--203, 14.205,
-14.208, 14.214--217, 14.221, 15.47; barcott:review, bundy:macneil,
-Clemens:letter, gourmet:052006, kozinn:review, nyt:trevorobit,
-unsigned:ranke, wallraff:word.)  If, on the other hand, the piece
-comes from a \enquote{journal,} then you don't need an
-\textsf{entrysubtype}.  The generic title goes in \textsf{title}, and
-the remaining fields work just as they do in a plain \textsf{article}
-entry.  (See 14.215; ratliff:review.)
+\textsf{entrysubtype} \texttt{newspaper}.  The generic title goes in
+\textsf{title} and the other fields work just as as they do in an
+\textsf{article} entry with the same \textsf{entrysubtype}, including
+the substitution of the \textsf{journaltitle} for the \textsf{author}
+if the latter is missing. (See 14.190--91, 14.195--96, 14.201--4,
+14.213, 15.49; barcott:review, bundy:macneil, Clemens:letter,
+gourmet:052006, kozinn:review, nyt:trevorobit, unsigned:ranke,
+wallraff:word.)  If, on the other hand, the piece comes from a
+\enquote{journal,} then you don't need an \textsf{entrysubtype}.  The
+generic title goes in \textsf{title}, and the remaining fields work
+just as they do in a plain \textsf{article} entry.  (See 14.202;
+ratliff:review.)
 
 \mylittlespace The \emph{Manual} now suggests that, no matter which
 citation style you are using, it is \enquote{usually sufficient to
@@ -7059,16 +9631,22 @@ but if it's a fuller entry also containing an \textsf{author} then
 you'll also need \texttt{useauthor=false} in the \textsf{options}
 field.  Other surplus fields will be ignored.  (See osborne:poison.)
 
-\mylittlespace \textsf{Biblatex-chicago} \colmarginpar{New!} now also,
-at the behest of Bertold Schweitzer, supports the \textsf{relatedtype}
-\mycolor{\texttt{reviewof}}, which allows you to use the
-\textsf{related} mechanism to provide information about the work being
-reviewed.  This may be particularly helpful if you need to cite
-multiple reviews of the same work, but in any case the usual
-distinction between \textsf{article} and \textsf{review} entries still
-holds, with the \textsf{related} entry's \textsf{title} providing the
-\textsf{titleaddon} in the former type and the \textsf{title} in the
-latter.  Please see section \ref{sec:authrelated} for further details.
+\enlargethispage{\baselineskip}
+
+\mylittlespace \textsf{Biblatex-chicago} also, at the behest of
+Bertold Schweitzer, supports the \textsf{relatedtype}
+\texttt{reviewof}, which allows you to use the \textsf{related}
+mechanism to provide information about the work being reviewed,
+thereby simplifying how much information you need to provide in the
+reviewing entry.  In particular, it relieves you of the need to
+construct \textsf{title} or \textsf{titleaddon} fields like:
+\verb+review of \mkbibemph{Book Title} by Author+, as the
+\textsf{related} entry's \textsf{title} automatically provides the
+\textsf{title} in the \textsf{review} type and the \textsf{titleaddon}
+in the \textsf{article} type, with the \textsf{related} mechanism
+providing the connecting string.  This may be particularly helpful if
+you need to cite multiple reviews of the same work.  Please see
+section \ref{sec:authrelated} for further information.
 
 \mylittlespace Most of the onerous details are the same as I described
 them in the \textbf{article} section above, but I'll repeat some of
@@ -7081,37 +9659,110 @@ in citations and heads the entry in the list of references, without an
 \textsf{entrysubtype} the \textsf{title} does the same.  In the former
 case, \textsf{Biber} handles the sorting for you, but in the latter
 you'll need a \textsf{sortkey} because \textsf{journaltitle} comes
-before \textsf{title} in the sorting scheme.  (14.175, 14.217;
-gourmet:052006, nyt:trevorobit, unsigned:ranke, and see
-\cmd{DeclareSortingTemplate} in section~\ref{sec:authformopts}, below.).
-As in \textsf{misc} entries with an \textsf{entrysubtype}, words like
-\enquote{interview,} \enquote{review,} and \enquote{letter} only need
-capitalization after a full stop, so you can start the \textsf{title}
-field with a lowercase letter and let the automatic field formatting
-with \cmd{autocap} do its work, though this isn't strictly necessary
-with \textsf{biblatex-chicago-authordate}.
-
-\mylittlespace One detail of the \textsf{review} type is new to both
-specifications, and responds to the needs of the 16th edition of the
-\emph{Manual}.  As I mentioned above, blogs are best treated as
-\textsf{articles} with \texttt{magazine} \textsf{entrysubtype},
-whereas comments on those blogs --- or on any similar sort of online
-content --- need the \textsf{review} type with the same
-\textsf{entrysubtype}.  What they will frequently also need is a date
-of some sort closely associated with the comment (14.246; ac:comment),
-so I have included the \textsf{eventdate} in \textsf{review} entries
-for just this purpose.  The \textsf{eventyear} will appear in
-citations and at the head of the reference list entry, while the
-remainder of the \textsf{eventdate} will be printed just after the
-\textsf{title}.  If, in addition, you need an identifying timestamp,
-then the \textsf{nameaddon} field is the place for it, but you'll have
-to provide your own parentheses, in order to preserve the possibility
-of providing pseudonyms in square brackets that is the standard
-function of this field in all other entry types, and possibly in the
-the \textsf{review} type as well.  (Cf.\ the documentation of
-\textsf{eventdate} in section~\ref{sec:fields:authdate},
+before \textsf{title} in the sorting scheme.  (14.204; gourmet:052006,
+nyt:trevorobit, unsigned:ranke, and see \cmd{DeclareSortingTemplate}
+in section~\ref{sec:authformopts}, below.).  As in \textsf{misc}
+entries with an \textsf{entrysubtype}, words like \enquote{interview,}
+\enquote{review,} and \enquote{letter} only need capitalization after
+a full stop, so you can start the \textsf{title} field with a
+lowercase letter and let the automatic field formatting with
+\cmd{autocap} do its work, though this isn't strictly necessary with
+\textsf{biblatex-chicago-authordate}.
+
+\mylittlespace A \colmarginpar{New!} few details of the
+\textsf{review} type are fairly new, and in particular have changed
+between the 16th and 17th editions of the \emph{Manual}.  As I
+mentioned above, blogs are best treated as \textsf{articles} with
+\texttt{magazine} \textsf{entrysubtype}, whereas comments on those
+blogs --- or replies to those comments, etc.\ --- need the
+\textsf{review} type with the same \textsf{entrysubtype}.  The 17th
+edition recommends that blog comments appear only in the text, and not
+in the reference list (15.51), so just as with comments in social
+media threads, for which see the \textbf{online} type above, I have
+provided the \mycolor{\texttt{commenton}} \texttt{relatedtype} to
+simplify the presentation of such material wherever you want it to
+appear.  Following the specifications, then, the default when you use
+\mycolor{\texttt{commenton}} is for
+\textsf{biblatex-chicago-authordate} to modify how your .bib entry
+appears in the .bbl file by setting both \texttt{skipbib} and
+\texttt{cmsdate=full} in the \textsf{options} field, so that nothing
+appears in the reference list and citations present the full date and
+possibly also a time stamp (see below).  Further, the style sets the
+\mycolor{\textsf{verbc}} field so that these entries don't interfere
+with the provision of extra date letters --- the full date and time
+should be enough to individuate separate comments.  Finally, the style
+creates a new \textsf{customc} entry in your .bbl file which you can
+cite after your initial \mycolor{\texttt{commenton}} entry using
+\cmd{autocites} and which will, as a comment to your initial entry,
+say whether it's a comment or a reply or what have you, and then
+giving the short citation of that upon which it is a comment.
+
+\mylittlespace As an example, take the blog ellis:blog, which does
+appear in the reference list.  The entry ac:comment presents a comment
+on this post using the \textsf{relatedtype}
+\mycolor{\texttt{commenton}}, so \textsf{biblatex-chicago-authordate}
+creates a new entry, ellis:blog-customc, which won't appear in your
+.bib file (which is never altered) but in the .bbl file that
+\textsf{biber} produces to supply \textsf{biblatex} with the data for
+its citations.  A command in your document like
+\verb+\autocites{ac:comment}{ellis:blog-customc}+ will produce a
+citation like (AC, July 1, 2008, 10:18 a.m.; comment on Ellis 2008).
+You can alter the string connecting the two citations (by default
+\verb+\bibstring{commenton}+) by using the \textsf{relatedstring}
+field in the first of them.  (Note how minimal the .bib entry of a
+comment using this system can be --- \textsf{author},
+\textsf{entrysubtype}, \textsf{related}, \textsf{relatedtype}, and
+\textsf{eventdate} are pretty much the only fields required.)
+
+\mylittlespace Those who want \textsf{online} comments to appear in
+the reference list can still use the \mycolor{\texttt{commenton}}
+\textsf{relatedtype}, and the same citation of the commented piece
+will appear there, connected by the same string that the
+\textsf{customc} entry provides.  Here, though, you can also provide a
+separate \textsf{url} for the comment, should it exist, which will be
+printed after the citation of the commented piece.  (In
+\textsf{online} entries, which use the same \textsf{relatedtype}, you
+can also provide a separate title for the comment.)  If you manually
+set either (or both) of the \texttt{cmsdate} or the \texttt{skipbib}
+options in your entry then \textsf{biblatex-chicago} will assume you
+want to hand-craft that entry without its intervention, though it will
+still provide the virtual \textsf{customc} entry in your .bbl file, as
+that may still prove convenient.  Note also that any
+\mycolor{\textsf{verbc}} field you provide will never be altered by
+the package.  (Please see the documentation of this
+\textsf{relatedtype} in section~\ref{sec:authrelated}, that of
+\mycolor{\textsf{verbc}} in section~\ref{sec:fields:authdate}, and
+also the information about online materials in
+table~\ref{tab:online:adtypes}.)
+
+\mylittlespace The new edition of the \emph{Manual} retains the
+requirement for a date closely associated with the comment (14.208,
+15.51), so in such entries you now have a choice.  If you are using
+the \mycolor{\texttt{commenton}} \textsf{relatedtype}, you can use the
+\textsf{date} or \textsf{eventdate} indifferently, as even when you
+print the entry in the reference list the reference to the main blog
+provides its own date.  If, in 16th-edition style, you print a fuller
+entry in the reference list, then you'll need the \textsf{eventdate}
+for the comment, as the \textsf{date} applies to the main blog post.
+If you need a time stamp in addition, as may frequently be the case
+with multiple contributions by the same author to a single thread,
+then you should now use the standard \textsf{biblatex} time-stamp
+format (e.g., \texttt{2008-07-01T10:18:00}) in whichever of the two
+date fields you're using, and not, as previously, in the
+\textsf{nameaddon} field.  \textsf{Biblatex-chicago} will format and
+print it appropriately.  This change allows the \textsf{nameaddon}
+field to revert to its primary use, which is to provide extra
+information about the \textsf{author}.  In blog comments, this could
+include the commenter's geographical location, which you need to
+enclose in parentheses, as I've removed the automatic square brackets
+from this field to allow it this more general usefulness.  You can, of
+course, still provide your own square brackets in \textsf{review}
+entries to indicate pseudonymous authorship, which is the standard
+function of \textsf{nameaddon} in most entry types.  Please see the
+documentation of \textsf{date}, \textsf{eventdate}, and
+\textsf{timezone} in section~\ref{sec:fields:authdate},
 \cmd{DeclareLabeldate} in section~\ref{sec:authformopts}, and
-\texttt{avdate} in section~\ref{sec:authpreset}.)
+\texttt{avdate} in section~\ref{sec:authpreset}.
 
 \mylittlespace For the reasons I explained in the \textsf{article}
 docs above, I have brought the \textsf{article} and \textsf{review}
@@ -7133,7 +9784,53 @@ the creation of lists of journal abbreviations in the manner of a
 \textbf{shortjournal} in section~\ref{sec:fields:authdate} for all the
 details on how this works.
 
-%%\enlargethispage{\baselineskip}
+\mybigspace In \colmarginpar{\textbf{standard}} older releases it was
+fairly straightforward to present published national or international
+standards using a \textsf{book} entry, but with some additional
+specifications now included in the 17th edition of the \emph{Manual}
+(14.259, 15.37) I think it might be helpful to provide a separate
+entry type.  The \mycolor{\textbf{standard}} type has long existed in
+\textsf{biblatex}, though none of its included styles use it.  In
+\textsf{biblatex-chicago} constructing such an entry is mostly
+straightforward.  The organization responsible for the standard goes
+in \textsf{organization}, the title in \textsf{title}, and the
+\textsf{series} and \textsf{number} fields provide the ID of the
+standard.  The \textsf{date} field generally provides the publication
+date, though for some standards there may also be a later
+reaffirmation date (or similar), for which you can use the
+\textsf{eventdate}.  To choose which year appears in citations, the
+\mycolor{\textbf{standard}} type follows, by default, the same
+ordering as \textsf{review} and \textsf{music} entries, so that the
+\textsf{eventdate} will, if present, provide the year.  (Cf.\
+\texttt{avdate} in section~\ref{sec:authpreset}, below.)
+
+\mylittlespace Now, for the peculiarities.  In the reference list, the
+\textsf{organization} will appear at the head of the entry, and will
+be reprinted as the publisher.  If you wish to provide a shortened
+version for the second appearance, then the \textsf{publisher} field
+is the place for it.  You can also use an \textsf{author} instead of
+an \textsf{organization}, but in such a case you'll have to provide a
+\textsf{publisher}, and no matter which field you choose to appear at
+the head of the entry you'll usually have to think about providing
+some sort of abbreviated form for citations.  A \textsf{shortauthor}
+will appear only in citations, while a \textsf{shorthand} can also
+appear at the head of the entry in the list of references.  (If you
+provide the latter, \textsf{biblatex-chicago} will automatically sort
+entries by it.)  Any named \textsf{editor} or \textsf{namec} will, as
+per the specification, \emph{not} appear at the head of entries.  You
+can really only alter this by using a \textsf{book} entry, instead.
+(Cf.\ w3c:xml, and the \textsf{shorthand} docs on
+page~\pageref{sec:ad:shorthand}, below.)
+
+\mylittlespace Finally, it is distinctly possible that an entry with
+two dates will need somehow to specify just what sort of dates are
+involved.  The usual \textsf{biblatex-chicago} method is the
+\textsf{userd} field, and here that field will act as a date-type for
+the \textsf{date} field itself, assuming as usual that there is no
+\textsf{urldate}.  For the \textsf{eventdate}, you'll need to use
+\textsf{howpublished}, which I have commandeered for this purpose in a
+few other entry types, as well.  (Cf.\ niso:bibref and
+\textbf{howpublished} in section~\ref{sec:fields:authdate}, below.)
 
 \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to
 use if the main focus of a reference is supplemental material in a
@@ -7160,20 +9857,18 @@ depending on the context.  Examples might be \enquote{\texttt{preface
 that unless you use a \cmd{bibstring} command in the \textsf{type}
 field, the resultant entry will not be portable across languages.)
 
-% %\enlargethispage{\baselineskip}
-
 \mylittlespace The other rules for constructing your .bib entry remain
 the same.  The \textsf{author} field refers to the author of the
 introduction or afterword, while \textsf{bookauthor} refers to the
-author of the main text of the work, if the two differ.  For the 16th
-edition, the \emph{Manual} requires that you include the page range
+author of the main text of the work, if the two differ.  Recent
+editions of the \emph{Manual} requires that you include the page range
 for the cited part in the list of references.  As ever, if the focus
 of the reference is the main text of the book, but you want to mention
 the name of the writer of an introduction or afterword for
 completeness, then the normal \textsf{biblatex} rules apply, and you
 can just put their name in the appropriate field of a \textsf{book}
 entry, that is, in the \textsf{foreword}, \textsf{afterword}, or
-\textsf{introduction} field.  (See \emph{Manual} 14.116;
+\textsf{introduction} field.  (See \emph{Manual} 14.110;
 friedman:intro, polakow:afterw, prose:intro).
 
 \mybigspace This \mymarginpar{\textbf{suppcollection}} fulfills a
@@ -7187,12 +9882,11 @@ intended to allow reference to generically-titled works in
 periodicals, such as regular columns or letters to the editor.
 \textsf{Biblatex} also provides the \textsf{review} type for this
 purpose, so in both Chicago styles \textsf{suppperiodical} is an alias
-of \textsf{review}.  In the 16th edition of the \textsf{authordate}
-style, as discussed above, the use of this latter entry type has
-become necessary, so please see its documentation for instructions on
-how to construct a .bib entry for such works.
+of \textsf{review}.  Please see above under \textbf{review} for the
+full instructions on how to construct a .bib entry for such a
+reference.
 
-\mybigspace The \colmarginpar{\textbf{unpublished}}
+\mybigspace The \mymarginpar{\textbf{unpublished}}
 \textsf{unpublished} entry type works largely as it does in standard
 \textsf{biblatex}, though it's worth remembering that you should use a
 lowercase letter at the start of your \textsf{note} field (or perhaps
@@ -7206,15 +9900,22 @@ conforming to the indications of the \emph{Manual}, and thanks to the
 prompting of Jan David Hauck, you can use the \textsf{venue},
 \textsf{eventdate}, \textsf{eventtitle}, and \textsf{eventtitleaddon}
 fields further to specify unpublished conference papers and the like
-(14.226--8; nass:address).
-
-\mybigspace This \mymarginpar{\textbf{video}} is the last of the three
-audiovisual entry types, and as its name suggests it is intended for
-citing visual media, be it films of any sort or TV shows, broadcast,
-on the Net, on VHS, DVD, or Blu-ray.  As with the \textsf{music} type
-discussed above, certain choices had to be made when associating the
-production roles found, e.g., on a DVD, to those bookish ones provided
-by \textsf{biblatex}.  Here are the main correspondences:
+(14.216--18; nass:address).
+
+\mybigspace This \colmarginpar{\textbf{video}} is the last of the
+three audiovisual entry types, and as its name suggests it is intended
+for citing visual media, be it films of any sort or TV shows,
+broadcast, on the Net, on VHS, DVD, or Blu-ray, though it will serve
+as well, I think, for radio broadcasts of plays or drama serials.  As
+with the \textsf{music} type discussed above, certain choices had to
+be made when associating the production roles found, e.g., on a DVD,
+to those bookish ones provided by \textsf{biblatex}.  The 17th edition
+of the \emph{Manual} once again revised its recommendations for this
+type, but fortunately the changes are additive, i.e., you can re-use
+16th-edition citations but are encouraged to peruse the following
+guidelines to see if there's any information you might think of adding
+to bring your citations more into line with the spec.  Here are the
+main guidelines:
 
 {\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
 \begin{description}
@@ -7233,36 +9934,51 @@ by \textsf{biblatex}.  Here are the main correspondences:
   roles, you will need to identify them using the following:
 \item[editortype, editoratype, editorbtype:] The most common roles,
   all associated with specific bibstrings (or their absence), will
-  likely be \texttt{director}, \texttt{produ\-cer}, and, oddly,
+  likely be \texttt{director}, \texttt{producer}, and, oddly,
   \texttt{none}.  The last is particularly useful if you want to
   identify performers, as they usually don't need further specifying
   and this role prevents \textsf{biblatex} from falling back on the
-  default \texttt{editor} bibstring.
+  default \texttt{editor} bibstring.  Any other roles you want to
+  emphasize, even if there is no pre-defined \cmd{bibstring}, can be
+  provided here, and will be printed as-is, contextually capitalized.
+  (Cf.\ hitchcock:nbynw.)
 \item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As
   with the other audiovisual types, \textsf{video} serves as an
   analogue both to books and to collections, so the \textsf{title} may
   be of a whole film DVD or of a TV series, or it may identify one
   episode in a series or one scene in a film.  In the latter cases,
   the title of the whole would go in \textsf{booktitle}.  The
-  \textsf{booktitleaddon} field, in a change from the 15th edition,
-  may be useful for specifying the season and/or episode number of a
-  TV series, while the \textsf{titleaddon} is for any information that
-  needs to come between the \textsf{title} and the \textsf{booktitle}
-  (cleese:holygrail, episode:tv, handel:messiah).  As in the
-  \textsf{music} type, \textsf{maintitle} may be necessary for a boxed
-  set or something similar.
-\item[date, eventdate, origdate, pubstate:] The 16th edition of the
-  \textsf{Manual} now \enquote{recommends a more comprehensive
-    approach to dating audiovisual materials than in previous
-    editions} (15.53).  Indeed, \enquote{citations without a date are
-    generally unacceptable} (14.276), while if there is more than one
-  date \enquote{the date of the original recording should be
-    privileged} (15.53).  As with \textsf{music} entries, in order to
-  follow these specifications I have had to provide three separate
-  date fields for citing \textsf{video} sources, but their uses differ
-  somewhat between the two types.  In both, the \textsf{date} will
-  generally provide the publishing or copyright date of the medium you
-  are referencing.  More specific to this entry type, the
+  \textsf{booktitleaddon} field is the place for specifying the season
+  and/or episode number of a TV series, while the \textsf{titleaddon}
+  is for any information that needs to come between the \textsf{title}
+  and the \textsf{booktitle} (american:crime, cleese:holygrail,
+  friends:\break leia, handel:messiah, hitchcock:nbynw,
+  mayberry:brady).  As in the \textsf{music} type, \textsf{maintitle}
+  may be necessary for a boxed set or something similar.
+\item[\mycolor{entrysubtype:}] If, for some reason, you want to cite
+  an individual episode or scene without reference to any larger unit,
+  then your entry will contain only a \textsf{title}, which
+  \textsf{biblatex-chicago} would normally interpret as the title of a
+  complete film or TV series.  In such a case, you'll need to define
+  an \textsf{entrysubtype} to let it know that the lone \textsf{title}
+  is such a sub-unit.  In quite a different syntactic transformation,
+  the 17th edition (14.265) now recommends that, when presenting
+  episodes from a TV series, the name of the series
+  (\textsf{booktitle}) comes before the episode name (\textsf{title}).
+  The exact string \mycolor{\texttt{tvepisode}} in the
+  \textsf{entrysubtype} field achieves this reversal, which includes
+  using the \textsf{booktitle} as a \textsf{sorttitle} in the
+  reference list and also as the \textsf{labeltitle} in short notes.
+\item[date, eventdate, origdate, pubstate:] The 17th edition of the
+  \emph{Manual} continues to encourage writers to find some way of
+  dating audiovisual materials, while if there is more than one date
+  \enquote{the date of the original recording should be privileged}
+  (15.57).  As with \textsf{music} entries, in order to follow these
+  specifications I have had to provide three separate date fields for
+  citing \textsf{video} sources, but their uses differ somewhat
+  between the two types.  In both, the \textsf{date} will generally
+  provide the publishing or copyright date of the medium you are
+  referencing.  More specific to this entry type, the
   \textsf{origdate} will generally hold the date of the original
   theatrical release of a film, while the \textsf{eventdate} will most
   commonly present either the broadcast date of a particular TV
@@ -7282,9 +9998,6 @@ by \textsf{biblatex}.  Here are the main correspondences:
   the entry, though I have altered the string that is printed there.
   Cf.\ friends:leia, handel:messiah, hitchcock:nbynw;
   \textsf{pubstate}, below.
-\item[entrysubtype:] With the changes to the date fields detailed just
-  above, this field is no longer needed for \textsf{video} entries,
-  and will be ignored.
 \item[type:] As in all the audiovisual entry types, the \textsf{type}
   field holds the medium of the \textsf{title}, e.g., 8 mm, VHS, DVD,
   Blu-ray, MPEG.
@@ -7292,10 +10005,11 @@ by \textsf{biblatex}.  Here are the main correspondences:
 
 As with the \textsf{music} type, entries in \textsf{dates-test.bib}
 should at least give you a good idea of how all this works.  (Cf.\
-14.279--80; \textsf{eventdate}, \textsf{origdate}, \textsf{userd};
+14.265, 14.267; \textsf{eventdate}, \textsf{origdate}, \textsf{userd};
 \cmd{DeclareLabeldate} in section~\ref{sec:authformopts}, and
 \texttt{avdate} in section~\ref{sec:authpreset}; cleese:holygrail,
-friends:leia, handel:messiah, hitchcock:nbynw, loc:city.)
+friends:leia, handel:messiah, hitchcock:nbynw, loc:city,
+weed:flatiron.)
 
 \subsection{Entry Fields}
 \label{sec:fields:authdate}
@@ -7318,7 +10032,7 @@ filing and issue dates.  In any entry type, if your data begins with a
 word that would ordinarily only be capitalized at the beginning of a
 sentence, then simply ensure that that word is in lowercase, and the
 style will take care of the rest.  Cf.\ \textsf{note}. (See
-\emph{Manual} 14.119, 14.166--68; davenport:attention,
+\emph{Manual} 14.114, 14.159--63; davenport:attention,
 natrecoff:camera.)
 
 \mybigspace In most \mymarginpar{\textbf{afterword}} circumstances,
@@ -7338,28 +10052,26 @@ afterword, foreword, or introduction the main focus of a citation.  If
 it's an afterword at issue, simply define \textsf{afterword} any way
 you please, leave \textsf{foreword} and \textsf{introduction}
 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}
+\textsf{foreword} and \textsf{introduction}. (See \emph{Manual}
+14.105, 14.110; polakow:afterw.)
 
 \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
-Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a
-package option (see \texttt{annotation} below, section
-\ref{sec:useropts}) to allow you to produce annotated lists of
-references.  The formatting of such a list is currently fairly basic,
-though it conforms with the \emph{Manual's} minimal guidelines
-(14.59).  The default in \textsf{chicago-authordate.cbx} is to define
-\cmd{DeclareFieldFormat\{an\-notation\}} using \cmd{par}\cmd{nobreak}
-\cmd{vskip} \cmd{bibitem\-sep}, though you can alter it by re-declaring
-the format in your preamble.  The page-breaking algorithms don't
-always give perfect results here, but the default formatting looks, to
-my eyes, fairly decent.  In addition to tweaking the field formatting
-you can also insert \cmd{par} (or even \cmd{vadjust\{\cmd{eject}\}})
-commands into the text of your annotations to improve the appearance.
-Please consider the \texttt{annotation} option a work in progress, but
-it is usable now.  (N.B.: The \textsc{Bib}\TeX\ field \textsf{annote}
-serves as an alias for this.)
+Salim, \textsf{biblatex-chicago} provides a package option (see
+\texttt{annotation} below, section~\ref{sec:authuseropts}) to allow
+you to produce annotated lists of references.  The formatting of such
+a list is currently fairly basic, though it conforms with the
+\emph{Manual's} minimal guidelines (14.64).  The default in
+\textsf{chicago-dates-common.cbx} is to define
+\verb+\DeclareFieldFormat{annotation}+ using
+\verb+\par\nobreak\vskip\bibitemsep #1+, though you can alter it by
+re-declaring the format in your preamble.  The page-breaking
+algorithms don't always give perfect results here, but the default
+formatting looks, to my eyes, fairly decent.  In addition to tweaking
+the field formatting you can also insert \cmd{par} (or even
+\verb+\vadjust{\eject}+) commands into the text of your annotations to
+improve the appearance.  Please consider the \texttt{annotation}
+option a work in progress, but it is usable now.  (N.B.: The old
+\textsc{Bib}\TeX\ field \textsf{annote} serves as an alias for this.)
 
 \mybigspace I \mymarginpar{\textbf{annotator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
@@ -7369,17 +10081,17 @@ be useful for some purposes.  Cf.\ \textsf{commentator}.
 \paragraph*{\protect\mymarginpar{\textbf{author}}}
 \label{sec:ad:author}
 For the most part, I have implemented this field in a completely
-standard \textsc{Bib}\TeX\ fashion.  Remember that corporate or
-organizational authors need to have an extra set of curly braces
-around them (e.g., \texttt{\{\{Associated Press\}\}}\,) to prevent
-\textsc{Bib}\TeX\ from treating one part of the name as a surname
-(14.92, 14.212, 15.36; assocpress:gun, chicago:man\-ual).  If there is
-no \textsf{author}, then \textsf{biblatex-chicago} will look, in
-sequence, for a \textsf{namea}, an \textsf{editor}, a \textsf{nameb},
-a \textsf{translator}, or a \textsf{namec} (i.e., a compiler) and use
+standard fashion.  Remember that corporate or organizational authors
+need to have an extra set of curly braces around them (e.g.,
+\texttt{\{\{Associated Press\}\}}\,) to prevent \textsf{biber} from
+treating one part of the name as a surname (14.84, 14.200, 15.37;
+assocpress:gun, chicago:manual).  If there is no \textsf{author}, then
+\textsf{biblatex-chicago} will look, in sequence, for a
+\textsf{namea}, an \textsf{editor}, a \textsf{nameb}, a
+\textsf{translator}, or a \textsf{namec} (i.e., a compiler) and use
 that name (or those names) instead, followed by the appropriate
-identifying string (esp.\ 15.35, also 14.76, 14.87, 14.126, 14.132,
-14.189; boxer:china, brown:bremer, harley:cartography,
+identifying string (esp.\ 15.36, also 14.76, 14.103, 14.121, 14.126,
+14.180; boxer:china, brown:bremer, harley:cartography,
 schellin\-ger:novel, sechzer:women, silver:gawain, soltes:georgia).
 \textsf{Biber} and \textsf{biblatex} take care of alphabetizing
 entries no matter which name appears at their head.  In citations,
@@ -7389,7 +10101,7 @@ augmented: \textsf{shortauthor}, \textsf{author},
 \textsf{translator}, and \textsf{namec}.
 
 \mylittlespace If you wish to emphasize the activity of an editor, a
-translator, or a compiler (14.90; eliot:pound), you can use the
+translator, or a compiler (14.104; eliot:pound), you can use the
 \textsf{biblatex} options \texttt{useauthor=false},
 \texttt{usenamea=false}, \texttt{use\-editor=false},
 \texttt{usenameb=false}, \texttt{usetranslator=false}, and
@@ -7399,7 +10111,7 @@ need to turn off any fields that are present in the entry, but please
 remember to use the new option \texttt{usenamec} instead of the old
 \texttt{usecompiler} (which I've deprecated), as the latter doesn't
 work as smoothly and completely as \textsf{biblatex's} own name
-toggles.  See \cmd{DeclareSort\-ingTemplate} in
+toggles.  See \cmd{DeclareSortingTemplate} in
 section~\ref{sec:authformopts}, and the \textsf{editortype}
 documentation, below.
 
@@ -7414,24 +10126,22 @@ be used.  See the discussion a few paragraphs down, and those entry
 types, for further details.
 
 \mylittlespace Recommendations concerning anonymous authors in other
-kinds of references have changed somewhat in the 16th edition of the
-\emph{Manual} (15.32), placing greater emphasis on using the
-\textsf{title} in citations and at the head of reference list entries,
-rather than \enquote{Anonymous.}  The latter may still in some cases
-be useful \enquote{in a bibliography in which several anonymous works
-  need to be grouped} (14.79), but even with a source like
-virginia:plantation, \enquote{the reference list entry should normally
-  begin with the title\ldots\ Text citations may refer to a short form
-  of the title but must include the first word (other than an initial
-  article)} (15.32).  The \textsf{shorttitle} field is the place for
-the short form, and you'll also need a \textsf{sortkey} of some sort
-if the full title begins with an article that is to be ignored when
-alphabetizing.
+kinds of references (15.34) emphasize using the \textsf{title} in
+citations and at the head of reference list entries, rather than
+\enquote{Anonymous.}  The latter may still in some cases be useful
+\enquote{in a bibliography in which several anonymous works need to be
+  grouped} (14.79), but even with a source like virginia:plantation,
+\enquote{the reference list entry should normally begin with the
+  title\ldots\ Text citations may refer to a short form of the title
+  but must include the first word (other than an initial article)}
+(15.34).  The \textsf{shorttitle} field is the place for the short
+form, and you'll also need a \textsf{sortkey} of some sort if the full
+title begins with an article that is to be ignored when alphabetizing.
 
 \mylittlespace If \enquote{the authorship is known or guessed at but
   was omitted on the title page,} then you need to use the
 \textsf{authortype} field to let \textsf{biblatex-chicago} know this
-fact (15.33).  If the author is known (horsley:prosodies), then put
+fact (15.34).  If the author is known (horsley:prosodies), then put
 \texttt{anon} in the \textsf{authortype} field, if guessed at
 (cook:sotweed) put \texttt{anon?}\ there.  (In both cases,
 \textsf{biblatex-chicago} tests for these \emph{exact} strings, so
@@ -7441,27 +10151,30 @@ mark indicating doubt.  As long as you have the right string in the
 \textsf{authortype} field, \textsf{biblatex-chicago-authordate} will
 also do the right thing automatically in text citations.
 
-\enlargethispage{-\baselineskip}
-
-\mylittlespace The \textsf{nameaddon} field furnishes the means to
-cope with the case of pseudonymous authorship.  If the author's real
-name isn't known, simply put \texttt{pseud.}\ (or
-\cmd{bibstring\hfill\{pseudonym\}}) in that field (centinel:letters).
-If you wish to give a pseudonymous author's real name, simply include
-it there, formatted as you wish it to appear, as the contents of this
-field won't be manipulated as a name by \textsf{biblatex}
-(lecarre:quest, stendhal:parma).  If you have given the author's real
-name in the \textsf{author} field, then the pseudo\-nym goes in
-\textsf{nameaddon}, in the form \texttt{Firstname Lastname,\,pseud.}\
-(creasey:ashe:blast, creasey:morton:hide, creasey:york:death).
-This latter method will allow you to keep all references to one
-author's work under different pseudonyms grouped together in the list
-of references, a method recommended by the \emph{Manual}.  The 16th
-edition of the \emph{Manual} (14.84) has strengthened its policies
-about cross-references from author to pseudonym or vice versa, so in
-these latter examples I have included such references from the various
+\mylittlespace In most entry types (except \textsf{customc}) the
+\textsf{nameaddon} field furnishes the means to cope with the case of
+pseudonymous authorship.  If the author's real name isn't known,
+simply put \texttt{pseud.}\ (or \verb+\bibstring{pseudonym}+) in that
+field (centinel:letters).  If you wish to give a pseudonymous author's
+real name, simply include it there, formatted as you wish it to
+appear, as the contents of this field won't be manipulated as a name
+by \textsf{biblatex} (lecarre:quest, stendhal:parma).  If you have
+given the author's real name in the \textsf{author} field, then the
+pseudonym goes in \textsf{nameaddon}, in the form \texttt{Firstname
+  Lastname,\,pseud.}\ (creasey:ashe:blast, creasey:morton:hide,
+creasey:york:death).  This latter method will allow you to keep all
+references to one author's work under different pseudonyms grouped
+together in the list of references, a method recommended by the
+\emph{Manual}.  The \emph{Manual} (14.82) recommends using
+cross-references from author to pseudonym or vice versa, so in these
+latter examples I have included such references from the various
 pseudonyms back to the author's name, using the \textsf{customc} entry
-type, which see (ashe:creasey, morton:creasey, york:creasey).
+type, which see (ashe:creasey, morton:creasey, york:creasey).  Please
+see also the entry on \textbf{nameaddon}, below, for circumstances
+where you may need to provide your own square brackets when presenting
+a pseudonym.
+
+\enlargethispage{\baselineskip}
 
 \mylittlespace As its name suggests, the author-date style very much
 wants to have a name of some sort present both for the entries in the
@@ -7479,28 +10192,26 @@ the reference list.  An institutional author's name can also be rather
 too long for in-text citations.  In unsigned:ranke I placed an
 abbreviated form of the \textsf{journaltitle} into
 \textsf{shortjournal}, adapting for a periodical the practice
-recommended for books in 15.32.  In iso:electrodoc, I provided a
+recommended for books in 15.37.  In iso:electrodoc, I provided a
 \textsf{shorthand} field, which by default in
-\textsf{biblatex-chicago-authordate} will appear in text citations.
-Pursuant to the 16th edition's specifications, this \textsf{shorthand}
-will also appear at the head of the entry in the list of references,
+\textsf{biblatex-chicago-authordate} will appear both in text
+citations and at the head of the entry in the list of references,
 followed, within the entry, by its expansion, this latter placed
-within parentheses.  You no longer, therefore, need to use a
-\textsf{customc} entry to provide the expansion --- please see
-\textsf{shorthand} below for the details.  (You can still utilize the
-list of shorthands to clarify the abbreviation, if you wish, and you
-can also provide a separate list of journal abbreviations using the
-\cmd{printbiblist\{shortjournal\}} command.  Please cf.\ the
-\textbf{shortjournal} documentation, below, and the
-\texttt{journalabbrev} option in section~\ref{sec:authpreset}.)
+within parentheses.  Please see under \textbf{shorthand} below for the
+details.  (You can utilize the list of shorthands to clarify the
+abbreviation, if you wish, and you can also provide a separate list of
+journal abbreviations using the \cmd{printbiblist\{shortjournal\}}
+command.  Please cf.\ the \textbf{shortjournal} documentation, below,
+and the \texttt{journalabbrev} option in
+section~\ref{sec:authpreset}.)
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
 keeping with the spirit of standard \textsf{biblatex}, if not with its
 letter.  Instead of allowing you to change the string used to identify
 an author, the field allows you to indicate when an author is
-anonymous, that is, when his or her name doesn't appear on the title
-page of the work you are citing.  As I've just detailed under
+anonymous, that is, when their name doesn't appear on the title page
+of the work you are citing.  As I've just detailed under
 \textsf{author}, the \emph{Manual} generally discourages the use of
 \enquote{Anonymous} (or \enquote{Anon.} as an author, though in some
 cases it may well be your best option.  If, however, the name of the
@@ -7514,9 +10225,7 @@ for these \emph{exact} strings, so check your typing if you don't see
 the brackets.  Assuming the strings are correct,
 \textsf{biblatex-chicago} will also automatically do the right thing
 in citations.  (See the \textsf{author} docs just above.  Also
-\emph{Manual} 15.33; cook:sotweed, horsley:prosodies.)
-
-%%\enlargethispage{-\baselineskip}
+\emph{Manual} 15.34; cook:sotweed, horsley:prosodies.)
 
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
 \textsf{biblatex}, a \textsf{bookauthor} is the author of a
@@ -7527,7 +10236,7 @@ entry type for introductions, forewords and afterwords
 (\textsf{suppbook}) uses \textsf{bookauthor} as the author of
 \textsf{title} (polakow:afterw, prose:intro).
 
-\mybigspace This, \mymarginpar{\vspace{-12pt}\textbf{bookpagination}}
+\mybigspace This, \mymarginpar{\vspace{-8pt}\textbf{bookpagination}}
 a standard \textsf{biblatex} field, allows you automatically to prefix
 the appropriate string to information you provide in a \textsf{pages}
 field.  If you leave it blank, the default is to print no identifying
@@ -7549,7 +10258,7 @@ specification, which may be confusing if they don't produce the
 strings you expect.  Second, remember that \textsf{bookpagination}
 applies only to the \textsf{pages} field --- if you need to format a
 citation's \textsf{postnote} field, then you must use
-\textsf{pagination}, which see (10.43--44, 14.154--163).
+\textsf{pagination}, which see (10.42--43, 14.147--56).
 
 \mybigspace The \mymarginpar{\textbf{booksubtitle}} subtitle for a
 \textsf{booktitle}.  See the next entry for further information.
@@ -7567,12 +10276,10 @@ find a \textsf{booktitle} in other sorts of entries (e.g.,
 \textsf{book} or \textsf{collection}), but there it will almost
 invariably be providing information for the traditional
 \textsc{Bib}\TeX\ cross-referencing apparatus (prairie:state), which I
-discuss below (\textbf{crossref}).  Such provision is unnecessary when
-using \textsf{Biber}.  The \textsf{booktitle} no longer takes
-sentence-style capitalization in \textsf{authordate}, though it does
-in \textsf{authordate-trad}.
-
-%%\enlargethispage{\baselineskip}
+discuss below (\textbf{crossref}).  Such provision is now unnecessary,
+assuming you are using \textsf{biber}.  The \textsf{booktitle} no
+longer takes sentence-style capitalization in \textsf{authordate},
+though it does in \textsf{authordate-trad}.
 
 \mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the
 \textsf{booktitle}.  It will be printed in the main text font, without
@@ -7585,10 +10292,12 @@ package and entry options \texttt{ptitleaddon} and
 customize the punctuation that appears before the
 \textsf{booktitleaddon} field.
 
-\mybigspace This \mymarginpar{\textbf{chapter}} field holds the
+\mybigspace This \colmarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
 \textsf{incollection} entry where you wish to cite a specific chapter
-of a book (ashbrook:brain).
+of a book (ashbrook:brain).  It now also holds the track number of
+individual pieces of \textsf{music}, whether on a traditional format
+or on a streaming service (holiday:fool, rihanna:umbrella).
 
 \mybigspace I \mymarginpar{\textbf{commentator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
@@ -7600,9 +10309,13 @@ standard \textsc{Bib}\TeX\ cross-referencing mechanism, and has also
 introduced a modified one of its own (\textsf{xref}).  The latter
 works as it always has, attempting to remedy some of the deficiencies
 of the traditional mechanism by ensuring that child entries will
-inherit no data at all from their parents.  For the \textsf{crossref}
-field, when \textsf{Biber} is the backend, \textsf{biblatex} defines a
-series of inheritance rules which make it much more convenient to use.
+inherit no data at all from their parents.  Section~2.4.1 of
+\textsf{biblatex.pdf} contains useful notes on managing
+cross-referenced entries, and section~3.15 explains some of the
+limitations of the traditional backends, which offer only a small
+subset of \textsf{Biber's} features.  For the \textsf{crossref} field,
+when \textsf{Biber} is the backend, \textsf{biblatex} defines a series
+of inheritance rules which make it much more convenient to use.
 Appendix B of \textsf{biblatex.pdf} explains the defaults, to which
 \textsf{biblatex-chicago} has added several that I should mention
 here: \textsf{incollection} entries can inherit from \textsf{book} and
@@ -7620,7 +10333,7 @@ and \textsf{origdate} fields are not inheritable from any of the
 function of the \textsf{crossref} and \textsf{xref} fields in
 \textsf{biblatex-chicago} is as a trigger for the provision of
 abbreviated entries in the list of references.  The \emph{Manual}
-(15.37) specifies that if you cite several contributions to the same
+(15.42) specifies that if you cite several contributions to the same
 collection, all (including the collection itself) may be listed
 separately in the list, which the package does automatically, using
 the default inclusion threshold of 2 in the case both of
@@ -7631,7 +10344,7 @@ child entries.  The \textsf{biblatex-chicago-authordate} package has
 always implemented these instructions, but only if you use a
 \textsf{crossref} or an \textsf{xref} field, and only in
 \textsf{incollection}, \textsf{inproceedings}, or \textsf{letter}
-entries (on the last named, see just below).  More recently, I have
+entries (on the last named, see just below).  Recent releases have
 considerably extended this functionality.
 
 \mylittlespace First, I added five entry types --- \textbf{book},
@@ -7666,8 +10379,6 @@ these four entry types than for the other 4 (see below).  In
 looking at bernhard:boris, bernhard:ritter, bernhard:themacher,
 harley:ancient:cart, harley:cartogra\-phy, and harley:hoc.
 
-%%\enlargethispage{\baselineskip}
-
 \mylittlespace A published collection of letters requires a somewhat
 different treatment (15.40).  In the author-date style, the
 \emph{Manual} discourages individual letters from appearing in the
@@ -7704,7 +10415,7 @@ types more-or-less authorized by the \emph{Manual}: \textsf{inbook},
   setting to provide abbreviated citations not just of the four entry
   types mentioned but also of \textsf{book}, \textsf{bookinbook},
   \textsf{collection}, and \textsf{proceedings} entries.
-\item[\qquad notes,bib:] These two options are carried over from the
+\item[\qquad notes, bib:] These two options are carried over from the
   notes \&\ bibliography style; here they are synonymous with
   \texttt{false} and \textsf{true}, respectively.
 \end{description}
@@ -7720,7 +10431,7 @@ entries:
   \emph{not} get any abbreviated citations in the reference list.
 \item[\qquad false:] You'll get abbreviated citations in these entry
   types in the reference list.
-\item[\qquad notes,bib:] These two options are carried over from the
+\item[\qquad notes, bib:] These two options are carried over from the
   notes \&\ bibliography style; here they are synonymous with
   \texttt{false} and \textsf{true}, respectively.
 \end{description}
@@ -7733,16 +10444,16 @@ allowing you to change the settings on an entry-by-entry basis.
 \textsf{biblatex-chicago} I recommended against using
 \textsf{shorthand}, \textsf{reprinttitle} and/or \textsf{userf} fields
 in combination with this abbreviated cross-referencing mechanism.  I
-have, however, received a request from Alexandre Ro\-berts to allow
-the shorthand to appear in the place of the abbreviated
-cross-reference as an additional space-saving measure, and one from
-Kenneth Pearce to permit the combination of the other two fields with
-\textsf{crossref}, as well.  All three of these fields, in any
-combination, should just work in such circumstances in
-\textsf{biblatex-chicago-authordate}, though if you are using a list
-of shorthands then you may need to include \texttt{skipbiblist} in the
-\textsf{options} field of some entries to avoid duplicates.  If you
-come across any problems or inaccuracies, please report them.
+received, however a request from Alexandre Roberts to allow the
+shorthand to appear in the place of the abbreviated cross-reference as
+an additional space-saving measure, and one from Kenneth Pearce to
+permit the combination of the other two fields with \textsf{crossref},
+as well.  All three of these fields, in any combination, should just
+work in such circumstances in \textsf{biblatex-chicago-authordate},
+though if you are using a list of shorthands then you may need to
+include \texttt{skipbiblist} in the \textsf{options} field of some
+entries to avoid duplicates.  If you come across any problems or
+inaccuracies, please report them.
 
 \mylittlespace Finally, there is also an \texttt{xrefurl} option
 available to control the printing of \textsf{url}, \textsf{doi}, and
@@ -7750,17 +10461,19 @@ available to control the printing of \textsf{url}, \textsf{doi}, and
 information might otherwise never appear.  See \texttt{xrefurl} in
 section~\ref{sec:authuseropts}.
 
-\paragraph*{\protect\mymarginpar{\textbf{date}}}
+\paragraph*{\protect\colmarginpar{\textbf{date}}}
 \label{sec:ad:date}
 Predictably, this is one of the key fields for the author-date styles,
 and one which, as a general rule, every .bib entry designed for this
 system ought to contain.  So important is it, that
 \textsf{biblatex-chicago-authordate} will, in most entry types, supply
 a missing \cmd{bibstring\{nodate\}} if there is no date otherwise
-provided (15.41); citations will look like (Author, n.d.), and entries
-in the list of references will begin: Author, Firstname.\ n.d.  This
-seems simple enough, but there are a surprising number of
-complications which require attention.
+provided (15.44), or if there is only a \textsf{urldate}, and that
+date is an access\colmarginpar{New!} date, i.e., there's no
+\textsf{userd} field (15.50).  Citations will look like (Author,
+n.d.), and entries in the list of references will begin: Author,
+Firstname.\ n.d.  This seems simple enough, but there are a surprising
+number of complications which require attention.
 
 \mylittlespace To start, in each entry, \textsf{Biber} attempts to
 find something which it can designate a \textsf{labeldate}, which
@@ -7776,77 +10489,65 @@ guided by the instructions given by the \cmd{DeclareLabeldate}
 instances, \textsf{Biber} will search each entry in the declared
 order, and the first match will provide the \textsf{labeldate}.  Only
 when it finds no match at all will it fall back on
-\cmd{bibstring\{nodate\}}.  Now, the entry types in which this
-automatic provision is turned off are \textsf{inreference},
-\textsf{misc}, and \textsf{reference}, none of which may be expected
-in the standard case to have a date provided.  In all other entry
-types \enquote{\texttt{n.d.}}\ will appear if no date is provided,
-though you can turn this off throughout the document in all entry
-types with the option \texttt{nodates=false} when loading
-\textsf{biblatex-chicago} in your preamble.  (See
+\verb+\bibstring{nodate}+.  (In the \textsf{misc} and
+\mycolor{\textsf{dataset}} types this automatic provision is turned
+off, as such material may not be expected in many standard cases to
+have a usable date provided.)  You can prevent the appearance of
+\verb+\bibstring{nodate}+ throughout your document in all entry types
+with the option \texttt{nodates=false} when loading
+\textsf{biblatex-chicago} in your preamble, or you can set it in the
+options field of individual entries.  (See
 section~\ref{sec:authpreset}, below.)
 
 \mylittlespace The thing to keep in mind is that \emph{only} for a
 \textsf{labelyear} will \textsf{biblatex} provide what it calls the
-\textsf{extrayear} field, which means the alphabetical suffix
+\textsf{extradate} field, which means the alphabetical suffix
 (1978\textbf{a}) to differentiate entries with the same author and
 year.  A style can print any year it wants in a citation, but only the
-\textsf{labelyear} comes equipped with an \textsf{extrayear}.  (It is
+\textsf{labelyear} comes equipped with an \textsf{extradate}.  (It is
 also, by the way, the field that the sorting algorithm will use for
 ordering the list of references.)  So the challenge, in a style
 wherein entries can contain more than one date, is to allow different
 dates to appear in citations and at the head of reference list
 entries, but to ensure that, as often as is possible, that date
-\emph{is} the \textsf{labeldate}.  In previous releases of
-\textsf{biblatex-chicago-authordate}, the search for a
-\textsf{labeldate} could occur in two possible orders: in
-\textsf{music}, \textsf{review}, and \textsf{video} entries, the
-default order was \textsf{eventdate, origdate, date, urldate}, while
-in all other entry types the order was \textsf{date, eventdate,
-  origdate, urldate}.  This, I believe, still works well for reference
-lists that contain relatively few entries with multiple dates, where
-using, e.g., an \textsf{origdate} at the head of an entry, even if it
-wasn't the \textsf{labeldate}, would rarely cause problems, because it
-was unlikely that there would be another entry by the same author with
-the same date (or \textsf{origdate}) requiring the \textsf{extrayear}
-field.  Judging from the feedback I've received, I significantly
-overestimated the likelihood that most reference lists would be so
-cooperative.  Users could always eliminate some of these dates from
-the running, or change the search order, using \cmd{DeclareLabeldate}
-in their preamble, but I had to hard-code the default order(s) into
-the author-date styles in order to cope with some tricky corners of
-the specification.  If users modified \cmd{DeclareLabeldate}, and
-their references entered these tricky corners, the results could be
-surprising.
-
-\mylittlespace I have, therefore, included several means of coping
-with multiple dates in database entries, hoping that users might be
-able to choose one that works well for them.  These mechanisms include
-the \texttt{avdate} option, set to \texttt{true} by default, which
-treats as \emph{sui generis} \textsf{music}, \textsf{review}, and
-\textsf{video} entries.  They have their own rules, and their own
-version of \cmd{DeclareLabeldate} (\textsf{eventdate, origdate, date,
-  urldate}), so please see their documentation above in
-section~\ref{sec:types:authdate} for the details of how multiple dates
-will be treated in such entries, and also see \texttt{avdate} in
+\emph{is} the \textsf{labeldate}.  This sounds simple, but in practice
+it requires a series of options for date presentation, and multiple
+iterations of the \cmd{DeclareLabeldate} command.  There are
+\emph{two} standard search orders set up by default: in
+\textsf{music}, \textsf{review}, \mycolor{\textsf{standard}},
+\textsf{suppperiodical}, and \textsf{video} entries, the default order
+is \textsf{eventdate, origdate, date, urldate}, while in all other
+entry types the default is \textsf{date, eventdate, origdate,
+  urldate}.  I believe that these defaults work well for most
+reference lists, especially those that contain relatively few entries
+with multiple dates, but if they don't work for you then the following
+options can help.
+
+\mylittlespace In the case of \textsf{music}, \textsf{review},
+\mycolor{\textsf{standard}}, \textsf{suppperiodical}, and
+\textsf{video} entries, the \texttt{avdate} (i.e., audio-visual date)
+option, set to \texttt{true} by default, can be set to \texttt{false}
+in your preamble to return these entry types to the general defaults.
+Please see the documentation of the entry types in
+section~\ref{sec:types:authdate} above for the details of how multiple
+dates will be treated in such entries, and also see \texttt{avdate} in
 section~\ref{sec:authpreset}, below.  If you don't alter the
-\textsf{avdate} settings, the other settings I describe below don't
-apply to such entries.
-
-\mylittlespace For other entry types, the 16th edition of the
-\emph{Manual} (15.38) presents a fairly simple scheme for when a
-particular entry has more than one date, but I have been unable to
-make its implementation quite as straightforward.  If a reprinted
-book, say, has both a \textsf{date} of publication for the reprint
-edition and an \textsf{origdate} for the original edition, then by
-default \textsf{biblatex-chicago-authordate} will use the
-\textsf{date} in citations and at the head of the entry in the
-reference list.  If you inform \textsf{biblatex-chicago} that the book
-is a reprint by putting the string \texttt{reprint} in the
-\textsf{pubstate} field, then a notice will be printed at the end of
-the entry saying \enquote{Originally published in 1898.}  With no
-\textsf{pubstate} field (and no \texttt{cmsdate} option), the
-algorithms will ignore the \textsf{origdate}.
+\texttt{avdate} settings, the other settings I am about to describe
+won't apply to such entries.  For the entry types not covered by the
+\texttt{avdate} option, the \emph{Manual} (15.40) presents a fairly
+simple scheme for when a particular entry has more than one date, but
+I have been unable to make its implementation quite as
+straightforward.  If a reprinted book, say, has both a \textsf{date}
+of publication for the reprint edition and an \textsf{origdate} for
+the original edition, then by default
+\textsf{biblatex-chicago-authordate} will use the \textsf{date} in
+citations and at the head of the entry in the reference list.  If you
+inform \textsf{biblatex-chicago} that the book is a reprint by putting
+the string \texttt{reprint} in the \textsf{pubstate} field, then a
+notice will be printed at the end of the entry saying \enquote{First
+  published 1898.}  With no \textsf{pubstate} field (and no
+\texttt{cmsdate} option), the algorithms will ignore the
+\textsf{origdate}.
 
 \mylittlespace If, \mymarginpar{\texttt{cmsdate}\\\emph{in entry}}
 for any reason, you wish the \textsf{origdate} to appear at the head
@@ -7868,7 +10569,7 @@ state (\texttt{full}) which I shall discuss below:
   options.  If you want to present the \textsf{origdate} at the head
   of an entry, then generally speaking you should probably use
   \texttt{cmsdate=both}.  I have nevertheless retained this option for
-  certain cases where it has proved useful.  The 15th-edition options
+  certain cases where it has proved useful.  The obsolete options
   \texttt{new} and \texttt{old} work like \texttt{both}.
 \end{enumerate}
 
@@ -7896,7 +10597,7 @@ set to something earlier than the date of the other work, e.g.,
 --- of the two works were the same?  Just as when it is ordering
 entries, \textsf{biblatex} will always first process the contents of
 the \textsf{labelyear} field when it is deciding whether to add the
-\textsf{extrayear} alphabetical suffix (\texttt{a,b,c} etc.)\ to the
+\textsf{extradate} alphabetical suffix (\texttt{a,b,c} etc.)\ to the
 year to distinguish different works by the same author published in
 the same year.  Our current hypothetical examples would look like
 this: ([1896] 1974a) and ([1898] 1974b), with the suffixes
@@ -7911,8 +10612,6 @@ 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
@@ -7933,12 +10632,12 @@ follows:
 \item \texttt{cmsdate=off} (the default) and \texttt{cmsdate=on}
   \emph{both} print the \textsf{date} at the head of the entry in the
   list of references and in citations: (Author 1898a), (Author 1898b).
-  As noted above, this style is no longer recommended by the 16th
-  edition of the \emph{Manual}, but it is still useful in some cases.
+  As noted above, this style is no longer recommended by the
+  \emph{Manual}, but may still be useful in some cases.
 \item \texttt{cmsdate=both} prints both the \textsf{date} and the
   \textsf{origdate}, using the \emph{Manual's}\ preferred format:
-  (Author [1898a] 1952), (Author [1898b] 1974).  The 15th-edition
-  options \texttt{old} and \texttt{new} are synonyms for this.
+  (Author [1898a] 1952), (Author [1898b] 1974).  The obsolete options
+  \texttt{old} and \texttt{new} are synonyms for this.
 \end{enumerate}
 
 If, for some reason, the automatic switching of the dates cannot be
@@ -7954,8 +10653,8 @@ required effects.
     preamble}} drastic method of simplifying the creation of databases
 with a great many multi-date entries is to use the \texttt{cmsdate}
 option \emph{in the preamble}.  Despite warnings in previous releases,
-users have plainly already been setting this option in their
-preambles, so I thought I might at least attempt to make it work as
+users had plainly already been setting this option in their preambles,
+so I thought I might at least attempt to make it work as
 \enquote{correctly} as I can.  The switches for this option are the
 same as for the entry-only option, that is:
 
@@ -7971,15 +10670,15 @@ same as for the entry-only option, that is:
   options.  If you want to present the \textsf{origdate} at the head
   of an entry, then generally speaking you should probably use
   \texttt{cmsdate=both}.  I have nevertheless retained this option for
-  certain cases where it has proved useful.  The 15th-edition options
+  certain cases where it might proved useful.  The obsolete options
   \texttt{new} and \texttt{old} work like \texttt{both}.
 \end{enumerate}
 
 The important change for the user is that, when you set this option in
-your preamble to \texttt{on} or \texttt{both} (or to the 15th-edition
+your preamble to \texttt{on} or \texttt{both} (or to the obsolete
 synonyms for the latter, \texttt{new} or \texttt{old}), then
 \textsf{biblatex-chicago-authordate} will change the default
-\cmd{DeclareLa\-bel\-date} definition so that the \textsf{labelyear}
+\cmd{DeclareLabeldate} definition so that the \textsf{labelyear}
 search order will be \textsf{origdate, date, eventdate, urldate}.
 This means that for entry types not covered by the \texttt{avdate}
 option, and for those types as well if you turn off that option, the
@@ -7987,7 +10686,7 @@ option, and for those types as well if you turn off that option, the
 be that very date.  If you want \emph{every} such entry to present its
 \textsf{origdate} in citations and at the head of reference list
 entries, then setting the option this way makes sense, as you should
-automatically get the proper \textsf{extrayear} and the correct
+automatically get the proper \textsf{extradate} and the correct
 sorting, without having to switch dates around counter-intuitively in
 your .bib file.  A few clarifications may yet be in order.
 
@@ -8015,59 +10714,212 @@ of such sources, I made a slight change to the way the entry-only
 a work has only one date, and there is no \texttt{switchdates} in the
 \textsf{options} field, then \texttt{cmsdate=on} and
 \texttt{cmsdate=both} will both result in the suppression of the
-\textsf{extrayear} field in that entry, that is, the year will no
+\textsf{extradate} field in that entry, that is, the year will no
 longer be printed with its following lowercase letter used to
 distinguish works by the same \textsf{author} published in the same
 year.  Obviously, if the same options are set in the preamble, this
 behavior is turned off, so that single-date entries will still work
 properly without manual intervention.
 
+\mylittlespace Up\colmarginpar{\textsc{iso}8601-2\\Extended\\Format}
+to this point, the discussion of the \textsf{date} field has in fact
+presented no substantive alterations to the way it behaved in previous
+releases of \textsf{biblatex-chicago.}  With this release, however, I
+have implemented all of the applicable parts of \textsf{biblatex's}
+elegant, and long standing, support for the \textsc{iso}8601-2
+Extended Format specification, which means the package now provides
+greatly enhanced possibilities for presenting uncertain and
+unspecified dates and date ranges, along with date eras, seasons, and
+time stamps.  I have also implemented the \emph{Manual's} (9.64)
+guidelines for compressing year ranges, as well as providing a few
+more extras to help with some of the other tricky corners of the
+\emph{Manual's} instructions.  A combination of \textsf{biblatex} and
+\textsf{biblatex-chicago} package options allows you to define when,
+how, and where any of these extended specifications will appear in
+your documents.  I have attempted to provide as compliant a set of
+defaults as possible in \textsf{biblatex-chicago.sty}, but you can
+alter any of them according to your needs.  All are documented in
+section~\ref{sec:opts:authdate}, below, but table~\ref{ad:date:extras}
+purports to serve as a convenient reference guide to how this all
+works.
+
+\afterpage{\clearpage
+
+\begin{table}[h!]
+\hspace*{-2.5em}
+\begin{threeparttable}
+  \caption[\hspace{-1em}\mycolor{Enhanced Date Specifications}]
+  {Enhanced Date Specifications in biblatex-chicago}
+\begin{tabularx}{140mm}{@{}>{\ttfamily}llX@{}}
+\toprule
+\multicolumn{1}{@{}H}{Date Specification} &
+\multicolumn{2}{H}{Formatted Date (Examples use \texttt{american}
+  localization)\tnote{\textmd{a}}} \\
+\cmidrule(l){2-3}
+&
+\multicolumn{1}{H}{Output Format} &
+\multicolumn{1}{H}{Output Format Notes} \\
+\cmidrule{1-1}\cmidrule(l){2-2}\cmidrule(l){3-3}
+1723? & [1723?]\tnote{b} & \texttt{dateuncertain=true} set by default\\
+1723\textasciitilde & [ca. 1723]\tnote{b} & \texttt{datecirca=true} set by
+default\\
+1723\% & [ca. 1723?]\tnote{b} & Both \textsf{biblatex} options \texttt{true} by
+default, as above\\\addlinespace[.8mm]
+\cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+2016-05-24T15:34:00 & May 2, 2016, 3:34 p.m.\tnote{c} &
+\texttt{alltimes=12h} set by default \\
+2016-05-24T15:34:00 & May 2, 2016, 15:34\tnote{c} &
+\texttt{urltime=24h} set by default \\\addlinespace[.8mm]
+\cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+-0876 & 877 BC & \texttt{dateera=christian} set in your preamble\\
+-0876/-0866 & 877--867 BC & \\
+0876 & AD 876\tnote{d} & \texttt{dateeraauto=1000} also in preamble\\
+-0876/0866 & 877 BC--AD 866 & \\
+0866/0876 & AD 866--76 & Cf.\ \mycolor{\texttt{compressyears}}, below\\
+0343-02-03 & February 3, AD 343 & \\\addlinespace[.8mm]
+\cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+-0876 & 877 BCE & \texttt{dateera=secular}, \texttt{dateeraauto=1000}\\
+-0876/-0866 & 877--867 BCE & \\
+0876 & 876 CE &  \\
+-0876/0866 & 877 BCE--866 CE & \\
+0866/0876 & 866--76 CE & Cf.\ \mycolor{\texttt{compressyears}}, below\\
+0343-02-03 & February 3, 343 CE & \\\addlinespace[.8mm]
+\cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+195X & 1950s\tnote{e,f} & Chicago option
+\mycolor{\texttt{decaderange=true}} gets you 1950--59 \\
+19XX & 20th c.\tnote{f} & Chicago option
+\mycolor{\texttt{centuryrange=true}} gets you 1900--1999;
+\mycolor{\texttt{alwaysrange=true}} does the same for this and the
+previous entry \\\addlinespace[.8mm]
+\cmidrule(r{2em}){1-1}\addlinespace[.8mm]
+2004-22 & Summer 2004 &  \\
+1908/1912 & 1908--12\tnote{g} & Chicago option
+\mycolor{\texttt{compressyears=true}} set by default \\
+\bottomrule
+\end{tabularx}
+  \def\TPTnoteSettings{%
+    \setlength\leftmargin{1.5em}%
+    \setlength\labelwidth{.5em}%
+    \setlength\labelsep{.2em}%
+    \footnotesize
+    \rightskip\tabcolsep \leftskip\tabcolsep}%
+\begin{tablenotes}
+\item[a] In other languages both the strings and their
+    placement with respect to the year can and will differ.
+\item[b] The two Chicago options \mycolor{\texttt{nodatebrackets}}
+    and \mycolor{\texttt{noyearbrackets}} can remove the brackets
+    around the year in this context, though please note that they work
+    quite differently in the notes \&\ bibliography and author-date
+    styles. Please see their documentation in
+    sections~\ref{sec:useropts} and \ref{sec:authuseropts},
+    respectively.
+\item[c] Any time stamp that is part of a \textsf{urldate} will
+    appear in any entry type, though you can prevent this by setting
+    \mycolor{\texttt{urlstamp=false}}. Time stamps in \textsf{date}
+    and \textsf{origdate} fields will appear only in \textsf{article}
+    and \textsf{periodical} entries with a \texttt{magazine}
+    \textsf{entrysubtype}, as well as in all \textsf{online},
+    \textsf{review}, and \textsf{suppperiodical} entries. Such data in
+    \textsf{eventdate} fields will appear only in \textsf{review} and
+    \textsf{suppperiodical} entries. For timezones the four
+    \textsf{timezone} fields allow you to present Chicago's preferred
+    initialisms (\enquote{PST}). The \texttt{timezones} option is
+    \texttt{true} by default. By contrast, the \texttt{seconds} option
+    is not set by default, though you still need to include the
+    seconds, as above, for \textsf{biber} to process the time stamp.
+\item[d] The \texttt{annodomini} string appears before the year
+  \emph{only} in documents in some variant of English.
+\item[e] When the decade string would be ambiguous ---
+  \enquote{1900s} --- the style prints \enquote{1900--1909} instead.
+\item[f] For decades and centuries, the current state of the
+  \textsf{biber} code cannot process dates BCE / BC.
+\item[g] The Chicago rules for year-range compression differ from its
+  rules for page-range compression (9.61 \&\ 9.64). Dates BCE~/ BC are
+  never compressed. You must have loaded \textsf{biblatex-chicago.sty}
+  for the compression code to be available.
+\end{tablenotes}
+\vspace*{2em}
+\label{ad:date:extras}
+\end{threeparttable}
+\end{table}}
+
 \mylittlespace There are several more general remarks about the
-\textsf{date} field that may be helpful to users.  First, for most
-entry types, only a year is really necessary, and in most situations
-only the year --- or year range --- will be printed in text citations
-and at the head of entries in the list of references.  More specific
-\textsf{date} fields are often present, however, in \textsf{article},
-\textsf{misc}, \textsf{music}, \textsf{online}, \textsf{patent},
-\textsf{unpublished}, and \textsf{video} entries, for all of which any
-day or month provided will be printed later in the reference list
-entry.  If you follow the recommendations of the 16th edition of the
-\emph{Manual} and present newspaper and magazine articles
-\enquote{entirely within the text} (15.47), then the citations need to
-contain the complete \textsf{date} along with the
-\textsf{journaltitle}.  Placing \mymarginpar{\texttt{cmsdate=full}}
-\texttt{cmsdate=full} (and \texttt{skipbib}) in the \textsf{options}
-field of an \textsf{article} or a \textsf{review} entry, alongside a
-possible \texttt{useauthor=false}, should allow you to achieve this.
+\textsf{date} field that may be helpful to users of the author-date
+styles.  First, I highly recommend familiarizing yourself with the
+extended date specifications, as in many cases they will greatly
+simplify the creation of your .bib databases.  A \textsf{date} field
+like \verb+{1957?}+ in clark:mesopot not only lets the package provide
+the appropriate square brackets for you, it also means that the
+\textsf{year} field in the .bbl file sorts just as it should, and can
+be tested numerically for its relation to other date years in the
+entry.  A \textsf{year} field like \verb+{[1957?]}+ in the .bib
+database produces a field in the .bbl that neither sorts nor can be
+numerically tested.  The same holds for a compressed year range, as in
+tillich:system.  With \mycolor{\texttt{compressyears}} set to
+\texttt{true} by default, a \textsf{date} field like
+\verb+{1951/1963}+ lets the package decide what compression is
+correct, and provides \textsf{year} and \textsf{endyear} fields that
+sort and compare numerically for both \textsf{switchdates} and
+\textsf{extradate} tests.  Clearly, situations may still arise when a
+specially-crafted \textsf{year} or \textsf{origyear} field may be
+necessary, but if you can use the enhanced specifications then I
+strongly advocate doing so.
+
+\mylittlespace One\colmarginpar{\textsf{verbc}} possible drawback is
+that using these facilities makes a great many more dates available to
+the \textsf{extradate} mechanism which, it turns out, is something of
+a mixed blessing.  The \emph{Manual} isn't entirely forthcoming about
+what to do in the (vanishingly rare) case that two works by the same
+\textsf{author} have the same uncertain \textsf{date}.
+\textsf{Biblatex-chicago} will print the \textsf{extradate} in such
+situations, so that you could have \texttt{[1957?]a} followed by
+\texttt{[ca.~1957]b}, which may not be exactly right, nor exactly what
+you want.  Here, the new \mycolor{\textsf{verbc}} field can help ---
+giving the two entries different values of this field will prevent the
+\textsf{extradate} from appearing.  Please see the documentation of
+the \mycolor{\textsf{verbc}} field below for all the details.
+
+\mylittlespace Second, for most entry types, only a year is really
+necessary, and in most situations only the year --- or year range ---
+will be printed in text citations and at the head of entries in the
+list of references.  More specific \textsf{date} fields are often
+present, however, in an unpredictably broad range of entries.  In a
+change to previous practice, a \textsf{date} with a year, month, and
+day will, even if the year appears at the head of the entry, be
+repeated in full later in the entry, while if there's only a month (or
+a season) and a year the month (or season) alone will follow.  Also
+new is the presentation of time stamps, which you can easily provide
+in your \textsf{date} fields (see examples and usage notes in
+table~\ref{ad:date:extras}).  These finer-grained specifications are
+really only necessary for news stories that are frequently updated
+\enquote{as they unfold} (14.191), or for online posts, particularly
+comments, that may need a time stamp for disambiguation.  If you wish
+to specify the time zone, the \emph{Manual} (10.41) prefers
+initialisms like \enquote{EST} or \enquote{PDT,} and these are most
+easily provided using the \mycolor{\texttt{timezone}} field, where you
+can include your own parentheses if so desired (cp.\ 14.191).  If you
+follow the recommendations of the \emph{Manual} and present newspaper
+and magazine articles \enquote{entirely within the text} (15.49), then
+the citations need to contain the complete \textsf{date} (and possible
+time stamp) along with the \textsf{journaltitle}.  Placing
+\mymarginpar{\texttt{cmsdate=full}} \texttt{cmsdate=full} (and
+\texttt{skipbib}) in the \textsf{options} field of an \textsf{article}
+or a \textsf{review} entry, alongside a possible
+\texttt{useauthor=false}, should allow you to achieve this.  For
+online comments in \textsf{online} or \textsf{review} entries this
+presentation is the default when you use the new
+\mycolor{\texttt{commenton}} \textsf{relatedtype}.  (See the
+documentation of those two types in section~\ref{sec:types:authdate},
+as well as \textsf{relatedtype} in section~\ref{sec:authrelated}.)
 While we're on this subject, the \emph{Manual} is flexible (in both
-specifications) on abbreviating the names of months (14.180).  By
+specifications) on abbreviating the names of months (14.171).  By
 default, \textsf{biblatex-chicago-authordate} uses the full names,
 which you can change by setting the option \texttt{dateabbrev=true} in
-the preamble.  (Cf.\ assocpress:gun, barcott:review, batson,
-creel:\hfill house, friends:leia, holiday:fool, nass:address,
-petroff:\-impurity, powell:email.)
-
-\mylittlespace Second, when you need to indicate that a work is
-\enquote{\texttt{forthcoming},} and for some reason can't put
-\texttt{forthcoming} in the \textsf{pubstate} field, then the
-\textsf{year} field, instead of the \textsf{date} field, is the place
-for it, though you should use the \cmd{autocap} macro there to make
-sure the word comes out correctly in both citations and the list of
-references.  (The \textsf{pubstate} field more conveniently takes the
-bare string.)  The reason for the field switch is that the
-\textsf{date} field accepts only numerical data, in \textsc{iso}8601
-format (\texttt{yyyy-mm-dd}), whereas \textsf{year} can, conveniently,
-hold just about anything.  Third, it may be worth noting here that
-\textsf{Biber} is somewhat more exacting when parsing the
-\textsf{date} field than \textsc{Bib}\TeX, so a field looking like
-\texttt{1968/75} will simply be ignored, producing
-\enquote{\texttt{n.d.}}\ in the output --- you need \texttt{1968/1975}
-instead.  If you want a more compressed year range, then you'll want
-to use the \textsf{year} field.
-
-%%\enlargethispage{\baselineskip}
-
-\mylittlespace Fourth, in the \textsf{misc} entry type the
+the preamble.  (Cf.\ ac:comment, assocpress:gun, barcott:review,
+batson, creel:house, friends:leia, holiday:fool, nass:address,
+petroff:impurity, powell:e\-mail.)
+
+\mylittlespace Third, in the \textsf{misc} entry type the
 \textsf{date} field can help to distinguish between two classes of
 archival material, letters and \enquote{letter-like} sources using
 \textsf{origdate} while others (interviews, wills, contracts) use
@@ -8075,39 +10927,47 @@ archival material, letters and \enquote{letter-like} sources using
 for the details.)  If such an entry, as may well occur, contains only
 an \textsf{origdate}, as can also be the case in \textsf{letter}
 entries, then \textsf{Biber} and either \cmd{DeclareLabeldate}
-definition will make it work without further intervention.  Fifth, and
-finally, you can in most entry types qualify a \textsf{date} with the
+definition will make it work without further intervention.  Fourth,
+you can in most entry types qualify a \textsf{date} with the
 \textsf{userd} field, assuming that the entry contains no
 \textsf{urldate}.  For \textsf{music} and \textsf{video} entries,
 there are several other requirements --- please see the documentation
-of \textsf{userd}, below.
+of \textsf{userd}, below.  Fifth, and finally, please note that the
+\textsf{nameaddon} field, which see, is no longer the place for time
+stamps, as it was in the 16th-edition styles.  Any such data there
+should be moved into the corresponding date field (either the
+\textsf{date} or the \textsf{eventdate}, typically).
 
 \mylittlespace I recommend that you have a look through
 \textsf{dates-test.bib} to see how all these complications will affect
 the construction of your .bib database, especially at the following
 entries: aristotle:metaphy:gr, creel:house, emerson:nature,
-james:ambas\-sa\-dors, mait\-land:canon, mait\-land:equity,
-schweit\-zer:bach, spock:in\-terview, white:ross:me\-mo, and
-white:russ.  Cf.\ also \textsf{origdate} and \textsf{year}, below; the
-\texttt{cmsdate}, \texttt{nodates}, and \texttt{switchdates} options
-in sections~\ref{sec:preset:authdate}, \ref{sec:authuseropts}, and
-\ref{sec:authentryopts}; and section~4.5.8 in \textsf{biblatex.pdf},
-and section \ref{sec:authformopts}, below, for the
-\cmd{DeclareLabeldate} command
-
+james:ambassadors, maitland:canon, maitland:equity, schweitzer:bach,
+spock:interview, white:ross:memo, and white:russ.  Cf.\ also
+\textsf{origdate}, \textsf{timezone}, \mycolor{\textsf{verbc}}, and
+\textsf{year}, below; the \texttt{alldates}, \texttt{alltimes},
+\mycolor{\texttt{alwaysrange}}, \mycolor{\texttt{centuryrange}},
+\texttt{cmsdate}, \mycolor{\texttt{compressyears}},
+\texttt{datecirca}, \texttt{dateera}, \texttt{dateera\-auto},
+\texttt{dateuncertain}, \mycolor{\texttt{decaderange}},
+\mycolor{\texttt{nodatebrackets}}, \texttt{nodates},
+\mycolor{\texttt{noyearbrackets}},\break \texttt{switchdates},
+\texttt{timezones}, \mycolor{\texttt{urlstamp}}, and \texttt{urltime}
+options in sections~\ref{sec:preset:authdate}, \ref{sec:authuseropts},
+and \ref{sec:authentryopts}; and section~4.5.10 in
+\textsf{biblatex.pdf}, and section \ref{sec:authformopts}, below, for
+the \cmd{DeclareLabeldate} command.
 
 \mybigspace This \mymarginpar{\textbf{day}} field, as of
 \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it
 in your .bib files.  Use \textsf{date} instead.
 
 \mybigspace Standard \mymarginpar{\textbf{doi}} \textsf{biblatex}
-field, providing the Digital Object Identifier of the work.  The 16th
-edition of the \emph{Manual} specifies that, given their relative
-permanence compared to URLs, \enquote{authors should include DOIs
-  rather than URLs for sources that make them readily available}
-(14.6; cf.\ 15.9).  (14.184; friedman:learn\-ing).  Cf.\ \textsf{url}.
-
-%%\enlargethispage{-\baselineskip}
+field, providing the Digital Object Identifier of the work.  The
+\emph{Manual} specifies that, given their relative permanence compared
+to URLs, \enquote{authors should prefer a DOI- or Handle-based URL
+  whenever one is available} (14.8).  (14.175; friedman:learning).
+Cf.\ \textsf{url}.
 
 \mybigspace Standard \mymarginpar{\textbf{edition}} \textsf{biblatex}
 field.  If you enter a plain cardinal number, \textsf{biblatex} will
@@ -8168,12 +11028,13 @@ Cf. section~\ref{sec:international}, and also \textsf{namea},
 as a means to specify additional contributors to texts in a number of
 editorial roles.  In the Chicago styles they seem most relevant for
 the audiovisual types, especially \textsf{music} and \textsf{video},
-where they help to identify conductors, directors, producers, and
+and now also the \mycolor{\textsf{performance}} type, in all of which
+they help to identify conductors, directors, producers, and
 performers.  To specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
-bernstein:shostakovich, handel:messiah.)
+bernstein:shostakovich, hamilton:miranda, handel:messiah.)
 
-\mybigspace Normally, \mymarginpar{\textbf{editortype}} with the
+\mybigspace Normally, \colmarginpar{\textbf{editortype}} with the
 exception of the \textsf{article} and \textsf{review} types with a
 \texttt{magazine} \textsf{entrysubtype},
 \textsf{biblatex-chicago-authordate} will automatically find a name to
@@ -8199,7 +11060,18 @@ then you need to put \texttt{compiler} into the \textsf{editortype}
 field, and \textsf{biblatex} will print the correct string after the
 name in the list of references.
 
-%\enlargethispage{\baselineskip}
+\mylittlespace In \colmarginpar{New!} previous releases of
+\textsf{biblatex-chicago} you could only use defined \cmd{bibstrings}
+in this field, at least if you wanted anything printed.  N.~Andrew
+Walsh pointed out that the standard \textsf{biblatex} styles will just
+print the field as-is in this case, allowing them to handle a great
+many unforeseen editorial roles with comparative ease, so I've
+implemented this, too, making sure to capitalize the string if the
+context demands it.  The string you choose will differ depending on
+whether it will be printed after a name at the head of an entry or
+before a name later on in the entry, e.g., \enquote{cartographer} or
+\enquote{maps created by.}  A bit of trial and error should see you
+through.
 
 \mylittlespace There are a few details of which you need to be aware.
 Because \textsf{biblatex-chicago} has added the \textsf{namea} field,
@@ -8222,6 +11094,8 @@ should ensure presents whichever of the two editors' names
 (\textsf{namea} or \textsf{editor}) appears at the head of the
 reference-list entry.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string
 concatenation mechanism, for reasons he outlines in his RELEASE file,
 and I have followed his lead.  In short, if you define the
@@ -8244,29 +11118,36 @@ requirements in the specification -- absence of an \textsf{author},
 for example -- the \texttt{useauthor=false} mechanism is either
 unnecessary or won't work properly in the following entry types:
 \textsf{collection}, \textsf{letter}, \textsf{patent},
-\textsf{periodical}, \textsf{proceedings}, \textsf{suppbook},
-\textsf{suppcollection}, and \textsf{suppperiodical}.
+\textsf{periodical}, \textsf{proceedings}, \textsf{review},
+\textsf{suppbook}, \textsf{suppcollection}, and
+\textsf{suppperiodical}.
 
 \mybigspace These
-\mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
+\colmarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
 identify the exact role of the person named in the corresponding
-\textsf{editor[a-c]} field.  Note that they are not part of the string
+\textsf{editor[a-c]} field, just as \textsf{editortype} (q.v.) does
+for the \textsf{editor}.  Note that they are not part of the string
 concatenation mechanism.  I have implemented them just as the standard
-styles do, and they have found a use particularly in \textsf{music}
+styles do, that is, if the field isn't a pre-defined \cmd{bibstring}
+it will be printed as-is, contextually capitalized.  They have found a
+use particularly in \textsf{music}, \mycolor{\textsf{performance}},
 and \textsf{video} entries.  Cf.\ bernstein:shostakovich,
-handel:messiah.
+hamilton:miranda, and handel:messiah.
 
-\mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
 identify a particular article.  Only applicable to the
-\textsf{article} entry type.  Not typically required by the
-\emph{Manual}.
+\textsf{article} entry type, and only to those without a
+\texttt{magazine} \textsf{entrysubtype}.  The 17th edition of the
+\emph{Manual} now specifies where to print this (14.174), and I have
+moved it in accordance with its specifications.  It replaces the
+\textsf{pages} field in the list of references.
 
 \paragraph*{\protect\mymarginpar{\textbf{entrysubtype}}}
 \label{sec:ad:entrysubtype}
 Standard and very powerful \textsf{biblatex} field, left undefined by
 the standard styles.  In \textsf{biblatex-chicago-authordate} it has
-four very specific uses, the first three of which I have designed in
+seven very specific uses, the first three of which I have designed in
 order to maintain, as much as possible, backward compatibility with
 the standard styles.  First, in \textsf{article} and
 \textsf{periodical} entries, the field allows you to differentiate
@@ -8298,13 +11179,12 @@ Papers).  (Cf.\ the next but one paragraph.)
 \mylittlespace If you wish to reference a classical or medieval work
 by the page numbers of a particular, non-standard edition, then you
 shouldn't use the \texttt{classical} \textsf{entrysubtype} toggle.
-Also, and the specification isn't entirely clear about this, works
-from the Renaissance and later, even if cited by the traditional
-divisions, seem to have citations formatted normally, and therefore
-don't need an \textsf{entrysubtype} field.  (See \emph{Manual}
-14.256--268; aristotle:metaphy:gr, plato:republic:gr;
-euripides:orestes is an example of a translation cited by page number
-in a modern edition.)
+Also, and the specification is reasonably clear about this, works from
+the Renaissance and later, even if cited by the traditional divisions,
+seem to have citations formatted normally, and therefore don't need an
+\textsf{entrysubtype} field.  (See \emph{Manual} 14.242--54;
+aristotle:metaphy:gr, plato:republic:gr; euripides:orestes is an
+example of a translation cited by page number in a modern edition.)
 
 \mylittlespace The third use of the \textsf{entrysubtype} field occurs
 in \textsf{misc} entries.  If such an entry contains no such field,
@@ -8316,16 +11196,31 @@ unpublished archive.  Please see section~\ref{sec:types:authdate}
 above under \textbf{misc} for all the details on how these citations
 work.
 
-\enlargethispage{-\baselineskip}
-
 \mylittlespace Fourth, the field can be defined in the
 \textsf{artwork} entry type in order to refer to a work from antiquity
 whose title you do not wish to be italicized.  Please see the
-documentation of \textsf{artwork} above for the details.  (In previous
-releases, there was a special \texttt{tv} \textsf{entrysubtype} for
-\textsf{video} entries.  This is no longer necessary.  Please see the
-documentation of \textsf{video} in section~\ref{sec:types:authdate}
-above, and that of \textsf{userd} below.)
+documentation of \textsf{artwork} above for the details.  Fifth, you
+can define it in an \textbf{audio}, \textbf{music}, or \textbf{video}
+entry if such an entry refers to an individual unit that isn't part of
+any larger collection, the entry therefore having only a
+\textsf{title} and not a \textsf{booktitle}, a \textsf{title} that
+\textsf{biblatex-chicago} would normally interpret as the title of a
+larger unit (and therefore italicize).  Sixth, and sticking with the
+\textbf{video} type, though enacting quite a different syntactic
+transformation, the 17th edition (14.265) now recommends that, when
+presenting episodes from a TV series, the name of the series
+(\textsf{booktitle}) comes before the episode name (\textsf{title}).
+The exact string \mycolor{\texttt{tvepisode}} in the
+\textsf{entrysubtype} field achieves this reversal, which includes
+using the \textsf{booktitle} as a \textsf{sorttitle} in the list of
+references.
+
+\mylittlespace Seventh, and finally, you can use any
+\textsf{entrysubtype} whatever in \textsf{inreference} entries in
+order to treat them as inherently online works rather than standard
+published works.  See the documentation of \textbf{online} and
+\textbf{inreference} entries in section~\ref{sec:types:authdate},
+above, and also 14.233 and wikiped:bibtex.
 
 \mybigspace Kazuo
 \mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}}
@@ -8337,45 +11232,72 @@ standard \textsf{biblatex}.  They may prove helpful in providing more
 abbreviated references to online content than conventional URLs,
 though I can find no specific reference to them in the \emph{Manual}.
 
-\mybigspace This \mymarginpar{\textbf{eventdate}} is a standard
-\textsf{biblatex} field.  In the 15th edition it was barely used, but
-in order to comply with changes in the 16th edition of the
-\emph{Manual} it plays a significant role in \textsf{music},
-\textsf{review}, and \textsf{video} entries.  In \textsf{music}
-entries, it identifies the recording or performance date of a
-particular song (rather than of a whole disc, for which you would use
-\textsf{origdate}), whereas in \textsf{video} entries it identifies
-either the original broadcast date of a particular episode of a TV
-series or the date of a filmed musical performance.  In both these
-cases \textsf{biblatex-chicago} will automatically prepend a bibstring
---- \texttt{recorded} and \texttt{aired}, respectively --- to the
-date, but you can change this string using the \textsf{userd} field,
-something you'll definitely want to do for filmed musical performances
-(friends:leia, handel:messiah, holiday:fool).
+\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
+\textsf{biblatex} field which has gradually accumulated functions in
+\textsf{biblatex-chicago}.  It can now play a role in
+\mycolor{\textsf{artwork}}, \mycolor{\textsf{audio}},
+\mycolor{\textsf{image}}, \textsf{music}, \textsf{review},
+\mycolor{\textsf{standard}}, \textsf{suppperiodical},
+\textsf{unpublished}, and \textsf{video} entries.  In \textsf{artwork}
+and \textsf{image} entries it identifies the publication date of, most
+frequently, a photograph, in association with the
+\textsf{howpublished} field which identifies the periodical or other
+medium in which it was published (mccurry:afghangirl).  In
+\textsf{standard} entries it will also usually be associated with a
+\textsf{howpublished} field, allowing you to specify a later renewal
+or reaffirmation of a standard (niso:bibref).  In \textsf{audio}
+entries, it specifies the release date of a single episode of a
+podcast (danforth:podcast).  In \textsf{music} entries, it identifies
+the recording or performance date of a particular song (rather than of
+a whole disc, for which you would use \textsf{origdate}), whereas in
+\textsf{video} entries it identifies either the original broadcast
+date of a particular episode of a TV series or the date of a filmed
+musical performance.  In both these cases \textsf{biblatex-chicago}
+will automatically prepend a bibstring --- \texttt{recorded} and
+\texttt{aired}, respectively --- to the date, but you can change this
+string using the \textsf{userd} field, something you'll definitely
+want to do for filmed musical performances (friends:leia,
+handel:messiah, holiday:fool).
+
+\mylittlespace In \textsf{unpublished} entries it identifies the date
+of an event at which an unpublished work was presented, though in
+truth the \textsf{date} will do as well here (nass:address).  The
+field's use in \textsf{review} and \textsf{suppperiodical} entries,
+finally, includes a possible time stamp.  In this context, an
+\textsf{eventdate} helps to identify a particular comment on, or reply
+to another comment on, a blog post.  Given that many such posts by a
+single \textsf{author} could appear on the same day, you can
+distinguish them by putting a time specification in the
+\textsf{eventdate} field itself (ac:comment).  Please see the
+\textbf{review} type, above, for the details of how to cite these
+materials, possibly with the help of the new
+\mycolor{\texttt{commenton}} \textsf{relatedtype}.  See also the
+\textsf{date} field docs above, in particular
+table~\ref{ad:date:extras}, for\colmarginpar{New!} details on how the
+\mycolor{\textsc{iso}8601-2 Extended Format specifications} offered by
+\textsf{biblatex}, including time stamps and much else besides, have
+been implemented in \textsf{biblatex-chicago}.
 
 \mylittlespace In the default configuration of \cmd{DeclareLabeldate},
 dates for citations and for the head of reference list entries are
 searched for in the order \textsf{date, eventdate, origdate, urldate}.
 This suits the Chicago author-date styles very well, except for
-\textsf{music} and \textsf{video} entries, where the general rule is
-to emphasize the earliest date, whether that be, for example, the
-recording date or original release date (15.53).  For these two entry
+\textsf{music}, \textsf{review}, \mycolor{\textsf{standard}},
+\textsf{suppperiodical}, and \textsf{video} entries.  In
+\textsf{music} and \textsf{video} entries the general rule is to
+emphasize the earliest date, whether that be, for example, the
+recording date or original release date (15.57).  The other three
+types have special requirements that once again necessitate putting
+the \textsf{eventdate} at the head of the queue.  For these five entry
 types, then, \cmd{DeclareLabeldate} uses the order \textsf{eventdate,
   origdate, date, urldate}.  (See the \texttt{avdate} option in
 section~\ref{sec:authpreset}, below.)
 
-\mylittlespace For \textsf{review} entries I use the same, custom
-definition of \cmd{DeclareLabeldate}, but for somewhat different
-reasons.  In general, such an entry will only have a \textsf{date},
-but an \textsf{eventdate} can be used to identify a particular comment
-within an online thread.  The year of the comment will therefore
-appear at the head of the entry and in citations, while the remainder
-of the \textsf{eventdate} will appear just after the \textsf{title},
-and the \textsf{date} after the \textsf{journaltitle}.  There isn't a
-particular string associated with the \textsf{eventdate}, but you can
-further specify a comment by placing a time\-stamp in parentheses in
-the \textsf{nameaddon} field, in case the date alone isn't enough
-(14.246; ac:comment, ellis:blog).
+\mybigspace This \colmarginpar{\textbf{eventtimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{eventdate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
 
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
@@ -8392,13 +11314,27 @@ from the \textsf{author}.  The \emph{Manual} has nothing to say on the
 subject, but \textsf{biblatex-chicago} prints it (them), in
 parentheses, just after the author(s).
 
-\enlargethispage{-\baselineskip}
-
-\mybigspace Standard \mymarginpar{\textbf{howpublished}}
-\textsf{biblatex} field, mainly applicable in the \textsf{booklet}
-entry type, where it replaces the \textsf{publisher}.  I have also
-retained it in the \textsf{misc} and \textsf{unpublished} entry types,
-for historical reasons.
+\mybigspace Standard \colmarginpar{\textbf{howpublished}}
+\textsf{biblatex} field which, like the \textsf{eventdate} field, is
+gradually accumulating functions in \textsf{biblatex-chicago}.  In the
+\textsf{booklet} type it retains something of its traditional usage,
+replacing the \textsf{publisher}, and has a similar (somewhat
+paradoxical) place in \textsf{unpublished} entries.  In the
+\textsf{misc} and \mycolor{\textsf{performance}} types it works almost
+as a second \textsf{note} field, bringing in extra information about a
+work in close association with the \textsf{type} and \textsf{version}
+fields, while the \mycolor{\textsf{dataset}} entry type associates it
+both with those two fields and with the \textsf{number} field.
+17th-edition \textsf{music} entries require a field to provide the
+medium of downloaded music and/or the name of the streaming service,
+so \textsf{howpublished} works there as an online double of
+\textsf{type} and of \textsf{publisher}.  Finally, in
+\textsf{artwork}, \textsf{image}, and \mycolor{\textsf{standard}}
+entries it serves to qualify or modify an \textsf{eventdate}, almost
+as a \textsf{userd} field modifies a \textsf{date} or
+\textsf{urldate}.  Please see the docs of those entry types for more
+information, and also bedford:photo, clark:mesopot,
+mccurry:afghangirl, niso:bibref, rihanna:umbrella.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -8432,7 +11368,10 @@ typically required by the \emph{Manual}.
 field, designed for \textsf{article} or \textsf{periodical} entries
 identified by something like \enquote{Spring} or \enquote{Summer}
 rather than by the usual \textsf{month} or \textsf{number} fields
-(brown:bre\-mer).
+(brown:bre\-mer).  \textsf{Biblatex's} enhanced date handling allows
+you to specify a season in the \textsf{date} field, with the
+\enquote{months} 21--24 used for Spring, Summer, Autumn, and Winter,
+respectively.  Cf.\ table~\ref{ad:date:extras}, above.
 
 \mybigspace The \mymarginpar{\textbf{issuesubtitle}} subtitle for an
 \textsf{issuetitle} --- see next entry.
@@ -8468,27 +11407,13 @@ citations and/or in the reference list, and you can also use it to
 print a list of journal abbreviations.  Cf.\ the \textsf{shortjournal}
 documentation below.
 
-\enlargethispage{\baselineskip}
-
 \mybigspace This \mymarginpar{\textbf{keywords}} field is
-\textsf{biblatex}'s extremely powerful and flexible technique for
-filtering entries in a list of references, allowing you to subdivide
-it according to just about any criteria you care to invent.  See
-\textsf{biblatex.pdf} (3.11.4) for thorough documentation.  In
-\textsf{biblatex-chicago}, the field provides one convenient means to
-exclude certain entries from making their way into a list of
-references, though the toggle \texttt{skipbib} in the \textsf{options}
-field works just as well, and perhaps more simply.  There are a few
-reasons for so excluding entries.  When citing both an original text
-and its translation (see \textbf{userf}, below), the \emph{Manual}
-(14.109) suggests including the original at the end of the
-translation's reference list entry, a procedure which requires that
-the original not also be printed as a separate entry
-(aristotle:metaphy:trans, aristotle:metaphy:gr).  Well-known reference
-works (like the \emph{Encyclopaedia Britannica}, for example) and many
-sacred texts need only be presented in citations, and not in the list
-of references (14.247--248; ency:britannica, genesis, wikiped:bibtex;
-see \textsf{inreference} and \textsf{misc}, above).
+\textsf{biblatex}'s powerful and flexible technique for filtering
+entries in a list of references, allowing you to subdivide it
+according to just about any criteria you care to invent, or indeed to
+prevent entries in citations from appearing in reference list, as the
+\emph{Manual} sometimes recommends.  See \textsf{biblatex.pdf} (3.7)
+for thorough documentation.
 
 \mybigspace A \mymarginpar{\textbf{language}} standard
 \textsf{biblatex} field, designed to allow you to specify the
@@ -8500,15 +11425,15 @@ however, when the \emph{Manual} does specify this data, and that is
 when the title of a work is given in translation, even though no
 translation of the work has been published, something that might
 happen when a title is in a language deemed to be unparseable by a
-majority of your expected readership (14.108, 14.110, 14.194;
-chu:panda, pirumova, rozner:liberation).  In such a case, you should
-provide the language(s) involved using this field, connecting multiple
-languages using the keyword \texttt{and}.  (I have retained
-\textsf{biblatex's} \cmd{bibstring} mechanism here, which means that
-you can use the standard bibstrings or, if one doesn't exist for the
-language you need, just give the name of the language, capitalized as
-it should appear in your text.  You can also mix these two modes
-inside one entry without apparent harm.)
+majority of your expected readership (14.99; chu:panda, pirumova,
+rozner:liberation).  In such a case, you should provide the
+language(s) involved using this field, connecting multiple languages
+using the keyword \texttt{and}.  (I have retained \textsf{biblatex's}
+\cmd{bibstring} mechanism here, which means that you can use the
+standard bibstrings or, if one doesn't exist for the language you
+need, just give the name of the language, capitalized as it should
+appear in your text.  You can also mix these two modes inside one
+entry without apparent harm.)
 
 \mylittlespace An alternative arrangement suggested by the
 \emph{Manual} is to retain the original title of a piece but then to
@@ -8525,8 +11450,6 @@ language or a translation to either of the latter two, you could
 probably manage it with special formatting inside those fields
 themselves.
 
-%%\enlargethispage{\baselineskip}
-
 \mybigspace I \mymarginpar{\textbf{lista}} intend this field
 specifically for presenting citations from reference works that are
 arranged alphabetically, where the name of the article rather than a
@@ -8538,21 +11461,19 @@ appropriate string (\enquote{s.v.,} \emph{sub verbo}, pl.\
 \enquote{s.vv.}).  \textsf{Biblatex-chicago} will only print such a
 field in a \textsf{book} or an \textsf{inreference} entry, and you
 should look at the documentation of these entry types for further
-details.  (See \emph{Manual} 14.247--248; grove:sibelius, times:guide,
+details.  (See \emph{Manual} 14.232--33; grove:sibelius, times:guide,
 wikiped:bibtex.)
 
 \mybigspace This \mymarginpar{\textbf{location}} is
 \textsf{biblatex}'s version of the usual \textsc{Bib}\TeX\ field
 \textsf{address}, though the latter is accepted as an alias if that
 simplifies the modification of older .bib files.  According to the
-\emph{Manual} (14.135), a citation usually need only provide the first
+\emph{Manual} (14.129), a citation usually need only provide the first
 city listed on any title page, though a list of cities separated by
 the keyword \enquote{\texttt{and}} will be formatted appropriately.
 If the place of publication is unknown, you can use
-\cmd{autocap\{n\}.p.}\ instead (14.138).  For all cities, you should
-use the common English version of the name, if such exists (14.137).
-
-%%\enlargethispage{\baselineskip}
+\verb+\autocap{n}.p.+\ instead (14.132).  For all cities, you should
+use the common English version of the name, if such exists (14.131).
 
 \mylittlespace Two other uses need explanation here.  In
 \textsf{article}, \textsf{periodical}, and \textsf{review} entries,
@@ -8560,16 +11481,16 @@ there is usually no need for a \textsf{location} field, but
 \enquote{if a journal might be confused with another with a similar
   title, or if it might not be known to the users of a bibliography,}
 then this field can present the place or institution where it is
-published (14.191, 14.203; garrett, kimluu:diethyl, and
+published (14.182, 14.191, 14.193--94; garrett, kimluu:diethyl, and
 lakeforester:pushcarts).  For blogs cited using \textsf{article}
 entries, this is a good place to identify the nature of the source ---
 i.e., the word \enquote{blog} --- letting the style automatically
-provide the parentheses (14.246; ellis:blog).
+provide the parentheses (15.51; ellis:blog).
 
 \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a
 \textsf{maintitle} --- see next entry.
 
-\mybigspace The \mymarginpar{\textbf{maintitle}} main title for a
+\mybigspace The \colmarginpar{\textbf{maintitle}} main title for a
 multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
 It no longer takes sentence-style capitalization in
 \textsf{authordate}, though it does in \textsf{authordate-trad}.  In
@@ -8579,6 +11500,14 @@ cross references produced using the \textsf{crossref} field, the
 euripides:orestes, harley:carto\-graphy, lach:asia,
 pelikan:christian, and plato:republic:gr.)
 
+\mylittlespace Because \colmarginpar{New!} the 17th edition of the
+\emph{Manual} recommends that you present not only the names of blogs
+but also the names of their parent (usually periodical) publications,
+I have added this field to \textsf{article}, \textsf{periodical}, and
+\textsf{review} entries for just this purpose.  See the documentation
+of those entry types in section~\ref{sec:types:authdate}, above, and
+also table~\ref{tab:online:adtypes} (15.51; amlen:hoot).
+
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
 \textsf{maintitle}, for which see previous entry.  Such an annex would
 be printed in the main text font.  If your data begins with a word
@@ -8618,30 +11547,47 @@ with \textsf{editortype}, which see.  Cf.\ also \textsf{nameb},
 \textsf{namec}, \textsf{translator}, and the macros \cmd{partedit},
 \cmd{parttrans}, \cmd{parteditandtrans}, \cmd{partcomp},
 \cmd{parteditandcomp}, \cmd{parttransandcomp}, and
-\cmd{partedittransand\-comp}, for which see
+\cmd{partedittransandcomp}, for which see
 section~\ref{sec:formatting:authdate}.
 
-\mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided
+\mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
 \textsf{biblatex-chicago}, it allows you to specify that an author's
-name is a pseudo\-nym, or to provide either the real name or the
+name is a pseudonym, or to provide either the real name or the
 pseudonym itself, if the other is being provided in the
 \textsf{author} field.  The abbreviation
 \enquote{\texttt{pseud.}\hspace{-2pt}}\ (always lowercase in English)
 is specified, either on its own or after the pseudonym
 (centinel:letters, creasey:ashe:blast, creasey:morton:hide,
-creasey:york:death, and le\-carre:quest); \cmd{bibstring\{pseudonym\}}
+creasey:york:death, and lecarre:quest); \verb+\bibstring{pseudonym}+
 does the work for you.  See under \textbf{author} above for the full
 details.
 
-\mylittlespace In \textsf{review} entries, I have removed the
-automatic provision of square brackets from the field, allowing it to
-be used in at least two ways.  First, if you provide your own square
-brackets, then it can have its standard function, as above.  Second,
-you can further specify comments to blogs and other online content
-using a timestamp (in parentheses) that supplements the
-\textsf{eventdate}, particularly when the latter is too coarse a
-specification to identify a comment unambiguously.  Cf.\ ac:comment.
+\mylittlespace In \textsf{online, review,} and \textsf{suppperiodical}
+entries, as well as in \textsf{misc} entries with an
+\textsf{entrysubtype}, I have removed the automatic provision of
+square brackets from the field, allowing it to be used in at least two
+ways.  First, if you provide your own square brackets, then it can
+have its standard function, as above.  Second you can, within
+parentheses, provide a screen name for online social media, or merely
+additional specifics about an author in a piece from an unpublished
+archive.  (The 16th edition of the \emph{Manual} recommended
+specifying comments to blogs and other online content using a time
+stamp in parentheses after the \textsf{author}, but the 17th edition
+\colmarginpar{New!} handles time stamps differently.  In this case the
+\emph{Manual} (15.52) now specifies that comments should appear
+\enquote{only in the text, in reference to the related post,} so I've
+provided some new functionality to enable this.  Please see the
+\textbf{online} and \textbf{review} types, above, especially
+table~\ref{tab:online:adtypes}, for the details of how to cite these
+materials, possibly with the help of the new
+\mycolor{\texttt{commenton}} \textsf{relatedtype} and a separate
+\textbf{customc} entry.  See also the \textsf{date} field docs above,
+in particular table~\ref{ad:date:extras}, for details on how the
+\mycolor{\textsc{iso}8601-2 Extended Format specifications} offered by
+\textsf{biblatex}, including time stamps and much else besides, have
+been implemented in \textsf{biblatex-chicago}.  Cf.\ ellis:blog,
+obrien:recycle.)
 
 \mylittlespace In the \textsf{customc} entry type, finally, which is
 used to create alphabetized cross-references to other entries in the
@@ -8680,7 +11626,7 @@ macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans},
 \cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and
 \cmd{partedittransandcomp} in section~\ref{sec:formatting:authdate}.
 
-\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (15.35)
+\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (15.36)
 specifies that works without an author may be listed under an editor,
 translator, or compiler, assuming that one is available, and it also
 specifies the strings to be used with the name(s) of compiler(s).  All
@@ -8746,11 +11692,15 @@ that that word is in lowercase, and \textsf{biblatex-chicago} will
 automatically do the right thing.  Cf.\ \textsf{addendum}.
 
 \mybigspace This \mymarginpar{\textbf{number}} is a standard
-\textsf{biblatex} field, containing the number of a
+\textsf{biblatex} field, steadily accumulating uses in
+\textsf{biblatex-chicago}.  It may contain the number of a
 \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry,
 the number of a \textsf{title} in a \textsf{periodical} entry, the
-volume/number of a book in a \textsf{series}, or the (generally
-numerical) specifier of the \textsf{type} in a \textsf{report} entry.
+volume/number of a book (or musical recording) in a \textsf{series},
+the (generally numerical) specifier of the \textsf{type} in a
+\textsf{report} entry, the archive location (or database accession
+number) of a \textsf{dataset} entry, and the number of a national or
+international standard in a \mycolor{\textsf{standard}} entry.
 Generally, in an \textsf{article}, \textsf{periodical}, or
 \textsf{review} entry, this will be a plain cardinal number, but in
 such entries \textsf{biblatex-chicago} does the right thing if you
@@ -8760,21 +11710,19 @@ information, including even a reference to \enquote{2nd ser.,} for
 example, while the \textsf{series} field in such an entry will contain
 the name of the series, rather than a number.  This field is also the
 place for the patent number in a \textsf{patent} entry.  Cf.\
-\textsf{issue} and \textsf{series}.  (See \emph{Manual} 14.128--132
-and boxer:china, palmatary:pottery, wauchope:ceramics; 14.180--181 and
-beattie:crime, conley:fifthgrade, friedman:learn\-ing, garrett,
-gibbard, hlatky:hrt, mcmillen:antebellum, rozner:liberation,
-warr:el\-lison.)
+\textsf{issue} and \textsf{series}.  (See 14.123--25 and boxer:china,
+palmatary:pottery, wauchope:ceramics; 14.171 and beattie:crime,
+conley:fifthgrade, friedman:learning, garrett, gibbard, hlatky:hrt,
+mcmillen:antebellum, rozner:liberation, warr:ellison; 14.257 and
+genbank:db; 14.259 and niso:bibref; 14.263 and holiday:fool.)
 
 \mylittlespace \textbf{NB}: This may be an opportune place to point
-out that the \emph{Manual} (14.154) prefers arabic to roman numerals
+out that the \emph{Manual} (14.147) prefers arabic to roman numerals
 in most circumstances (chapters, volumes, series numbers, etc.), even
 when such numbers might be roman in the work cited.  The obvious
 exception is page numbers, in which roman numerals indicate that the
 citation came from the front matter, and should therefore be retained.
 
-\enlargethispage{\baselineskip}
-
 \mybigspace A \mymarginpar{\textbf{options}} standard
 \textsf{biblatex} field, for setting certain options on a per-entry
 basis rather than globally.  Information about some of the more common
@@ -8792,25 +11740,31 @@ organization sponsoring a conference in a \textsf{proceedings} or
 \textsf{inproceedings} entry, and I have retained this as a
 possibility, though the \emph{Manual} is silent on the matter.
 
-\mybigspace This \mymarginpar{\textbf{origdate}} is a standard
+\enlargethispage{\baselineskip}
+
+\mybigspace This \colmarginpar{\textbf{origdate}} is a standard
 \textsf{biblatex} field which allows more than one full date
-specification for those references which need to provide more than
-just one.  As with the analogous \textsf{date} field, you provide the
-date (or range of dates) in \textsc{iso}8601 format, i.e.,
-\texttt{yyyy-mm-dd}.  In most entry types, you would use
+specification for those references which need it.  (You can also
+provide a time stamp in the field, after an uppercase
+\enquote{\texttt{T}}, but I foresee this being very rarely needed in
+the author-date styles.  See table~\ref{ad:date:extras} for
+\textsf{biblatex-chicago's} implementation of \textsf{biblatex's}
+enhanced date specifications.)  As with the analogous \textsf{date}
+field, you provide the date (or range of dates) in \textsc{iso}8601
+format, i.e., \texttt{yyyy-mm-dd}.  In most entry types, you would use
 \textsf{origdate} to provide the date of first publication of a work,
 most usually needed only in the case of reprint editions, but also
 recommended by the \emph{Manual} for electronic editions of older
-works (15.38, 14.119, 14.166, 14.169; aristotle:metaphy:gr,
-emerson:nature, james:ambassadors, schweitzer:bach).  In both the
-\textsf{letter} and \textsf{misc} (with \textsf{entrysubtype)} entry
-types, the \textsf{origdate} identifies when a letter (or similar) was
-written.  In such \textsf{misc} entries, some
-\enquote{non-letter-like} materials (like interviews) need the
-\textsf{date} field for this purpose, while in \textsf{letter} entries
-the \textsf{date} applies to the publication of the whole collection.
-If such a published collection were itself a reprint, judicious use of
-the \textsf{pubstate} field or perhaps improvisation in the
+works (15.40, 14.114, 14.162; aristotle:metaphy:gr, emerson:nature,
+james:ambassadors, schweitzer:bach).  In both the \textsf{letter} and
+\textsf{misc} (with \textsf{entrysubtype)} entry types, the
+\textsf{origdate} identifies when a letter (or similar) was written.
+In such \textsf{misc} entries, some \enquote{non-letter-like}
+materials (like interviews) need the \textsf{date} field for this
+purpose, while in \textsf{letter} entries the \textsf{date} applies to
+the publication of the whole collection.  If such a published
+collection were itself a reprint, judicious use of the
+\textsf{pubstate} field or perhaps improvisation in the
 \textsf{location} field might be able to rescue the situation.  (See
 white:ross:memo, white:russ, and white:total for how \textsf{letter}
 entries can work; creel:house shows the field in action in a
@@ -8818,7 +11772,7 @@ entries can work; creel:house shows the field in action in a
 instead.)
 
 \mylittlespace Because of the importance of date specifications in the
-author-date styles, \textsf{bibla\-tex-chicago-authordate} and
+author-date styles, \textsf{biblatex-chicago-authordate} and
 \textsf{authordate-trad} provide options and automated behaviors that
 allow you to emphasize the \textsf{origdate} in citations and at the
 head of entries in the list of references.  In entries which have
@@ -8827,14 +11781,14 @@ head of entries in the list of references.  In entries which have
 \cmd{DeclareLabeldate} configuration make it possible to do without a
 \texttt{cmsdate} option, as the \textsf{origdate} will automatically
 appear where and as it should.  In \textsf{book}-like entries with
-both a \textsf{date} and an \textsf{origdate}, the 16th edition of the
-\emph{Manual} recommends that you present, in citations and at the
-head of reference list entries, only the \textsf{date} or both dates
-together.  The latter is accomplished using the \texttt{cmsdate} entry
-option.  In some cases it may even be necessary to reverse the two
-date fields, putting the earlier year in \textsf{date} and the later
-in \textsf{origdate}.  If your reference apparatus contains many such
-instances, it may well be convenient for you instead to use the 
+both a \textsf{date} and an \textsf{origdate}, the \emph{Manual}
+recommends that you present, in citations and at the head of reference
+list entries, only the \textsf{date} or both dates together.  The
+latter is accomplished using the \texttt{cmsdate} entry option.  In
+some cases it may even be necessary to reverse the two date fields,
+putting the earlier year in \textsf{date} and the later in
+\textsf{origdate}.  If your reference apparatus contains many such
+instances, it may well be convenient for you instead to use the
 \mymarginpar{\texttt{cmsdate}\\\emph{in preamble}} \texttt{cmsdate}
 preamble option, which I have designed in an attempt to reduce the
 amount of manual intervention needed to present lots of entries with
@@ -8842,7 +11796,7 @@ multiple dates.  In short, setting \texttt{cmsdate} to \texttt{both}
 or \texttt{on} in the preamble promotes the \textsf{origdate} to the
 top of the search for a \textsf{labeldate} to use in citations and at
 the head of entries in the reference list.  This can solve many
-problems with the \textsf{extrayear} field --- 1978\textbf{a} --- and
+problems with the \textsf{extradate} field --- 1978\textbf{a} --- and
 also with sorting in the reference list.  Please see above under
 \textbf{date} for all the details on how these options interact.
 
@@ -8852,9 +11806,10 @@ searched for in the order \textsf{date, eventdate, origdate, urldate}.
 If you set the \texttt{cmsdate} preamble options I've just mentioned,
 this changes to \textsf{origdate, date, eventdate, urldate}.  These
 generally cover the needs of the Chicago author-date styles well,
-except for \textsf{music} and \textsf{video} entries, and,
-exceptionally, some \textsf{review} entries.  Here the general rule is
-to emphasize the earliest date.  For these three entry types, then,
+except for \textsf{music}, \mycolor{\textsf{standard}}, and
+\textsf{video} entries, and, exceptionally, some \textsf{review} and
+\textsf{suppperiodical} entries.  Here the general rule is to
+emphasize the earliest date.  For these five entry types, then,
 \cmd{DeclareLabeldate} uses the order \textsf{eventdate, origdate,
   date, urldate}.  In \textsf{music} entries, you can use the
 \textsf{origdate} in two separate but related ways.  First, it can
@@ -8875,19 +11830,26 @@ context, automatically prepend appropriate bibstrings to the
 different string using the \textsf{userd} field, but please be aware
 that if an entry also has an \textsf{eventdate}, then \textsf{userd}
 will apply to that, instead, and you'll be forced to accept the
-default string.  (Compare friends:leia with hitchcock:nbynw; 15.53,
-14.279-280; cf.\ \texttt{cmsdate} in sections~\ref{sec:authuseropts}
+default string.  (Compare friends:leia with hitchcock:nbynw; 15.57,
+14.263--65; Cf.\ \texttt{cmsdate} in sections~\ref{sec:authuseropts}
 and \ref{sec:authentryopts}, \cmd{DeclareLabeldate} in
 section~\ref{sec:authformopts}, and \texttt{avdate} in
 section~\ref{sec:authpreset}.)
 
-\mylittlespace Because the \textsf{origdate} field only accepts
-numbers, some improvisation may be needed if you wish to include
-\enquote{n.d.}\ (\cmd{bibstring\{nodate\}}) in an entry.  In
-\textsf{letter} and \textsf{misc}, this information can be placed in
-\textsf{titleaddon}, but in other entry types you may need to use the
-\textsf{location} field.  (The \textsf{origyear} field usually works,
-too.)
+\mylittlespace A couple of further notes are in order.  First,
+\textsf{artwork} and \textsf{image} entries (which see) have their own
+scheme, and are not governed by the \texttt{avdate} option.  Here, the
+style uses the earlier of two dates as the creation date of the work
+while the later is the printing date of, e.g., a particular exemplar
+of a photograph or of an etching.  Depending on how you want this
+information presented in an entry, you can distribute these dates
+between the \textsf{date} and \textsf{origdate} fields as you wish.
+Second, because the \textsf{origdate} field only accepts numbers, some
+improvisation may be needed if you wish to include \enquote{n.d.}\
+(\verb+\bibstring{nodate}+) in an entry.  In \textsf{letter} and
+\textsf{misc}, this information can be placed in \textsf{titleaddon},
+but in other entry types you may need to use the \textsf{location}
+field.  (The \textsf{origyear} field usually works, too.)
 
 \mybigspace See
 \vspace{-14.2pt}
@@ -8896,21 +11858,27 @@ too.)
 section~\ref{sec:authrelated}, below.
 \vspace{18pt}
 
+\mybigspace This \colmarginpar{\textbf{origtimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{origdate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
+
 \mybigspace This \mymarginpar{\textbf{pages}} is the standard
 \textsf{biblatex} field for providing page references.  In many
 \textsf{article} entries you'll find this contains something other
 than a page number, e.g. a section name or edition specification
-(14.203, 14.209; kozinn:review, nyt:trevorobit).  Of course, the same
-may be true of almost any sort of entry, though perhaps with less
-frequency.  Curious readers may wish to look at brown:bremer (14.189)
-for an example of a \textsf{pages} field used to facilitate reference
-to a two-part journal article.  Cf.\ \textsf{number} for more
-information on the \emph{Manual}'s preferences regarding the
-formatting of numerals; \textsf{bookpagination} and
-\textsf{pagination} provide details about \textsf{biblatex's}
-mechanisms for specifying what sort of division a given \textsf{pages}
-field contains; and \textsf{usera} discusses a different way to
-present the section information pertaining to a newspaper article.
+(14.191; kozinn:review, nyt:trevorobit).  Of course, the same may be
+true of almost any sort of entry, though perhaps with less frequency.
+Curious readers may wish to look at brown:bremer (14.180) for an
+example of a \textsf{pages} field used to facilitate reference to a
+two-part journal article.  Cf.\ \textsf{number} for more information
+on the \emph{Manual}'s preferences regarding the formatting of
+numerals; \textsf{bookpagination} and \textsf{pagination} provide
+details about \textsf{biblatex's} mechanisms for specifying what sort
+of division a given \textsf{pages} field contains; and \textsf{usera}
+discusses a different way to present the section information
+pertaining to a newspaper article.
 
 \mylittlespace David Gohlke brought to my attention a discussion that
 took place a couple of years ago on
@@ -8918,14 +11886,17 @@ took place a couple of years ago on
 regarding the automatic compression of page ranges, e.g., 101-{-}109
 in the .bib file or in the \textsf{postnote} field would become 101--9
 in the document.  \textsf{Biblatex} has long had the facilities for
-providing this, and though the \emph{Manual's} rules (9.60) are fairly
+providing this, and though the \emph{Manual's} rules (9.61) are fairly
 complicated, Audrey Boruvka fortunately provided in that discussion
 code that implements the specifications.  As some users may well be
 accustomed to compressing page ranges themselves in their .bib files,
 and in their \textsf{postnote} fields, I have made the activation of
 this code a package option, so setting \texttt{compresspages=true}
 when loading \textsf{biblatex-chicago} should automatically give you
-the Chicago-recommended page ranges.
+the Chicago-recommended page ranges.  \textbf{NB}: the code now
+resides in \textsf{biblatex-chicago.sty}, so if you don't load that
+package then you'll need to copy the code into your preamble for the
+option to have the desired effect.
 
 \mybigspace This, \mymarginpar{\textbf{pagination}} a standard
 \textsf{biblatex} field, allows you automatically to prefix the
@@ -8940,7 +11911,7 @@ just mentioned the two fields are equivalent.
 field, which identifies physical parts of a single logical volume in
 \textsf{book}-like entries, not in periodicals.  It has the same
 purpose in \textsf{biblatex-chicago}, but because the \emph{Manual}
-(14.126) calls such a thing a \enquote{book} and not a \enquote{part,}
+(14.121) calls such a thing a \enquote{book} and not a \enquote{part,}
 the string printed in the list of references will, at least in
 English, be \enquote{\texttt{bk.}\hspace{-2pt}}\ instead of the plain
 dot between volume number and part number (harley:cartography,
@@ -8958,42 +11929,83 @@ different field, (which in the case of a series would be
 \textsf{number} [palmatary:pottery]).  Cf.\ \textsf{volume};
 iso:electrodoc.
 
-\mybigspace Standard \mymarginpar{\textbf{publisher}}
+\mybigspace Standard \colmarginpar{\textbf{publisher}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
 keyword for connecting multiple publishers, so if a publisher's name
 contains \enquote{and,} then you should either use the ampersand (\&)
 or enclose the whole name in additional braces.  (See \emph{Manual}
-14.139--148; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
+14.133--41; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
 dunn:revolutions.)
 
-\mylittlespace There are, as one might expect, a couple of further
-subtleties involved here.  Two publishers will be separated by a
-forward slash in the list of references, and you no longer, in the
-16th edition, need to provide hand formatting if a company issues
-\enquote{certain books through a special publishing division or under
-  a special imprint,} as these, too, should be separated by a forward
-slash.  If a book has two co-publishers, \enquote{usually in different
-  countries,} (14.147) then the simplest thing to do is to choose one,
-probably the nearest one geographically.  If you feel it necessary to
-include both, then levistrauss:savage demonstrates one way of doing
-so, using a combination of the \textsf{publisher} and
-\textsf{location} fields.  Finally, if the publisher is unknown, then
-the \emph{Manual} recommends (14.143) simply using the place (if
-known) and the date.  If for some reason you need to indicate the
-absence of a publisher, the abbreviation given by the \emph{Manual} is
-\texttt{n.p.}, though this can also stand for \enquote{no place.}
-Some style guides apparently suggest using \texttt{s.n.}\,(=
-\emph{sine nomine}) to specify the lack of a publisher, but the
-\emph{Manual} doesn't mention this.
-
-\mybigspace In addition to the functions involving reprinted titles,
-on which see \colmarginpar{\textbf{pubstate}}
-section~\ref{sec:authrelated} below, you can now also use the
-\textsf{pubstate} field to indicate that a work is
-\enquote{forthcoming.}  Just put the exact string \texttt{forthcoming}
-into the field and the style will print
-\cmd{bibstring\{forth\-coming\}} as the \textsf{year}
-(author:forthcoming, contrib:contrib).
+\mylittlespace There are, as one might expect, a few further
+subtleties involved here.  If you give two publishers in the field
+they will both be printed, separated by a forward slash in both notes
+and bibliography (14.90; sereny:cries).  The 17th edition generally is
+rather keener than the 16th on using just one, particularly so in the
+case when the parent company of an imprint is also listed on a title
+page, in which case only the imprint need be included in your
+apparatus (14.138).  If an academic publisher issues \enquote{certain
+  books through a special publishing division or under a special
+  imprint or as part of a publishing consortium (or joint imprint),}
+this arrangement may be specified in the \textsf{publisher} field
+(14.139; cohen:schiff).  If a book has two co-publishers \enquote{in
+  different countries} (14.140), then the simplest thing to do is to
+choose one, probably the nearest one geographically.  If you feel it
+necessary to include both, then levistrauss:savage demonstrates one
+way of doing so, using a combination of the \textsf{publisher} and
+\textsf{location} fields.  If the work is self-published, you can
+specify this in the \textsf{pubstate} field (see below), and any
+commercial self-publishing platform would go in \textsf{publisher}
+(14.137).  Books published before 1900 can, at your discretion,
+include only the place (if known) and the date (14.128).  If for some
+reason you need to indicate the absence of a publisher, the
+abbreviation given by the \emph{Manual} is \texttt{n.p.}, though this
+can also stand for \enquote{no place.}  The \emph{Manual} also
+mentions {s.n.}\,(= \emph{sine nomine}) to specify the lack of a
+publisher (10.42).
+
+\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+specifications in the 17th edition of the \emph{Manual} (esp.\
+14.137), I have tried to generalize the functioning of the
+\textsf{pubstate} field in all entry types.  Because the author-date
+style has fairly complicated rules about presenting reprinted editions
+(15.40), the \texttt{reprint} string still has a special status.
+Depending on which date(s) you have chosen to appear at the head of
+the entry, \textsf{biblatex-chicago-authordate} will either print the
+(localized) string \texttt{reprint} in the proper place or otherwise
+provide a notice at the end of the entry detailing the original
+publication date.  See under \textbf{date} above for the available
+permutations.  (Cf.\ aristotle:metaphy:gr, maitland:canon,
+maitland:equity, schweitzer:bach.)
+
+\mylittlespace Other strings are divided into two types: those which
+\textsf{biblatex-chicago} will print as the \textsf{year}, which
+currently means \emph{only} those for which \textsf{biblatex} contains
+bibstrings indicating works soon to be published, i.e.,
+\texttt{forthcoming}, \texttt{inpreparation}, \texttt{inpress}, and
+\texttt{submitted}; and those, i.e., everything else, which will be
+printed before, and in close association with, other information about
+the publisher of a work.  (This \colmarginpar{\textbf{NB}} is a change
+from previous behavior, where non-\texttt{reprint} strings were
+printed \emph{after} the publication information, as in the standard
+styles.  You can still use the \textsf{addendum} field to present
+information here, of course.)  The four strings that replace the
+\textsf{year} will always be localized, as will \texttt{reprint} and
+\mycolor{\texttt{selfpublished}} (and anything else that
+\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
+category.  All other strings will be printed as-is, capitalized if
+needed, just before the publisher (author:forthcoming,
+contrib:contrib, schweitzer:bach).
+
+\mylittlespace There is one further subtlety of which you ought to be
+aware.  In \textsf{music} and \textsf{video} entries, the
+\texttt{reprint} string in \textsf{pubstate} will only make a
+difference to your entries when the date which it modifies --- the
+\textsf{origdate}, typically --- \emph{doesn't} appear in citations
+and at the head of reference-list entries.  In this case the date is
+treated as an original release date, and it will be printed, preceded
+by the appropriate string, near the end of the entry.  Other strings
+don't show this special behavior in these entries.
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
@@ -9003,11 +12015,15 @@ purposes.  Cf.\ \textsf{annotator} and \textsf{commentator}.
 \mybigspace See \mymarginpar{\textbf{reprinttitle}}
 section~\ref{sec:authrelated}, below.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
 \textsf{periodical}, or \textsf{review} entry, almost always the name
-of a publication series in \textsf{book}-like entries.  If you need to
-attach further information to the \textsf{series} name in a
+of a publication series in \textsf{book}-like entries, and providing
+similar identifying information associated with a \textsf{number} in
+\textsf{music} and \mycolor{\textsf{standard}} entries.  If you need
+to attach further information to the \textsf{series} name in a
 \textsf{book}-like entry, then the \textsf{number} field is the place
 for it, whether it be a volume, a number, or even something like
 \enquote{2nd ser.} or \enquote{\cmd{bibstring\{oldseries\}}.}  Of
@@ -9017,21 +12033,21 @@ you would place it in the \textsf{series} field itself.  (In fact, the
 \textsf{series} field in \textsf{article} and \textsf{periodical}
 entries is one of the places where \textsf{biblatex} allows you just
 to use the plain bibstring \texttt{oldseries}, for example, rather
-than making you type \cmd{bibstring\{oldseries\}}.  The \textsf{type}
+than making you type \verb+\bibstring{oldseries}+.  The \textsf{type}
 field in \textsf{manual}, \textsf{patent}, \textsf{report}, and
 \textsf{thesis} entries also has this auto-detection mechanism in
 place; see the discussion of \cmd{bibstring} below for details.)  In
 whatever entry type, these bibstrings produce the required
 abbreviation.  (For books and similar entries, see \emph{Manual}
-14.128--132; boxer:china, browning:aurora, palmatary:pottery,
-plato:republic:gr, wauchope:ceramics; for periodicals, see 14.195;
+14.123--26; boxer:china, browning:aurora, palmatary:pottery,
+plato:republic:gr, wauchope:ceramics; for periodicals, see 14.184;
 garaud:gatine, sewall:letter.)  Cf.\ \textsf{number} for more
 information on the \emph{Manual}'s preferences regarding the
 formatting of numerals.
 
 \mybigspace This \mymarginpar{\textbf{shortauthor}} is a standard
 \textsf{biblatex} field, but \textsf{biblatex-chicago} makes
-considerably grea\-ter use of it than the standard styles.  For the
+considerably greater use of it than the standard styles.  For the
 purposes of the author-date specification, the field provides the name
 to be used in text citations.  In the vast majority of cases, you
 don't need to specify it, because the \textsf{biblatex} system selects
@@ -9055,7 +12071,7 @@ save space in the running text (evanston:library), but see under
 \textbf{shorthand} for another method of saving space.
 
 \mylittlespace As mentioned under \textsf{editortype}, the
-\emph{Manual} (15.21) recommends against providing the identifying
+\emph{Manual} (15.36) recommends against providing the identifying
 string (e.g., ed.\ or trans.)\ in text citations, and
 \textsf{biblatex-chicago} follows their recommendation.  If you need
 to provide these strings in such a citation, then you'll have to do so
@@ -9077,7 +12093,6 @@ list entry before the \textsf{editor}, you should present the
 shortened \textsf{namea} here instead of a shortened \textsf{editor}
 in such cases.Cf.\ \textsf{editortype}, above.
 
-% %\enlargethispage{\baselineskip}
 \paragraph*{\protect\mymarginpar{\textbf{shorthand}}}
 \label{sec:ad:shorthand}
 
@@ -9106,26 +12121,26 @@ parseable by them, while with the latter you can either rely on the
 conventions of your field or, alternately, provide a list of journal
 abbreviations using \cmd{printbiblist\{shortjournal\}}.
 
-\enlargethispage{\baselineskip}
+\enlargethispage{-\baselineskip}
 
 \mylittlespace For long institutional names the \emph{Manual's}
-recommendation (15.36), and this has changed for the 16th edition,
-involves using an abbreviation, an abbreviation which will appear not
-only in citations but also at the head of the entry in the list of
-references.  Such an entry should therefore be alphabetized by the
-abbreviation, with its expansion placed (inside parentheses) between
-the abbreviation and the date.  This formatting can be produced in one
-of two ways: either you can provide a specially-formatted
-\textsf{author} field (for the reference list, and including both the
-abbreviation and the parenthesized expansion) + a \textsf{shortauthor}
-(for the citations), or you can use a normal \textsf{author} field + a
-\textsf{shorthand}, in which case \textsf{biblatex-chicago-authordate}
-will automatically use the \textsf{shorthand} in text citations and
-also place it at the head of the reference list entry, followed by the
-\textsf{author} within parentheses.  This method is simpler and more
-compatible with other styles, though you do need a \textsf{sortkey}
-when you use the \textsf{shorthand} field this way.  (Cf.\
-bsi:abbreviation, iso:electrodoc.)
+recommendation (15.37) involves using an abbreviation which will
+appear not only in citations but also at the head of the entry in the
+list of references.  Such an entry should therefore be alphabetized by
+the abbreviation, with its expansion placed (inside parentheses)
+between the abbreviation and the date.  This formatting can be
+produced in one of two ways: either you can provide a
+specially-formatted \textsf{author} field (for the reference list, and
+including both the abbreviation and the parenthesized expansion) + a
+\textsf{shortauthor} (for the citations), or you can use a normal
+\textsf{author} field + a \textsf{shorthand}, in which case
+\textsf{biblatex-chicago-authordate} will automatically use the
+\textsf{shorthand} in text citations and also place it at the head of
+the reference list entry, followed by the \textsf{author} within
+parentheses.  This method is simpler and more compatible with other
+styles, and will also produce a list that is correctly sorted by the
+\textsf{shorthand}.  (Cf.\ niso:bibref, bsi:abbreviation,
+iso:electrodoc.)
 
 \mylittlespace I should clarify here that this automatic placement of
 the \textsf{shorthand} at the head of the entry will \emph{not} occur
@@ -9140,7 +12155,7 @@ decide to print that list, giving maximum flexibility.
 
 \mylittlespace Indeed, I have provided two options to add to this
 flexibility.  First, I have included two \texttt{bibenvironments} for
-use with the \texttt{env} option to the \cmd{printshort\-hands} command:
+use with the \texttt{env} option to the \cmd{printshorthands} command:
 \texttt{losnotes} is designed to allow a list of shorthands to appear
 inside footnotes, while \texttt{losendnotes} does the same for
 endnotes.  Their main effect is to change the font size, and in the
@@ -9149,16 +12164,14 @@ I see on my system when using endnotes.  (You'll probably also want to
 use the option \texttt{heading=none} in order to get rid of the
 [oversized] default, providing your own within the \cmd{footnote}
 command.)  Second, I have provided a package option,
-\texttt{short\-handfull}, which prints entries in the list of
-shorthands which contain full bibliographical information, effectively
-allowing you to eschew the list of references in favor of a fortified
-shorthand list.  This option will only work if used in tandem with
+\texttt{shorthandfull}, which prints entries in the list of shorthands
+which contain full bibliographical information, effectively allowing
+you to eschew the list of references in favor of a fortified shorthand
+list.  This option will only work if used in tandem with
 \texttt{cmslos=false}, as otherwise the shorthand will be printed
-twice.  (See 15.36, 13.65, 14.54--55, and also \textsf{biblatex.pdf}
+twice.  (See 15.37, 13.67, 14.59--60, and also \textsf{biblatex.pdf}
 for more information.)
 
-%%\enlargethispage{-\baselineskip}
-
 \mylittlespace As I mentioned above under \textbf{crossref}, I believe
 it is safe to use shorthands in parent entries, as this, in the
 standard configuration, gives you the shorthand itself in the child
@@ -9173,7 +12186,7 @@ this be needed, rather in the manner of a \textsf{shorthand} list.  As
 requested by user BenVB, you can now utilize this functionality in
 your documents, but there are a few details worth mentioning here.
 First, users in some fields may well already be accustomed to using a
-set of standard journal abbreviations (15.44), in which case the
+set of standard journal abbreviations (15.46), in which case the
 \textsf{journaltitle} field may well already contain the abbreviation,
 which will appear wherever that field is printed.  In such cases, it
 usually isn't necessary to provide a list of abbreviations in
@@ -9199,7 +12212,7 @@ place of an \textsf{author}.  There are three other settings:
 reference list, \texttt{bib} prints them only in the reference list,
 and \texttt{false} ignores them.  Should you wish to present a list of
 these abbreviations with their expansions, then you need to use the
-\cmd{printbiblist\{shortjournal\}} command, perhaps with a
+\verb+\printbiblist{shortjournal}+ command, perhaps with a
 \texttt{title} option to differentiate the list from any
 \textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
 provided two \texttt{bibenvironments} for printing this list in foot-
@@ -9210,11 +12223,47 @@ as with \textsf{shorthands}, you'll probably want to use the option
 the (oversized) default, and perhaps provide your own title within the
 \cmd{footnote} command.  Finally, if you don't like the default
 formatting of the abbreviations in the list (bold italic), you can
-roll your own using \cmd{DeclareFieldFormat\{shortjournalwidth\}} ---
-you can see its default definition at the top of
+change it with \verb+\DeclareFieldFormat{shortjournal-width}+ --- you
+can see its default definition at the top of
 \textsf{chicago-authordate.bbx}.
 
-\enlargethispage{\baselineskip}
+\mybigspace A \colmarginpar{\textbf{shortseries}} special
+\textsf{biblatex} field, used both to provide an abbreviated form of a
+(book) \textsf{series} in a reference list and to facilitate the
+creation of a list of such abbreviations rather in the manner of a
+\textsf{shorthand} list.  As with the \textsf{shortjournal} field, its
+inclusion in \textsf{biblatex-chicago} was requested by user BenVB,
+and it is now available in entry types which have book-like series
+titles rather than journal-like numbers in the \textsf{series} field,
+to wit: \textsf{audio, book, bookinbook, collection, inbook,
+  incollection, inproceedings, inreference, letter, manual, music,
+  mvbook, mvcollection, mvproceedings, mvreference, reference, report,
+  standard, suppbook,} and \textsf{video}.  There are several steps to
+take in order to use the field.  First, you'll need to provide both
+\textsf{shortseries} and \textsf{series} fields in the entry, then
+you'll need to set the \mycolor{\texttt{seriesabbrev}} option either
+when loading \textsf{biblatex-chicago}, for the whole document or for
+specific entry types, or in the \textsf{options} field of individual
+.bib entries.  By default, this option is not set, so your
+\mycolor{\textsf{shortseries}} fields will be silently ignored.
+Setting it to \texttt{true} prints the shortened fields in the
+reference list.  Should you wish to present a list of these
+abbreviations with their expansions, then you need to use the
+\verb+\printbiblist{shortseries}+ command, perhaps with a
+\texttt{title} option to differentiate the list from any
+\textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
+provided two \texttt{bibenvironments} for printing this list in foot-
+or endnotes (\mycolor{\texttt{shsernotes}} and
+\mycolor{\texttt{shserendnotes}}, respectively), to be used with the
+\texttt{env} option to \cmd{printbiblist}.  Again as with
+\textsf{shorthands}, you'll probably want to use the option
+\texttt{heading=none} when using these environments, just to turn off
+the (oversized) default, and perhaps provide your own title within the
+\cmd{footnote} command.  Finally, if you don't like the default
+formatting of the abbreviations in the list (plain roman), you can
+roll your own using \verb+\DeclareFieldFormat{shortserieswidth}+ ---
+you can see its default definition at the top of
+\textsf{chicago-authordate.bbx}.
 
 \mybigspace A \mymarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
@@ -9225,87 +12274,83 @@ on which see the previous entry.)  In
 only very rarely (unlike in the notes \&\ bibliography style), and is
 most likely to turn up in \textsf{inreference} or \textsf{reference}
 entries (where the \textsf{title} takes the place of the
-\textsf{author}), or in any sort of entry with a \texttt{classical}
-\textsf{entrysubtype}.  This latter toggle makes citations use
-\textsf{author} and \textsf{title} instead of \textsf{author} and
-\textsf{year}, and if an abbreviated version of that title would save
-space in your running text this is the field where you can provide it.
-(Cf.\ ency:britannica, grove:sibelius, aristotle:metaphy:gr.)
-
-\mybigspace A \mymarginpar{\textbf{sortkey}} standard
-\textsf{biblatex} field, designed to allow you to specify how you want
-an entry alphabetized in a list of references.  In general, if an
-entry doesn't turn up where you expect or want it, this field should
-provide the solution.  Entries with a corporate author can omit the
-definite or indefinite article, which should help (14.85;
-cotton:manufacture, nytrumpet:art).  The default settings of
-\cmd{DeclareSortingTemplate} include the three supplemental name
-fields (\textsf{name[a-c]}) and also the \textsf{journaltitle} in the
-sorting algorithm, so once again you should find those algorithms
-needing less help than before.  Entries using a \textsf{shorthand},
-and entries headed by a \textsf{title} beginning with the definite or
-indefinite article, may well now require such assistance
-(bsi:abbreviation, grove:sibelius, iso:electrodoc).  There may be
-circumstances --- several reprinted books by the same author, for
-example --- when the \textbf{sortyear} field is more appropriate, on
-which see below.  \textsf{Biblatex} also provides \textbf{sortname}
-and \textbf{sorttitle} for equally fine-grained control.  Please
-consult \textsf{biblatex.pdf} for the details.
-
-\mybigspace A \mymarginpar{\textbf{sortyear}} standard
-\textsf{biblatex} field, provided for more fine-grained control over
-the sorting of entries in a list of references, and possibly useful in
-\textsf{biblatex-chicago-authordate} to help present several reprinted
-books by the same author.  See \textsf{sortkey} and \textsf{date}
-above.
+\textsf{author}), in \mycolor{\textsf{dataset}} entries, or in any
+sort of entry with a \texttt{classical} \textsf{entrysubtype} or with
+\mycolor{\texttt{authortitle}} set in its \textsf{options} field.
+These latter three contexts make citations use \textsf{author} and
+\textsf{title} instead of \textsf{author} and \textsf{year}, and if an
+abbreviated version of that title would save space in your running
+text this is the field where you can provide it.  (Cf.\
+ency:britannica, grove:sibelius, aristotle:metaphy:gr.)
+
+\mybigspace Standard \mymarginpar{\textbf{sortkey} \\\textbf{sortname}
+  \\\textbf{sorttitle} \\\textbf{sortyear}} \textsf{biblatex} fields,
+designed to allow you to specify how you want an entry alphabetized in
+a list of references.  The \textsf{sortkey} field trumps all other
+sorting information, while the others offer more fine-grained control.
+In general, if an entry doesn't turn up where you expect or want it,
+one of these fields should provide the solution.  Entries with a
+corporate author can omit the definite or indefinite article, which
+should help (14.70, 14.84; cotton:manufacture, nytrumpet:art).  The
+default settings of \cmd{DeclareSortingTemplate} include the three
+supplemental name fields (\textsf{name[a-c]}) and also the
+\textsf{journaltitle} in the sorting algorithm, so once again you
+should find those algorithms needing less help than before.  Entries
+headed by a \textsf{title} beginning with the definite or indefinite
+article may well still require such assistance (grove:sibelius).
+There may be circumstances --- several reprinted books by the same
+author, for example --- when the \textsf{sortyear} field is the best
+choice.  Please consult \textsf{biblatex.pdf} for the details.
 
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
 
-\mybigspace This \mymarginpar{\textbf{title}} release of
-\textsf{biblatex-chicago} includes the \textsf{authordate-trad} style,
-designed as a kind of hybrid style according to indications contained
-in the 16th edition of the \emph{Manual} (14.45).  This \textsf{trad}
-style differs \emph{only} in the way it treats the \textsf{title} and
-related fields, which retain the forms they have traditionally had in
-the Chicago author-date specifications prior to the latest edition.
-Where the new edition uses headline-style capitalization, the older
-editions used sentence-style; where the new edition places
-\textsf{article} or \textsf{incollection} \textsf{titles} within
-quotation marks, the older editions presented them in plain text.  If
-you have been using the 15th-edition author-date style, then your
-\textsf{title} fields won't need any changes for
-\textsf{authordate-trad}, but I shall include just below, under a
-separate rubric, full documentation for \textsf{trad} \textsf{title}
-fields for those just coming to the package.  First, though, I
-document the same field(s) for the standard author-date style.
+\mybigspace This \colmarginpar{\textbf{timezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{date}.  The \emph{Manual} prefers initialisms like
+\enquote{EST} for this purpose, and you can provide parentheses around
+it at your discretion (cp.\ 10.41 and 14.191).
+
+\mybigspace \textsf{Biblatex-chicago} \mymarginpar{\textbf{title}}
+includes the \textsf{authordate-trad} style, designed as a kind of
+hybrid style according to indications contained in the \emph{Manual}
+(15.38).  This \textsf{trad} style differs \emph{only} in the way it
+treats the \textsf{title} and related fields, which retain the forms
+they have traditionally had in the Chicago author-date specifications
+prior to the 16th edition.  Where newer editions use headline-style
+capitalization, the older editions used sentence-style; where newer
+editions place \textsf{article} or \textsf{incollection}
+\textsf{titles} within quotation marks, the older editions presented
+them in plain text.  I include below, under a separate rubric, full
+documentation of \textsf{trad} \textsf{title} fields for those needing
+or wishing to use them.  First, though, I document the same field(s)
+for the standard author-date style.
 
 \mylittlespace In the vast majority of cases, this field works just as
 it always has in \textsc{Bib}\TeX, and just as it does in
-\textsf{biblatex}.  In a major change to previous editions of the
-\emph{Manual}, the 16th edition now recommends that \textsf{titles} be
-treated more or less identically across both its systems of
-documentation (15.2, 15.6, 15.13).  This means that users of the
-author-date style no longer need to worry about sentence-style
+\textsf{biblatex}.  The \emph{Manual} recommends that \textsf{titles}
+be treated more or less identically across both its systems of
+documentation (15.3, 15.6, 15.13).  This means that users of the
+author-date style don't need to worry about sentence-style
 capitalization when compiling their .bib databases, and so can eschew
 the extra curly braces needed to preserve uppercase letters in this
-context.  The other new rules, however, mean that a few new
-complications, familiar to users of the notes \&\ bibliography style,
-will arise.  First, although nearly every entry will have a
-\textsf{title}, there are some exceptions, particularly
-\textsf{incollection} or \textsf{online} entries with a merely generic
-title, instead of a specific one (centinel:letters, powell:email).
-Second, the \emph{Manual}'s rules for formatting \textsf{titles},
-which also hold for \textsf{booktitles} and \textsf{maintitles},
-require additional attention.  The whole point of using a
-\textsc{Bib}\TeX-based system is for it to do the formatting for you,
-and in most cases \textsf{biblatex-chicago-authordate} does just that,
-surrounding titles with quotation marks, italicizing them, or
-occasionally just leaving them alone.  When, however, a title is
-quoted within a title, then you need to know some of the rules.  A
-summary here should serve to clarify them, and help you to understand
-when \textsf{biblatex-chicago-authordate} might need your help in
-order to comply with them.
+context.  These rules, however, mean that a few complications familiar
+to users of the notes \&\ bibliography style do arise.  First,
+although nearly every entry will have a \textsf{title}, there are some
+exceptions, particularly \textsf{incollection} or \textsf{online}
+entries with a merely generic title, instead of a specific one
+(centinel:letters, powell:email).  Second, the \emph{Manual}'s rules
+for formatting \textsf{titles}, which also hold for
+\textsf{booktitles} and \textsf{maintitles}, require additional
+attention.  The whole point of using a \textsf{biblatex}-based system
+is for it to do the formatting for you, and in most cases
+\textsf{biblatex-chicago-authordate} does just that, surrounding
+titles with quotation marks, italicizing them, or occasionally just
+leaving them alone.  When, however, a title is quoted within a title,
+then you need to know some of the rules.  A summary here should serve
+to clarify them, and help you to understand when
+\textsf{biblatex-chicago-authordate} might need your help in order to
+comply with them.
 
 \mylittlespace The internal rules of
 \textsf{biblatex-chicago-authordate} are as follows:
@@ -9315,15 +12360,16 @@ order to comply with them.
   \textsf{journaltitle} in all entry types; \textsf{title} of
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
   \textsf{booklet}, \textsf{collection}, \textsf{image},
-  \textsf{inbook}, \textsf{manual}, \textsf{misc} (with no
-  \textsf{entrysubtype}), \textsf{periodical}, \textsf{proceedings},
-  \textsf{report}, \textsf{suppbook}, and \textsf{suppcollection}
-  entry types.
+  \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
+  \mycolor{\textsf{performance}}, \textsf{periodical},
+  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
+  \textsf{suppbook}, and \textsf{suppcollection} entry types.
 \item[\qquad Quotation Marks:] \textsf{title} of \textsf{article},
-  \textsf{incollection}, \textsf{inproceedings}, \textsf{online},
-  \textsf{periodical}, \textsf{thesis}, and \textsf{unpublished} entry
-  types, \textsf{issuetitle} in \textsf{article}, \textsf{periodical},
-  and \textsf{review} entry types.
+  \textsf{inbook} \textsf{incollection}, \textsf{inproceedings},
+  \textsf{online}, \textsf{periodical}, \textsf{thesis}, and
+  \textsf{unpublished} entry types, \textsf{issuetitle} in
+  \textsf{article}, \textsf{periodical}, and \textsf{review} entry
+  types.
 \item[\qquad Unformatted:] \textsf{booktitleaddon},
   \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types,
   \textsf{title} of \textsf{customc}, \textsf{letter}, \textsf{misc}
@@ -9335,14 +12381,14 @@ order to comply with them.
   \textsf{inbook}.  Therefore, if there is both a \textsf{title} and a
   \textsf{booktitle}, then the \textsf{title} will be in quotation
   marks.  If there is no \textsf{booktitle}, then the \textsf{title}
-  will be italicized.
+  will be italicized, unless you provide an \textsf{entrysubtype}.
 \end{description}
 
 Now, the rules for which entry type to use for which sort of work tend
 to be fairly straightforward, but in cases of doubt you can consult
 section~\ref{sec:types:authdate} above, the examples in
 \textsf{dates-test.bib}, or go to the \emph{Manual} itself,
-8.154--195.  Assuming, then, that you want to present a title within a
+8.156--201.  Assuming, then, that you want to present a title within a
 title, and you know what sort of formatting each of the two would, on
 its own, require, then the following rules apply:
 
@@ -9351,7 +12397,7 @@ its own, require, then the following rules apply:
   quotation marks and italicized, so in such cases all you need to do
   is provide the quotation marks using \cmd{mkbibquote}, which will
   take care of any following punctuation that needs to be brought
-  within the closing quotation mark(s) (14.102; donne:var,
+  within the closing quotation mark(s) (14.94; donne:var,
   mchugh:wake).
 \item Inside a quoted title, you should present another title as it
   would appear if it were on its own, so in such cases you'll need to
@@ -9359,8 +12405,8 @@ its own, require, then the following rules apply:
   another quoted title would take single quotes --- the
   \cmd{mkbibquote} command does this for you automatically, and also,
   I repeat, takes care of any following punctuation that needs to be
-  brought within the closing quotation mark(s).  (See 14.177; garrett,
-  loften:hamlet, murphy:silent, white:calli\-machus.)
+  brought within the closing quotation mark(s).  (See 14.94--95;
+  garrett, loften:hamlet, murphy:silent, white:cal\-limachus.)
 \item Inside a plain title (most likely in a \textsf{review} entry or
   a \textsf{titleaddon} field), you should present another title as it
   would appear on its own, once again formatting it yourself using
@@ -9372,11 +12418,13 @@ The \emph{Manual} provides a few more rules, as well.  A word normally
 italicized in text should also be italicized in a quoted or plain-text
 title, but should be in roman (\enquote{reverse italics}) in an
 italicized title.  A quotation used as a (whole) title (with or
-without a subtitle) retains its quotation marks in an italicized title
-\enquote{only if it appears that way in the source,} but always
-retains them when the surrounding title is quoted or plain (14.104,
-14.177; lewis).  A word or phrase in quotation marks, but that isn't a
-quotation, retains those marks in all title types (kimluu:diethyl).
+without a subtitle) retains, according to the 16th edition, its
+quotation marks in an italicized title if it appears that way in the
+source, but I can't find similar instructions in the 17th.  Such a
+quotation always retains its quotation marks when the surrounding
+title is quoted or plain (14.94; lewis).  A word or phrase in
+quotation marks, but that isn't a quotation, retains those marks in
+all title types (kimluu:diethyl).
 
 \mylittlespace Finally, please note that in all \textsf{review} (and
 \textsf{suppperiodical}) entries, and in \textsf{misc} entries with an
@@ -9387,22 +12435,20 @@ assuming that such a \textsf{title} begins with a lowercase letter in
 your .bib database.  See\,\textbf{\textbackslash autocap} in
 section~\ref{sec:formatting:authdate} below for more details.
 
-% %\enlargethispage{\baselineskip}
-
 \mybigspace When \mymarginpar{\textbf{title (trad)}} you choose the
 \textsf{authordate-trad} style, your \textsf{title} and related fields
 will need extra care, familiar to users of the 15th-edition
-author-date style.  The whole point of using a \textsc{Bib}\TeX-based
+author-date style.  The whole point of using a \textsf{biblatex}-based
 system is for it to do the formatting for you, and in most cases
 \textsf{biblatex-chicago-authordate-trad} does just that, capitalizing
-them sentence-style, italicizing them, and sometimes both.  There are
-two situations that require user intervention.  First, in titles that
-take sentence-style capitalization, you need, as always in traditional
-\textsc{Bib}\TeX, to assist the algorithms by placing anything that
-needs to remain capitalized within an extra pair of curly braces.
-Second, when a title is quoted within a title, you need to know some
-of the rules of the Chicago style.  A summary here should serve to
-clarify them, and help you to understand when
+titles sentence-style, italicizing them, and sometimes both.  There
+are two situations that require user intervention.  First, in titles
+that take sentence-style capitalization, you need, as always in
+traditional \textsc{Bib}\TeX, to assist the algorithms by placing
+anything that needs to remain capitalized within an extra pair of
+curly braces.  Second, when a title is quoted within a title, you need
+to know some of the rules of the Chicago style.  A summary here should
+serve to clarify them, and help you to understand when
 \textsf{biblatex-chicago-authordate-trad} might need your help in
 order to comply with them.
 
@@ -9415,15 +12461,17 @@ of the Chicago \textsf{authordate-trad} style are fairly simple:
   \textsf{articles}), and \textsf{title} in \textsf{periodical}
   entries.
 \item[\qquad Sentence Style:] every other \textsf{title},
-  \emph{except} in \textsf{letter} entries, \textsf{review} entries,
-  and in \textsf{misc} entries with an \textsf{entrysubtype}.  Also,
-  the \textsf{booktitle}, \textsf{issuetitle}, and \textsf{maintitle}
-  in all entry types use sentence style.
+  \emph{except} in \textsf{letter} entries, \textsf{review} and
+  \textsf{suppperiodical} entries, and in \textsf{misc} entries with
+  an \textsf{entrysubtype}.  Also, the \textsf{booktitle},
+  \textsf{issuetitle}, and \textsf{maintitle} in all entry types use
+  sentence style.
 \item[\qquad Contextual Capitalization of First Word:]
   \textsf{titleaddon}, \textsf{booktitleaddon},
   \textsf{maintitle\-addon} in all entry types, also the
-  \textsf{title} of \textsf{review} entries and of \textsf{misc}
-  entries with an \textsf{entrysubtype}.
+  \textsf{title} of \textsf{review} entries, of
+  \textsf{suppperiodical} entries, and of \textsf{misc} entries with
+  an \textsf{entrysubtype}.
 \item[\qquad Plain:] \textsf{title} in \textsf{letter} entries.
 \end{description}
 
@@ -9464,33 +12512,34 @@ fields], but it still pays to be aware of the issue.)
 \item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and
   \textsf{journaltitle} in all entry types; \textsf{title} of
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
-  \textsf{booklet}, \textsf{collection}, \textsf{inbook},
-  \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
-  \textsf{periodical}, \textsf{proceedings}, \textsf{report},
-  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+  \textsf{booklet}, \textsf{collection}, \textsf{manual},
+  \textsf{misc} (w/o \textsf{entrysubtype}),
+  \mycolor{\textsf{performance}}, \textsf{periodical},
+  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
+  \textsf{suppbook}, and \textsf{suppcollection} types.
 \item[\qquad Main Text Font (Roman):] \textsf{title} of
-  \textsf{article}, \textsf{image}, \textsf{incollection},
-  \textsf{inproceedings}, \textsf{letter}, \textsf{misc} (with an
-  \textsf{entrysubtype}), \textsf{online}, \textsf{patent},
-  \textsf{periodical}, \textsf{review}, \textsf{suppperiodical},
-  \textsf{thesis}, and \textsf{unpublished} entry types,
-  \textsf{issuetitle} in \textsf{article} and \textsf{periodical}
-  entry types.  \textsf{booktitleaddon}, \textsf{maintitleaddon}, and
-  \textsf{titleaddon} in all entry types.
+  \textsf{article}, \textsf{image}, \textsf{inbook},
+  \textsf{incollection}, \textsf{inproceedings}, \textsf{letter},
+  \textsf{misc} (with an \textsf{entrysubtype}), \textsf{online},
+  \textsf{patent}, \textsf{periodical}, \textsf{review},
+  \textsf{suppperiodical}, \textsf{thesis}, and \textsf{unpublished}
+  entry types, \textsf{issuetitle} in \textsf{article} and
+  \textsf{periodical} entry types.  \textsf{booktitleaddon},
+  \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types.
 \item[\qquad Italics or Roman:] All of the audiovisual entry types ---
   \textsf{audio}, \textsf{music}, and \textsf{video} --- have to serve
   as analogues both to \textsf{book} and to \textsf{inbook}.
   Therefore, if there is both a \textsf{title} and a
   \textsf{booktitle}, then the \textsf{title} will be in the main text
   font.  If there is no \textsf{booktitle}, then the \textsf{title}
-  will be italicized.
+  will be italicized, unless you provide an \textsf{entrysubtype}.
 \end{description}
 
 Now, the rules for which entry type to use for which sort of work tend
 to be fairly straightforward, but in cases of doubt you can consult
 section~\ref{sec:types:authdate} above, the examples in
 \textsf{dates-test.bib}, or go to the \emph{Manual} itself,
-8.154--195.  Assuming, then, that you want to present a title within a
+8.156--201.  Assuming, then, that you want to present a title within a
 title, and you know what sort of formatting each of the two would, on
 its own, require, then the following rules apply:
 
@@ -9499,14 +12548,14 @@ its own, require, then the following rules apply:
   quotation marks and italicized, so in such cases all you need to do
   is provide the quotation marks using \cmd{mkbibquote}, which will
   take care of any following punctuation that needs to be brought
-  within the closing quotation mark(s) (14.102; donne:var,
+  within the closing quotation mark(s) (14.94; donne:var,
   mchugh:wake).
 \item Inside a plain-text title, you should set off other plain-text
   titles with quotation marks, while italicized titles should appear
   as they would if they were on their own.  In such cases you'll need
   to do the formatting yourself, using \cmd{mkbibemph} or
   \cmd{mkbibquote}.  (See barcott:review, garrett, gibbard,
-  loften:hamlet, loomis:structure, murphy:silent, osborne:poi\-son,
+  loften:hamlet, loomis:structure, murphy:silent, osborne:poison,
   ratliff:review, unsigned:ranke, white:callimachus.)
 \end{enumerate}
 
@@ -9514,10 +12563,12 @@ The \emph{Manual} provides a few more rules, as well.  A word normally
 italicized in text should also be italicized in a plain-text title,
 but should be in roman (\enquote{reverse italics}) in an italicized
 title.  A quotation used as a (whole) title (with or without a
-subtitle) retains its quotation marks when it is plain, but loses them
-when it is italicized, unless it specifically retains them in the
-source (14.104, 14.177; lewis).  A word or phrase in quotation marks,
-but that isn't a quotation, retains those marks in all title types
+subtitle) retains, according to the 16th edition, its quotation marks
+in an italicized title if it appears that way in the source, but I
+can't find similar instructions in the 17th.  Such a quotation always
+retains its quotation marks when the surrounding title is quoted or
+plain (14.94; lewis).  A word or phrase in quotation marks, but that
+isn't a quotation, retains those marks in all title types
 (kimluu:diethyl).
 
 \mylittlespace Finally, please note that there is also a preamble
@@ -9537,7 +12588,7 @@ that may need to be formatted differently from the titles themselves,
 and \textsf{biblatex-chicago} uses it in just this way, with the
 additional wrinkle that it can, if needed, replace the \textsf{title}
 entirely, and this in, effectively, any entry type, providing a fairly
-powerful, if somewhat complicated, tool for getting \textsc{Bib}\TeX\
+powerful, if somewhat complicated, tool for getting \textsf{biblatex}
 to do what you want (cf.\ centinel:letters).  This field will always
 be unformatted, that is, neither italicized nor placed within
 quotation marks, so any formatting you may need within it you'll need
@@ -9559,8 +12610,6 @@ capitalized, a situation that is handled as you would expect;
 coolidge:speech shows an entry option for controlling the
 punctuation.)
 
-%\enlargethispage{\baselineskip}
-
 \mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
 have implemented this field as \textsf{biblatex}'s standard styles do,
 but the requirements specified by the \emph{Manual} present certain
@@ -9611,20 +12660,22 @@ controlled with the \texttt{use<name>} switches in the
 \textsf{options} field.  Cf.\ \textsf{author}, \textsf{editor},
 \textsf{namea}, \textsf{nameb}, and \textsf{namec}.
 
-%%\enlargethispage{\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{type}} is a standard
+\mybigspace This \colmarginpar{\textbf{type}} is a standard
 \textsf{biblatex} field, and in its normal usage serves to identify
 the type of a \textsf{manual}, \textsf{patent}, \textsf{report}, or
 \textsf{thesis} entry.  \textsf{Biblatex} implements the possibility,
 in some circumstances, to use a bibstring without inserting it in a
-\cmd{bibstring} command, and in these entry types the \textsf{type}
-field works this way, allowing you simply to input, e.g.,
-\texttt{patentus} rather than \cmd{bibstring\{patentus\}}, though both
-will work.  (See petroff:impurity; herwign:office, murphy:silent, and
-ross:thesis all demonstrate how the \textsf{type} field may sometimes
-be automatically set in such entries by using one of the standard
-entry-type aliases).
+\cmd{bibstring} command, and in some entry types (\textsf{audio,
+  manual, music, patent, report, suppbook, suppcollection, thesis,}
+and \textsf{video}) the \textsf{type} field works this way, allowing
+you simply to input, e.g., \texttt{patentus} rather than
+\verb+\bibstring{patentus}+, though both will work.  (See
+petroff:impurity; herwign:office, murphy:silent, and ross:thesis all
+demonstrate how the \textsf{type} field may sometimes be automatically
+set in such entries by using one of the standard entry-type aliases).
+In other entry types (\textsf{artwork, image, book, online, article,
+  review,} and \textsf{suppperiodical}) \textsf{biblatex-chicago} will
+merely capitalize the contents according to context.
 
 \mylittlespace Another use for the field is to generalize the
 functioning of the \textsf{suppbook} entry type, and of its alias
@@ -9632,67 +12683,109 @@ functioning of the \textsf{suppbook} entry type, and of its alias
 specify what sort of supplemental material you are citing, e.g.,
 \enquote{\texttt{preface to}} or \enquote{\texttt{postscript to}.}
 Cf.\ \textsf{suppbook} above for the details.  (See \emph{Manual}
-17.74--75; polakow:afterw, prose:intro).
+14.110; polakow:afterw, prose:intro).
 
-\mylittlespace You can also use the \textsf{type} field in
+\mylittlespace You can use the \textsf{type} field in
 \textsf{artwork}, \textsf{audio}, \textsf{image}, \textsf{music}, and
 \textsf{video} entries to identify the medium of the work, e.g.,
-\texttt{oil on canvas}, \texttt{albumen print}, \texttt{compact disc},
-or \texttt{MPEG}.  If the first word in this field would normally only
-be capitalized at the beginning of a sentence, then leave it in
-lowercase in your .bib file and \textsf{biblatex} will automatically
-do the right thing in citations.  Cf.\ \textsf{artwork},
-\textsf{audio}, \textsf{image}, \textsf{music}, and \textsf{video},
-above, for all the details.  (See auden:reading, bedford:photo,
-cleese:holygrail, leo:madonna, nytrumpet:art.)
+\texttt{oil on canvas}, \texttt{albumen print}, \texttt{compact disc}
+or \texttt{MPEG}.  In \textsf{book} entries it will normally hold
+system information about multimedia app content, while in
+\textsf{online, article,} and \textsf{review} entries it will hold the
+medium of online multimedia (15.57, 14.267--68).  Cf.\ under these
+entry types in section~\ref{sec:types:authdate}, above, for more
+details.  (See auden:reading, bedford:photo, cleese:holygrail,
+leo:madonna, nytrumpet:art.)
 
 \mybigspace Standard \mymarginpar{\textbf{url}} \textsf{biblatex}
 field, it holds the url of an online publication, though you can
-provide one for all entry types.  The 16th edition of the
-\textsf{Manual} expresses a strong preference for DOIs over URLs if
-the former is available --- cf.\ \textsf{doi} above, and also
-\textsf{urldate} just below.  The required \LaTeX\ package
-\textsf{url} will ensure that your documents format such references
-properly, in the text and in the reference apparatus.  It may be worth
-noting that child entries no longer inherit \textsf{url} fields from
-their parents --- the information seems entry-specific enough to
-warrant a little bit of extra typing if you need to present the same
-locator in several entries.
-
-\mybigspace Standard \mymarginpar{\textbf{urldate}} \textsf{biblatex}
-field, it identifies exactly when you accessed a given url.  The 16th
-edition of the \emph{Manual} prefers DOIs to URLs; in the latter case
-it allows the use of access dates, particularly in contexts that
-require it, but prefers that you use revision dates, if these are
-available.  To enable you to specify which date is at stake, I have
-provided the \textbf{userd} field, documented below.  If an entry
-doesn't have a \textsf{userd}, then the \textsf{urldate} will be
-treated, as before, as an access date (14.6--8, 14.184, 15.9;
-evanston:library, grove:sibelius, hlatky:hrt, osborne:poison,
-sirosh:visualcortex, wikiped:bibtex).  In the default setting of
-\cmd{DeclareLabeldate}, any entry without a \textsf{date},
-\textsf{eventdate}, or \textsf{origdate} will use the \textsf{urldate}
-to find a year for citations and the list of references
-(grove:sibelius, wikiped:bibtex).
-
-% %\enlargethispage{\baselineskip}
-
-\mybigspace A \mymarginpar{\textbf{usera}} supplemental
-\textsf{biblatex} field which functions in \textsf{biblatex-chicago}
-almost as a \enquote{\textsf{journaltitleaddon}} field.  In
-\textsf{article}, \textsf{periodical}, and \textsf{review} entries
-with \textsf{entrysubtype} \texttt{maga\-zine}, the contents of this
-field will be placed, unformatted and between commas, after the
-\textsf{journaltitle} and before the date.  The main use is for
-identifying the broadcast network when you cite a radio or television
-program (14:221; bundy:macneil).
+provide one for all entry types.  The \emph{Manual} expresses a strong
+preference for DOIs over URLs if the former is available --- cf.\
+\textsf{doi} above, and also \textsf{urldate} just below.  The
+required \LaTeX\ package \textsf{url} will ensure that your documents
+format such references properly, in the text and in the reference
+apparatus.  It may be worth noting that child entries no longer
+inherit \textsf{url} fields from their parents --- the information
+seems entry-specific enough to warrant a little bit of extra typing if
+you need to present the same locator in several entries.
+
+\mybigspace Standard \colmarginpar{\textbf{urldate}} \textsf{biblatex}
+field, it identifies exactly when you accessed a given url.  The
+\emph{Manual} prefers DOIs to URLs; in the latter case it allows the
+use of access dates, particularly in contexts that require it, but
+prefers that you use revision dates, if these are available.  To
+enable you to specify which date is at stake, I have provided the
+\textbf{userd} field, documented below.  If an entry doesn't have a
+\textsf{userd}, then the \textsf{urldate} will be treated as an access
+date (14.8, 14.12--13, 15.50; evanston:library, grove:sibelius,
+hlatky:hrt, osborne:poison, sirosh:visualcortex, wikiped:bibtex).  In
+the default setting of \cmd{DeclareLabeldate}, any entry without a
+\textsf{date}, \textsf{eventdate}, or \textsf{origdate} will use the
+\textsf{urldate} to find a year for citations and the list of
+references (grove:sibelius, wikiped:bibtex), but \colmarginpar{New!}
+\emph{only} if the \textsf{urldate} isn't an access date, that is,
+only if a \textsf{userd} field is present.  If the only date available
+is an online access date, then the entry is considered to have no
+date, and \enquote{n.d.} will appear instead, though of course the
+access date will still be printed later in the reference list entry.
+(If you were to put the string \texttt{accessed} into the
+\textsf{userd} field, you could work around this prohibition.)
+
+\mylittlespace You can \colmarginpar{New!} also use the
+\textsf{urldate} field to specify a time stamp, should the date alone
+not be specific enough.  The time stamp follows the date, separated by
+an uppercase \enquote{T}, like so:
+\texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.  If you wish to specify the
+time zone, the \emph{Manual} (10.41) prefers initialisms like
+\enquote{EST} or \enquote{PDT,} and these are most easily provided
+using the \mycolor{\texttt{urltimezone}} field, where you can provide
+your own parentheses if so desired (cp.\ 14.191).  Following the
+examples in the \emph{Manual}, any \textsf{urldate} will by default be
+printed in 24-hour format, though other time stamps use 12-hour
+format.  The \textsf{biblatex} option \texttt{urltime}, discussed in
+section~\ref{sec:preset:authdate}, allows you to change this in your
+preamble.
+
+\mylittlespace A \textsf{urldate} time stamp (and
+\mycolor{\texttt{urltimezone}}) can appear in any entry whatsoever, if
+you judge the online source to be the sort that changes rapidly enough
+for a time stamp to be necessary (14.207, 14.233; wikiped:bibtex).
+You can stop it printing by setting the new
+\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}} option to
+\texttt{false} in your preamble for the whole document or for
+specified entry types, or in the \textsf{options} field of individual
+entries.  Please see the documentation of \textbf{date} and also
+table~\ref{ad:date:extras}, above, for more details about time stamps
+and other parts of \textsf{biblatex's} enhanced date specifications.
+Table~\ref{tab:online:adtypes} contains a summary of the current state
+of \textsf{biblatex-chicago's} handling of online materials.
+
+\mybigspace This \colmarginpar{\textbf{urltimezone}} field can, if
+necessary, specify the time zone associated with a time stamp given as
+part of an \textsf{urldate}.  The \emph{Manual} prefers initialisms
+like \enquote{EST} for this purpose, and you can provide parentheses
+around it at your discretion (cp.\ 10.41 and 14.191).
+
+\mybigspace A \colmarginpar{\textbf{usera}} supplemental
+\textsf{biblatex} field which in certain contexts in
+\textsf{biblatex-chicago} will identify the broadcast network when you
+cite a radio or television program.  In \textsf{article},
+\textsf{periodical}, and \textsf{review} entries with
+\textsf{entrysubtype} \texttt{magazine}, it acts almost as a
+\enquote{\textsf{journaltitleaddon}} field, and its contents will be
+placed, unformatted and between commas, after the
+\textsf{journaltitle} and before the \textsf{date}.  In \textsf{video}
+entries it comes after the \textsf{eventdate}, i.e., the date of first
+broadcast, and is separated from that date by the \cmd{bibstring}
+\enquote{\texttt{on}} (14.213, 14.265; american:crime, bundy:macneil,
+friends:leia, mayberry:brady).
 
 \mybigspace I \mymarginpar{\textbf{userc}} have implemented this
 supplemental \textsf{biblatex} field as part of the Chicago
 author-date style's handling of cross-references within the list of
 references.  (The \enquote{c} part is meant as a sort of mnemonic for
-this latter function.)  In the 16th edition of the \emph{Manual}, you
-no longer need to use the \textbf{customc} entry type to include
+this latter function.)  In recent editions of the \emph{Manual} you no
+longer need to use the \textbf{customc} entry type to include
 alphabetized expansions of \textsf{shorthands} in the reference list,
 but you may still need to provide cross-references of some sort to
 separate entries in that list, perhaps when a single author uses
@@ -9704,24 +12797,27 @@ two choices.  You can either include the entry key of the
 or you can place that entry key in the \textsf{userc} field of the
 .bib entry that actually contains one of the full citations.  In the
 latter case, \textsf{biblatex-chicago} will call \cmd{nocite} for you
-when you cite the main entry.  (See 14.84, 14.86; creasey:ashe:blast,
+when you cite the main entry.  (See 14.81--82; creasey:ashe:blast,
 creasey:morton:hide, creasey:york:death, lecarre:quest.)
 
-\mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field,
-recently added to the package, acts as a sort of
-\enquote{\textsf{datetype}} field, allowing you in most entry types to
-identify whether a \textsf{urldate} is an access date or a revision
-date.  The general usage is fairly simple.  If this field is absent,
-then a \textsf{urldate} will be treated as an access date, as has long
-been the default in \textsf{biblatex} and in
+\mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field acts
+as a sort of \enquote{\textsf{datetype}} field, allowing you in most
+entry types to identify whether a \textsf{urldate} is an access date
+or a revision date.  The general usage is fairly simple.  If this
+field is absent, then a \textsf{urldate} will be treated as an access
+date, as has long been the default in \textsf{biblatex} and in
 \textsf{biblatex-chicago}.  If you need to identify it in any other
 way, what you include in \textsf{userd} will be printed \emph{before}
 the \textsf{urldate}, so phrases like \enquote{\texttt{last modified}}
 or \enquote{\texttt{last revised}} are what the field will typically
-contain (14.7--8; wikiped:bibtex).  In the absence of a
+contain (14.12--13; wikiped:bibtex).  In the absence of a
 \textsf{urldate}, you can in most entry types include a \textsf{userd}
 field to qualify a \textsf{date} in the same way it would have
-modified a \textsf{urldate}.
+modified a \textsf{urldate}.  If an entry contains \emph{only} a
+\textsf{urldate} and no other sort of date, and has no \textsf{userd}
+field, that entry will now \colmarginpar{New!} be treated as though it
+had no date, and \enquote{n.d.} will appear in citations and at the
+head of entries in the reference list (15.50).
 
 \mylittlespace Because of the rather specialized needs of some
 audio-visual references, this basic sche\-ma changes for
@@ -9754,44 +12850,93 @@ can translate the title and use that translation in your
 \textsf{title} field, providing the original language in
 \textsf{language}, or you can give the original title in
 \textsf{title} and the translation in \textsf{usere}.  Cf.\
-\textbf{language}, above.  (See 14.108--110, 14.194; kern,
-pirumova:russian, weresz.)
+\textbf{language}, above.  (See 14.99; kern, pirumova:russian,
+weresz.)
 
 \mybigspace See \mymarginpar{\textbf{userf}}
 section~\ref{sec:authrelated}, below.
 
-\mybigspace Standard \mymarginpar{\textbf{venue}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
-\textsf{inproceedings} entries, but I haven't yet implemented it,
-mainly because the \emph{Manual} has nothing to say about it.  Perhaps
-the \textsf{organization} field could be used, for the moment,
-instead.  Anything in a \textsf{venue} field will be ignored.
-
-\mybigspace Standard \mymarginpar{\textbf{version}} \textsf{biblatex}
-field, currently only available in \textsf{misc} and \textsf{patent}
-entries in \textsf{biblatex-chicago}.
+\textsf{inproceedings} entries, but I haven't yet implemented it
+there, mainly because the \emph{Manual} has nothing to say about it.
+Perhaps the \textsf{organization} field could be used, for the moment,
+instead.  I have implemented the field in the \textbf{misc} entry
+type, both with and without an \textsf{entrysubtype}, in the new
+\mycolor{\textbf{performance}} type, and in the \textbf{unpublished}
+type.  In all uses it will normally present the actual venue of an
+event, as opposed, e.g., to the \textsf{origlocation}, which might
+present where a letter was written or where an earlier edition was
+printed.
+
+\mybigspace Author-date \colmarginpar{\textbf{verbc}} styles in
+\textsf{biblatex} use the \textsf{extradate} field, automatically
+provided by \textsf{biber}, to distinguish citations of different
+works by the same \textsf{author} that were published in the same
+year, e.g., (Surname 1978\textbf{a}).  The Chicago author-date styles
+recommend that some sorts of material --- online comments, newspaper
+articles, and live performances, \emph{inter alia} --- needn't appear
+in reference lists, but only in the text, often accompanied by a full
+date reference (\texttt{cmsdate=full}) rather than by the rather less
+informative year on its own.  In most circumstances a simple
+\texttt{skipbib} in the \textsf{options} field will suffice, but,
+especially with online materials, it is possible, even probable, that
+users will have .bib databases containing different works by the same
+\textsf{author} from the same \textsf{year}, only \emph{some} of which
+need to appear in the reference list.  \textsf{Biber} will provide
+\textsf{extradate} fields for all these entries, however, so it is
+easy to get an extradate letter in a reference even when only one work
+by that \textsf{author} appears in the list, or perhaps a series of
+letters with some missing from the sequence.
+
+\mylittlespace The \mycolor{\textbf{verbc}} field allows you manually
+to intervene to control these side effects.  (It's a standard
+\textsf{biblatex} field, but isn't used in the standard styles.)
+Putting anything in the field prevents that entry from interfering in
+the \textsf{extradate} provision of entries that don't contain such a
+field, and in more complicated scenarios you could group entries by
+identical \textsf{verbc} field to prevent them from interfering both
+with entries not having any \textsf{verbc} field \emph{and} with
+entries having a different value for that field.  By default, the
+\mycolor{\texttt{commenton}} \textsf{relatedtype} for \textbf{online}
+and \textbf{review} entries adds a \textsf{verbc} field to its entry,
+but you can in all cases control this and provide your own in any
+circumstances and in any entry type you wish.  Please see the
+documentation of those two entry types in
+section~\ref{sec:types:authdate}, and of the \textsf{commenton}
+\textsf{relatedtype} in section~\ref{sec:authrelated}.
+
+\mybigspace Standard \colmarginpar{\textbf{version}} \textsf{biblatex}
+field, formerly only available in \textsf{artwork}, \textsf{image},
+\textsf{misc}, \textsf{music}, and \textsf{pa\-tent} entries in
+\textsf{biblatex-chicago-authordate}, but now also in \textbf{book} and
+\mycolor{\textbf{performance}} entries.  In most entry types it prints
+a localized \enquote{\texttt{version}} string, but there may be
+specialist needs in \textsf{artwork} and \textsf{image} entries, so
+there you'll need to specify the type of data inside the field
+itself.  In the \textsf{book} type it is particularly needed for
+presenting multimedia app content (15.57, 14.268).
 
 \mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex}
 field.  It holds the volume of a \textsf{journaltitle} in
 \textsf{article} entries, and also the volume of a multi-volume work
 in many other sorts of entry.  The treatment and placement of
 \textsf{volume} information in \textsf{book}-like entries is rather
-complicated in the \emph{Manual} (14.121--27, 15.39).  In the
+complicated in the \emph{Manual} (14.116--22, 15.41).  In the
 reference list, the \textsf{volume} appears either before the
 \textsf{maintitle} or before the publication information, while in
 citations you may need to provide it in the \textsf{postnote} field
 --- see the \textsf{volumes} field, just below.  In a number of these
 contexts, and in both books and periodicals, \textsf{volume}
 information can appear \emph{immediately before} the page number(s).
-In such a case, the \emph{Manual} (14.121) prescribes the same
+In such a case, the \emph{Manual} (14.116) prescribes the same
 treatment for both sorts of sources, that is, that \enquote{a colon
   separates the volume number from the page number with no intervening
   space.}  I have implemented this, but at the request of Clea~F.\
-Rees I have made this punctuation customizable, using the command
-\cmd{postvolpunct} \mymarginpar{\cmd{postvolpunct}}.  By default it
-prints \cmd{addcolon}, but you can use
-\cmd{renewcommand\{\textbackslash postvolpunct\}\{\ldots\}} in your
-preamble to redefine it.  Cf.\ \textsf{part}, and the command
+Rees \mymarginpar{\cmd{postvolpunct}} I have made this punctuation
+customizable, using the command \cmd{postvolpunct}.  By default it
+prints \cmd{addcolon}, so use \verb+\renewcommand{\postvolpunct}{...}+
+in your preamble to redefine it.  Cf.\ \textsf{part}, and the command
 documentation in section~\ref{sec:formatting:authdate};
 conway:evolution shows how sometimes this field may hold series
 information, as well.
@@ -9802,9 +12947,9 @@ and in such references you should provide the volume and page numbers
 in the \textsf{postnote} field of the relevant \cmd{cite} command,
 e.g.:
 
-\begin{quote}
-\cmd{autocite}\texttt{[3:25]\{bibfile:key\}}.  
-\end{quote}
+\begin{verbatim}
+\autocite[3:25]{bibfile:key}.
+\end{verbatim}
 
 Cf.\ 15.22; meredith:letters, tillich:system, weber:saugetiere,
 wright:evolution.  The entry wright:theory presents one volume of such
@@ -9826,17 +12971,17 @@ option's documentation in section~\ref{sec:authpreset}, below.
 field provided by \textsf{biblatex}, which prevents inheritance of any
 data from the parent entry.  See \textbf{crossref}, above.
 
-%\enlargethispage{\baselineskip}
-
-\mybigspace Standard \mymarginpar{\textbf{year}} \textsf{biblatex}
+\mybigspace Standard \colmarginpar{\textbf{year}} \textsf{biblatex}
 field, especially important for the author-date specification.  Please
 see all the details under \textbf{date} above.  Unlike the
 \textsf{date} field \textsf{year} allows non-numeric input, so you can
-put \cmd{bibstring\{nodate\}} here if required, or indeed any other
-sort of non-numerical date information.  If you can guess the date
-then you can include that guess in square brackets instead of
-\cmd{bibstring\{nodate\}}.  Cf.\ bedford:photo, clark:meso\-pot,
-leo:madonna, ross:thesis.
+put \verb+\bibstring{nodate}+ here if required, or indeed any other
+sort of non-numerical date information.  For many kinds of uncertain
+and unspecified dates it is now much simpler to make use of
+\textsf{biblatex's} enhanced date specifications in the \textsf{date}
+field, instead.  Please see table~\ref{ad:date:extras} for a summary
+of how \textsf{biblatex-chicago} implements these enhancements.  Cf.\
+bedford:photo, clark:mesopot, leo:madonna, ross:thesis.
 
 \subsubsection{Fields for Related Entries}
 \label{sec:authrelated}
@@ -9910,21 +13055,20 @@ writing, be one of \texttt{american}, \texttt{brazilian},
 \texttt{norwegian}, \texttt{portuguese}, \texttt{spanish}, or
 \texttt{swedish}, to which I've added \texttt{russian}.
 
-\mybigspace The \mymarginpar{\textbf{origlocation}} 16th edition of
-the \emph{Manual} has somewhat clarified issues pertaining to the
-documentation of reprint editions and their corresponding originals
-(14.166, 15.38).  In \textsf{biblatex-chicago} you can provide both an
-\textsf{origlocation} and an \textsf{origpublisher} to go along with
-the \textsf{origdate}, should you so wish, and all of this information
-will be printed in the reference list.  You can also use this field in
-a \textsf{letter} or \textsf{misc} (with \textsf{entrysubtype}) entry
-to give the place where a published or unpublished letter was written
-(14.117).  (Jonathan Robinson has suggested that the
-\textsf{origlocation} may in some circumstances actually be helpful
-for disambiguation, his example being early printed editions of the
-same material printed in the same year but in different cities.  The
-new functionality should make this simple to achieve.  Cf.\
-\textsf{origdate} [section~\ref{sec:fields:authdate}],
+\mybigspace This \mymarginpar{\textbf{origlocation}} field mainly
+serves to help document reprint editions and their corresponding
+originals (14.114, 15.40).  In \textsf{biblatex-chicago} you can
+provide both an \textsf{origlocation} and an \textsf{origpublisher} to
+go along with the \textsf{origdate}, should you so wish, and all of
+this information will be printed in the reference list.  You can also
+use this field in a \textsf{letter} or \textsf{misc} (with
+\textsf{entrysubtype}) entry to give the place where a published or
+unpublished letter was written (14.111, 14.229).  (Jonathan Robinson has
+suggested that the \textsf{origlocation} may in some circumstances
+actually be helpful for disambiguation, his example being early
+printed editions of the same material printed in the same year but in
+different cities.  The new functionality should make this simple to
+achieve.  Cf.\ \textsf{origdate} [section~\ref{sec:fields:authdate}],
 \textsf{origpublisher} and \textsf{pubstate}; schweitzer:bach.)
 \textbf{NB:} It is impossible to present this same information, as
 here, \emph{inside} a single entry using a \texttt{related} field,
@@ -9933,48 +13077,60 @@ same information \emph{after} the entry, using data extracted from a
 separate entry.
 
 \mybigspace As \mymarginpar{\textbf{origpublisher}} with the
-\textsf{origlocation} field just above, the 16th edition of the
-\emph{Manual} has clarified issues pertaining to reprint editions and
-their corresponding originals (14.166, 15.38).  You can provide an
-\textsf{origpublisher} and/or an \textsf{origlocation} in addition to
-the \textsf{origdate}, and all will be presented in long notes and
-bibliography.  (Cf.\ \textsf{origdate}
+\textsf{origlocation} field just above, this field mainly serves to
+help document reprint editions and their corresponding originals
+(14.114, 15.40).  You can provide an \textsf{origpublisher} and/or an
+\textsf{origlocation} in addition to the \textsf{origdate}, and all
+will be presented in the reference list.  (Cf.\ \textsf{origdate}
 [section~\ref{sec:fields:authdate}], \textsf{origlocation}, and
-\textsf{pubstate}; schweitzer:bach.)  \textbf{NB:} It is impossible to
+\textsf{pubstate}; schweitzer:\break bach.)  \textbf{NB:} It is impossible to
 present this same information, as here, \emph{inside} a single entry
 using a \texttt{related} field, though the \textsf{relatedtype}
 \texttt{origpubin} presents much the same information \emph{after} the
 entry, using data extracted from a separate entry.
 
-\mybigspace A \mymarginpar{\textbf{pubstate}} standard
-\textsf{biblatex} field.  Because the author-date specification has
-fairly complicated rules about presenting reprinted editions (15.38),
-I have adopted this field as a means of simplifying the problem for
-users.  Instead of manually formatting the \textsf{location} field,
-you can simply put the string \texttt{reprint} into the
-\textsf{pubstate} field, and depending on which date(s) you have
-chosen to appear at the head of the entry,
-\textsf{biblatex-chicago-authordate} will either print the (localized)
-string \texttt{reprint} in the proper place or otherwise provide a
-notice at the end of the entry detailing the original publication
-date.  See under \textbf{date} above for the available permutations.
-(Cf.\ aristotle:metaphy:gr, maitland:canon, maitland:equity,
-schweitzer:bach.)  Aside from the word \texttt{reprint}, the field may
-also contain the word \texttt{forthcoming}, which instructs the styles
-to print that \cmd{bibstring} instead of the \textsf{year}
-(author:forthcoming, contrib:contrib).  Anything else in the field
-will be treated as in the standard styles and printed after the
-publication information.
-
-\mylittlespace There is one subtlety of which you ought to be aware.
-In \textsf{music} entries, the \textsf{pubstate} mechanism transforms
-the \textsf{origdate} from a recording date for an album into the
-original release date for that album.  If that date appears in
-citations and at the head of reference-list entries, then this
-mechanism won't generally make much difference, but if it appears
-elsewhere then a recording date will be printed in the middle of the
-reference list entry, while the original release date will be printed
-near the end, preceded by the appropriate string.  \textbf{NB:} For
+\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+specifications in the 17th edition of the \emph{Manual} (esp.\
+14.137), I have tried to generalize the functioning of the
+\textsf{pubstate} field in all entry types.  Because the author-date
+style has fairly complicated rules about presenting reprinted editions
+(15.40), the \texttt{reprint} string still has a special status.
+Depending on which date(s) you have chosen to appear at the head of
+the entry, \textsf{biblatex-chicago-authordate} will either print the
+(localized) string \texttt{reprint} in the proper place or otherwise
+provide a notice at the end of the entry detailing the original
+publication date.  See under \textbf{date} above for the available
+permutations.  (Cf.\ aristotle:metaphy:gr, maitland:canon,
+maitland:equity, schweitzer:bach.)
+
+\mylittlespace Other strings are divided into two types: those which
+\textsf{biblatex-chicago} will print as the \textsf{year}, which
+currently means \emph{only} those for which \textsf{biblatex} contains
+bibstrings indicating works soon to be published, i.e.,
+\texttt{forthcoming}, \texttt{inpreparation}, \texttt{inpress}, and
+\texttt{submitted}; and those, i.e., everything else, which will be
+printed before, and in close association with, other information about
+the publisher of a work.  (This \colmarginpar{\textbf{NB}} is a change
+from previous behavior, where non-\texttt{reprint} strings were
+printed \emph{after} the publication information, as in the standard
+styles.  You can still use the \textsf{addendum} field to present
+information here, of course.)  The four strings that replace the
+\textsf{year} will always be localized, as will \texttt{reprint} and
+\mycolor{\texttt{selfpublished}} (and anything else that
+\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
+category.  All other strings will be printed as-is, capitalized if
+needed, just before the publisher (author:forthcoming,
+contrib:contrib, schweitzer:bach).
+
+\mylittlespace There is one further subtlety of which you ought to be
+aware.  In \textsf{music} and \textsf{video} entries, the
+\texttt{reprint} string in \textsf{pubstate} will only make a
+difference to your entries when the date which it modifies --- the
+\textsf{origdate}, typically --- \emph{doesn't} appear in citations
+and at the head of reference-list entries.  In this case the date is
+treated as an original release date, and it will be printed, preceded
+by the appropriate string, near the end of the entry.  Other strings
+don't show this special behavior in these entries.  \textbf{NB:} For
 those uses of the \textsf{pubstate} field that print a notice at the
 end of the entry, the \textsf{relatedtype} \texttt{origpubin} provides
 much the same information, using data extracted from a different
@@ -10001,7 +13157,11 @@ package option \texttt{related} is set to print \textsf{related}
 entries in the list of references.  If you would like to turn this off
 you can set this option, either in your preamble or in the
 \textsf{options} or \textsf{relatedoptions} field of the relevant
-entry, to \texttt{false}.
+entry, to \texttt{false}.  For the two \textsf{relatedtypes} that
+construct a single entry using data extracted from related entries ---
+\mycolor{\texttt{commenton}} and \texttt{reviewof} --- you'll need to
+make sure this is \texttt{true} to get properly-formatted citations in
+the reference list.  See below for the details.
 
 \mybigspace This \mymarginpar{\textbf{relatedoptions}} field will, I
 should expect, only be needed very rarely.  If you want to set
@@ -10036,11 +13196,11 @@ context, and modified the \textsf{pubstate} mechanism to use the
 \texttt{origpubin} string, which brings it into line with the notes
 \&\ bibliography style.
 
-\mybigspace The \colmarginpar{\textbf{relatedtype}} standard
+\mybigspace The \mymarginpar{\textbf{relatedtype}} standard
 \textsf{biblatex} styles define six \textsf{relatedtypes}, and I have
 either simply adopted them wholesale or adapted them to the needs of
 the Chicago style, retaining the basic syntax as much as possible.  I
-have also added one to these six (see below):
+have also added two to these six (see below):
 
 \begin{description}
 \item[\qquad bytranslator:] This prints a full reference to a
@@ -10049,7 +13209,7 @@ have also added one to these six (see below):
     \ldots} The reference is fuller in \textsf{biblatex-chicago} than
   in the standard styles, and for the first time allows users to
   choose the \emph{Manual's} alternate method for presenting original
-  + translation (14.109; furet:passing:fr).  The old \textsf{userf}
+  + translation (14.99; furet:passing:fr).  The old \textsf{userf}
   mechanism provides the other, as does the \texttt{origpubas}
   \textsf{relatedtype} (see below).
 \item[\qquad default:] This is the macro used when no
@@ -10084,11 +13244,78 @@ have also added one to these six (see below):
   behaving oddly please let me know, including whether you are using
   \textsf{babel} [which I've tested] or \textsf{polyglossia} [which I
   haven't].)
-\item[\qquad \mycolor{reviewof:}] Philip Kime's \textsf{biblatex-apa}
-  package includes this type, and user Bertold Schweitzer suggested it
-  might be a useful addition to \textsf{biblatex-chicago}, so I've
-  added it to the standard six detailed above.  It differs from all of
-  them in that it prints the \textsf{relatedstring} (by default
+\end{description}
+Now, the Chicago-specific types:
+\begin{description}
+\item[\qquad \mycolor{commenton:}] I designed the new
+  \textsf{relatedtype} \mycolor{\texttt{commenton}} to facilitate
+  citation of online comments, and it is available in two entry types,
+  \textsf{online} and \textsf{review} (with its clone
+  \textsf{suppperiodical}).  In both types the \emph{Manual}
+  (15.51--52) recommends that such material appear \emph{only} in the
+  text and not in the reference list, but I have attempted to simplify
+  the presentation of such material wherever you want it to appear.
+  Following the specifications, then, the default when you use
+  \mycolor{\texttt{commenton}} is for
+  \textsf{biblatex-chicago-authordate} to modify how your .bib entry
+  appears in the .bbl file by setting both \texttt{skipbib} and
+  \texttt{cmsdate=full} in the \textsf{options} field, so that nothing
+  appears in the reference list and citations present the full date
+  and possibly also a time stamp (see below).  Further, the style sets
+  the \mycolor{\textsf{verbc}} field so that these entries don't
+  interfere with the provision of extra date letters --- the full date
+  and time should be enough to individuate separate comments.
+  Finally, the style creates a new \textsf{customc} entry in your .bbl
+  file which you can cite after your initial
+  \mycolor{\texttt{commenton}} entry using \cmd{autocites} and which
+  will, as a comment to your initial entry, say whether it's a comment
+  or a reply or what have you, and then giving the short citation of
+  that upon which it is a comment.  (Just to be clear: your .bib file
+  will itself never be altered, only the .bbl file, which is produced
+  by \textsf{biber} and which provides the data from which
+  \textsf{biblatex} actually typesets citations.)
+
+  As an example, take the Facebook post diaz:surprise, which does
+  appear in the reference list.  The entry licis:diazcomment presents
+  a comment on this post using the \textsf{relatedtype}
+  \mycolor{\texttt{commenton}}, so
+  \textsf{biblatex-chicago-authordate} creates a new entry,
+  diaz:surprise-customc.  When you cite the comment in your document a
+  command like
+  \verb+\autocites{licis:diazcomment}{diaz:surprise-customc}+ will
+  produce a citation like (Licis, February 24, 2016; comment on D\'iaz
+  2016).  You can alter the string connecting the two citations (by
+  default \verb+\bibstring{commenton}+) by using the
+  \textsf{relatedstring} field in the first of them (cf.\
+  powell:comment).  (Note how minimal the .bib entry of a comment
+  using this system can be --- \textsf{author}, \textsf{related},
+  \textsf{relatedtype}, and \textsf{date} are pretty much the only
+  fields required.)
+
+  Those who want \textsf{online} comments to appear in the reference
+  list can still use the \mycolor{\texttt{commenton}}
+  \textsf{relatedtype}, and the same citation of the commented piece
+  will appear there, connected by the same string that the
+  \textsf{customc} entry provides.  Here, though, you can also provide
+  a separate \textsf{title} for the comment, and/or a separate
+  \textsf{url} for it, should they exist, which will be printed
+  before/after the citation of the commented piece, respectively.  (In
+  \textsf{review} entries, which use the same \textsf{relatedtype},
+  only the generic title is available, as is always the case with such
+  entries.)  If you manually set either (or both) of the
+  \texttt{cmsdate} or the \texttt{skipbib} options in your entry then
+  \textsf{biblatex-chicago} will assume you want to hand-craft that
+  entry without its intervention, so it won't alter the
+  \textsf{options} field or indeed provide any
+  \mycolor{\textsf{verbc}} field, though it will still provide the
+  virtual \textsf{customc} entry in your .bbl file, as that may still
+  prove convenient.  Note also that any \mycolor{\textsf{verbc}} field
+  you provide will never be altered by the package.
+\item[\qquad reviewof:] Philip Kime's \textsf{biblatex-apa} package
+  includes this type, and user Bertold Schweitzer suggested it might
+  be a useful addition to \textsf{biblatex-chicago}, so I've added it
+  to the standard six detailed above.  It differs from all of them in
+  that it prints the \textsf{relatedstring} (by default
   \cmd{bibstring\{reviewof\}}) and the data from the \textsf{related}
   entry in the middle of the parent entry, rather than at the end.  It
   also differs from them in being available only in \textsf{article}
@@ -10129,33 +13356,32 @@ request of Will Small, I have included a means of providing the
 original publication details of an essay or a chapter that you are
 citing from a subsequent reprint, e.g., a \emph{Collected Essays}
 volume.  In such a case, at least according to the \emph{Manual}
-(14.115), such details needn't be provided in notes, only in the
-bibliography, and then only if these details are \enquote{of
-  particular interest.}  The data would follow an introductory phrase
-like \enquote{originally published as,} making the problem strictly
-parallel to that of including details of a work in the original
-language alongside the details of its translation.  I have addressed
-the latter problem with the \textsf{userf} field, which provides a
-sort of cross-referencing method for this purpose, and
-\textsf{reprinttitle} works in \emph{exactly} the same way.  In the
-.bib entry for the reprint you include a cross-reference to the cite
-key of the original location using the \textsf{reprinttitle} field
-(which it may help mnemonically to think of as a \enquote{reprinted
-  title} field).  The main difference between the two forms is that
-\textsf{userf} prints all but the \textsf{author} of the original
-work, whereas \textsf{reprinttitle} suppresses both the
-\textsf{author} and the \textsf{title} of the original, giving only
-the more general details, beginning with, e.g., the
-\textsf{journaltitle} or \textsf{booktitle} and continuing from there.
-The string prefacing this information will be \enquote{Originally
-  published in.}  Please see the documentation on \textsf{userf} below
-for all the details on how to create .bib entries for presenting your
-data.
+(14.181), these details would only appear in the reference list, and
+then only if these details are \enquote{of particular interest.}  The
+data would follow an introductory phrase like \enquote{originally
+  published as,} making the problem strictly parallel to that of
+including details of a work in the original language alongside the
+details of its translation.  I have addressed the latter problem with
+the \textsf{userf} field, which provides a sort of cross-referencing
+method for this purpose, and \textsf{reprinttitle} works in
+\emph{exactly} the same way.  In the .bib entry for the reprint you
+include a cross-reference to the cite key of the original location
+using the \textsf{reprinttitle} field (which it may help mnemonically
+to think of as a \enquote{reprinted title} field).  The main
+difference between the two forms is that \textsf{userf} prints all but
+the \textsf{author} of the original work, whereas
+\textsf{reprinttitle} suppresses both the \textsf{author} and the
+\textsf{title} of the original, giving only the more general details,
+beginning with, e.g., the \textsf{journaltitle} or \textsf{booktitle}
+and continuing from there.  The string prefacing this information will
+be \enquote{Originally published in.}  Please see the documentation on
+\textsf{userf} below for all the details on how to create .bib entries
+for presenting your data.
 
 \mybigspace This \mymarginpar{\textbf{userf}} is one of the
 supplemental fields which \textsf{biblatex} provides, and is used by
 \textsf{biblatex-chicago} for a very specific purpose.  When you cite
-both a translation and its original, the \emph{Manual} (14.109)
+both a translation and its original, the \emph{Manual} (14.99)
 recommends that, in a reference list at least, you combine references
 to both texts in one entry.  Lacking specific instructions about the
 author-date style, I have nonetheless chosen to implement this
@@ -10189,8 +13415,6 @@ aristotle:metaphy:trans).  \textbf{NB:} You can use the
 \textsf{relatedstring} field to achieve the same result as with
 \textsf{origlanguage}.
 
-%\enlargethispage{\baselineskip}
-
 \subsection{Commands}
 \label{sec:commands:authdate}
 
@@ -10240,10 +13464,10 @@ begins with a capital letter --- and this is not infrequent --- that
 capital will always be retained.  (cf., e.g., creel:house,
 morgenson:market.)  If, on the other hand, you for some reason need
 such a field always to start with a lowercase letter, then you can try
-using the \cmd{isdot} macro at the start, which turns off the
-mechanism without printing anything itself.  Here, then, for reference
-purposes, is the complete list of fields where this functionality is
-active:
+putting an empty set of curly braces\ \{\}\ at the start, which turns
+off the mechanism without printing anything itself.  Here, then, for
+reference purposes, is the complete list of fields where this
+functionality is active:
 
 \begin{enumerate}
 \setlength{\parskip}{-4pt}
@@ -10273,7 +13497,7 @@ active:
 \end{enumerate}
 
 If you accidentally use the \cmd{autocap} macro in one of the above
-fields, it frankly shouldn't matter at all, and you'll still get what
+fields, it really shouldn't matter at all, and you'll still get what
 you want, but taking advantage of the automatic provisions should at
 least save some typing.
 
@@ -10283,7 +13507,7 @@ provide a localized version of a string, and to determine whether that
 string needs capitalization, depending on where it falls in an entry.
 \textsf{Biblatex} also provides functionality which allows you
 sometimes simply to input, for example, \texttt{newseries} instead of
-\cmd{bib\-string\{newseries\}}, the package auto-detecting when a
+\verb+\bibstring{newseries}+, the package auto-detecting when a
 bibstring is involved and doing the right thing, though in all such
 cases either form will work.  This functionality is available in the
 \textsf{series} field of \textsf{article}, \textsf{periodical}, and
@@ -10297,7 +13521,16 @@ styles support this feature, though I have added the last,
 style-specific, one.  If the \textsf{biblatex} authors generalize it
 still further in a future release, I shall do the same, if possible.
 
-%\enlargethispage{-2\baselineskip}
+\mybigspace I \colmarginpar{\textbf{\textbackslash letterdatelong}}
+have provided this macro mainly for use in the optional postnote field
+of the various citation commands.  When citing a letter (published or
+unpublished, \textsf{letter} or \textsf{misc}), it may be useful to
+include the date in the citation in order to disambiguate references.
+This macro simply prints the date of a letter, or indeed of any other
+sort of correspondence, in day-month-year order, as recommended by the
+\emph{Manual} (14.224).  (If your main document language isn't
+American, it's better just to use the standard \textsf{biblatex}
+command \cmd{printorigdate}.)
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
@@ -10343,10 +13576,10 @@ final quotation marks, like so: \emph{Annotations to
 
 \mylittlespace Note in both cases that you only need to be careful
 with the capitalization inside the curly brackets if you are using
-\textsf{authordate-trad}, as the 16th edition of the \textsf{Manual}
-has unified the title formatting for the two remaining styles, which
-means that, for them, all lower- and uppercase letters remain as they
-are typed in your .bib file.
+\textsf{authordate-trad}, as recent editions of the \emph{Manual} have
+unified the title formatting for the two remaining styles, which means
+that, for them, all lower- and uppercase letters remain as they are
+typed in your .bib file.
 
 \mylittlespace Let me also add that this command interacts well with
 Lehman's \textsf{csquotes} package, which I highly recommend, though
@@ -10355,7 +13588,7 @@ to which \textsf{biblatex} defaults when \textsf{csquotes} isn't
 loaded.
 
 \mybigspace The \mymarginpar{\textbf{\textbackslash postvolpunct}}
-\emph{Manual} (14.121) unequivocally prescribes that when a
+\emph{Manual} (14.116) unequivocally prescribes that when a
 \textsf{volume} number appears immediately before a page number,
 \enquote{the abbreviation \emph{vol.}\ is omitted and a colon
   separates the volume number from the page number with no intervening
@@ -10395,8 +13628,6 @@ intended them for use when a particular name applied only to a
 specific \textsf{title}, rather than to a \textsf{maintitle} or
 \textsf{booktitle} (cf.\ \textbf{namea} and \textbf{nameb}, above).
 
-% %\enlargethispage{\baselineskip}
-
 \mylittlespace In the present instance, you can use \cmd{partcomp} to
 identify a compiler when \textsf{namec} (or \textsf{editortype}) won't
 do, e.g., in a \textsf{note} field or the like.  In such a case,
@@ -10432,6 +13663,54 @@ compiler.
 whose name doesn't conveniently fit into the usual fields
 (\textsf{translator} and \textsf{nameb}).
 
+\mylittlespace This \mymarginpar{\textbf{\textbackslash reprint}} is
+equivalent to \verb+\bibstring{reprint}+.  It is useful in the notes
+\&\ bibliography style, and I include it in the author-date styles for
+compatibility.
+
+\mylittlespace Unlike \colmarginpar{\textbf{\textbackslash
+    suppress-\\bibfield[]\{\}}} the other commands presented here,
+this should be used in your document preamble rather than in your
+bibliographical apparatus.  Also unlike them, it has two arguments,
+the first of which is optional, the second required.  Jan David Hauck
+suggested that, in addition to the field-exclusion package options
+provided by \textsf{biblatex-chicago} (see
+section~\ref{sec:authpreset}), I might also provide a general-purpose
+macro to clear fields from selected entry types when the package
+options aren't quite right for a user's particular needs.  The
+\mycolor{\cmd{suppressbibfield}} command does this, so that
+\verb+\suppressbibfield{note}+ clears the \textsf{note} field from
+\emph{all} entries, while \verb+\suppressbibfield[report]{note}+
+clears it only from \textsf{report} entries.  Both arguments take
+comma-separated lists, so to suppress \textsf{titleaddon} and
+\textsf{volumes} fields from \textsf{report} and \textsf{manual}
+entries, your preamble could contain
+\verb+\suppressbibfield[report,manual]{titleaddon,volumes}+.
+
+\mylittlespace A few usage notes are in order.  First, you can use as
+many calls to the command in your preamble as you wish.  Second, the
+command is a very basic user interface to \textsf{biblatex's} source
+mapping functionality (\textsf{biblatex.pdf} \S~4.5.3), so what it
+does is modify what \textsf{biber} takes from your .bib file in order
+to produce the .bbl file that \textsf{biblatex} actually reads.  As
+far as \textsf{biblatex} is concerned, the fields simply aren't there
+in the data source, so they can't appear anywhere in the
+bibliographical apparatus, whether in citations, reference lists, or
+shorthand lists.  Third, because source mapping is involved, you'll
+need a complete cycle of \LaTeX-\textsf{biber}-\LaTeX\ runs to make
+the commands take effect.  Fourth, source mapping occurs at a very
+early stage in \textsf{biber's} operation, so if your field names or
+entry types are standard aliases, the command will only work on the
+names as they appear in your .bib file, not as they are aliased in the
+.bbl file.  If you have a \textsf{techreport} entry, for example, it
+won't be affected by a command that alters \textsf{report} entries,
+and a \textsf{date} field won't be affected by a command that
+suppresses the \textsf{year}.  Fifth, the code for the command resides
+in \textsf{biblatex-chicago.sty}, so if you load the styles without
+loading that package it won't be available to you.  Sixth and finally,
+the \mycolor{\cmd{suppressbibfield}} command is new and relatively
+untested, so please report any untoward behavior to me.
+
 \subsubsection{Citation Commands}
 \label{sec:cite:authordate}
 
@@ -10448,6 +13727,19 @@ but if there are standard commands that don't work for you, or new
 commands that would be useful, please let me know, and it should be
 possible to fix or add them.
 
+\mybigspace These \colmarginpar{\textbf{\textbackslash atcite
+    \\\textbackslash atpcite}} two new citation commands allow you
+quickly and easily to provide an author-title citation of any entry,
+instead of an author-date citation.  The \texttt{classical}
+\textsf{entrysubtype} field does this, but it also changes punctuation
+in the citation, so I've provided other means to achieve the same end.
+The first of these new citation commands presents the plain citation,
+the second includes it in parentheses for inclusion in running text.
+The new \mycolor{\texttt{authortitle}} type and entry option
+(section~\ref{sec:authuseropts}) has the same effect when using the
+standard citation commands, but it's possible that using these new
+commands instead may give added flexibility.
+
 \mybigspace I \mymarginpar{\textbf{\textbackslash autocite}} haven't
 adapted this in the slightest, but I thought it worth pointing out
 that \textsf{biblatex-chicago-authordate} sets this command to use
@@ -10459,7 +13751,7 @@ its multicite form, \textbf{\textbackslash autocites}.
 Skjærholt requested, for the author-date styles, a variant of the
 \cmd{textcite} command that presented the author's name in the
 genitive case in running text, thereby simplifying certain syntactic
-constructions (15.24).  The \cmd{gentextcite} command, in effect,
+constructions (15.25).  The \cmd{gentextcite} command, in effect,
 provides a way to include almost anything in between the name and the
 parenthesized date in a \cmd{textcite}, so its use may well not be
 limited to the possessive.  In most respects it behaves exactly like
@@ -10535,10 +13827,36 @@ for the \cmd{ifciteseen} test is enabled globally.
 
 \mybigspace The \mymarginpar{\texttt{alldates=comp}} specification
 calls for the long format when presenting dates, slightly shortened
-when presenting date ranges.  Please note that because of the
-author-date style's complicated requirements with respect to dates,
-there will be cases when printed ranges don't look exactly right ---
-cf., e.g., nass:address.  I'm working on this.
+when presenting date ranges.  The new style option
+\mycolor{\texttt{compressyears}}, enabled by default, means that year
+ranges are now compressed automatically according to the
+\emph{Manual's} instructions (9.64; section~\ref{sec:authpreset}).
+
+\mylittlespace In \colmarginpar{\texttt{alltimes=12h}} entries which
+print time stamps, they will, when the stamp is part of a
+\textsf{date}, \textsf{eventdate}, or \textsf{origdate}, appear in
+12-hour format, i.e., \enquote{4:45 p.m.}  Stamps that are part of a
+\textsf{urldate} are, by default, controlled by the
+\mycolor{\texttt{urltime}} option, which is set to
+\mycolor{\texttt{24h}}.  See that option below, and
+table~\ref{ad:date:extras}.
+
+\enlargethispage{\baselineskip}
+
+\mylittlespace This \colmarginpar{\texttt{datecirca=true}} option
+enables \textsf{biblatex's} enhanced \enquote{circa} date
+specification, which given a \textsf{date} like \verb+1989~+ will
+print [ca.\ 1989].  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace This \colmarginpar{\texttt{dateuncertain=\\true}}
+option enables \textsf{biblatex's} enhanced \enquote{uncertain} date
+specification, which given a \textsf{date} like \verb+1989?+ will
+print [1989?].  A field like \verb+1989%+ is both \enquote{circa}
+\emph{and} \enquote{uncertain,} like so: [ca.\ 1989?].  Cf.\
+table~\ref{ad:date:extras}.
+
+\mylittlespace This \colmarginpar{\texttt{datezeros=false}} ensures
+that leading zeros don't appear in date specifications.
 
 \mylittlespace This \mymarginpar{\texttt{ibidtracker=\\constrict}}
 enables an \emph{ibidem} mechanism in citations, but only in the most
@@ -10546,7 +13864,7 @@ strictly-defined circumstances.  The Chicago author-date style doesn't
 print \enquote{Ibid} in citations, but in general a repeated citation
 on the same page will print only the page reference.  Technically,
 this should only occur when a source is cited \enquote{more than once
-  in one paragraph} (15.26), so you can use the \cmd{citereset}
+  in one paragraph} (15.27), so you can use the \cmd{citereset}
 command from \textsf{biblatex} to achieve the greatest compliance, as
 the package only offers automatic resetting on part, chapter, section,
 and subsection boundaries, while \textsf{biblatex-chicago}
@@ -10560,24 +13878,20 @@ cite command provides a postnote --- you'll no longer get any annoying
 empty parentheses, but you will get another standard citation, which
 may add too much clutter.
 
-\enlargethispage{-\baselineskip}
-
-\mylittlespace This \mymarginpar{\texttt{labelyear=\\true}} option
-tells \textsf{biblatex} to provide the special \textsf{labelyear} and
-\textsf{extrayear} fields for author-date styles.
+\mylittlespace This \mymarginpar{\texttt{labeldateparts\\=true}}
+option tells \textsf{biblatex} to provide the special
+\textsf{labelyear} and \textsf{extradate} fields for author-date
+styles.  (This is the option formerly known as \texttt{labelyear} and
+then \texttt{labeldate}, both of which are obsolete.)
 
 \mylittlespace These \mymarginpar{\textsf{\texttt{maxbibnames\\=10\\
       minbibnames\\=7}}} two options control the number of names
 printed in the list of references when that number exceeds 10.  These
-numbers follow the recommendations of the \emph{Manual} (17.29--30),
-and they are different from those for use in citations.  With
-\textsf{biblatex} 1.6 you can no longer redefine \texttt{maxnames} and
-\texttt{minnames} in the \cmd{printbibliography} command at the bottom
-of your document, so \textsf{biblatex-chicago} does this automatically
-for you, though of course you can change them in your document
-preamble.  Please see section~\ref{sec:otherhints:auth} below (and the
-file \textsf{cms-dates-sample.pdf}) for hints on dealing with entries
-with more than three authors.
+numbers follow the recommendations of the \emph{Manual} (14.76, 15.9),
+and they are different from those for use in citations.  Please see
+section~\ref{sec:otherhints:auth} below (and the file
+\href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}}) for
+hints on dealing with entries with more than three authors.
 
 \mylittlespace This \mymarginpar{\texttt{pagetracker=\\true}} enables
 page tracking for the \cmd{iffirstonpage} and \cmd{ifsamepage}
@@ -10608,24 +13922,39 @@ sorting order in the list of references tailored to comply with the
 Chicago author-date specification.  Please see the documentation of
 \cmd{DeclareSortingTemplate} in section~\ref{sec:authformopts}, below.
 
+\mylittlespace If \colmarginpar{\texttt{timezones=true}} you provide a
+timezone for a time stamp, usually using one of the \textsf{timezone}
+fields, this option ensures it will be printed.
+
 \mylittlespace This \mymarginpar{\texttt{uniquelist=\\minyear}} option
 enables \textsf{biblatex-chicago-authordate} to disambiguate entries
 which have more than three \textsf{authors}, but which differ
 \emph{after} the first name in the list.  This will only occur when
-two such entries have the same \textsf{year} (15.28).  The option is
+two such entries have the same \textsf{year} (15.29).  The option is
 \textsf{Biber}-only, like the following, which means that this
 next-generation \textsc{Bib}\TeX\ replacement is required for the
-author-date styles.  Please see \textsf{cms-dates-sample.pdf} (or
-\textsf{cms-trad-sample.pdf}) and section~\ref{sec:otherhints:auth},
-below, for further details.
+author-date styles.  Please see
+\href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}} and
+section~\ref{sec:otherhints:auth}, below, for further details.
 
 \mylittlespace This \mymarginpar{\texttt{uniquename=\\minfull}}
 enables the package to distinguish different authors who share a
 surname, using initials in the first instance, and whole names if
-initials aren't enough (15.21).  The option is \textsf{Biber}-only,
+initials aren't enough (15.22).  The option is \textsf{Biber}-only,
 like the previous one.
 
-%\enlargethispage{\baselineskip}
+\mylittlespace In \colmarginpar{\texttt{urltime=24h}} entries with
+\textsf{urldate} fields containing time stamps, that stamp will by
+default appear in 24-hour format, i.e., \enquote{16:45.}  Cf.\
+\mycolor{\texttt{alltimes}}, above, \mycolor{\texttt{urlstamp}} in
+section~\ref{sec:authpreset} below, and table~\ref{ad:date:extras}.
+
+\mylittlespace In
+\colmarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
+\mycolor{\textsf{standard}} entries any editors' or compilers' names
+appear after the title, according to 14.259, so these
+entry-type-specific options encode this.  You can, of course, override
+these defaults in your preamble, should you deem it necessary.
 
 \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}}
 enables automatic use of the \textsf{translator} at the head of
@@ -10649,7 +13978,7 @@ formatting options I've implemented by default: the 3-em dash as a
 replacement for repeated names in the list of references (15.17--19,
 and just below); and the formatting of note numbers, both in the main
 text and at the bottom of the page / end of the essay (superscript in
-the text, in-line in the notes; 14.19).  The code for this last
+the text, in-line in the notes; 14.24).  The code for this last
 formatting is also in \textsf{biblatex-chicago.sty}, and I've wrapped
 it in a test that disables it if you are using the \textsf{memoir}
 class, which I believe has its own commands for defining these
@@ -10679,7 +14008,7 @@ I see on my system when using endnotes.  (You'll probably also want to
 use the option \texttt{heading=none} in order to get rid of the
 [oversized] default, providing your own within the \cmd{footnote}
 command.)  If you use a command like
-\cmd{printbiblist\{shortjournal\}} to print a list of journal
+\verb+\printbiblist{shortjournal}+ to print a list of journal
 abbreviations, you can use the \texttt{sjnotes} and
 \texttt{sjendnotes} \texttt{bibenvironments} in exactly the same way.
 Please see the documentation of \textsf{shorthand} and
@@ -10691,9 +14020,7 @@ two types of \texttt{biblist}.
 \textsf{biblatex} offer enhanced functionality in many areas,
 including the next three declarations.  If the default definitions
 don't work well for you, you can redefine all of them in your document
-preamble --- see \textsf{biblatex.pdf} §§4.5.8 and 4.5.5.
-
-%\enlargethispage{\baselineskip}
+preamble --- see \textsf{biblatex.pdf} §§4.5.6 and 4.5.10.
 
 \mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}}
 option allows you to add name fields for consideration when
@@ -10746,14 +14073,15 @@ improve the automatic sorting of entries by the same \textsf{author}.)
 
 \mylittlespace The advantages of this scheme are, specifically, that
 any entry headed by one of the supplemental name fields
-(\textsf{name[a-c]}), a \textsf{manual} entry headed by an
-\textsf{organization}, or an \textsf{article} or \textsf{review} entry
-with an \textsf{entrysubtype} and headed by a \textsf{journaltitle}
-will no longer need a \textsf{sortkey} set.  Further, the
-\textsf{biblatex} \texttt{use<name>=false} options will remove any
-name field from the sorting order, again reducing the need for user
-intervention.  The main disadvantage should only occur very rarely.
-In \textsf{author}-less \textsf{article} and \textsf{review} entries
+(\textsf{name[a-c]}), a \textsf{manual} or a
+\mycolor{\textsf{standard}} entry headed by an \textsf{organization},
+or an \textsf{article} or \textsf{review} entry with an
+\textsf{entrysubtype} and headed by a \textsf{journaltitle} will no
+longer need a \textsf{sortkey} set.  Further, the \textsf{biblatex}
+\texttt{use<name>=false} options will remove any name field from the
+sorting order, again reducing the need for user intervention.  The
+main disadvantage should only occur very rarely.  In
+\textsf{author}-less \textsf{article} and \textsf{review} entries
 without an \textsf{entrysubtype}, the \textsf{title} will appear
 instead of the \textsf{journaltitle}, and since the latter appears
 before the former in the sorting scheme, you'll need a
@@ -10769,101 +14097,124 @@ bibliographic managers, apparently, place the total page count in that
 field by default, and this option allows you to stop the printing of
 this information in the reference list.  It defaults to true, which
 means the field is printed, but it can be set to false either in the
-preamble, for the whole document, or on a per-entry basis in the
-\textsf{options} field (though rather than use this latter method it
-would make sense to eliminate the \textsf{pages} field from the
-affected entries).
+preamble, for the whole document or for specific entry types, or on a
+per-entry basis in the \textsf{options} field (though rather than use
+this latter method it would make sense to eliminate the \textsf{pages}
+field from the affected entries).
 
 \mylittlespace This \mymarginpar{\texttt{doi=true}} option controls
 whether any \textsf{doi} fields present in the .bib file will be
 printed in the reference list.  At the request of Daniel Possenriede,
 and keeping in mind the \emph{Manual's} preference for this field
-instead of a \textsf{url} (15.9), I have added a third switch,
+instead of a \textsf{url} (14.7--8), I have added a third switch,
 \texttt{only}, which prints the \textsf{doi} if it is present and the
 \textsf{url} only if there is no \textsf{doi}.  The package default
 remains the same, however --- it defaults to true, which will print
 both \textsf{doi} and \textsf{url} if both are present.  The option
 can be set to \texttt{only} or to \texttt{false} either in the
-preamble, for the whole document, or on a per-entry basis in the
-\textsf{options} field.  In \textsf{online} entries, the \textsf{doi}
-field will always be printed, but the \texttt{only} switch will still
-eliminate any \textsf{url}.
+preamble, for the whole document or for specific entry types, or on a
+per-entry basis in the \textsf{options} field.  In \textsf{online}
+entries, the \textsf{doi} field will always be printed, but the
+\texttt{only} switch will still eliminate any \textsf{url}.
 
 \mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls
 whether any \textsf{eprint} fields present in the .bib file will be
 printed in the list of references.  It defaults to true, and can be
-set to false either in the preamble, for the whole document, or on a
-per-entry basis, in the \textsf{options} field.  In \textsf{online}
-entries, the \textsf{eprint} field will always be printed.
+set to false either in the preamble, for the whole document or for
+specific entry types, or on a per-entry basis, in the \textsf{options}
+field.  In \textsf{online} entries, the \textsf{eprint} field will
+always be printed.
 
 \mylittlespace This \mymarginpar{\texttt{isbn=true}} option controls
 whether any \textsf{isan}, \textsf{isbn}, \textsf{ismn},
 \textsf{isrn}, \textsf{issn}, and \textsf{iswc} fields present in the
 .bib file will be printed in the list of references.  It defaults to
 true, and can be set to false either in the preamble, for the whole
-document, or on a per-entry basis, in the \textsf{options} field.
-
-%%\enlargethispage{-\baselineskip}
+document or for specific entry types, or on a per-entry basis, in the
+\textsf{options} field.
 
-\mylittlespace Once \mymarginpar{\texttt{numbermonth=\\true}} again
-at the request of Scot Becker, I have included this option, which
+\mylittlespace Once \mymarginpar{\texttt{numbermonth\\=true}} again at
+the request of Scot Becker, I have included this option, which
 controls the printing of the \textsf{month} field in all the
 periodical-type entries when a \textsf{number} field is also present.
 Some bibliographic software, apparently, always includes the month of
 publication even when a \textsf{number} is present.  When all this
-information is available the \emph{Manual} (17.181) prints everything,
+information is available the \emph{Manual} (14.171) prints everything,
 so this option defaults to true, which means the field is printed, but
-it can be set to false either in the preamble, for the whole document,
-or on a per-entry basis in the \textsf{options} field.
+it can be set to false either in the preamble, for the whole document
+or for specific entry types, or on a per-entry basis in the
+\textsf{options} field.
 
 \mylittlespace This \mymarginpar{\texttt{url=true}} option controls
 whether any \textsf{url} fields present in the .bib file will be
 printed in the reference list.  It defaults to true, and can be set to
-false either in the preamble, for the whole document, or on a
-per-entry basis, in the \textsf{options} field.  Please note that, as
-in standard \textsf{biblatex}, the \textsf{url} field is always
-printed in \textsf{online} entries, regardless of the state of this
-option.
+false either in the preamble, for the whole document or for specific
+entry types, or on a per-entry basis, in the \textsf{options} field.
+Please note that, as in standard \textsf{biblatex}, the \textsf{url}
+field is always printed in \textsf{online} entries, regardless of the
+state of this option.
+
+\mylittlespace This \colmarginpar{\texttt{urlstamp=true}} option
+controls whether any \textsf{urltime} fields, included as part of the
+\textsf{urldate}, will be printed in citations and reference list.  It
+defaults to true, and can be set to false either in the preamble, for
+the whole document or for specific entry types, or on a per-entry
+basis in the \textsf{options} field.  Please note that, unlike the
+\texttt{url} option, this option \emph{does} control what is printed
+in \textsf{online} entries.
 
 \mylittlespace This \mymarginpar{\texttt{includeall=\\true}} is the
-one option that rules the six preceding, either printing all the
+one option that rules the seven preceding, either printing all the
 fields under consideration --- the default --- or excluding all of
 them.  It is set to \texttt{true} in \textsf{chicago-authordate.cbx},
-but you can change it either in the preamble for the whole document
-or, for specific fields, in the \textsf{options} field of individual
-entries.  The rationale for all of these options is the availability
-of bibliographic managers that helpfully present as much data as
+but you can change it either in the preamble for the whole document or
+for specific entry types, or in the \textsf{options} field of
+individual entries.  The seven individual options above are similarly
+available in the same places, for finer-grained control.  The
+rationale for all of these options is the availability of
+bibliographic managers that helpfully present as much data as
 possible, in every entry, some of which may not be felt to be entirely
 necessary.  Setting \texttt{includeall} to \texttt{true} probably
 works just fine for those compiling their .bib databases by hand, but
 others may find that some automatic pruning helps clear things up, at
-least to a first approximation.  Some per-entry work afterward may
-then polish up the details.
+least to a first approximation.  Some per-type or per-entry work
+afterward may then polish up the details.  If you find that you need
+control over fields that aren't included among these options, I have
+provided the \mycolor{\cmd{suppressbibfield}} command for your
+preamble, as suggested by Jan David Hauck.  It is in fact a user
+interface to the source mapping feature of \textsf{biblatex}, and it
+is something of a nuclear option, preventing fields from even
+appearing in the .bbl file generated by \textsf{biber} from your .bib
+database.  See the \mycolor{\cmd{suppressbibfield}} command in
+section~\ref{sec:formatting:authdate} and the source mapping docs in
+\textsf{biblatex.pdf} \S~4.5.3.
 
 \paragraph*{\protect\mymarginpar{\texttt{avdate=true}}}
 \label{sec:ad:avdate}\vspace{-.5\baselineskip}
-For \textsf{music} and \textsf{video} entries, the 16th edition of the
-\emph{Manual} (15.53) strongly recommends both that you provide a
-recording, release, or broadcast date for your references and also
-that this earlier date should appear in citations and at the head of
-reference list entries.  In the default setting of
-\cmd{DeclareLabeldate}, \textsf{biblatex} searches for dates in the
-following order: \textsf{year, eventyear, origyear, urlyear}.  This
-option changes the default ordering in \textsf{music} and
-\textsf{video} entries to the following: \textsf{eventyear, origyear,
-  year, urlyear}.  \textsf{Review} entries presenting on-line comments
-have similar needs, so the same reordering applies to that entry type,
-too.  If you simply want to apply the defaults to these three entry
-types, you can use \texttt{avdate=false} in the options when loading
+For \textsf{music} and \textsf{video} entries, the \emph{Manual}
+(14.263, 15.57) strongly recommends both that you provide a recording,
+release, or broadcast date for your references and also that this
+earlier date should appear in citations and at the head of reference
+list entries.  In the default setting of \cmd{DeclareLabeldate},
+\textsf{biblatex} searches for dates in the following order:
+\textsf{year, eventyear, origyear, urlyear}.  This option changes the
+default ordering in \textsf{music} and \textsf{video} entries to the
+following: \textsf{eventyear, origyear, year, urlyear}.
+\textsf{Review} entries presenting on-line comments have similar
+needs, as do \mycolor{\textsf{standard}} entries, so the same
+reordering applies to those entry types, too.  If you simply want to
+apply the defaults to these four entry types, you can use
+\texttt{avdate=false} in the options when loading
 \textsf{biblatex-chicago}.  If, however, you want to tailor the
 algorithm to your own needs, then you can use \cmd{DeclareLabeldate}
 commands in your preamble.  Please be aware, however, that some parts
 of the style hard-code the search syntax, and although they take
 account of the \texttt{avdate} setting, if you use your own
 definitions of \cmd{DeclareLabeldate} the results may, in some corner
-cases, surprise.  Please see \textsf{music}, \textsf{review}, and
-\textsf{video} in section~\ref{sec:types:authdate}; \textsf{date},
-\textsf{eventdate}, \textsf{origdate}, and \textsf{urldate} in
+cases, surprise.  Please see \textsf{music}, \textsf{review},
+\mycolor{\textsf{standard}}, and \textsf{video} in
+section~\ref{sec:types:authdate}; \textsf{date}, \textsf{eventdate},
+\textsf{origdate}, and \textsf{urldate} in
 section~\ref{sec:fields:authdate}; and \cmd{DeclareLabeldate} in
 section~\ref{sec:authformopts}.
 
@@ -10887,7 +14238,7 @@ depending on the value of the option:
   \emph{not} get any abbreviated citations in the reference list.
 \item[\qquad false:] You'll get abbreviated citations in these entry
   types in the reference list.
-\item[\qquad notes,bib:] These two options are carried over from the
+\item[\qquad notes, bib:] These two options are carried over from the
   notes \&\ bibliography style; here they are synonymous with
   \texttt{false} and \textsf{true}, respectively.
 \end{description}
@@ -10905,25 +14256,36 @@ behavior of \textsf{inbook}, \textsf{incollection},
 recommend the use of shorthands as abbreviations for long authors'
 names, particularly institutional names, which means the shorthand
 will replace only the name part in citations rather than the whole
-citation (15.36; bsi:abbreviation, iso:electrodoc).  The 16th edition
-now suggests placing the abbreviation at the head of the entry,
-followed by its expansion inside parentheses, an arrangement
-automatically provided by \textsf{biblatex-chicago-authordate} when
-you use the \textsf{shorthand} field, assuming you retain the default
-setting of this option.  Please note that you can still print a list
-of shorthands if you wish, and you can also get back something
+citation (15.37; bsi:abbreviation, iso:electrodoc).  Recent editions
+suggest placing the abbreviation at the head of the entry, followed by
+its expansion inside parentheses, an arrangement automatically
+provided by \textsf{biblatex-chicago-authordate} when you use the
+\textsf{shorthand} field, assuming you retain the default setting of
+this option.  Please note that you can still print a list of
+shorthands if you wish, and you can also get back something
 approaching the \enquote{standard} behavior of shorthands if you give
 the \texttt{cmslos=false} option to \textsf{biblatex-chicago} in your
 document preamble.  Cf.\ section~\ref{sec:fields:authdate},
 s.v. \enquote{\textbf{shorthand}} above, and also
-\textsf{cms-dates-sample.pdf}.
+\href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}}.
+
+\mylittlespace The \colmarginpar{\texttt{compressyears\\=true}}
+\emph{Manual} has long recommended (9.64, 15.41), as a space-saving
+measure, the compression of year ranges when presenting dates.  I
+have, finally, implemented this in the current release, and have made
+it the default, which you can change in your document preamble.
+Please note that the rules for compressing years are different from
+those for compressing other numbers (e.g., page numbers), and also
+that the compression code is in \textsf{biblatex-chicago.sty}, which
+will have to be loaded for this option to make any difference.  Cf.\
+table~\ref{ad:date:extras}.
 
 \mylittlespace Roger
 \mymarginpar{\texttt{ctitleaddon=\\comma\\ptitleaddon=\\period}} Hart
 requested a way to control the punctuation printed before the
 \textsf{titleaddon}, \textsf{booktitleaddon}, and
 \textsf{maintitleaddon} fields.  By default, this is
-\cmd{addcomma\cmd{add\-space}} (\textsf{ctitleaddon}) for nearly all
+\cmd{addcomma\cmd{addspace}} (\textsf{ctitleaddon}) for nearly all
 \textsf{book-} and \textsf{maintitleaddons} in the list of references,
 while \cmd{addperiod\cmd{addspace}} (\textsf{ptitleaddon}) is the
 default before most \textsf{titleaddons} there.  If the punctuation
@@ -10950,6 +14312,17 @@ you use the \textsf{options} field in your other entries with a
 relevant option to \texttt{none} in your entry and then include the
 punctuation in the \textsf{titleaddon} field itself.
 
+\mylittlespace Constanza Cordoni \colmarginpar{\texttt{dashed=true}}
+has requested a way to turn off the 3-em dash for replacing repeated
+names in the reference list, and the \emph{Manual} admits that some
+publishers prefer this, as the dash can carry with it certain
+inconveniences, especially for electronic formats (15.17).  Some of
+\textsf{biblatex's} standard styles have a \texttt{dashed} option, so
+for compatibility purposes I've provided the same.  By default, I have
+set it to print the name dash, but you can set
+\mycolor{\texttt{dashed=false}} in your preamble to repeat names
+instead throughout your document.
+
 \mylittlespace If \mymarginpar{\texttt{hidevolumes=\\true}} both a
 \textsf{volume} and a \textsf{volumes} field are present, as may occur
 particularly in cross-referenced entries, then
@@ -10974,7 +14347,7 @@ in the reference list only, and \texttt{false} in neither.  Please
 note that in \textsf{periodical} entries the \textsf{title} and
 \textsf{shorttitle} fields behave in exactly the same manner.  For
 more details, see the documentation of \textbf{shortjournal} in
-section~\ref{sec:entryfields}, above.
+section~\ref{sec:fields:authdate}, above.
 
 \mylittlespace This \mymarginpar{\texttt{longcrossref=\\false}} is
 the second option, requested by Bertold Schweitzer, for controlling
@@ -11001,7 +14374,7 @@ governed by the following options:
   setting to provide abbreviated citations not just of the four entry
   types mentioned but also of \textsf{book}, \textsf{bookinbook},
   \textsf{collection}, and \textsf{proceedings} entries.
-\item[\qquad notes,bib:] These two options are carried over from the
+\item[\qquad notes, bib:] These two options are carried over from the
   notes \&\ bibliography style; here they are synonymous with
   \texttt{false} and \textsf{true}, respectively.
 \end{description}
@@ -11013,32 +14386,38 @@ and \textsf{proceedings} entries, please see \texttt{booklongxref},
 above, and also the documentation of \textsf{crossref} in
 section~\ref{sec:fields:authdate}.
 
-%\enlargethispage{\baselineskip}
-
 \mylittlespace This \mymarginpar{\texttt{nodates=true}} option means
-that for all entry types except \textsf{inreference}, \textsf{misc},
-and \textsf{reference}, \textsf{bibla\-tex-chicago} will automatically
-provide \cmd{bibstring\{nodates\}} for any entry that doesn't
-otherwise provide a date for citations and for the heads of entries in
-the list of references.  If you set \texttt{nodates=false} in your
-preamble, then the package won't perform this substitution in any
-entry type whatsoever.  (The bibstring expands to
-\enquote{\texttt{n.d.}} in English.)
-
-\mylittlespace As \mymarginpar{\texttt{usecompiler=\\true}}
-\textsf{biblatex} automatically includes a \texttt{usenamec} option as
-standard, the Chicago-specific option \texttt{usecompiler} is now
-deprecated.  Please replace it your documents and .bib files with
-\texttt{usenamec}, which works much better across the board.
+that for all entry types except \textsf{misc} and
+\mycolor{\textsf{dataset}} \textsf{biblatex-chicago} will
+automatically provide \verb+\bibstring{nodate}+ for any entry that
+doesn't otherwise provide a date for citations and for the heads of
+entries in the list of references.  If you set \texttt{nodates=false}
+either in your preamble (for global coverage) or in individual entries
+then the package won't perform this substitution.  (The bibstring
+expands to \enquote{\texttt{n.d.}} in English.)
 
 \subsubsection{Style Options -- Preamble}
 \label{sec:authuseropts}
 
 These are parts of the specification that not everyone will wish to
-enable.  All except the fifth can be used even if you load the package
-in the old way via a call to \textsf{biblatex}, but most users can
-just place the appropriate string(s) in the options to the
-\cmd{usepackage\break\{biblatex-chicago\}} call in your preamble.
+enable.  All except the sixth and eighth can be used even if you load
+the package in the old way via a call to \textsf{biblatex}, but most
+users can just place the appropriate string(s) in the options to the
+\cmd{usepackage\{biblatex-chicago\}} call in your preamble.
+
+\mylittlespace \textsf{Biblatex-chicago}
+\colmarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
+enhanced date specifications, one part of which is the presentation of
+decades and centuries not as year ranges but as localized strings like
+\enquote{19th c.} or \enquote{1970s.}  The
+\mycolor{\texttt{alwaysrange}} option set to \texttt{true}, either in
+your preamble or in individual entries, simply tells the package to
+present the year range instead.  This allows you to use the efficient
+enhanced notations in the \textsf{date} field (\verb+{18XX}+ or
+\verb+{197X}+) without the localized strings appearing, should you
+require it.  The two options \mycolor{\texttt{centuryrange}} and
+\mycolor{\texttt{decaderange}} limit the same effect to centuries and
+decades, respectively.  Please see table~\ref{ad:date:extras}.
 
 \mylittlespace At \mymarginpar{\texttt{annotation}} the request of
 Emil Salim, I have added to this version of \textsf{biblatex-chicago}
@@ -11046,11 +14425,52 @@ the ability to produce annotated reference lists.  If you turn this
 option on then the contents of your \textsf{annotation} (or
 \textsf{annote}) field will be printed after the reference.  (You can
 also use external files to store annotations -- please see
-\textsf{biblatex.pdf} §~3.11.8 for details on how to do this.)  This
+\textsf{biblatex.pdf} §~3.13.8 for details on how to do this.)  This
 functionality is currently in a beta state, so before you use it
 please have a look at the documentation for the \textsf{annotation}
 field, in section~\ref{sec:fields:authdate} above.
 
+\mylittlespace In \colmarginpar{\texttt{authortitle}} a few contexts
+--- classical references, some archival material, perhaps scientific
+data\-bases --- the provision of a date for citations may well be
+impossible, irrelevant, or both.  The \textsf{entrysubtype} value
+\texttt{classical} results in author-title citations for the entry
+containing it, but it modifies punctuation in those citations in a way
+that might be wrong for some sources, and it's also possible that you
+may need the \textsf{entrysubtype} field for some other purpose yet
+still wish to present author-title citations.  You can set
+\mycolor{\texttt{authortitle}} to \texttt{true} either for a specific
+entry type in the preamble or in the \textsf{options} field of
+individual entries to achieve this.  You can also use the citation
+commands \mycolor{\cmd{atcite}} and \mycolor{\cmd{atpcite}}, instead,
+if that's more convenient.  The \textsf{shorttitle} field provides a
+way to abbreviate long titles in this context.  Please note that
+\textsf{biblatex-chicago} by default sets this to \texttt{true} for
+the new \mycolor{\textsf{dataset}} entry type, so you can set it to
+\texttt{false} if you want to present such entries differently.
+
+\mylittlespace This \colmarginpar{\texttt{centuryrange}} option works
+just like \mycolor{\texttt{alwaysrange}}, above, but only affects
+century presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace The \colmarginpar{\texttt{cmsbreakurl}} \emph{Manual}
+gives fairly specific instructions about breaking URLs across lines
+(14.18), so I have attempted to implement them by tweaking
+\textsf{biblatex's} default settings, which are found in
+\textsf{biblatex.def}.  In truth, I haven't succeeded in getting
+\textsf{biblatex} flawlessly to follow all of the \emph{Manual's}
+instructions, nor do the changes I have made work well in all
+circumstances, being particularly unsightly if you happen to be using
+the \textsf{ragged2e} package.  For these reasons, I have made my
+changes dependent on a package option, \mycolor{\texttt{cmsbreakurl}},
+which you can set in your preamble.  I have placed all of this code in
+\textsf{biblatex-chicago.sty}, so if you load the package with a call
+to \textsf{biblatex} instead, then URL line breaking will revert to
+the \textsf{biblatex} defaults.  See
+\href{file:cms-dates-sample.pdf}{\textsf{cms-dates-sample.pdf}} for a
+lot of examples of what URLs look like when the option is set, and
+also section~\ref{sec:loading:auth}, below.
+
 \mylittlespace This \mymarginpar{\texttt{cmsdate}} option used
 \emph{in the preamble} provides a method for simplifying the creation
 of data\-bases with a great many multi-date entries.  Despite warnings
@@ -11074,28 +14494,27 @@ in 1926 (the \textsf{origdate}) and reprinted in 1985 (the
   options.  If you want to present the \textsf{origdate} at the head
   of an entry, then generally speaking you should probably use
   \texttt{cmsdate=both}.  I have nevertheless retained this option for
-  certain cases where it has proved useful.  The 15th-edition options
+  certain cases where it has proved useful.  The old options
   \texttt{new} and \texttt{old} work like \texttt{both}.
 \end{enumerate}
 
 The important information for the user is that, when you set this
-option in your preamble to \texttt{on} or \texttt{both} (or to the
-15th-edition synonyms for the latter, \texttt{new} or \texttt{old}),
-then \textsf{biblatex-chicago-authordate} (and
-\textsf{authordate-trad}) will change the default
-\cmd{DeclareLa\-beldate} definition so that the \textsf{labelyear}
-search order will be \textsf{origdate, date, eventdate, urldate}.
-This means that for entry types not covered by the \texttt{avdate}
-option, and for those types as well if you turn off that option, the
-\textsf{labelyear} will, in any entry containing an \textsf{origdate},
-be that very date.  If you want \emph{every} such entry to present its
-\textsf{origdate} in citations and at the head of reference list
-entries, then setting the option this way makes sense, as you should
-automatically get the proper \textsf{extrayear} letter
-(1926\textbf{a}) and the correct sorting, without having to use the
-counter-intuitive .bib file date switching that sometimes accompanied
-the entry-only \texttt{cmsdate} option.  A few clarifications may yet
-be in order.
+option in your preamble to \texttt{on} or \texttt{both} (or to the old
+synonyms for the latter, \texttt{new} or \texttt{old}), then
+\textsf{biblatex-chicago-authordate} (and \textsf{authordate-trad})
+will change the default \cmd{DeclareLabeldate} definition so that the
+\textsf{labelyear} search order will be \textsf{origdate, date,
+  eventdate, urldate}.  This means that for entry types not covered by
+the \texttt{avdate} option, and for those types as well if you turn
+off that option, the \textsf{labelyear} will, in any entry containing
+an \textsf{origdate}, be that very date.  If you want \emph{every}
+such entry to present its \textsf{origdate} in citations and at the
+head of reference list entries, then setting the option this way makes
+sense, as you should automatically get the proper \textsf{extradate}
+letter (1926\textbf{a}) and the correct sorting, without having to use
+the counter-intuitive .bib file date switching that sometimes
+accompanied the entry-only \texttt{cmsdate} option.  A few
+clarifications may yet be in order.
 
 \mylittlespace Obviously, any entry with only a \textsf{date} should
 behave as usual.  Also, since \textsf{patent} entries have fairly
@@ -11131,10 +14550,17 @@ you want to set it to true without any of the other effects of the
 \mylittlespace When \mymarginpar{\texttt{compresspages}} set to
 \texttt{true}, any page ranges in your .bib file or in the
 \textsf{postnote} field of your citation commands will be compressed
-in accordance with the \emph{Manual's} specifications (9.60).
+in accordance with the \emph{Manual's} specifications (9.61).
 Something like 321-{-}328 in your .bib file would become 321--28 in
 your document.  See the \textsf{pages} field in
-section~\ref{sec:fields:authdate}, above.
+section~\ref{sec:fields:authdate}, above.  Please note that the code
+for this is in \textsf{biblatex-chicago.sty}, so if you load the
+package with a call to \textsf{biblatex} instead then you'll get the
+default \textsf{biblatex} compression style.
+
+\mylittlespace This \colmarginpar{\texttt{decaderange}} option works
+just like \mycolor{\texttt{alwaysrange}}, above, but only affects
+decade presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
 
 \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the
 \emph{Manual} (14.19) recommends specific formatting for footnote (and
@@ -11169,7 +14595,7 @@ capitalization.  It works by redefining the command
 latter anywhere in your document please be aware that it will also be
 turned off there.
 
-\mylittlespace When \colmarginpar{\texttt{hypertitle}} you use the
+\mylittlespace When \mymarginpar{\texttt{hypertitle}} you use the
 \textsf{hyperref} package with the author-date styles, the in-text
 citations will provide a hyperlink to the full information in the list
 of references.  Timo Thoms rightly pointed out that, generally, one
@@ -11179,12 +14605,12 @@ the \textsf{date} part.  The author-date styles will instead link the
 \textsf{date}, but if you set this option to \texttt{true} globally in
 your preamble then all \textsf{titles} and \textsf{shorthands} will
 link, regardless of whether a \textsf{date} is also present.  You can
-also set \mycolor{\texttt{hypertitle}} in the \textsf{options} field
-of individual entries, allowing you to provide a hyperlink in cases
-where the automatic mechanism gets it wrong (ency:britannica).
+also set \texttt{hypertitle} in the \textsf{options} field of
+individual entries, allowing you to provide a hyperlink in cases where
+the automatic mechanism gets it wrong (ency:britannica).
 
 \mylittlespace The \mymarginpar{\texttt{juniorcomma}} \emph{Manual}
-(6.47) states that \enquote{commas are not required around \emph{Jr.}\
+(6.43) states that \enquote{commas are not required around \emph{Jr.}\
   and \emph{Sr.},} so by default \textsf{biblatex-chicago} has
 followed standard \textsf{biblatex} in using a simple space in names
 like \enquote{John Doe Jr.}  Charles Schaum has pointed out that
@@ -11214,6 +14640,22 @@ form also works if you use \cmd{usepackage}
 \texttt{[style=chicago-authordate]\{bibla\-tex\}}, so I hope this
 requirement isn't too onerous.
 
+\mylittlespace When \colmarginpar{\texttt{nodatebrackets}\\
+  \texttt{noyearbrackets}} you use \textsf{biblatex's} enhanced date
+specifications to present an uncertain date (\verb+{1956?}+), a
+\enquote{circa} date (\verb+{1956~}+), or one that is both at the same
+time (\verb+{1956%}+), the date that by default will appear in your
+documents will have square brackets around it.  This accords with the
+\emph{Manual's} instructions concerning such dates (15.44), but may in
+some circumstances prove syntactically awkward, or may perhaps be out
+of step with a specific house style.  These two options, which may
+appear in the preamble either for the whole document or for specific entry
+types, or in individual entries, allow you to control when these
+brackets will appear.  The first controls, mainly, dates that appear
+in the body of an entry in the reference list, while the second
+controls dates in citations and at the head of entries in the
+reference list.  Cf.\ table~\ref{ad:date:extras}.
+
 \mylittlespace At \mymarginpar{\texttt{noibid}} the request of an
 early tester, I have included this option to allow you globally to
 turn off the \texttt{ibidem} mechanism that
@@ -11233,29 +14675,42 @@ 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.
+\emph{Manual} (9.35).  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
-the \textsf{authordate} styles.  If set to \texttt{true}, it allows
+notes \&\ bibliography style, this option may in fact be more useful
+in the \textsf{authordate} styles.  If set to \texttt{true}, it allows
 you to alter the punctuation that appears just before the
 \textsf{postnote} argument of citation commands, simplifying in
 particular the provision of comments within parenthetical citations.
 In previous releases, you either needed to include the comment after a
 page number, e.g., \cmd{autocite[16; some comment]\{citekey\}}, or
 provide a separate .bib entry using the \textsf{customc} entry type,
-e.g., \cmd{autocites\{chicago:man\-ual\}\{chicago:comment\}}.  With
-this option enabled, \cmd{autocite[;\,some\,comment]\{citekey\}} will
-do.  More generally, the \texttt{postnotepunct} option
-allows you to start the \textsf{postnote} field with a punctuation
-mark (.\,,\,;\,:) and have it appear as the \cmd{postnotedelim} in
-place of whatever the package might otherwise automatically have
-chosen.  Please note that this functionality relies on a very nifty
-macro by Philipp Lehman which I haven't extensively tested, so I'm
-labeling this option \enquote{experimental.}  Note also that the
-option only affects the \textsf{postnote} field of citation commands,
-not the \textsf{pages} field in your .bib file.
+e.g., \cmd{autocites\{chicago:manual\}\{chicago:comment\}}.  With this
+option enabled, \cmd{autocite[;\,some\,comment]\{citekey\}} will do.
+More generally, the \texttt{postnotepunct} option allows you to start
+the \textsf{postnote} field with a punctuation mark (.\,,\,;\,:) and
+have it appear as the \cmd{postnotedelim} in place of whatever the
+package might otherwise automatically have chosen.  Please note that
+this functionality relies on a very nifty macro by Philipp Lehman
+which I haven't extensively tested, so I'm labeling this option
+\enquote{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}
+
+\mylittlespace This \colmarginpar{\texttt{seriesabbrev}} option
+controls the printing, in the reference list, of the
+\mycolor{\textsf{shortseries}} field in place of the \textsf{series}
+field in book-like entries.  It is \texttt{false} by default, so as
+shipped \textsf{biblatex-chicago-authordate} will silently ignore such
+fields, but you can set it to \texttt{true} either in the preamble for
+the whole document or for specific entry types, or in individual
+entries, and it will appear in the reference list.  For more details,
+see the documentation of \mycolor{\textsf{shortseries}} in
+section~\ref{sec:fields:authdate}, above.
 
 \mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has
 suggested that, in some fields of study, a list of shorthands
@@ -11292,12 +14747,11 @@ field to appear even in these abbreviated references.
 \label{sec:authentryopts}
 
 These options are settable on a per-entry basis in the
-\textsf{options} field; both relate to the presentation of dates in
-citations and the list of references.
+\textsf{options} field.
 
-\mylittlespace The \mymarginpar{\texttt{cmsdate}} 16th edition of the
-\emph{Manual} has simplified the options for entries with more than
-one date (15.38).  You can choose among them using the
+\mylittlespace Recent \mymarginpar{\texttt{cmsdate}} editions of the
+\emph{Manual} have simplified the options for entries with more than
+one date (15.40).  You can choose among them using the
 \texttt{cmsdate} entry option.  It has 3 possible states relevant to
 this problem, alongside a fourth which I discuss below.  An example
 should make this clearer.  Let us assume that an entry presents a
@@ -11313,13 +14767,13 @@ reprinted edition of a work by Smith, first published in 1926 (the
   If you want to present the \textsf{origdate} at the head of an
   entry, then generally speaking you should probably use
   \texttt{cmsdate=both}.  I have retained the option because in some
-  cases it is still useful.  The 15th-edition options \texttt{new} and
+  cases it is still useful.  The old options \texttt{new} and
   \texttt{old} work like \texttt{both}.
 \end{description}
 
 As I explained in detail above in section~\ref{sec:fields:authdate},
 s.v.\ \enquote{\textbf{date},}\ because \textsf{biblatex's} sorting
-algorithms and automatic creation of the \textsf{extrayear} field
+algorithms and automatic creation of the \textsf{extradate} field
 refer by default to the \textsf{date} before the \textsf{origdate}
 when both are present, there may be situations when you need to have
 the \emph{earlier} year in the \textsf{date} field, and the later one
@@ -11331,14 +14785,12 @@ be as follows:
 
 \begin{description}
 \item[\qquad off:] This is the default.  The citation will look like
-  (Smith 1926a).  This style is no longer recommended by the 16th
-  edition of the \emph{Manual}.
+  (Smith 1926a).  This style is no longer recommended by the
+  \emph{Manual}.
 \item[\qquad both:] The citation will look like (Smith [1926a] 1985).
-  The 15th-edition options \texttt{old} and \texttt{new} are synonyms
-  for this.
+  The old options \texttt{old} and \texttt{new} are synonyms for this.
 \item[\qquad on:] The citation will look like (Smith 1926a).  As noted
-  above, this style is no longer recommended by the 16th edition of
-  the \emph{Manual}.
+  above, this style is no longer recommended by the \emph{Manual}.
 \end{description}
 
 If, \mymarginpar{\texttt{switchdates}} for any reason, simply
@@ -11352,8 +14804,8 @@ the preamble version \mymarginpar{\texttt{cmsdate}\\\emph{in
 of the \textbf{date} field to which I referred just above, at the
 preamble \texttt{cmsdate} documentation in
 section~\ref{sec:authuseropts}, and also at
-\textsf{cms-dates-sample.pdf} and \textsf{dates-test.bib} for examples
-of how all this works.
+\href{file:cms-dates-sample.pdf}{\textsf{cms-dates-sample.pdf}} and
+\textsf{dates-test.bib} for examples of how all this works.
 
 \mylittlespace Bertold Schweitzer has brought to my attention certain
 difficult corner cases involving cross-referenced works with more than
@@ -11362,19 +14814,19 @@ sources, I made a slight change to the way \texttt{cmsdate=on}
 and \texttt{cmsdate=both} work.  If, and only if, a work has only one
 date, and there is no \texttt{switchdates} in the \textsf{options}
 field, then \texttt{cmsdate=on} and \texttt{cmsdate=both} will both
-result in the suppression of the \textsf{extrayear} field in that
+result in the suppression of the \textsf{extradate} field in that
 entry.  Obviously, if the same options are set in the preamble, this
 behavior is turned off, so that single-date entries will still work
 properly without manual intervention.
 
-\mylittlespace The 16th edition of the \emph{Manual} now specifies
-that it is \enquote{usually sufficient to cite newspaper and magazine
-  articles entirely within the text} (15.47).  This will apply mainly
-to \textsf{article} and \textsf{review} entries with
+\mylittlespace Recent editions of the \emph{Manual} specify that it is
+\enquote{usually sufficient to cite newspaper and magazine articles
+  entirely within the text} (15.49).  This will apply mainly to
+\textsf{article} and \textsf{review} entries with
 \textsf{entrysubtype} \texttt{magazine}, and involves a parenthetical
 citation giving the \textsf{journaltitle} and then the full
 \textsf{date}, not just the year, with any other relevant identifying
-information incorporated into running text.  (Cf.\ 14.206.)\ In order
+information incorporated into running text.  (Cf.\ 14.198.)\ In order
 to facilitate this, I have added a further switch to the
 \texttt{cmsdate} option \mymarginpar{\texttt{cmsdate=full}} ---
 \texttt{full} --- which \emph{only} affects the presentation of
@@ -11398,17 +14850,17 @@ package, there are now three keys for choosing which style to load,
 of which you put in the options to the \cmd{usepackage} command.  With
 early versions of \textsf{biblatex-chicago}, the standard way of
 loading the package was via a call to \textsf{biblatex}, e.g.:
-\begin{quote}
-  \cmd{usepackage[style=chicago-authordate,strict,backend=biber,\%\\
-    babel=other,bibencoding=inputenc]\{biblatex\}}
-\end{quote}
+\begin{verbatim}
+  \usepackage[style=chicago-authordate,strict,backend=biber,%
+    babel=other,bibencoding=inputenc]{biblatex}
+\end{verbatim}
 Now, the default way to load the style, and one that will in the
 vast majority of standard cases produce the same results as the old
 invocation, will look like this:
-\begin{quote}
-  \cmd{usepackage[authordate,strict,backend=biber,autolang=other,\%\\
-    bibencoding=inputenc]\{biblatex-chicago\}}
-\end{quote}
+\begin{verbatim}
+  \usepackage[authordate,strict,backend=biber,autolang=other,%
+    bibencoding=inputenc]{biblatex-chicago}
+\end{verbatim}
 
 If you read through \textsf{biblatex-chicago.sty}, you'll see that it
 sets a number of \textsf{biblatex} options aimed at following the
@@ -11430,12 +14882,16 @@ then you may want to revert to the old style of invocation above.
 You'll lose all the definitions in \textsf{biblatex-chicago.sty},
 including those to which I've already alluded and also the code that
 sets the note number in-line rather than superscript in endnotes or
-footnotes.  Also in this file is the code that calls all of the
-package's localization files, which means that you'll lose all the
-Chicago-specific bibstrings I've defined unless you provide, in your
-preamble, a \cmd{DeclareLanguageMapping} command, or several, adapted
-for your setup, on which see section~\ref{sec:international} below and
-also §§~4.9.1 and 4.11.8 in \textsf{biblatex.pdf}.
+footnotes, the URL line-breaking code, and the Chicago-specific
+number- and date-range compression code.  You'll need to load the
+required packages \textsf{xstring} and \textsf{nameref} yourself, as
+\textsf{biblatex} doesn't do it for you.  Also in this file is the
+code that calls all of the package's localization files, which means
+that you'll lose all the Chicago-specific bibstrings I've defined
+unless you provide, in your preamble, a \cmd{DeclareLanguageMapping}
+command, or several, adapted for your setup, on which see
+section~\ref{sec:international} below and also §§~4.9.1 and 4.11.8 in
+\textsf{biblatex.pdf}.
 
 \mylittlespace What you \emph{will not} lose is the ability to call
 the package options \texttt{annotation, strict, cmslos=false} and
@@ -11455,14 +14911,13 @@ process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the required features.  This
 document assumes that you are using \textsf{Biber}; if you wish to
 continue using \textsc{Bib}\TeX\ then you need \textsf{biblatex}
-version 1.4c and, if you have any problems with the current release,
-possibly \textsf{biblatex-chicago} 0.9.7a.
+version 1.4c and \textsf{biblatex-chicago} 0.9.7a.
 
 \mylittlespace If your .bib file contains a large number of entries
 with more than three authors, then you may run into some limitations
 of the \textsf{biblatex-chicago} code.  The default settings are
 \texttt{maxnames=3,minnames=1} in citations and
-\texttt{max\-bibnames=10,minbibnames=7} in the list of references.  In
+\texttt{maxbibnames=10,minbibnames=7} in the list of references.  In
 practice, this means that an entry like hlatky:hrt, with 5 authors,
 will present all of them in the list of references but will truncate
 to one in citations, like so: (Hlatky et al. 2002).  For the vast
@@ -11471,7 +14926,7 @@ Chicago author-date specification.  However, if \enquote{a reference
   list includes another work of the same date that would also be
   abbreviated as [\enquote{Hlatky et al.}] but whose coauthors are
   different persons or listed in a different order, the text citations
-  must distinguish between them} (15.28).  The (\textsf{Biber}-only)
+  must distinguish between them} (15.29).  The (\textsf{Biber}-only)
 \textsf{biblatex} option \texttt{uniquelist}, set for you in
 \textsf{biblatex-chicago.sty}, will automatically handle many of these
 situations for you, but it is as well to understand that it does so by
@@ -11516,8 +14971,6 @@ reevaluate how much information you're providing.  I've tried to make
 data-rich citations, but there may be instances where you can save
 yourself some typing by keeping it simple.
 
-% %\enlargethispage{\baselineskip}
-
 \mylittlespace Scot Becker has pointed out to me that the inverse
 problem not only exists but may well become increasingly common, to
 wit, .bib database entries generated by bibliographic managers which
@@ -11532,39 +14985,32 @@ that may be of more general usefulness.  There is also a general
 option to excise with one command all the fields under consideration
 -- please see section~\ref{sec:authpreset} above.
 
-\mylittlespace Finally, allow me to reiterate what
-\textsf{biblatex.pdf} says, to wit, if you aren't going to use
-\textsf{Biber}, use \textsf{bibtex8}, rather than standard
-\textsc{Bib}\TeX, and avoid the cryptic errors that ensue when your
-.bib file gets to a certain size.
-
-\section{The \mycolor{\textsf{Jurisdiction}},
-  \mycolor{\textsf{Legislation}}, and \mycolor{\textsf{Legal}} Entry
+\section{The \textsf{Jurisdiction},
+  \textsf{Legislation}, and \textsf{Legal} Entry
   Types}
 \label{sec:legal}
 
 I have received numerous requests over the years to include some means
 of referring to legal and public documents which, broadly speaking,
 don't fit easily into any of the standard \textsf{biblatex} entry
-types.  The \emph{Manual} (14.281--317) recommends using the
+types.  The \emph{Manual} (14.269--305) recommends using the
 \emph{Bluebook} as a guide for formatting such references, while also
 suggesting certain modifications to this formatting to bring it more
 into line with Chicago's usual practices.  \textsf{Biblatex-chicago}
-now offers three entry types --- \mycolor{\textbf{jurisdiction}},
-\mycolor{\textbf{legal}}, and \mycolor{\textbf{legislation}} --- which
-allow you to present at least a substantial subset of what the
-\emph{Bluebook} offers.  As the rules for your .bib entries are the
-same in the notes \&\ bibliography style and in the author-date
-styles, and as these rules mainly come from a source outside the
-\emph{Manual,} and additionally as these rules apparently require even
-the author-date styles to use a system of foot- or endnotes (15.54), I
-have documented these types in a section of their own, applicable to
-all the Chicago styles.  (Some few changes needed when using the
-author-date styles, mainly to do with citation commands, will be
-outlined at the end.)  You can also consult the example files
-\mycolor{\textsf{legal-test.bib}} and
-\mycolor{\textsf{cms-legal-sample.pdf}} to see how you might construct
-your database entries.
+now offers three entry types --- \textbf{jurisdiction},
+\textbf{legal}, and \textbf{legislation} --- which allow you to
+present at least a substantial subset of what the \emph{Bluebook}
+offers.  As the rules for your .bib entries are the same in the notes
+\&\ bibliography style and in the author-date styles, and as these
+rules mainly come from a source outside the \emph{Manual,} and
+additionally as these rules apparently require even the author-date
+styles to use a system of foot- or endnotes (15.58), I have documented
+these types in a section of their own, applicable to all the Chicago
+styles.  (Some few changes needed when using the author-date styles,
+mainly to do with citation commands, will be outlined at the end.)
+You can also consult the example files \textsf{legal-test.bib} and
+\href{file:cms-legal-sample.pdf}{\textsf{cms-legal-sample.pdf}} to see
+how you might construct your database entries.
 
 \subsection{Types, Subtypes, and Fields}
 \label{sec:legal:types}
@@ -11582,7 +15028,7 @@ across the three.  Standard practice is to present the references
 \textsf{biblatex-chicago} excludes these types from the latter, though
 you can control this using an option (see below).
 
-\mybigspace This \colmarginpar{\textbf{jurisdiction}} type is for
+\mybigspace This \mymarginpar{\textbf{jurisdiction}} type is for
 presenting legal cases and court decisions.  A typical entry will
 contain the following fields:
 
@@ -11598,9 +15044,10 @@ contain the following fields:
   either in the \textsf{journaltitle} or in the \textsf{shortjournal}
   field.  If you wish to present your readers with a list of
   abbreviations with their expansions, then the expansion goes in
-  \textsf{journaltitle} and the abbreviation in
-  \textsf{shortjournal}.  (Cf.\
-  \mycolor{\textsf{cms-legal-sample.pdf}} to see how this might look.)
+  \textsf{journaltitle} and the abbreviation in \textsf{shortjournal}.
+  (Cf.\
+  \href{file:cms-legal-sample.pdf}{\textsf{cms-legal-sample.pdf}} to
+  see how this might look.)
 \item[pages \emph{or} issue] When using a standard official reporter,
   this will contain the opening page of the decision in that reporter,
   while any \textsf{postnote} field will contain the specific page on
@@ -11632,25 +15079,24 @@ contain the following fields:
   uk:case:square).
 \end{description}}
 
-These are, so to speak, the basic elements of a
-\mycolor{\textsf{jurisdiction}} citation, which may, depending on
-specific circumstances, require supplementation by the following:
+These are, so to speak, the basic elements of a \textsf{jurisdiction}
+citation, which may, depending on specific circumstances, require
+supplementation by the following:
 
 {\renewcommand{\descriptionlabel}[1]{\quad\textsf{#1}:}
 \begin{description}
 \setlength{\parskip}{-2pt}    
-\item[entrysubtype\{\mycolor{square}\} \textrm{or}
-  \{\mycolor{round}\}] The \emph{Manual} includes examples for citing
-  cases in Canada and in the United Kingdom, and the \texttt{square}
-  \textsf{entrysubtype} identifies the reporter either as Canadian or
-  as a UK reporter for which the year is essential to locating the
-  case, that is, when \enquote{there is either no volume number or the
-    volumes for each year are numbered anew, not cumulatively}
-  (14.310).  The \texttt{round} subtype, by contrast, identifies a UK
-  reporter where the volumes are numbered cumulatively, making the
-  year inessential.  (The names refer to the shapes of the brackets
-  placed around the year in each case.  Cf.\ canada:case,
-  uk:case:round, and uk:case:square.)
+\item[entrysubtype\{square\} \textrm{or} \{round\}] The \emph{Manual}
+  includes examples for citing cases in Canada and in the United
+  Kingdom, and the \texttt{square} \textsf{entrysubtype} identifies
+  the reporter either as Canadian or as a UK reporter for which the
+  year is essential to locating the case, that is, when \enquote{there
+    is either no volume number or the volumes for each year are
+    numbered anew, not cumulatively} (14.298).  The \texttt{round}
+  subtype, by contrast, identifies a UK reporter where the volumes are
+  numbered cumulatively, making the year inessential.  (The names
+  refer to the shapes of the brackets placed around the year in each
+  case.  Cf.\ canada:case, uk:case:round, and uk:case:square.)
 \item[origlocation \textrm{or} origpublisher] If you need to cite more
   than one reporter for a given case, then there are two
   possibilities.  Either the second (and subsequent) reporter(s)
@@ -11666,19 +15112,19 @@ specific circumstances, require supplementation by the following:
   \textsf{relatedstring} field.  (Cf.\ federal:lower:related.)
 \end{description}}
 
-This \colmarginpar{\textbf{legislation}} is the most complicated of
+This \mymarginpar{\textbf{legislation}} is the most complicated of
 the new entry types, with several \textsf{entrysubtypes} and a number
 of tricky corners, particularly with regard to the provision of
 subsequent short notes after the first full citation.  It is intended
 to cope with constitutions and with legislative and executive
 documents of all kinds, with the exception of treaties, for which you
-can use the \mycolor{\textsf{legal}} type, below.  In effect, the type
-tries to cover federal, state, and municipal laws and ordinances,
-statutes, bills, resolutions, reports, debates, hearings, presidential
-and congressional documents, and constitutions, none of which it does
-with particular elegance, so consider it a work in progress.  Many of
-the fields have close analogues in the \textsf{jurisdiction} type, so
-at least there is some bare minimum of consistency when dealing with
+can use the \textsf{legal} type, below.  In effect, the type tries to
+cover federal, state, and municipal laws and ordinances, statutes,
+bills, resolutions, reports, debates, hearings, presidential and
+congressional documents, and constitutions, none of which it does with
+particular elegance, so consider it a work in progress.  Many of the
+fields have close analogues in the \textsf{jurisdiction} type, so at
+least there is some bare minimum of consistency when dealing with
 public and legal material.
 
 {\renewcommand{\descriptionlabel}[1]{\quad\textsf{#1}:}
@@ -11691,8 +15137,8 @@ public and legal material.
   \textsf{title} which, please note, quite frequently will not turn up
   in short notes, depending on which other fields are present.
 \item[titleaddon] This field is considerably more important in
-  \mycolor{\textsf{legislation}} entries than the \textsf{shorttitle}
-  field, mainly because it will turn up in many short notes where the
+  \textsf{legislation} entries than the \textsf{shorttitle} field,
+  mainly because it will turn up in many short notes where the
   \textsf{title} will not.  It will frequently contain specifying
   information on legislative material, and will therefore often allow
   short notes to differentiate citations of sources that might have
@@ -11706,32 +15152,32 @@ public and legal material.
   congress:publiclaw.)
 \item[journaltitle \textrm{and/or} shortjournal] There is usually a
   standard place for publishing various sorts of legislative material,
-  and as in \mycolor{\textsf{jurisdiction}} entries it is
-  \emph{always} presented in a standard abbreviated form available in
-  the \emph{Bluebook}.  You can place the abbreviation either in the
+  and as in \textsf{jurisdiction} entries it is \emph{always}
+  presented in a standard abbreviated form available in the
+  \emph{Bluebook}.  You can place the abbreviation either in the
   \textsf{journaltitle} or in the \textsf{shortjournal} field.  If you
   wish to present your readers with a list of abbreviations with their
   expansions, then the expansion goes in \textsf{journaltitle} and the
   abbreviation in \textsf{shortjournal}.  Like \textsf{titleaddon},
   this field will often appear in short notes.  (Cf.\
-  \mycolor{\textsf{cms-legal-sample.pdf}} to see how this might look.)
+  \href{file:cms-legal-sample.pdf}{\textsf{cms-legal-sample.pdf}} to
+  see how this might look.)
 \item[volume] The volume number of the \textsf{shortjournal}.  It can
   be a cardinal or an ordinal, depending on the \textsf{shortjournal}.
   (Cf.\ congress:publiclaw and congress:bill.)
 \item[series] In citations of American material, this will usually
   contain session information pertaining to a legislative publication.
   Elsewhere it will often contain just be a plain number, not unlike
-  in \mycolor{\textsf{jurisdiction}} entries.  (Cf.\
-  congress:debate:globe, state:statute:okla, and uk:hansard.)
+  in \textsf{jurisdiction} entries.  (Cf.\ congress:debate:globe,
+  state:statute:okla, and uk:hansard.)
 \item[issue] This field can provide an identifying number in some
   circumstances, particularly when you don't want it prefixed by any
   bibstring --- cf.\ uk:command.
-\item[pages] Somewhat similar to its use in
-  \mycolor{\textsf{jurisdiction}} entries, this will usually contain
-  the opening page, or sometimes the section number, of the material
-  in the \textsf{shortjournal}, while any \textsf{postnote} field will
-  contain the specific page on which a particular citation appears (a
-  \enquote{pincite}).
+\item[pages] Somewhat similar to its use in \textsf{jurisdiction}
+  entries, this will usually contain the opening page, or sometimes
+  the section number, of the material in the \textsf{shortjournal},
+  while any \textsf{postnote} field will contain the specific page on
+  which a particular citation appears (a \enquote{pincite}).
 \item[part \textrm{or} chapter] Some sources use \textsf{part} or
   \textsf{chapter} numbers instead of \textsf{pages} or sections.
   (Cf.\ canada:statute and uk:statute.)
@@ -11755,10 +15201,10 @@ public and legal material.
   congress:debate:new, congress:hearing, state:statute:ky, and
   uk:statute.)
 \item[entrysubtype] The sheer variety of sources included under the
-  \mycolor{\textsf{legislation}} type, and the specialized rules for
-  presenting them, have necessitated the introduction of a substantial
-  network of \textsf{entrysubtypes}:
-  {\renewcommand{\descriptionlabel}[1]{\quad\mycolor{\textsf{#1}}:}
+  \textsf{legislation} type, and the specialized rules for presenting
+  them, have necessitated the introduction of a substantial network of
+  \textsf{entrysubtypes}:
+  {\renewcommand{\descriptionlabel}[1]{\quad\textsf{#1}:}
   \begin{description}
     \setlength{\parskip}{-2pt}
   \item[canada] Identifies Canadian statutes (canada:statute).
@@ -11777,15 +15223,14 @@ public and legal material.
   \end{description}}
 \end{description}}
 
-A glance through the \mycolor{\textsf{legal-test.bib}} file should
-help enormously when you're trying to work out how to present a
-particular source, and all suggestions for pruning the foliage will be
-welcome.
+A glance through the \textsf{legal-test.bib} file should help
+enormously when you're trying to work out how to present a particular
+source, and all suggestions for pruning the foliage will be welcome.
 
-\mybigspace This \colmarginpar{\textbf{legal}} type is intended as a
+\mybigspace This \mymarginpar{\textbf{legal}} type is intended as a
 catch-all for miscellaneous public documents not included in the
 previous two types, but for the moment the only sort of material for
-which it is required is international treaties (14.302; treaty).  The
+which it is required is international treaties (14.290; treaty).  The
 usual fields for such material include:
 
 {\renewcommand{\descriptionlabel}[1]{\quad\textsf{#1}:}
@@ -11804,7 +15249,8 @@ usual fields for such material include:
   with a list of abbreviations with their expansions, then the
   expansion goes in \textsf{journaltitle} and the abbreviation in
   \textsf{shortjournal}.  (Cf.\
-  \mycolor{\textsf{cms-legal-sample.pdf}} to see how this might look.)
+  \href{file:cms-legal-sample.pdf}{\textsf{cms-legal-sample.pdf}} to
+  see how this might look.)
 \item[issue] This will contain the identifying number provided by the
   \textsf{shortjournal}.
 \item[volume] The volume number of the \textsf{shortjournal}.
@@ -11827,10 +15273,16 @@ however, the \emph{Bluebook} more or less requires you to adopt a
 separate set of notes in addition to the standard author-year
 citations, which means that for these three legal entry types you'll
 have to remember to use new citation commands that I've provided:
-\mycolor{\cmd{fullcite}}, \mycolor{\cmd{footfullcite}}, and
-\mycolor{\cmd{parenfullcite}}.  The first prints the reference, the
-second does so in a footnote, and the third does so inside
-parentheses.
+\cmd{fullcite}, \cmd{footfullcite}, and \cmd{parenfullcite}.  The
+first prints the reference, the second does so in a footnote, and the
+third does so inside parentheses.  For both styles,
+\colmarginpar{\cmd{runcite}} there is a new command that you should
+use if you are citing a \textsf{jurisdiction} entry in the running
+flow of text rather than as a stand-alone citation, whether that text
+is in a note or in the main body (14.276).  This requires a different
+presentation of the \textsf{title} field, and using
+\mycolor{\cmd{runcite}} alerts \textsf{biblatex-chicago} to this
+circumstance.
 
 \subsection{Options}
 \label{sec:legal:options}
@@ -11839,14 +15291,14 @@ Several new options allow you to control the presentation of legal
 notes in your document.  The default settings are indicated in the
 margins.
 
-\mylittlespace This \colmarginpar{legalnotes=true} option prevents the
+\mylittlespace This \mymarginpar{legalnotes=true} option prevents the
 printing of legal citations in a bibliography or reference list, as
 the \emph{Bluebook} recommends.  You can change this to \texttt{false}
 in the preamble of your document, but you should be aware that the
 reference printed in the bibliography will be a clone of the long-note
 form, as the \emph{Bluebook} doesn't provide an alternative version.
 
-\mylittlespace This \colmarginpar{noneshort=false} option controls the
+\mylittlespace This \mymarginpar{noneshort=false} option controls the
 availability of the short form of the note, intended for use in
 subsequent citations of entries already presented in full notes.  By
 default, \textsf{biblatex-chicago} attempts to provide
@@ -11855,7 +15307,7 @@ situation, and some of the many \textsf{entrysubtypes} are at least
 partially designed to cope with the complexities of the specification.
 The \emph{Manual}, for its part, suggests that \enquote{works that
   cite only a few legal documents may be better off using the full
-  form for each citation} (14.287).  In the author-date styles, you
+  form for each citation} (14.275).  In the author-date styles, you
 can set this option to \texttt{true} either in the preamble or in
 individual .bib entries to accomplish this.  Assuming you've only used
 the \cmd{fullcite} commands for the \emph{Bluebook} entry types, the
@@ -11870,7 +15322,7 @@ repeated citations, and also that the option may give surprising
 results in the presence of \textsf{shorthand} fields and/or the
 \texttt{shorthandfirst} and \texttt{short} options.
 
-\mylittlespace I \colmarginpar{short=false} have ported this option,
+\mylittlespace I \mymarginpar{short=false} have ported this option,
 already present in the notes \&\ bibliography style, to the
 author-date styles to allow users to present short notes from the very
 first citation.  I'm not certain what the use case might be for this,
@@ -11878,7 +15330,7 @@ as it's intended for saving space in documents where short notes can
 point to references in a full bibliography.  Still, if for any reason
 you need this you can set the option to \texttt{true} in the preamble.
 
-\mylittlespace This \colmarginpar{supranotes=\\true} is a
+\mylittlespace This \mymarginpar{supranotes=\\true} is a
 \emph{Bluebook}-specific option, and it produces, for some entry types
 and subtypes, a back reference to the first, long note at the end of
 subsequent, short citations.  It takes the form \enquote{\emph{supra}
@@ -11898,14 +15350,14 @@ in other \enquote{American} \textsf{biblatex} styles (e.g.,
 for producing a Chicago-like style in other languages.  I have
 supplied three lbx files, \textsf{cms-german.lbx}, its clone
 \textsf{cms-ngerman.lbx}, and \textsf{cms-french.lbx}, in at least
-partial fulfillment of this request.  For this release, Gustavo Barros
-has very kindly provided \textsf{cms-brazilian.lbx} for speakers of
-that language, thereby adding to the generous contributions of Stefan
+partial fulfillment of this request.  For this release Wouter Lancee
+has provided \textsf{cms-dutch.lbx}, thereby adding to the generous
+contributions of Gustavo Barros (\textsf{cms-brazilian.lbx}), Stefan
 Björk (\textsf{cms-swedish.lbx}), Antti-Juhani Kaijahano
 (\textsf{cms-finnish.lbx}), Baldur Kristinsson
 (\textsf{cms-icelandic.lbx}), and Håkon Malmedal
-(\textsf{cms-norsk.lbx}, \textsf{cms-norwe\-gian.lbx}, and
-\textsf{cms-nynorsk.lbx}).  I include \textsf{cms-british.lbx} in
+(\textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx}, and
+\textsf{cms-ny\-norsk.lbx}).  I include \textsf{cms-british.lbx} in
 order to simplify and to improve the package's handling of
 non-American typographical conventions in English.  This means that
 all --- or at least most --- of the Chicago-specific bibstrings are
@@ -11931,7 +15383,7 @@ American-style punctuation tracking, when you:
 \item Do not load \textsf{babel} at all.
 \end{enumerate}
 (This last is a change from the \textsf{biblatex} defaults --- cp.\
-§~3.10.1 in \textsf{biblatex.pdf} --- but it seems to me reasonable,
+§~3.12.2 in \textsf{biblatex.pdf} --- but it seems to me reasonable,
 in an American citation style, to expect this arrangement to work well
 for the majority of users.)
 
@@ -11943,25 +15395,24 @@ complicated rules outlined in previous releases of
 \textsf{biblatex-chicago}.  Instead, simply load \textsf{babel} with
 the \texttt{british} option.
 
-\mylittlespace If you want to use Brazilian Portuguese, Finnish,
-French, German, Icelandic, Norwegian, or Swedish strings in the
-reference apparatus, then you can load \textsf{babel} with
-\texttt{brazilian}, \texttt{finnish}, \texttt{french},
+\mylittlespace If you want to use Brazilian Portuguese, Dutch,
+Finnish, French, German, Icelandic, Norwegian, or Swedish strings in
+the reference apparatus, then you can load \textsf{babel} with
+\texttt{brazilian}, \texttt{dutch}, \texttt{finnish}, \texttt{french},
 \texttt{german}, \texttt{icelandic}, \texttt{ngerman}, \texttt{norsk},
 \texttt{nynorsk}, or \texttt{swedish} as the main document language.
 You no longer need any calls to \cmd{DeclareLanguageMapping} in your
-document preamble, since \textsf{bib\-latex-chicago.sty} automatically
+document preamble, since \textsf{biblatex-chicago.sty} automatically
 provides these if you load the package in the standard way.
 
 \mylittlespace You can also define which bibstrings to use on an
 entry-by-entry basis by using the \textsf{hyphenation} field in your
-bib file, but you will have to make sure that the Chicago-specific
-strings for the given language are loaded using a
-\cmd{DeclareLanguageMapping} call in the preamble.  Indeed, if
-\texttt{american} isn't the main text language when loading
-\textsf{babel}, then in order to have access to those strings you'll
-need \cmd{DeclareLanguageMapping\break\{american\}\{cms-american\}} in
-your preamble, as \textsf{biblatex-chicago.sty} won't load it for you.
+bib file, but you will have to make sure that all the languages you
+want to use in this way are included in the call to load
+\textsf{babel} in your preamble, even if not as the main text
+language.  The \cmd{DeclareLanguageMapping} calls in
+\textsf{biblatex-chicago.sty} should do the rest, assuming you've
+loaded the package that way.
 
 \mylittlespace Three other hints may be in order here.  Please note,
 first, that I haven't altered the standard punctuation procedures used
@@ -11972,10 +15423,10 @@ wish to follow the Chicago specification and move punctuation inside
 quotation marks, then you'll need a declaration of this sort in your
 preamble:
 
-\begin{quote}
-  \cmd{DefineBibliographyExtras\{german\}\{\%}\\
-  \hspace*{2em}\cmd{DeclareQuotePunctuation\{.,\}\}}
-\end{quote}
+\begin{verbatim}
+  \DefineBibliographyExtras{german}{%
+    \DeclareQuotePunctuation{.,}}
+\end{verbatim}
 
 Second, depending on the nature of your bibliography database, it will
 only rarely be possible to process the same bib file in different
@@ -11999,10 +15450,10 @@ esp.\ s.v.\ \enquote{\cmd{partedit}.}
 provided may well break with established bibliographical traditions in
 those languages, but my main concern when choosing them was to remain
 as close as possible to the quirks of the Chicago specification.  I
-have entirely relied on the judgment of the creators of the Finnish,
-Icelandic, Norwegian, and Swedish localizations in those instances.
-If you have strong objections to any of the strings, or indeed to any
-of my formatting decisions, please let me know.
+have entirely relied on the judgment of the creators of the Brazilian,
+Dutch, Finnish, Icelandic, Norwegian, and Swedish localizations in
+those instances.  If you have strong objections to any of the strings,
+or indeed to any of my formatting decisions, please let me know.
 
 \section{One\,.bib Database, Two Chicago Styles}
 \label{sec:twostyles}
@@ -12010,7 +15461,7 @@ of my formatting decisions, please let me know.
 I have, when designing this package, attempted to keep at least half
 an eye on the possibility that users might want to re-use a .bib
 database in documents using the two different Chicago styles.  The
-extensive unification of the two styles in the 16th edition of the
+extensive unification of the two styles in recent editions of the
 \emph{Manual} has simplified things, and though I have no idea whether
 this will even be a common concern, I still thought I might gather in
 this section the issues that a hypothetical user might face.  The two
@@ -12071,7 +15522,7 @@ of the things you may need to address:
   in section~\ref{sec:formatting:authdate} above may help.
 \item You also need to be more careful about the use of abbreviations,
   e.g., in journal names, where the author-date style is more liberal
-  in their use than the notes \&\ bibliography style.  (Cf.\ 14.179.)
+  in their use than the notes \&\ bibliography style.  (Cf.\ 14.170.)
   The bibstrings mechanism and package options sort much of this out
   automatically, but not all.
 \item The \textsf{shorttitle} field is used extensively in notes \&\
@@ -12100,10 +15551,13 @@ of the things you may need to address:
 \label{sec:otherpacks}
 
 For \mymarginpar{\textbf{endnotes}} users of the \textsf{endnotes}
-package --- or of \textsf{pagenote} --- \textsf{biblatex} 0.9 offers
-considerably enhanced functionality.  Please read the package's
-RELEASE file and the documentation of the \texttt{notetype} option in
-\textsf{biblatex.pdf} §~3.1.2.1.
+package --- or of \textsf{pagenote} --- \textsf{biblatex} offers
+extensive compatibility options.  Please read the documentation of the
+\texttt{notetype} option in \textsf{biblatex.pdf} §~3.1.2.1.  If you
+are using the \mycolor{\texttt{noteref}} option with the notes \&\
+bibliography style and \textsf{endnotes}, please read the
+documentation in section~\ref{sec:endnoterefs} for your options, which
+include the \mycolor{\textsf{cmsendnotes.sty}} package.
 
 \mylittlespace Another \mymarginpar{\textbf{memoir}} problem I have
 found occurs because the \textsf{memoir} class provides its own
@@ -12114,45 +15568,28 @@ the \textsf{memoir} class is loaded, reasoning that users of that
 package may well have their own ideas about such formatting.
 
 \mylittlespace The \mymarginpar{\textbf{ragged2e}} footnote mark code
-I've just mentioned also causes problems for the \textsf{rag\-ged2e}
+I've just mentioned also causes problems for the \textsf{ragged2e}
 package, but in this case a simple workaround is to load
 \textsf{biblatex} \emph{after} you've loaded \textsf{ragged2e} in your
-document preamble.
-
-%\enlargethispage{\baselineskip}
-
-\mylittlespace Nick \mymarginpar{\textbf{Xe\LaTeX}} Andrewes alerted
-me to problems that appeared when he used the Xe\LaTeX\ engine to
-process his files.  These included spurious punctuation after
-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
-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
-latest version of \textsf{csquotes}, which I recommend doing in any
-case.  Compatibility with the EU1 encoding is now standard in that
-package.
+document preamble.  The URL line-breaking code activated by
+\mycolor{\texttt{cmsbreakurl}} doesn't play well with
+\textsf{ragged2e}, and so far I've not found a workaround.
 
 \section{TODO \&\ Known Bugs}
 \label{sec:bugs}
 
-This release implements the 16th edition of the \emph{Chicago Manual
-  of Style}.  It also contains a version of the author-date style
+This release implements the 17th edition of the \emph{Chicago Manual
+  of Style}.  It contains a version of the author-date style
 (\textsf{authordate-trad}) with traditional title formatting,
 alongside the \textsf{authordate} code which unifies the treatment of
 titles between itself and the notes \&\ bibliography style.  I
 strongly encourage users to migrate to one of the styles implementing
 the most recent specification, as I am focusing all of my development
-and testing time there.  With the current release I am removing the
-15th-edition styles, long obsolete, in preparation for the move to the
-17th edition in the next feature release.
+and testing time there.
 
 \mylittlespace Regardless of which edition you are considering, there
-remain things I haven't implemented.  The solution in brown:bre\-mer
-to multi-part journal articles obviously isn't optimal, and I should
+remain things I haven't implemented.  The solution in brown:bremer to
+multi-part journal articles obviously isn't optimal, and I should
 investigate a way of making it simpler.  If the kludge presented there
 doesn't appeal, you can always, for the time being, refer separately
 to the various parts.  If you have other issues with particular sorts
@@ -12162,12 +15599,6 @@ me that the available entry types could be pressed into service to
 address the vast majority of them.  If this optimism proves misguided,
 please let me know.
 
-\mylittlespace I haven't yet explored the possible uses in
-\textsf{biblatex-chicago} for the \textsf{biblatex}
-\textsf{datelabelsource} field, new in \textsf{biblatex} 2.8, nor have
-I implemented automatic compression of date ranges to go along with
-that provided for page ranges.
-
 \mylittlespace Kenneth L. Pearce has reported a bug that appears when
 using multiple citation commands inside the \textsf{annotation} field
 of annotated bibliographies.  If you run into this problem, he
@@ -12184,8 +15615,6 @@ 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}
-
 \mylittlespace This release fixes the formatting errors of which I am
 aware.  There remain the larger issues I've discussed throughout this
 documentation, which mainly represent my inability to make all of
@@ -12199,9 +15628,360 @@ do my best to fix them.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{1.0rc5: Released \today}
+\textbf{2.0: Released \today}
+
+\mylittlespace Converting from the 16th to the 17th edition in your
+.bib files and \LaTeX\ documents:\label{deprec:obsol}
+\begin{itemize}
+\item The 17th edition of the \emph{Manual} no longer encourages use
+  of \emph{ibid.}\ to replace repeated citations of the same work in
+  the notes \&\ bibliography style, preferring instead to use the
+  author's name alone, along with any page number(s).  If you wish to
+  continue using \emph{ibid.}\ in that style, you need to set the new
+  option \mycolor{\texttt{useibid=true}} when loading
+  \textsf{biblatex-chicago} in your preamble.
+\item If you are loading the package the old-fashioned way, with
+  \textsf{biblatex} and the \texttt{style=} option instead of with
+  \textsf{biblatex-chicago}, please be aware that there are two
+  standard packages required by \textsf{biblatex-chicago} that aren't
+  automatically loaded by \textsf{biblatex}:
+  \mycolor{\textsf{xstring}} and \mycolor{\textsf{refname}}.  You'll
+  need to load them in your preamble yourself.
+\item If you've been using the \textsf{year} field to present decades
+  like \texttt{1950s}, this will no longer work accurately in
+  author-date citations.  The correct way to do so now is to use one
+  of \textsf{biblatex's} \textsc{iso}8601-2 date specifications in the
+  \textsf{date} field instead, to wit, \texttt{195X}.  Generally, I've
+  tried to make \textsf{year} fields like \texttt{[1957?]} or
+  \texttt{[ca.\ 1850]} continue to work properly, but here too the
+  best thing to do is to use the new \textsf{date} features and
+  present them like \texttt{1957?} or \texttt{1850\textasciitilde},
+  respectively.  This will ensure that both sorting and punctuation
+  work out properly.  See table~\ref{ad:date:extras}, and the
+  \textsf{date} docs in sections~\ref{sec:entryfields} and
+  \ref{sec:ad:date}, above.
+\item If you have been using the \textsf{nameaddon} field to hold time
+  stamps for online comments, then you should put the time stamp into
+  the \textsf{date} or possibly \textsf{eventdate} field, instead,
+  using the \textsc{iso}8601-2 format implemented by
+  \textsf{biblatex}.  See the \textsf{date} and \textsf{nameaddon}
+  field docs in sections~\ref{sec:entryfields} and
+  \ref{sec:fields:authdate}, along with tables~\ref{tab:online:types},
+  \ref{tab:online:adtypes}, and \ref{ad:date:extras}.
+\item Following on from the previous item, the 17th edition of the
+  \emph{Manual} includes more plentiful and more detailed instructions
+  for presenting online materials than were available in previous
+  editions.  For users of \textsf{biblatex-chicago} this means that
+  there is now guidance for many more sorts of material than before,
+  so if you have been improvising citations of this sort of material
+  in previous releases it will be worth checking to see whether there
+  are now clearer instructions available.
+  Tables~\ref{tab:online:types} and \ref{tab:online:adtypes} summarize
+  the new specifications for the notes \&\ bibliography and
+  author-date styles, respectively.  Cf.\ in particular the new
+  \mycolor{\texttt{commenton}} \textsf{relatedtype} in
+  sections~\ref{sec:related} and \ref{sec:authrelated}.  Also, the
+  \textbf{online} entry type now prints both \textsf{author} and
+  \textsf{editor} (or other editorial role) if they exist, and I've
+  moved the \textsf{addendum} field \emph{before} the \textsf{url},
+  which fits better with indications in the \emph{Manual}.  If you've
+  been using the \textsf{addendum} field to present citations of other
+  entries (as in older versions of \textsf{biblatex-chicago}), please
+  switch to the \textsf{related} mechanism, which works better anyway.
+\item On the same subject, if you are using the notes \&\ bibliography
+  style and are retaining the \textsf{crossref} field (instead of
+  using the \mycolor{\texttt{commenton}} \textsf{relatedtype}) in
+  \textsf{review} entries as a means of presenting comments on blogs,
+  such entries are now subject to the settings of the
+  \texttt{longcrossref} option and will appear in abbreviated form in
+  some full notes and in the bibliography, as has always occurred in
+  \textsf{incollection} entries, for example.  You can set
+  \texttt{longcrossref} to \texttt{true} to get back the old behavior.
+\item The 17th edition generally encourages more strongly than the
+  16th the use of only one publisher in the \textsf{publisher} field.
+  If you decide to retain more than one, and one of them is a part of
+  an academic publishing consortium, it encourages you to specify this
+  relationship rather than merely listing the two using the keyword
+  \enquote{and} in the field.  Please see the documentation of the
+  field in sections~\ref{sec:entryfields} and
+  \ref{sec:fields:authdate}, above, for the rather minor (and rare)
+  changes this might mandate for your\ .bib files.
+\item The 17th-edition presentation of \textbf{music} entries has
+  added a few pieces of information it seems to find desirable ---
+  track number in \textsf{chapter} and specification of a lead
+  performer's role in, e.g., \textsf{editortype} --- though the basic
+  structure of a 16th-edition\ .bib entry remains unchanged.  Please
+  see the documentation of that entry type in
+  sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}, above.
+\item The 17th edition has added a couple of wrinkles to the
+  \textbf{video} type specifications.  You can now put the broadcast
+  network of a TV show in the \textsf{usera} field, and you can also
+  supply the new \textsf{entrysubtype} \mycolor{\texttt{tvepisode}} to
+  print the series title (\textsf{booktitle}) \emph{before} the
+  episode title (\textsf{title}).  Please see the documentation of the
+  entry type in sections~\ref{sec:entrytypes} and
+  \ref{sec:types:authdate}, above.
+\item Both Chicago styles now sentence case the \textsf{title} field
+  in \textbf{patent} entries, so you may need to put curly braces
+  around words that shouldn't appear in lowercase.
+\item The \textsf{pubstate} field now has a more generalized
+  functionality, while maintaining the specialized uses present in
+  earlier releases.  In particular, please note now that almost
+  anything you put in the field will be printed somewhere in the
+  entry, and in the case of the author-date styles may appear in a
+  somewhat different part of the entry than that to which you may have
+  become accustomed.  If you wish to move this data back to the end of
+  the entry in the author-date styles, then the \textsf{addendum}
+  field might be of service.  The documentation in
+  sections~\ref{sec:entryfields} and \ref{sec:fields:authdate} should
+  help.
+\item \textsf{Biber} is now the \emph{required} backend for all
+  Chicago styles, including the 16th-edition files still included in
+  the package.  If you have somehow been using some variant of
+  \textsc{Bib}\TeX\ in the notes \&\ bibliography style up to now, I'm
+  fairly confident it will no longer work.  Please switch to
+  \textsf{biber}.
+\end{itemize}
+
+Other new features common to the notes \&\ bibliography and
+author-date styles:
+\begin{itemize}
+\item Wouter Lancee has very generously provided a Dutch localization
+  for \textsf{biblatex-chicago}, called
+  \mycolor{\textsf{cms-dutch.lbx}}.  You can use it by including
+  \enquote{\texttt{dutch}} when loading \textsf{babel}.  Gustavo
+  Barros has also very kindly provided a much-revised version of his
+  \textsf{cms-brazilian.lbx}.
+\item As mentioned above, this release for the first time implements
+  \textsf{biblatex's} elegant and long-standing support for the
+  \textsc{iso}8601-2 Extended Format date specification, which means
+  there are now greatly enhanced possibilities for presenting
+  uncertain and unspecified dates and date ranges, along with date
+  eras, seasons, time stamps, and time zones.
+  Table~\ref{ad:date:extras} summarizes the implementation for all
+  Chicago styles, but see also the \textsf{date} field in
+  sections~\ref{sec:entryfields} and \ref{sec:fields:authdate}, along
+  with the new package options \mycolor{\texttt{alwaysrange}},
+  \mycolor{\texttt{centuryrange}}, \mycolor{\texttt{decaderange}},
+  \mycolor{\texttt{nodatebrackets}}, and
+  \mycolor{\texttt{noyearbrackets}}.
+\item I have also implemented year-range compression in all styles,
+  governed by the new \mycolor{\texttt{compressyears}} option, set to
+  \texttt{true} by default.
+\item Constanza Cordoni requested a way to turn off the printing of
+  the 3-em dash for repeated names in the bibliography or reference
+  list, and the \emph{Manual} concedes that some publishers prefer
+  this style.  Some of \textsf{biblatex's} standard styles have a
+  \mycolor{\texttt{dashed}} option, so for compatibility purposes I've
+  provided the same.  By default, I have set it to \texttt{true} to
+  print the name dash, but you can set \mycolor{\texttt{dashed=false}}
+  in your preamble to repeat names instead throughout your document.
+\item Jan David Hauck suggested I extend the field-exclusion
+  functionality beyond the package options already provided
+  (sections~\ref{sec:chicpreset} and \ref{sec:authpreset}) by
+  \textsf{biblatex-chicago}.  First, I made sure that all of those
+  options could be set globally, per type, and per entry.  Second, I
+  added the command \mycolor{\cmd{suppressbibfield}}, designed to
+  appear in the preamble, and which will look something like:
+\begin{verbatim}
+  \suppressbibfield[entrytype,entrytype,...]{field,field,field,...}
+\end{verbatim}
+  Please see sections~\ref{sec:formatcommands} and
+  \ref{sec:formatting:authdate} for the details.
+\item After a request by user BenVB, I have added support for the
+  \textsf{biblatex} \mycolor{\textbf{shortseries}} field, which allows
+  you to present abbreviated \textsf{series} in book-like entries in
+  all the styles.  You can use the \mycolor{\texttt{seriesabbrev}}
+  option to control where in your document these abbreviated forms
+  will appear.  By default, the field is ignored in all styles.  You
+  can also print a list of series abbreviations, rather in the manner
+  of a list of shorthands, using a command like:
+  \verb+\printbiblist{shortseries}+.  Please see
+  \mycolor{\textsf{shortseries}} in sections~\ref{sec:entryfields} and
+  \ref{sec:fields:authdate}.
+\item I have added a new preamble option,
+  \mycolor{\texttt{cmsbreakurl}}, which attempts to follow the
+  \emph{Manual's} instructions for line-breaking inside URLs.  It
+  doesn't work 100\%\ accurately, and it doesn't play well with the
+  \textsf{ragged2e} package, but in most circumstances it is at least
+  closer to the Chicago ideal than the \textsf{biblatex} defaults.
+  See sections~\ref{sec:useropts} and \ref{sec:authuseropts}.
+\item The \emph{Manual} now specifies how to present \textsf{articles}
+  with a unique numeric or alphanumeric ID, which you can place in the
+  \textsf{eid} field.  If you've been using this field in previous
+  releases you'll notice that the ID has moved to a different place in
+  long notes, bibliography, and list of references.
+\item In \textsf{jurisdiction} entries, the presentation of the
+  \textsf{title} changes depending on whether it appears in a
+  stand-alone citation or as part of the flow of running text, no
+  matter whether the citation is in the main body or in a note.  I
+  have provided the \mycolor{\cmd{runcite}} command, in both Chicago
+  styles, for \textsf{jurisdiction} citations that appear in running
+  text.
+\item N.\ Andrew Walsh suggested that I allow editorial roles that
+  aren't pre-defined \cmd{bibstrings} to appear as-is in entries, just
+  as the standard \textsf{biblatex} styles do.  I have followed this
+  advice for the \textsf{editortype}, \textsf{editoratype},
+  \textsf{editorbtype}, \textsf{editorctype}, and \textsf{nameatype}
+  fields, making sure to capitalize the string according to its
+  context.
+\item I have added the \textsf{venue} field to \textbf{misc} entries,
+  both with and without an \textsf{entrysubtype}. It also appears in
+  the new \mycolor{\textbf{performance}} type.
+\item I have added the \textsf{version} and \textsf{type} fields to
+  \textbf{book} entries to help with multimedia app content (14.268).
+  This material fits quite well in such entries but needs extra fields
+  to present information about the version of the app and also the
+  system type on which it runs.  I added the \textsf{type} field to
+  \textbf{article}, \textbf{review}, and \textbf{online} entries for
+  presenting medium information for online multimedia (14.267).
+\item I have added a new entry type, \mycolor{\textbf{dataset}}, to
+  allow the citation of scientific databases.  Cf.\
+  sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}.
+\item I have added the \textsf{number} field to \textbf{misc} entries
+  with an \textsf{entrysubtype} to help cope with the varieties of
+  location information in different archives.
+\item The new entry type \mycolor{\textbf{standard}} is now available
+  to cite standards published by national or international standards
+  organizations.  If you have been using the \textsf{book} type for
+  such material it might be worth switching to make sure your entries
+  are more in line with the \emph{Manual's} specifications.  See the
+  docs in sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}
+  for the details.
+\item The new entry type \mycolor{\textbf{performance}} is now
+  available for citing live performances.  You can sometimes also use
+  a \textbf{misc} entry without an \textsf{entrysubtype}.
+\item I have added the \textsf{eventdate} field to the \textbf{audio}
+  entry type to help it cope with the presentation of podcasts, which
+  are new to the 17th edition.  Please see the documentation of the
+  entry type in sections~\ref{sec:entrytypes} and
+  \ref{sec:types:authdate}, above.
+\item I have added the \textsf{origdate}, \textsf{eventdate},
+  \textsf{userd}, and \textsf{howpublished} fields to the
+  \textbf{artwork} and \textbf{image} entry types, in response to
+  additional information given in some of the \emph{Manual's}
+  examples.  Please see the documentation of \textbf{artwork} in
+  sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}, above.
+\item I have added the \textsf{maintitle}, \textsf{mainsubtitle}, and
+  \textsf{maintitleaddon} fields to the \textbf{article},
+  \textbf{periodical}, and \textbf{review} entry types, where it
+  (they) will hold the the name of any larger (usually periodical)
+  publication of which a blog is a part.  This departs from standard
+  \textsf{biblatex} usage, but the need for two italicized titles
+  demanded something like it.
+\item I have added a new field-exclusion option,
+  \mycolor{\texttt{urlstamp}}, set to \texttt{true} by default, which
+  means that any time stamp associated with the \textsf{urldate} will
+  always be printed.  You can set it to \texttt{false} in the preamble
+  either for the whole document or for specific entry types, or in the
+  \textsf{options} field of individual entries.  See the docs in
+  sections~\ref{sec:chicpreset} and \ref{sec:authpreset}, above.
+\item The \textsf{howpublished} field has accumulated a series of new
+  functions in various entry types, bringing it far from its origins
+  in \textsf{booklet}, \textsf{misc}, and \textsf{unpublished}
+  entries.  Please see its documentation in
+  sections~\ref{sec:entryfields} and \ref{sec:fields:authdate}.
+\item In \textsf{inreference}, \textsf{mvreference}, and
+  \textsf{reference} entries \textsf{biblatex-chicago} no longer
+  considers any of the name fields (\textsf{author}, \textsf{editor},
+  etc.) for sorting purposes in the bibliography or reference list,
+  thus leaving the \textsf{title} as the first field to be considered.
+  This may simplify the creation of .bib database entries.
+\end{itemize}
+
+New notes \&\ bibliography features:
+\begin{itemize}
+\item In keeping with indications in the 17th edition of the
+  \emph{Manual}, I have provided a means for altering the syntax when
+  presenting multi-volume works, i.e., for presenting the title of the
+  whole series (\textsf{maintitle}) \emph{before} the title of
+  individual volumes of that series (\textsf{title} or
+  \textsf{booktitle}).  This involves the use of the new
+  \textsf{relatedtypes} \mycolor{\texttt{maintitle}} and
+  \mycolor{\texttt{maintitlenc}}, which may be used in
+  \textsf{bookinbook}, \textsf{inbook}, \textsf{incollection},
+  \textsf{inproceedings}, \textsf{letter}, \textsf{mvbook},
+  \textsf{mvcollection}, \textsf{mvproceedings}, and
+  \textsf{mvreference} entries.  Please see the detailed documentation
+  of this feature in section~\ref{sec:related}, s.v.\
+  \textsf{relatedtype} \mycolor{\texttt{maintitle}}.
+\item I have implemented a new system of back references from short
+  notes to long notes to help readers find fuller information about a
+  source more quickly and conveniently, as envisaged by the
+  \textsf{Manual}.  The feature is enabled with the
+  \mycolor{\texttt{noteref}} option, and there are several sub-options
+  to control where and what is printed:
+  \mycolor{\texttt{fullnoterefs}}, \mycolor{\texttt{noterefinterval}},
+  \mycolor{\texttt{noterefintro}}, \mycolor{\texttt{pagezeros}},
+  \mycolor{\texttt{hidezeros}}, and \mycolor{\texttt{endnotesplit}}.
+  The dependent package \mycolor{\textsf{cmsendnotes.sty}} can assist
+  if you use endnotes instead of footnotes in this context.  It too
+  has numerous options: \mycolor{\texttt{hyper}},
+  \mycolor{\texttt{enotelinks}}, \mycolor{\texttt{noheader}},
+  \mycolor{\texttt{blocknotes}}, \mycolor{\texttt{split}},
+  \mycolor{\texttt{subheadername}}, \mycolor{\texttt{headername}},
+  \mycolor{\texttt{runningname}}, and \mycolor{\texttt{nosubheader}},
+  alongside the new commands \mycolor{\cmd{theendnotesbypart}} and
+  \mycolor{\cmd{cmsintrosection}}.  Four new citation commands
+  complete the provisions: \mycolor{\cmd{shortrefcite}},
+  \mycolor{\cmd{shorthandrefcite}}, \mycolor{\cmd{shortcite*}}, and
+  \mycolor{\cmd{shorthandcite*}}.  Please see
+  section~\ref{sec:noteref} for all the details, and also
+  \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}} for
+  a brief example and explanation of some of the functionality.
+\item I have ported, with modifications, the author-date package
+  option \mycolor{\texttt{nodates}} to the notes \&\ bibliography
+  style.  It is set to \texttt{true} by default.  In conjunction with
+  the \mycolor{\texttt{nodatebrackets}} and
+  \mycolor{\texttt{noyearbrackets}} options it provides an alternative
+  presentation of uncertain dates.  See section~\ref{sec:chicpreset}.
+\item Pursuant to a bug report by David Purton, I have recoded the
+  various \cmd{headlesscite} commands and included a new one,
+  \mycolor{\cmd{Headlesscite}}, which is the actually functional way
+  to enforce capitalization at the start of such a citation, should
+  you need to do so.
+\end{itemize}
+
+New author-date features:
+\begin{itemize}
+\item The \mycolor{\textbf{verbc}} field, which is standard but unused
+  in the styles included in \textsf{biblatex}, allows the user
+  fine-grained control over if and when an \textsf{extradate} letter
+  (1976\textbf{a}) will appear after the year in citations and the
+  list of references.  See its documentation in
+  section~\ref{sec:fields:authdate}.
+\item The new \mycolor{\texttt{authortitle}} type and entry option
+  allows you to provide author-title citations in the text instead of
+  author-date.  The \textsf{entrysubtype} value \texttt{classical}
+  does the same, but there may be cases where using such an
+  \textsf{entrysubtype} is impossible.  This is set to \texttt{true}
+  by default for \mycolor{\textbf{dataset}} entries.
+\item On the same subject, you can also use the new citation commands
+  \mycolor{\cmd{atcite}} and \mycolor{\cmd{atpcite}} to achieve the
+  same end.  The former prints a plain citation, the latter places it
+  in parentheses.
+\item In the default configuration, when you use a \textsf{shorthand}
+  field the style will now sort properly by that field, which is the
+  first thing to appear in reference list entries.  If you set
+  \texttt{cmslos=false} in your preamble then this no longer applies,
+  as the \textsf{shorthand} no longer appears in the reference list.
+\end{itemize}
+
+Note on the 16th-edition files:
+\begin{itemize}
+\item These have been updated for compatibility with the latest
+  \textsf{biblatex} and \textsf{biber}, and there are also a number of
+  bug fixes included, many of them already mentioned in changelog
+  items above.  The \mycolor{\texttt{compressyears}} option is
+  available and turned on by default, and so is the
+  \mycolor{\texttt{dashed}} option.  Most of the new
+  \textsc{iso}8601-2 Extended Format date specifications are
+  available, also, though time stamps won't be printed, as that
+  edition of the \emph{Manual} is mostly silent about them.
+\end{itemize}
+
+\textbf{1.0rc5: Released January 16, 2018}
 
-\mylittlespace Obsolete and Deprecated Features:\label{deprec:obsol}
 \begin{itemize}
 \item As Nikola Le\v{c}i\'c spotted, recent releases of
   \textsf{biblatex} have introduced some compatibility problems for
@@ -12288,7 +16068,7 @@ Other New Features:
   there's a \textsf{date} or not.  Cf.\
   section~\ref{sec:authuseropts}, above.
 \item Bertold Schweitzer requested that the styles allow using the
-  string \texttt{forth\-coming} in the \textsf{pubstate} field to
+  string \texttt{forthcoming} in the \textsf{pubstate} field to
   present sources that are yet to be published.  This is now supported
   in all styles, and has the additional benefit of rendering recourse
   to the \cmd{autocap} command unnecessary, as the styles print
@@ -12300,7 +16080,7 @@ Other New Features:
   \texttt{magazine} in the \textsf{entrysubtype} field of
   \textsf{article}, \textsf{review}, \textsf{periodical}, and
   \textsf{suppperiodical} entries.  I have provided this in all
-  styles, and whereever you see \texttt{magazine} in this
+  styles, and wherever you see \texttt{magazine} in this
   documentation then \texttt{newspaper} will work in exactly the same
   way.
 \item Bertold also suggested that, following the example of Philip
@@ -12352,7 +16132,7 @@ Other New Features:
   bug when presenting a \textsf{subtitle} after a \textsf{title} that
   ends in an exclamation point or question mark.  This bug has existed
   since the first release of the 16th-edition styles, and I think I've
-  finally solved it now after the release of the \emph{Manual's }17th
+  finally solved it now after the release of the \emph{Manual's} 17th
   edition.  (Cf.\ batson.)
 \end{itemize}
 
@@ -12808,7 +16588,6 @@ Other New Features:
   of your document to redefine the new \mycolor{\cmd{foottextcite}}
   and \mycolor{\cmd{foottextcites}} commands to change this
   formatting.  See section~\ref{sec:formatcommands}, above.
-%\enlargethispage{\baselineskip}
 \item This release includes support, in all styles, for
   \textsf{biblatex's} multi-volume entry types: \textbf{mvbook},
   \textbf{mvcollection}, \textbf{mvproceedings}, and
@@ -13036,8 +16815,6 @@ Other New Features:
   \textsf{postnote} field, then only that will appear.
 \end{itemize}
 
-%%\enlargethispage{-2\baselineskip}
-
 \textbf{0.9.9a: Released July 30, 2012}
 \begin{itemize}
 \item I have made a few changes to \textsf{biblatex-chicago.sty} to
@@ -13290,7 +17067,7 @@ Other New Features:
   you want to cite a comment to a blog or to other online material,
   the \textbf{review} entry type, \textsf{entrysubtype}
   \texttt{magazine} will serve.  The \textbf{eventdate} dates the
-  comment, and any timestamp that is required can go in
+  comment, and any time stamp that is required can go in
   \textsf{nameaddon}.  These instructions work in both specifications.
 \item Photographs are no longer presented differently from other sorts
   of artworks so, in effect, in both styles, the \textbf{image} type
@@ -13587,8 +17364,6 @@ Other New Features:
   me know if I'm wrong.
 \end{itemize}
 
-%\vspace{2\baselineskip}
-
 Other New Features:
 \begin{itemize}
 \item The Chicago author-date style is now implemented in the
@@ -13803,8 +17578,6 @@ Other New Features:
   field if you would like to test this functionality.
 \end{itemize}
 
-%%\enlargethispage{-3\baselineskip}
-
 \textbf{0.8.9a: Released July 5, 2009}
 \begin{itemize}
 \item Slight changes for compatibility with \textsf{biblatex} 0.8e.
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 b662e9ef265..0f148984f09 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 955b989e6a2..8473abe4585 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
@@ -8,7 +8,7 @@
 %\usepackage[document]{ragged2e}
 \usepackage[authordate,backend=biber,autolang=none,booklongxref=false,%
 bibencoding=latin1,postnotepunct,compresspages,strict,%
-annotation]{biblatex-chicago}
+annotation,cmsbreakurl]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
 \usepackage{lmodern}
@@ -18,36 +18,52 @@ annotation]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{13pt}
-\usepackage{url}
-\urlstyle{rm}
+% \usepackage{url}
+% \urlstyle{rm}
+\usepackage{multicol}
 \appto\bibsetup{\sloppy}
 \hyphenation{evans-ton clem-ens mc-hugh}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
+\setcounter{secnumdepth}{-1}
 \providecommand{\theendnote}{}
-\protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
+\protected\def\onethird{\mbox{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{xr-hyper}
-\externaldocument[cms-]{../../Docs/biblatex-chicago}%
+\externaldocument[cms-]{biblatex-chicago}%
 \externaldocument[trad-]{cms-trad-appendix}
 \usepackage[pdftex,hyperref,svgnames]{xcolor}
 \usepackage[pdftex,colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
 plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey,filecolor=Teal,
 baseurl=biblatex-chicago.pdf\#]{hyperref}
+\makeatletter
+\renewcommand{\section}{\@startsection{section}{1}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\large\bfseries}}
+\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\normalsize\bfseries}}
+\makeatother
 \usepackage{cmsdocs}
 \bibliography{dates-test}
 %%\onehalfspacing
 %\tracingstats=2
 \begin{document}
 
-\section*{The Chicago Author-Date Specification}
-\label{sec:spec}
-
+{\Large\bfseries The Chicago Author-Date Specification}
+\vspace*{1.5ex}
+\begin{multicols}{2}
+  \renewcommand{\contentsname}{\textcolor{darkgray}{Contents}}
+  \footnotesize
+  \tableofcontents
+\end{multicols}
 This file is intended as a brief introduction to the Chicago
-author-date specification (16th ed.) \autocite{chicago:manual} as
+author-date specification (17th ed.) \autocite{chicago:manual} as
 implemented by \textsf{biblatex-chicago}, and falls somewhere in
 between the \enquote{Quickstart} section of
 \textsf{biblatex-chicago.pdf} and the full documentation as presented
@@ -65,43 +81,44 @@ notes should take you to the other document.  If you can't find
 answers there, please write to me at the email address in
 \textsf{biblatex-chicago.pdf}.
 
-\subsection*{Important Note}
+\section{Important note: \textsf{biber}}
 \label{bibernote}
 
 Starting with \textsf{biblatex} version 1.5, in order to adhere to the
-author-date specification you will need to use \textsf{Biber} to
+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.10) and \textsf{biblatex} (3.10), which contain
+\textsf{biber} (2.14) and \textsf{biblatex} (3.14), 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
+follows in this document assumes that you are using \textsf{biber}; if
 you wish to continue using \textsc{Bib}\TeX\ then you need
 \textsf{biblatex} version 1.4c and \textsf{biblatex-chicago} 0.9.7a.
 
-\subsection*{Editions}
+\section{Editions}
 \label{editions}
 
-The 16th edition of \emph{The Chicago Manual of Style} implements
-significant changes to what the author-date specification has,
-historically, recommended, and there are certain to be users who
-prefer the older format with titles capitalized sentence-style and
-not, in the case of most un-book-like entries, enclosed in quotation
-marks.  For such users, the \textsf{authordate-trad} style, as
-envisaged by the \textcite[15.45]{chicago:manual}, grafts the
-traditional Chicago author-date title formatting onto the current
-recommendations for the remainder of the reference apparatus.  Please
-consult
+The 17th edition of \emph{The Chicago Manual of Style} makes fairly
+numerous changes to the author-date specification, but many of them
+required changes to package code rather than to current .bib
+databases.  I have \cmssecref{cms-deprec:obsol} listed elsewhere those
+changes that might require attention to your databases, but much of
+what follows will involve additions rather than alterations.  This is
+true no matter which of the two author-date styles you are using,
+\textsf{authordate} or \textsf{authordate-trad}, the latter of which
+differs only in the treatment of titles, maintaining the formatting
+that was traditional in the \emph{CMS} up to the 15th edition where
+many were capitalized sentence-style and those in most un-book-like
+entries appeared without quotation marks
+\autocite[15.38]{chicago:manual}.  Please consult
 \href{file:cms-trad-appendix.pdf}{\textsf{cms-trad-appendix.pdf}} for
 notes on the few .bib entries from this introduction that would
 require modification for the \texttt{trad} style; for the remainder,
 you'll notice a few extra sets of curly braces in various
 \textsf{title} fields to make the entry usable in both author-date
-styles.  I have removed the 15th-edition styles from the package to
-prepare for the appearance of the new 17th-edition styles, which will
-be the focus of my attention, after this last 16th-edition release.
+styles.
 
-\subsection*{Usage}
+\section{Basic usage: the \cmd{autocite} command}
 \label{usage}
 
 As a general rule, you'll probably want to use the \cmd{autocite}
@@ -112,7 +129,7 @@ exactly as you expect it to be.  A few examples:
 should also appear as you expect: \autocite[338]{batson};
 \autocite[79]{beattie:crime}; \autocite[36]{boxer:china}.
 
-\subsection*{Repeated citations}
+\section{Repeated citations}
 \label{sec:ibidem}
 
 Repeated citations are somewhat complicated.  The Chicago author-date
@@ -121,7 +138,7 @@ citation on the same page will print only the page reference:
 \autocite{browning:aurora}; \autocite[45]{browning:aurora}.
 Technically, this should only occur when a source is cited
 \enquote{more than once in one paragraph}
-\autocite[15.26]{chicago:manual}, so you can use the \cmd{citereset}
+\autocite[15.27]{chicago:manual}, so you can use the \cmd{citereset}
 command from \textsf{biblatex} to achieve the greatest compliance, as
 the package only offers automatic resetting on part, chapter, section,
 and subsection boundaries, while \textsf{biblatex-chicago}
@@ -136,7 +153,7 @@ If you don't need to cite a specific page, then it may be better, or
 at least more concise, only to use one citation command rather than
 two.
 
-\subsection*{Other citation commands}
+\section{Other citation commands}
 \label{sec:other}
 
 The other \cmssecref{cms-sec:cite:authordate} citation commands from
@@ -157,40 +174,38 @@ author with postnotes: \autocites{pirumova}[14]{pirumova:russian};
 \cmd{textcites} by the same author with postnotes:
 \textcites[37]{pirumova}{pirumova:russian}.
 
-\textsf{Biblatex-chicago} now also provides a \cmd{gentextcite}
-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:
+\textsf{Biblatex-chicago} also provides a \cmd{gentextcite} 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{gentextcites} command, modified thus:
 \cmd{gentextcites[<ending>]()()[][]\{key1\}\{key2\}}.
 
-\subsection*{Shorthands}
+\section{Shorthands}
 \label{sec:shorthands}
 
 Chicago's author-date style
-\cmssecref[shorthand]{cms-sec:ad:shorthand} only seems to recommend
+\cmssecref[shorthand]{cms-sec:ad:shorthand} seems only to recommend
 the use of shorthands as abbreviations for long authors' names,
-particularly institutional names \autocite[15.36]{chicago:manual}.  By
+particularly institutional names \autocite[15.37]{chicago:manual}.  By
 default, I have followed this recommendation: \cmd{autocites}:
 \autocites{bsi:abbreviation}{iso:electrodoc}; \cmd{textcites}:
 \textcites{bsi:abbreviation}{iso:electrodoc}.  This \textsf{shorthand}
 will by default appear at the head of the entry in the list of
 references, followed by the parenthesized expansion of the shorthand,
-taken from the \textsf{author} field.  (This is a change from the 15th
-edition.)  You will usually also need a \textsf{sortkey} field to make
-sure that the entry is alphabetized by the \textsf{shorthand} rather
-than by the \textsf{title}.  If you use a
-\cmd{printbiblist\{shorthand\}} command, the list of shorthands will
-still be printed, so you now have a variety of options available for
-presenting the expansions depending on your specific requirements.
-Please note, also, that you can get back something approaching the
-\enquote{standard} behavior of shorthands if you give the
-\texttt{cmslos=false} option to \textsf{biblatex-chicago} in your
+taken from the \textsf{author} (or possibly the \textsf{organization})
+field.  The entry will be alphabetized by the \textsf{shorthand}.  If
+you use a \cmd{printbiblist\{shorthand\}} command, the list of
+shorthands will still be printed, so you now have a variety of options
+available for presenting the expansions depending on your specific
+requirements.  Please note, also, that you can get back something
+approaching the \enquote{standard} behavior of shorthands if you give
+the \texttt{cmslos=false} option to \textsf{biblatex-chicago} in your
 document preamble.
 
-\subsection*{Mildly problematic entries}
+\section{Mildly problematic entries: authors and dates}
 \label{sec:problematic}
 
 In most \cmssecref[author]{cms-sec:ad:author} entries, the absence of
@@ -200,56 +215,65 @@ anonymous work's author is known or can be guessed:
 \autocite{horsley:prosodies}; \autocite{cook:sotweed}.  Alternatively,
 in some cases the \textsf{title} may appear in place of the
 \textsf{author}: \autocite{anon:stanze};
-\autocite{virginia:plantation}.  The 16th edition is less than
-enthusiastic about the use of \enquote{\texttt{Anon.}}\ as author.
+\autocite{virginia:plantation}.  Recent editions are less than
+enthusiastic about the use of \enquote{\texttt{Anon.}}\ as author,
+unless the title page of the work explicitly so attributes it.
 
 By default, in most \cmssecref[date]{cms-sec:ad:date} entry types, an
-absent \textsf{date} will automatically provoke \textsf{Biber} into
+absent \textsf{date} will automatically provoke \textsf{biber} into
 searching for other sorts of dates in the entry, in the order
-\textsf{year, eventyear, origyear, urlyear}: e.g.,
-\autocite{evanston:library}, which only has a \textsf{urlyear}.  In
-three entry types --- \textsf{Music}, \textsf{Review}, and
-\textsf{Video} --- this search order is \textsf{eventyear, origyear,
-  year, urlyear}, as in these types the earliest year should take
-precedence (cf.\ page~\pageref{sec:audiovisual}, below).  You can also
-change the default search order, for all but the three types just
-mentioned, by using the \texttt{cmsdate} option in the preamble of
-your document, instead of (or in addition to) using it in the
-\textsf{options} field of individual entries.  Setting that option in
-the preamble either to \enquote{\texttt{both}} or
-\enquote{\texttt{on}} makes the document-wide search order:
-\textsf{origyear, year, eventyear, urlyear}.  This may be useful for
-documents that contain many entries with multiple dates, and where you
-want \emph{always} to present the earlier (i.e., \textsf{orig}) dates
-at the head of reference list entries and in citations.  You can
-eliminate some of these dates from the running, or change the search
-order, using the \cmd{DeclareLabeldate} command in your preamble, but
-please be aware that I have hard-coded the possibilities above into
-the author-date style in order to cope with some tricky corners of the
-specification.  If you reorder these dates, and your references enter
-these tricky corners, the results might be surprising.  (Cf.\
-section~4.5.8 in \textsf{biblatex.pdf}.)
+\textsf{date, eventdate, origdate, urldate}: e.g.,
+\autocite{wikiped:bibtex}, which only has a \textsf{urldate}.  In
+five entry types --- \textsf{Music}, \textsf{Review},
+\textsf{Standard}, \textsf{SuppPeriodical}, and \textsf{Video} ---
+this search order is \textsf{eventdate, origdate, date, urldate}, as
+in these types the earliest date should take precedence (cf.\
+page~\pageref{sec:audiovisual}, below).  You can also change the
+default search order, for all but the three types just mentioned, by
+using the \texttt{cmsdate} option in the preamble of your document,
+instead of (or in addition to) using it in the \textsf{options} field
+of individual entries.  Setting that option in the preamble either to
+\enquote{\texttt{both}} or \enquote{\texttt{on}} makes the
+document-wide search order: \textsf{origyear, year, eventyear,
+  urlyear}.  This may be useful for documents that contain many
+entries with multiple dates, and where you want \emph{always} to
+present the earlier (i.e., \textsf{orig}) dates at the head of
+reference list entries and in citations.  You can eliminate some of
+these dates from the running, or change the search order, using the
+\cmd{DeclareLabeldate} command in your preamble, but please be aware
+that I have hard-coded the possibilities above into the author-date
+style in order to cope with some tricky corners of the specification.
+If you reorder these dates, and your references enter these tricky
+corners, the results might be surprising.  (Cf.\ section~4.5.8 in
+\textsf{biblatex.pdf}.)
 
-In most entry types, the absence of all four possible dates will
-automatically produce \mbox{\enquote{\texttt{n.d.}\hspace{-2pt}}}
-instead: \autocite{bernstein:shostakovich}.  You can also give it
-yourself in the form \cmd{bibstring\{nodate\}}:
-\autocite{ross:thesis}.  A date that can be guessed should appear
-within square brackets: \autocite{clark:mesopot}.  You can handle
-forthcoming works in one of two ways: either by using the
-\cmd{autocap} macro and the \textsf{year} (instead of the
-\textsf{date}) field, or by placing the exact string
-\texttt{forthcoming} in the \textsf{pubstate} field.  Either way the
-word will appear, correctly capitalized, in both citations and the
-list of references: \autocite{author:forthcoming};
+In all entry types except for \textsf{Misc}, the absence of all four
+possible dates will automatically produce
+\mbox{\enquote{\texttt{n.d.}\hspace{-2pt}}} instead:
+\autocite{bernstein:shostakovich}.  You will see this same string in
+entries that only contain a \textsf{urldate}, where that date is an
+access date as opposed to, e.g., a revision date provided by the URL
+itself, that is, where no \textsf{userd} field has been provided to
+change the default string before the date:
+\autocite{evanston:library}.  You can also provide
+\cmd{bibstring\{nodate\}} yourself in a \textsf{year} field:
+\autocite{ross:thesis}.  Uncertain dates or date ranges like decades
+and centuries can now be presented using \textsf{biblatex's}
+\textsc{iso}8601-2 Extended \cmstabref{cms-ad:date:extras} Format
+specification: \autocite{clark:mesopot}.  You can handle forthcoming
+works in one of two ways: either by using the \cmd{autocap} macro and
+the \textsf{year} (instead of the \textsf{date}) field, or by placing
+the exact string \texttt{forthcoming} in the \textsf{pubstate} field.
+Either way the word will appear, correctly capitalized, in both
+citations and the list of references: \autocite{author:forthcoming};
 \autocite{contrib:contrib}.
 
-The 16th edition of the \emph{Manual} has changed the rules for
-entries with more than one date \autocite[15.38]{chicago:manual}.
-First, \textsf{Music}, \textsf{Review}, and \textsf{Video} entries
-have their own rules, which are applied automatically.  (Once again,
-see page~\pageref{sec:audiovisual}, below.)  For other entry types,
-there are two options, corresponding to two different states of the
+The rules for entries with more than one date remain unchanged from
+the previous edition \autocite[15.40]{chicago:manual}.  First,
+\textsf{Music}, \textsf{Review}, and \textsf{Video} entries have their
+own rules, which are applied automatically.  (Once again, see
+page~\pageref{sec:audiovisual}, below.)  For other entry types, there
+are two options, corresponding to two different states of the
 \texttt{cmsdate} entry (or preamble) option.  The default is
 \texttt{cmsdate=off}: \autocite{maitland:equity}.  Here, setting the
 \textsf{pubstate} field to \texttt{reprint} ensures that a notice of
@@ -265,29 +289,34 @@ range of difficult cases.  Please see the next section below, and also
 the following entries in \textsf{dates-test.bib}:
 \autocites{schweitzer:bach}{white:russ}{white:ross:memo}.
 
-\subsection*{Corners of the specification}
+\section{Corners of the specification}
 \label{sec:corners}
 
-In some cases, the \emph{Manual} isn't altogether clear about how to
-present entries in the author-date style.  By following up on
-suggestions from the notes \&\ bibliography style, one can be
-reasonably certain about most of what follows, but if you interpret
-the specification differently please let me know.
+The \emph{Manual} has clarified many parts of the author-date
+specification, and by following up on suggestions from the notes \&\
+bibliography style one can be reasonably certain about many other
+details, but if you interpret the specification differently please let
+me know.
 
-\subsubsection*{InReference entries}
+\subsection{InReference entries}
 \label{sec:inref}
 
 These present \cmssecref[inreference]{cms-sec:ad:inreference} several
 peculiarities: the title of the work should always take the place of
-any author, no \enquote{\texttt{n.d.}\hspace{-2pt}} will automatically
-be provided, and any postnote field will be enclosed in quotation
+any author, citations of non-online sources should include a
+publication date, and any postnote field will be enclosed in quotation
 marks preceded by \enquote{\texttt{s.v.}\hspace{-2pt}} for
 \enquote{\emph{sub verbo}.}  This allows you to refer to alphabetized
 articles in well-known reference works: \autocite[Hume,
 David]{ency:britannica}; \autocite[Sibelius, Jean]{grove:sibelius};
-\autocite[BibTeX]{wikiped:bibtex}.
+\autocite[BibTeX]{wikiped:bibtex}.  As this last example shows, you
+can also put anything at all into the \textsf{entrysubtype} field to
+present, at your discretion, an online reference work more like an
+\textsf{Online} entry, that is, with a \textsf{title} in roman rather
+than italics.
 
-\subsubsection*{Author-less Article, Review, and Manual entries}
+\subsection{Author-less Article, Review, Manual and Standard
+  entries}
 \label{sec:authless:art}
 
 In \textsf{Article} and \textsf{Review} entries
@@ -298,35 +327,34 @@ of the entry in the list of references: \autocite{gourmet:052006}.
 (Without the entrysubtype, you'll get the \textsf{title} at the head
 rather than the \textsf{journaltitle}.)  You can cite newspaper and
 magazine articles entirely within the text, i.e., without them
-appearing in the reference list \autocite[15.47]{chicago:manual}, if
+appearing in the reference list \autocite[15.49]{chicago:manual}, if
 you set the \texttt{cmsdate=full} entry option:
 \autocite{lakeforester:pushcarts}; \autocite{nyt:trevorobit}.  In
-\textsf{Manual} entries, the \textsf{organization} field does the
-same: \autocite{dyna:browser}.  If you wish to present an abbreviated
-form of the organization name in citations only, then the
-\textsf{shortauthor} field --- or in other cases the
-\textsf{shorthand} field --- is the place for it:
-\autocite{bsi:abbreviation}.  For abbreviated \textsf{journaltitles},
-you can use \textsf{shortjournal}, which also allows you, should you
-wish, to provide a list of abbreviated journal names with their
-expansions using \cmd{printbiblist\{shortjournal\}}:
-\autocite{unsigned:ranke}.
+\textsf{Manual} and \textsf{Standard} entries, the
+\textsf{organization} field does the same: \autocite{dyna:browser}.
+If you wish to present an abbreviated form of the organization name in
+citations only, then the \textsf{shortauthor} field --- or in other
+cases the \textsf{shorthand} field --- is the place for it:
+\autocite{niso:bibref}.  For abbreviated \textsf{journaltitles}, you
+can use \textsf{shortjournal}, which also allows you, should you wish,
+to provide a list of abbreviated journal names with their expansions
+using \cmd{printbiblist\{shortjournal\}}: \autocite{unsigned:ranke}.
+
+% \enlargethispage{-\baselineskip}
 
-\subsubsection*{Misc entries with an entrysubtype}
+\subsection{Misc entries with an entrysubtype}
 \label{sec:misc}
 
-When \cmssecref[misc]{cms-sec:ad:misc} citing individual letter-like
-pieces from an unpublished archive where only an \textsf{origdate} is
-present, you no longer need to set the \texttt{cmsdate} option in your
-.bib entry, as \textsf{Biber} and \textsf{biblatex-chicago} now handle
-this automatically: \autocite{creel:house}.  Non-letters, e.g.,
-interviews, use the \textsf{date} field, so you don't need
-\texttt{cmsdate} there, either: \autocite{spock:interview}.  For
-undated pieces you can put \cmd{bibstring\{nodate\}} in the
-\textsf{year} field: \autocite{dinkel:agassiz}.  For citing whole
-collections, see the next section.
+When citing individual pieces from unpublished archives,
+\cmssecref[misc]{cms-sec:ad:misc} letter-like sources will generally
+only have an \textsf{origdate} \autocite{creel:house}, while
+non-letters, e.g., interviews, use the \textsf{date} field:
+\autocite{spock:interview}.  For undated pieces you can put
+\cmd{bibstring\{nodate\}} in the \textsf{year} field:
+\autocite{dinkel:agassiz}.  For citing whole collections, see the next
+section.
 
-\subsubsection*{entrysubtype = \{classical\}}
+\subsection{entrysubtype = \{classical\}}
 \label{sec:classical}
 
 This option's \cmssecref[entrysubtype]{cms-sec:ad:entrysubtype} name
@@ -334,13 +362,12 @@ derives from its use for citing texts from classical antiquity, though
 in the author-date style especially it can be put to use in several
 other contexts.  In a nutshell, any entry with such an
 \textsf{entrysubtype} will be treated, in citations only, not as
-author-date but as author-title.  (Entries in the list of references,
-e.g., a particular edition of Aristotle, will still appear in standard
-author-date format.)  A \cmd{cite*} or \cmd{autocite*} command will,
-in such a case, produce the title rather than the year.  Some examples
-should make this clearer:
-
-%\enlargethispage{-\baselineskip}
+author-date but as author-title, and will also have modified
+punctuation before \textsf{postnote} fields.  (Entries in the list of
+references, e.g., a particular edition of Aristotle, will still appear
+in standard author-date format.)  A \cmd{cite*} or \cmd{autocite*}
+command will, in such a case, produce the title rather than the year.
+Some examples should make this clearer:
 
 Classical works: without abbreviation:
 \autocite{aristotle:metaphy:trans}; with abbreviation:
@@ -355,14 +382,50 @@ Sacred works, e.g., the Bible and the Qur'an:
 
 An unpublished archive, from which more than one work has been cited:
 \autocite[file 12]{house:papers}.  (Both this and the previous example
-use a Misc entry with \texttt{classical} \textsf{entrysubtype}.)
+use a \textsf{Misc} entry with \texttt{classical}
+\textsf{entrysubtype}.)
+
+Similarly, scientific \cmssecref[dataset]{cms-sec:types:authdate}
+databases use the specialized \textsf{Dataset} entry type, and will
+generally only have an online access date (\textsf{urldate}), so by
+default I set \texttt{authortitle=true} for this type, instead of
+using an \textsf{entrysubtype}, to provide author-title citations:
+\autocite{nasa:db}.
 
-\subsubsection*{Comments inside citations}
+\subsection{Online sources}
+\label{sec:online}
+
+The 17th edition of the \emph{CMS} has greatly enhanced its treatment
+of online materials, including blogs, social media, podcasts, and
+scientific databases.  Table~2 in \textsf{biblatex-chicago.pdf}
+\cmstabref{cms-tab:online:adtypes} summarizes the specification for
+you, and there are examples scattered throughout this introduction.
+The presentation of online comments (on blogs or social media posts)
+warrants extra attention.  As a rule, such material need be presented
+only in the text, rather than in the reference list.  You could simply
+provide it there by hand, or perhaps as a comment to a citation of the
+main blog or post, using the techniques described in the next section.
+The \texttt{commenton} \textsf{relatedtype}
+\cmssecref{cms-sec:authrelated} allows you to gather all such
+references in your .bib file, and attempts to automate as far as
+possible the presentation of those references in your document.  In
+short, the comment \cmslink{ac:comment} with the \texttt{commenton}
+\textsf{relatedtype} can be cited as part of a multicite command like
+so: \verb+\autocites{ac:comment}{ellis:blog-customc}+, yielding
+\autocites{ac:comment}{ellis:blog-customc}.  The second key given to
+the \cmd{autocites} command is a virtual entry, created by
+\textsf{biber} in the document .bbl file, and reachable by combining
+the key in the \textsf{related} field with the suffix
+\texttt{-customc}.  You can, of course, arrange for comments to appear
+in the reference list, either using \texttt{commenton} or a more
+handcrafted solution, e.g., \autocite{viv:amlen}.
+
+\subsection{Comments inside citations}
 \label{sec:comments}
 
 If you wish to include a comment inside the parentheses of a citation,
 it will need to be separated by a semicolon
-\autocite[15.23]{chicago:manual}.  If you have a \textsf{postnote},
+\autocite[15.24]{chicago:manual}.  If you have a \textsf{postnote},
 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 have two choices.  You can enable the
@@ -376,7 +439,7 @@ containing just the text of the comment in the \textsf{title} field,
 text and the comment will then do the trick, e.g.,
 \autocites{chicago:manual}{chicago:comment}.
 
-\subsubsection*{Multiple authors}
+\subsection{Multiple authors}
 \label{sec:multiple}
 
 The default settings in \textsf{biblatex-chicago} are
@@ -391,8 +454,8 @@ Chicago author-date specification.  However, if \enquote{a reference
   list includes another work \emph{of the same date} that would also
   be abbreviated as [\enquote{Hlatky et al.}] but whose coauthors are
   different persons or listed in a different order, the text citations
-  must distinguish between them} \autocite[15.28]{chicago:manual}.
-The (\textsf{Biber}-only) \textsf{biblatex} option
+  must distinguish between them} \autocite[15.29]{chicago:manual}.
+The (\textsf{biber}-only) \textsf{biblatex} option
 \texttt{uniquelist}, set for you in \textsf{biblatex-chicago.sty},
 will automatically handle many of these situations for you, but it is
 as well to understand that it does so by temporarily suspending the
@@ -418,35 +481,32 @@ references.  This would produce (Hlatky et al., \enquote{Quality of
 2002), as the spec recommends.  There is, unfortunately, no simpler
 way that I know of to deal with this situation.
 
-\subsubsection*{Audiovisual entries}
+\subsection{Audiovisual entries}
 \label{sec:audiovisual}
 
-According \cmssecref{cms-sec:ad:avdate} to the \emph{Manual},
-\enquote{Chicago recommends a more comprehensive approach to dating
-  audiovisual materials than in previous editions.}  This means, for
-instance, that, even when consulting a digital copy, \enquote{it is
-  generally useful to give information about the original source.}
-Also, \enquote{the date of the original recording should be privileged
-  in the citation} \autocite[15.53]{chicago:manual}.  The rather more
-book-like entries are generally unaffected by these changes, so
-published (\textsf{Audio}) and unpublished (\textsf{Misc}) scores are
-no problem at all: \autocite{schubert:muellerin};
-\autocite{verdi:corsaro}; \autocite{shapey:partita}.  The dating of
-online materials has been enhanced: \autocite{coolidge:speech};
-\autocite{horowitz:youtube}; \autocite{pollan:plant}.  The most
-significant changes, however, appear in \textsf{Music} and
-\textsf{Video} entries, where every effort should be made to find
-date(s) for sources: \autocite{auden:reading};
-\autocite{friends:leia}; \autocite{handel:messiah};
-\autocite{holiday:fool}; \autocite{nytrumpet:art}.  Others perhaps
-require further information in the entry or genuinely are better
-suited to presentation in running text: \autocite{beethoven:sonata29}.
-The standard \textsf{biblatex} tools for subdividing reference lists
-are all available if you want to follow the \emph{Manual's}
-recommendations on presenting this kind of material separately from
-other sources.
+The \emph{Manual} \cmssecref{cms-sec:ad:avdate} acknowledges that most
+audio-visual material will be cited via a digital copy, but suggests
+that \enquote{it is generally useful to give information about the
+  original source,} and also that \enquote{the date of the original
+  recording should be privileged in the citation}
+\autocite[15.57]{chicago:manual}.  The more book-like entries, like
+published (\textsf{Audio}) and unpublished (\textsf{Misc}) scores, are
+straightforward: \autocite{schubert:muellerin};
+\autocite{verdi:corsaro}; \autocite{shapey:partita}.  Efforts should
+be made to provide a date beyond the access date for online materials:
+\autocite{coolidge:speech}; \autocite{horowitz:youtube};
+\autocite{pollan:plant}.  So too for \textsf{Music} and \textsf{Video}
+entries, where recording or broadcast dates are generally preferred;
+\autocite{auden:reading}; \autocite{friends:leia};
+\autocite{handel:messiah}; \autocite{holiday:fool};
+\autocite{nytrumpet:art}.  Others perhaps require further information
+in the entry or genuinely are better suited to presentation in running
+text: \autocite{beethoven:sonata29}.  The standard \textsf{biblatex}
+tools for subdividing reference lists are all available if you want to
+follow the \emph{Manual's} recommendations on presenting this kind of
+material separately from other sources.
 
-\subsubsection*{Related entries}
+\subsection{Related entries}
 \label{sec:related}
 
 \textsf{Biblatex} provides \cmssecref{cms-sec:authrelated} a powerful
@@ -456,11 +516,11 @@ while \textsf{biblatex-chicago} offers both this functionality and
 some Chicago-specific variants which employ different means.  You can
 find a full discussion of this in \textsf{biblatex-chicago.pdf}, but a
 few of the entries already cited in this introduction show some of the
-possibilities: \autocite{aristotle:metaphy:trans};
-\autocite{coolidge:speech}; \autocite{emerson:nature};
-\autocite{schweitzer:bach}.
+possibilities: \autocites{ac:comment}{ellis:blog-customc};
+\autocite{aristotle:metaphy:trans}; \autocite{coolidge:speech};
+\autocite{emerson:nature}; \autocite{schweitzer:bach}.
 
-\subsection*{In conclusion}
+\section*{In conclusion}
 \label{sec:conclude}
 
 Allow me, finally, to emphasize just how multifarious are the sources
@@ -472,7 +532,7 @@ arbitrate all disputes.  If you see something in
 \textsf{biblatex-chicago} that looks wrong to you, or if the
 documentation has left you perplexed, please let me know.
 
-
+\nocite{amlen:hoot}
 \printbibliography[title=References]
 \setlength{\textheight}{10.5in}
 \twocolumn[\Large \texttt{The Database File}]
@@ -500,6 +560,16 @@ documentation has left you perplexed, please let me know.
 @String{uchp = {University of Chicago Press}}
 @String{oup = {Oxford University Press}}
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ac:comment]
+*\adlnbackref{Review}{ac:comment}[ellis:blog]*,
+  entrysubtype = {magazine},
+  author = 	 {AC},
+  eventdate = 	 {2008-07-01T10:18:00},
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{ellis:blog}{anchor}{}}{\{\colorbox{Gainsboro}{ellis:blog}\}}*},
+  relatedtype =  {commenton}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=adorno:benj]
 *\adlnbackref{Book}{adorno:benj}*,
   title = 	 {The Complete Correspondence, 1928--1940},
@@ -508,7 +578,21 @@ documentation has left you perplexed, please let me know.
   author = 	 {Adorno, Theodor~W. and Benjamin, Walter},
   editor = 	 {Lonitz, Henri},
   translator = 	 {Nicholas Walker},
-  location =  {Cambridge, MA}
+  location =     {Cambridge, MA}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=amlen:hoot]
+*\adlnbackref{Article}{amlen:hoot}*,
+  author = 	 {Amlen, Deb},
+  title = 	 {One Who Gives a Hoot},
+  journaltitle = {Wordplay},
+  entrysubtype = {magazine},
+  maintitle = 	 {New York Times},
+  location = 	 {blog},
+  date = 	 {2015-01-26},
+  url = 	 {http://wordplay.blogs
+      .nytimes.com/2015/01/26
+      /one-who-gives-a-hoot/}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=anon:stanze]
@@ -526,13 +610,13 @@ documentation has left you perplexed, please let me know.
   options = 	 {skipbib},
   entrysubtype = {classical},
   origdate = 	 1924,
-  date = 1997,
+  date =         1997,
   author = 	 {Aristotle},
   editor = 	 {Ross, W.~D.},
-  publisher = {Oxford Univ.\ Press and Sandpiper Books},
+  publisher =    {Oxford Univ.\ Press and Sandpiper Books},
   pubstate = 	 {reprint},
   volumes = 	 2,
-  location =  {Oxford}
+  location =     {Oxford}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=aristotle:metaphy:trans]
@@ -549,9 +633,9 @@ documentation has left you perplexed, please let me know.
 {aristotle:metaphy:gr}{anchor}{}}%
 {\{\colorbox{Gainsboro}{aristotle:metaphy:gr}\}}*},
   maintitle = 	 {The Works of {Aristotle}, Translated into {English}},
-  publisher = {Clarendon Press},
+  publisher =    {Clarendon Press},
   edition = 	 2,
-  location =  {Oxford}
+  location =     {Oxford}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=ashbrook:brain]
@@ -559,11 +643,10 @@ documentation has left you perplexed, please let me know.
   author = 	 {Ashbrook, James~B. and Albright, Carol Rausch},
   title = 	 {The Frontal Lobes, Intending, and a Purposeful God},
   booktitle = 	 {The Humanizing Brain},
-  publisher = {Pilgrim Press},
+  publisher =    {Pilgrim Press},
   year = 	 1997,
   chapter = 	 7,
-  location =  {Cleveland, OH},
-  shorttitle = {The Frontal Lobes}
+  location =     {Cleveland, OH}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=auden:reading]
@@ -592,9 +675,9 @@ documentation has left you perplexed, please let me know.
   subtitle = 	 {The Political Economy of Marketwomen in {Peru}},
   year = 	 1989,
   author = 	 {Babb, Florence},
-  publisher = {University of Texas Press},
+  publisher =    {University of Texas Press},
   edition = 	 {\bibstring{revisededition}},
-  location =  {Austin}
+  location =     {Austin}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=barcott:review]
@@ -678,7 +761,6 @@ documentation has left you perplexed, please let me know.
   title = 	 {Specification for Abbreviation of Title Words and Titles of Publications},
   date = 	 1985,
   organization = {British Standards Institute},
-  sortname = 	 {BSI},
   address = 	 {Linford Woods, Milton Keynes, UK},
   shorthand = 	 {BSI}
 }
@@ -705,12 +787,12 @@ documentation has left you perplexed, please let me know.
 \begin{lstlisting}[language=BibTeX,label=chicago:manual]
 *\adlnbackref{Book}{chicago:manual}*,
   title = 	 {The {Chicago} Manual of Style},
-  year = 	 2010,
+  year = 	 2017,
   author = 	 {{University of Chicago Press}},
   shortauthor =  {\mkbibemph{CMS}},
-  publisher = uchp,
-  edition = 	 16,
-  location =  {Chicago}
+  publisher =    uchp,
+  edition = 	 17,
+  location =     {Chicago}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=clark:mesopot]
@@ -719,8 +801,8 @@ documentation has left you perplexed, please let me know.
   subtitle = 	 {Between Two Rivers},
   author = 	 {Hazel V. Clark},
   howpublished = {End of the Commons General Store},
-  year = 	 {\mkbibbrackets{1957?}},
-  location =  {Mesopotamia, OH}
+  date = 	 {1957?},
+  location =     {Mesopotamia, OH}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=conley:fifthgrade]
@@ -783,13 +865,13 @@ documentation has left you perplexed, please let me know.
 *\adlnbackref{Online}{coolidge:speech}*,
   author = 	 {Coolidge, Calvin},
   title = 	 {Equal Rights},
-  note = 	 {copy of an undated 78 rpm disc},
+  note = 	 {copy of an undated 78 rpm disc, 3:45},
   options = 	 {ptitleaddon=space},
   titleaddon = 	 {(speech)},
   related = 	 {*\hyperlink{\getrefbykeydefault%
 {loc:leaders}{anchor}{}}{\{\colorbox{Gainsboro}{loc:leaders}\}}*},
-  year = 	 {[1920?]},
-  relatedstring = {from}
+  date = 	 {1920~},
+  relatedstring = {in}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=creel:house]
@@ -820,8 +902,8 @@ documentation has left you perplexed, please let me know.
   year = 	 {\bibstring{nodate}},
   entrysubtype = {yes},
   note = 	 {Agassiz Papers},
-  location =  {Harvard University},
-  organization =  {Houghton Library}
+  location =     {Harvard University},
+  organization = {Houghton Library}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=donne:var]
@@ -858,12 +940,24 @@ documentation has left you perplexed, please let me know.
 \begin{lstlisting}[language=BibTeX,label=eliot:pound]
 *\adlnbackref{Book}{eliot:pound}*,
   title = 	 {Literary Essays},
-  options = {useauthor=false},
+  options =      {useauthor=false},
   year = 	 1953,
   author = 	 {Pound, Ezra},
-  editor =  {Eliot, T.~S.},
-  publisher = {New Directions},
-  location =  {New York}
+  editor =       {Eliot, T.~S.},
+  publisher =    {New Directions},
+  location =     {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ellis:blog]
+*\adlnbackref{Article}{ellis:blog}*,
+  author = 	 {Ellis, Rhian},
+  title = 	 {Squatters' Rights},
+  journaltitle = {Ward Six},
+  location = 	 {blog},
+  date = 	 {2008-06-30},
+  url = 	 {http://wardsix.blogspot.com
+      /2008/06/squatters-rights.html},
+  entrysubtype = {magazine}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=emerson:nature]
@@ -881,6 +975,7 @@ documentation has left you perplexed, please let me know.
 \begin{lstlisting}[language=BibTeX,label=ency:britannica]
 *\adlnbackref{InReference}{ency:britannica}*,
   title =        {Encyclopaedia Britannica},
+  date =         {1980},
   edition =      {15},
   shorttitle = 	 {Ency. {Brit}., \mkbibemph{15th ed}\adddot},
   options =      {hypertitle}
@@ -896,9 +991,9 @@ documentation has left you perplexed, please let me know.
   volume = 	 4,
   author = 	 {Euripides},
   editor = 	 {Grene, David and Lattimore, Richmond},
-  publisher = uchp,
+  publisher =    uchp,
   pages = 	 {185--288},
-  location =  {Chicago},
+  location =     {Chicago}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=evanston:library]
@@ -908,7 +1003,7 @@ documentation has left you perplexed, please let me know.
   title = 	 {Evanston Public Library Strategic Plan, 2000--2010},
   subtitle = 	 {A Decade of Outreach},
   organization = {Evanston Public Library},
-  url = 	 {http://www.epl.org/library/ strategic-plan-00.html},
+  url = 	 {http://www.epl.org/library /strategic-plan-00.html},
   urldate = 	 {2002-07-18}
 }
 \end{lstlisting}
@@ -917,12 +1012,12 @@ documentation has left you perplexed, please let me know.
   title = 	 {The One with the {Princess Leia} Fantasy},
   date = 	 2003,
   booktitle = 	 {Friends},
-  booktitleaddon = 	 {season~3, episode~1},
+  booktitleaddon = {season~3, episode~1},
   author = 	 {Curtis, Michael and Malins, Gregory~S.},
   eventdate = 	 {1996-09-19},
   editor = 	 {Mancuso, Gail},
   editortype = 	 {director},
-  publisher = {Warner Home Video},
+  publisher =    {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA}
 }
@@ -932,7 +1027,7 @@ documentation has left you perplexed, please let me know.
   shorttitle = 	 {Gen\adddot},
   entrysubtype = {classical},
   keywords = 	 {nosample},
-  title = 	 {Genesis},
+  title = 	 {Genesis}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=gourmet:052006]
@@ -948,7 +1043,7 @@ documentation has left you perplexed, please let me know.
   title = 	 {The New {Grove} Dictionary of Music and Musicians},
   author = 	 {Hepokoski, James},
   shorttitle = 	 {New {Grove} Dict\adddot},
-  lista = {Sibelius, Jean},
+  lista =        {Sibelius, Jean},
   url = 	 {http://www.grovemusic.com/},
   urldate = 	 {2002-01-03},
   sortkey = 	 {New Grove}
@@ -966,7 +1061,7 @@ documentation has left you perplexed, please let me know.
   editora = 	 {Shaw, Robert},
   editoratype =  {none},
   author = 	 {Handel, George Frederic},
-  publisher = {Video Artists International},
+  publisher =    {Video Artists International},
   address = 	 {Ansonia Station, NY}
 }
 \end{lstlisting}
@@ -979,7 +1074,7 @@ documentation has left you perplexed, please let me know.
   date = 	 {2002-02-06},
   volume =	 287,
   number =	 5,
-  url =   {http://jama.ama-assn.org/issues/ v287n5/rfull/joc10108.html#aainfo},
+  url =   {http://jama.ama-assn.org/issues /v287n5/rfull/joc10108.html#aainfo},
   urldate =	 {2002-01-07}
 }
 \end{lstlisting}
@@ -991,9 +1086,9 @@ documentation has left you perplexed, please let me know.
   booktitle = 	 {Lady in Satin},
   author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
   editor = 	 {Holiday, Billie},
-  editortype = 	 {none},
+  editortype = 	 {vocalist},
   number = 	 {CL 1157},
-  publisher = {Columbia},
+  publisher =    {Columbia},
   type = 	 {33\onethird\ rpm},
   note = 	 {with Ray Ellis},
   options = 	 {useauthor=false}
@@ -1003,13 +1098,12 @@ documentation has left you perplexed, please let me know.
 *\adlnbackref{Online}{horowitz:youtube}*,
   title = 	 {{HOROWITZ AT CARNEGIE HALL} 2-{Chopin Nocturne} in Fm Op.55},
   organization = {YouTube video, 5:53},
-  sortkey = 	 {Horowitz},
   url = 	 {http://www.youtube.com/watch? v=cDVBtuWkMS8},
   urldate = 	 {2009-01-09},
   userd = 	 {posted by \mkbibquote{hubanj,}},
   note = 	 {from a performance televised by CBS on\nopunct},
   date = 	 {1968-09-22},
-  shorttitle = {HOROWITZ}
+  shorttitle =   {HOROWITZ}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=horsley:prosodies]
@@ -1029,18 +1123,16 @@ documentation has left you perplexed, please let me know.
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=iso:electrodoc]
-*\adlnbackref{Book}{iso:electrodoc}*,
-  title = 	 {Electronic Documents or Parts thereof. {Excerpts} from {International Standard ISO} 690-2},
-  part = 	 {part 2},
-  date = 	 2001,
-  maintitle = 	 {Information and Documentation},
-  mainsubtitle = {Bibliographic References},
+*\adlnbackref{Standard}{iso:electrodoc}*,
+  title = 	 {Information and Documentation---Rules for the
+        Abbreviation of Title Words and Titles of Publications},
+  date = 	 1997,
   author = 	 {{International Organization for Standardization}},
-  shorthand =  {ISO},
-  publisher = {National Library of Canada},
-  sortname = 	 {ISO},
-  address = 	 {Ottawa},
-  url = 	 {http://www.nlc-bnc.ca/iso/ tc46sc9/standard/690-2e.htm}
+  shorthand =    {ISO},
+  series =       {ISO},
+  number =       {4:1997},
+  publisher =  	 {ISO},
+  address = 	 {Paris}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=james:ambassadors]
@@ -1050,10 +1142,11 @@ documentation has left you perplexed, please let me know.
   origdate = 	 1909,
   options = 	 {cmsdate=on},
   author = 	 {James, Henry},
-  publisher = {Project Gutenberg},
-  url = 	 {ftp://ibiblio.org/pub/docs/ books/gutenberg/etext96/ambas10.txt}
+  publisher =    {Project Gutenberg},
+  url = 	 {ftp://ibiblio.org/pub/docs
+     /books/gutenberg/etext96/ambas10.txt}
 }
-\end{lstlisting}\clearpage
+\end{lstlisting}%\clearpage
 \begin{lstlisting}[language=BibTeX,label=lakeforester:pushcarts]
 *\adlnbackref{Article}{lakeforester:pushcarts}*,
   journaltitle = {Lake Forester},
@@ -1061,15 +1154,15 @@ documentation has left you perplexed, please let me know.
   entrysubtype = {magazine},
   title = 	 {Pushcarts Evolve to Trendy Kiosks},
   options = 	 {cmsdate=full},
-  location =  {Lake Forest, IL}
+  location =     {Lake Forest, IL}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=loc:leaders]
 *\adlnbackref{Online}{loc:leaders}[coolidge:speech]*,
-  author = 	 {Library of Congress},
+  organization = {Library of Congress},
   title = 	 {American Leaders Speak},
   subtitle = 	 {Recordings from {World War I} and the 1920 Election, 1918--1920},
-  url = 	 {http://memory.loc.gov/ammem/ nfhtml/nforSpeakers01.html},
+  url = 	 {http://memory.loc.gov/ammem /nfhtml/},
   note = 	 {RealAudio and WAV formats}
 }
 \end{lstlisting}
@@ -1093,23 +1186,45 @@ documentation has left you perplexed, please let me know.
   origdate = 	 1909,
   author = 	 {Maitland, Frederic W.},
   editor = 	 {Chaytor, A.~H. and others},
-  publisher = cup,
+  publisher =    cup,
   address = 	 {Cambridge},
   pubstate = 	 {reprint},
   sortyear = 	 {2010}
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=nasa:db]
+*\adlnbackref{Dataset}{nasa:db}*,
+  author = 	 {{NASA/IPAC Extragalactic Database}},
+  title = 	 {object name IRAS F00400+4059},
+  url = 	 {http://ned.ipac.caltech.edu},
+  urldate = 	 {2016-04-06}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=niso:bibref]
+*\adlnbackref{Standard}{niso:bibref}*,
+  title = 	 {Bibliographic References},
+  organization = {National Information Standards Organization},
+  userd = 	 {approved},
+  howpublished = {reaffirmed},
+  eventdate =    {2010-05-13},
+  date = 	 {2005-06-09},
+  series = 	 {ANSI/NISO},
+  number =       {Z39.29-2005},
+  publisher =    {NISO},
+  shorthand =    {NISO},
+  location =     {Bethesda, MD}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=nytrumpet:art]
 *\adlnbackref{Music}{nytrumpet:art}*,
   title = 	 {Art of the Trumpet},
   date = 	 1982,
   origdate = 	 {1981-06-01/1981-06-02},
-  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll (trumpet) and Edward Brewer (organ)}},
+  author = 	 {{New York Trumpet Ensemble, with Edward Carroll (trumpet) and Edward Brewer (organ)}},
   shortauthor =  {{New York Trumpet Ensemble}},
   number = 	 {PVT 7183},
   series = 	 {Vox/Turnabout},
   userd = 	 {recorded at the Madeira Festival,},
-  sortkey = 	 {New York Trumpet},
   type = 	 {compact disc}
 }
 \end{lstlisting}
@@ -1118,7 +1233,7 @@ documentation has left you perplexed, please let me know.
   journaltitle = {New York Times},
   entrysubtype = {magazine},
   date = 	 {2000-04-10},
-  title = {obituary of {Claire Trevor}},
+  title =        {obituary of {Claire Trevor}},
   options = 	 {cmsdate=full},
   pages = 	 {national edition}
 }
@@ -1142,7 +1257,7 @@ documentation has left you perplexed, please let me know.
   usere = 	 {The zemstvo liberal movement: Its social roots and evolution to the beginning of the twentieth century},
   langid =       {russian},
   author = 	 {Pirumova, N.~M.},
-  publisher = {Izdatel'stvo \mkbibquote{Nauka}},
+  publisher =    {Izdatel'stvo \mkbibquote{Nauka}},
   address = 	 {Moscow}
 }
 \end{lstlisting}
@@ -1158,10 +1273,10 @@ documentation has left you perplexed, please let me know.
   shortauthor =  {Pl\adddot},
   booktitle = 	 {{Clitophon, Republic, Timaeus, Critias}},
   maintitle = 	 {Opera},
-  publisher = {Clarendon Press},
-  series = {Oxford Classical Texts},
+  publisher =    {Clarendon Press},
+  series =       {Oxford Classical Texts},
   pages = 	 {327--621},
-  location =  {Oxford}
+  location =     {Oxford}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=pollan:plant]
@@ -1169,7 +1284,9 @@ documentation has left you perplexed, please let me know.
   author = 	 {Pollan, Michael},
   title = 	 {Michael {Pollan} Gives a Plant's-Eye View},
   organization = {TED video, 17:31},
-  url = 	 {http://www.ted.com/index.php/ talks/michael_pollan_gives_a_ plant_s_eye_view.html},
+  url = 	 {http://www.ted.com/index.php
+      /talks/michael_pollan_gives_a _plant_s_eye_view.html},
+  note =         {filmed in\nopunct},
   urldate = 	 {2008-02},
   date = 	 {2007-03},
   userd = 	 {posted}
@@ -1193,7 +1310,7 @@ documentation has left you perplexed, please let me know.
   maintitle = 	 {First Vocal Album},
   options = 	 {ctitleaddon=space},
   author = 	 {Schubert, Franz},
-  publisher = {G.~Schirmer},
+  publisher =    {G.~Schirmer},
   address = 	 {New York}
 }
 \end{lstlisting}
@@ -1208,9 +1325,9 @@ documentation has left you perplexed, please let me know.
   addendum = 	 {Citations refer to the Dover edition},
   options = 	 {cmsdate=both},
   translator = 	 {Newman, Ernest},
-  publisher = {Dover},
+  publisher =    {Dover},
   pubstate = 	 {reprint},
-  location =  {New York}
+  location =     {New York}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=shapey:partita]
@@ -1231,7 +1348,7 @@ documentation has left you perplexed, please let me know.
   publisher = 	 uchp,
   year = 	 1974,
   translator = 	 {Silverstein, Theodore},
-  location =  {Chicago}
+  location =     {Chicago}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=spock:interview]
@@ -1243,7 +1360,7 @@ documentation has left you perplexed, please let me know.
   note = 	 {interview 67A, transcript},
   organization = {Senn Oral History Collection},
   institution =  {National Library of Medicine},
-  location =  {Bethesda, MD}
+  location =     {Bethesda, MD}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=stendhal:parma]
@@ -1252,7 +1369,7 @@ documentation has left you perplexed, please let me know.
   date = 	 1925,
   author = 	 {Stendhal},
   nameaddon = 	 {Marie Henri Beyle},
-  publisher = {Boni \& Liveright},
+  publisher =    {Boni \& Liveright},
   address = 	 {New York},
   translator = 	 {Scott-Moncrieff, C.~K.}
 }
@@ -1264,24 +1381,24 @@ documentation has left you perplexed, please let me know.
   date = 	 {1828-02},
   title =	 {unsigned review of \mkbibemph{Geschichten der romanischen und germanischen Völker}, by {Leopold von Ranke}},
   number =	 {23--24},
-  sortkey = 	 {Erg},
-  shortjournal =  {Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.}
+  shortjournal = {Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=verdi:corsaro]
 *\adlnbackref{Audio}{verdi:corsaro}*,
   title = 	 {Il corsaro (melodramma tragico \mkbibemph{in three acts})},
-  titleaddon = 	 {libretto by Francesco Maria Piave},
+  editortype = 	 {libretto by},
+  editor =       {Piave, Francesco Maria},
   date = 	 1998,
   author = 	 {Verdi, Giuseppe},
   editor = 	 {Hudson, Elizabeth},
   number = 	 {\bibstring{jourser} 1, Operas},
   series = 	 {The Works of Giuseppe Verdi},
-  publisher = {University of Chicago Press; Milan: G.\ Ricordi},
+  publisher =    {University of Chicago Press; Milan: G.\ Ricordi},
   volumes = 	 2,
   address = 	 {Chicago}
 }
-\end{lstlisting}\clearpage
+\end{lstlisting}%\clearpage
 \begin{lstlisting}[language=BibTeX,label=virginia:plantation]
 *\adlnbackref{Book}{virginia:plantation}*,
   title =	 {A True and Sincere Declaration of the Purpose and Ends of the Plantation Begun in {Virginia}, of the Degrees Which It Hath Received, and Means by Which It Hath Been Advanced},
@@ -1291,6 +1408,16 @@ documentation has left you perplexed, please let me know.
   year = 	 1610
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=viv:amlen]
+*\adlnbackref{Review}{viv:amlen}*,
+  author = 	 {Viv},
+  entrysubtype = {magazine},
+  title = 	 {comment on Amlen, \mkbibquote{Hoot}},
+  nameaddon = 	 {(Jerusalem, Isr.)},
+  crossref = 	 {amlen:hoot},
+  eventdate = 	 {2015-01-27}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=white:ross:memo]
 *\adlnbackref{Letter}{white:ross:memo}*,
   author = 	 {White, E.~B.},
@@ -1326,9 +1453,10 @@ documentation has left you perplexed, please let me know.
 *\adlnbackref{InReference}{wikiped:bibtex}*,
   title = 	 {Wikipedia},
   lista =        {BibTeX},
-  userd = 	 {last modified},
-  url = 	 {http://en.wikipedia.org/wiki/ BibTeX},
-  urldate = 	 {2012-05-18}
+  userd = 	 {last edited},
+  entrysubtype = {online},
+  url = 	 {http://en.wikipedia.org/wiki /BibTeX},
+  urldate = 	 {2019-11-15T20:59:00}
 }
 \end{lstlisting}
 \end{document}
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 71a9ceab272..679dea1d90c 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 663d7026a32..2b806af631d 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
@@ -7,7 +7,8 @@
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
 \usepackage[authordate,backend=biber,autolang=none,booklongxref=false,%
-bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
+bibencoding=latin1,postnotepunct,compresspages,strict,%
+cmsbreakurl]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
 \usepackage{lmodern}
@@ -25,7 +26,7 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
-\protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
+\protected\def\onethird{\mbox{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \usepackage[colorlinks,urlcolor=blue,citecolor=black,
@@ -37,23 +38,9 @@ plainpages=false,breaklinks=true]{hyperref}
 \section*{The Chicago Author-Date Specification: Testing Only}
 \label{sec:spec}
 
-\subsection*{Please see cms-dates-intro.pdf first}
+\subsection*{Please don't read on. See cms-dates-intro.pdf first.}
 \label{bibernote}
 
-Starting with \textsf{biblatex} version 1.5, in order to adhere to the
-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.10) and \textsf{biblatex} (3.10), 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
-\textsf{biblatex} version 1.4c and \textsf{biblatex-chicago} 0.9.7a.
-(Please contact me at the email address in
-\textsf{biblatex-chicago.pdf} if you have any difficulty obtaining a
-copy of this earlier release.)
-
 \subsection*{Editions}
 \label{editions}
 
@@ -432,7 +419,8 @@ Article: \autocite{assocpress:gun}; \autocite{brown:bremer};
 
 Artwork: \autocite{leo:madonna}.
 
-Audio: \autocite{greek:filmstrip}; \autocite{weed:flatiron}.
+Audio: \autocite{greek:filmstrip}; \autocite{twain:audio};
+\autocite{weed:flatiron}.
 
 Book: \autocite{barrows:reading}; \autocite{churchill:letters};
 \autocite{cohen:schiff}; \autocite{cotton:manufacture};
@@ -505,6 +493,40 @@ Unpublished: \autocite{nass:address}.
 
 Video: \autocite{cleese:holygrail}; \autocite{hitchcock:nbynw}.
 
+\subsubsection*{Additions and changes for the 17th edition}
+\label{ed17}
+
+Article: \autocite{amlen:hoot}; \autocite{black:infectious};
+\autocite{kessler:nyt}; \autocite{saberhagen:beluga};
+\autocite{stoffle:ghost}.
+
+Artwork: \autocite{mccurry:afghangirl}.
+
+Audio: \autocite{danforth:podcast}; \autocite{strayed:audiobook}.
+
+Book: \autocite{angry:birds}; \autocite{gems:ipad};
+\autocite{gems:print}.
+
+Dataset: \autocite{genbank:db}; \autocite{nasa:db}.
+
+Music: \autocite{naraya}; \autocite{rihanna:umbrella}.
+
+Online: \autocite{diaz:surprise}; \autocite{obrien:recycle};
+\autocite{quora:thread}; \autocite{souza:obama}; comments with
+\texttt{commenton}: \autocites{braun:reply}{quora:thread-customc};
+\autocites{licis:diazcomment}{diaz:surprise-customc}.
+
+Performance: \autocite{hamilton:miranda}.
+
+Periodical: \autocite{amlen:wordplay}.
+
+Review: blog comment without \texttt{commenton}: \autocite{viv:amlen};
+blog comment with \texttt{commenton}:
+\autocites{ac:comment}{ellis:blog-customc}.
+
+Standard: \autocite{niso:bibref}; \autocite{w3c:xml}.
+
+Video: \autocite{american:crime}; \autocite{mayberry:brady}.
 
 % \printshorthands % No longer necessary in author-date.
 % \nocite{*}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
index 6910dc8dc4c..ee957ed0f7f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
index dad24754a1f..8c907826331 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
@@ -14,9 +14,6 @@ related=true]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-\usepackage{url}
-\urlstyle{rm}
-\appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% If someone prints annotations
 \protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
@@ -37,7 +34,12 @@ filecolor=Teal]{hyperref}
 \subsection*{Long note forms}
 \label{sec:long}
 \begin{enumerate}\setlength{\parskip}{-4pt}
-\item Federal case\autocite[145]{federal:case}
+\item Federal case, with a Supreme Court case in running text in the
+  footnote using \verb+\runcite+\footnote{\cite[145]{federal:case}.
+    The court also noted that under
+    \runcite[7]{scotus:case:runningtext}, police may briefly detain a
+    person without probable cause if the officer believes criminal
+    activity \enquote{may be afoot.}  \cite[143]{federal:case}.}
 \item Database case\autocite{database:case}
 \item Lower federal-court case (with Supreme Court
   action)\autocite{federal:lower:related}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
new file mode 100644
index 00000000000..926617f6fe9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
new file mode 100644
index 00000000000..f2af81322bf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
@@ -0,0 +1,272 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage[latin1]{inputenc}
+\usepackage[american]{babel}
+\usepackage[autostyle]{csquotes}
+%\usepackage[document]{ragged2e}
+\usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
+bibencoding=latin1,booklongxref=false,compresspages,%
+noteref=section,noterefintro=introduction]{biblatex-chicago}
+\usepackage{lmodern}
+\usepackage{gentium}
+%\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}{6mm}
+\usepackage[split=section]{cmsendnotes}
+% \renewcommand{\footnote}{\endnote}
+\usepackage{multicol}
+\hyphenation{tech-re-port Ap-ril}
+\protected\def\onethird{{\mbox{\scriptsize\raisebox{.7ex}{1}%
+    \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}}
+\setlength{\parindent}{0pt}
+\setlength{\dimen\footins}{9.5in}
+\newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
+\usepackage{xr-hyper}
+\externaldocument[cms-]{biblatex-chicago}%
+\usepackage[pdftex,hyperref,svgnames]{xcolor}
+\usepackage[pdftex,colorlinks,filecolor=Teal,citecolor=black,
+plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
+linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
+\makeatletter
+\renewcommand{\section}{\@startsection{section}{1}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\large\bfseries}}
+\newrobustcmd*{\cmssecref}[2][]{\marginpar{\href{\@baseurl%
+      \getrefbykeydefault{#2}{anchor}{}}{\small §\,\getrefnumber{#2}}%
+      \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}%
+\makeatother
+\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+\newcommand{\mylittlespace}{\vspace{5pt}}%.5\baselineskip}}
+\bibliography{notes-test}
+%%\onehalfspacing
+%\tracingmacros=1
+\begin{document}
+
+{\Large\bfseries The \texttt{noteref} Option to the Notes \&\
+  Bibliography Style}\label{cms:top}
+\vspace*{1.5ex}
+
+Recent editions of the \emph{Chicago Manual of
+  Style}\autocite[14.31]{chicago:manual} have suggested that, in short
+notes, it may sometimes be helpful to provide a cross-reference to the
+work's initial presentation in a long note, \enquote{especially in the
+  absence of a full bibliography.}  With this release, I have provided
+for this purpose the \texttt{noteref} package option, which
+additionally involves many sub-options and even a new dependent
+\LaTeX\ package \textsf{cmsendnotes.sty} (with its own options) to
+help those users who need the same functionality in endnotes instead
+of footnotes (see page~\pageref{cms:endnotes}).  The full
+documentation in \cmssecref{cms-sec:noteref}
+\textsf{biblatex-chicago.pdf} contains all of the murky details, but
+in this document I wanted to provide straightforward examples so that
+users could get a quick glimpse of the features provided.
+
+\mylittlespace By setting the following options when loading
+\textsf{biblatex-chicago}:
+\begin{verbatim}
+noteref=section,noterefintro=introduction
+\end{verbatim}
+you'll get the following results, in what is obviously a rather
+artificial setting.
+
+\section{Long notes}
+\label{sec:one}
+
+Text\autocite{garaud:gatine} block\autocite{leo:madonna}
+with\autocite{schubert:muellerin} a\autocite{mchugh:wake}
+series\autocite{euripides:orestes} of\autocite{clark:mesopot}
+footnotes\autocite{ashbrook:brain} chosen\autocite{contrib:contrib}
+randomly.\autocite{frede:inproc}
+
+\section{Short notes on the same page}
+\label{sec:two}
+
+New\autocite{chicago:manual} text\autocite{garaud:gatine}
+block\autocite{leo:madonna} with\autocite{schubert:muellerin}
+a\autocite{mchugh:wake}
+series\footnote{\shortrefcite{euripides:orestes}.
+  \textcolor{DarkSlateBlue}{<--- \cmd{shortrefcite} produced this
+    \texttt{noteref} where by default one wouldn't have appeared.}}
+of\autocite{clark:mesopot} footnotes\autocite{ashbrook:brain}
+chosen\autocite{contrib:contrib} randomly.\autocite{frede:inproc}
+
+\mylittlespace Short notes on the same page, or in the same double-page
+spread when in \texttt{twoside} mode, won't by default have a
+\texttt{noteref} printed, though you can in fact alter this on a
+note-by-note basis by using \cmd{shortrefcite} or
+\cmd{shorthandrefcite} instead of your usual citation command, as I've
+done with the Euripides example below.
+
+\clearpage
+
+\section{Short notes on a new page}
+\label{sec:three}
+
+New\autocite{chicago:manual} text\autocite{garaud:gatine}
+block\autocite{leo:madonna} with\autocite{schubert:muellerin}
+a\autocite{mchugh:wake}
+series\footnote{\shortcite*{euripides:orestes}.
+  \textcolor{DarkSlateBlue}{<--- \cmd{shortcite*} suppressed the
+    \texttt{noteref} where by default one would have appeared.}}
+of\autocite{clark:mesopot} footnotes\autocite{ashbrook:brain}
+chosen\autocite{contrib:contrib} randomly.\autocite{frede:inproc}
+
+\mylittlespace Here \cmssecref[Zero Sections]{cms-sec:zero} all of the
+short notes will, by default, have a \texttt{noteref}.  The first note
+on this page refers back to a long note that occurred \emph{before}
+section~1, technically therefore in section~0, which is what would
+appear without further intervention.  The intervention I have made is
+the option \verb+noterefintro=introduction+, which tells
+\textsf{biblatex-chicago} to print \cmd{bibstring\{introduc\-tion\}}
+instead of \verb+\bibstring{section}+.  The problem of section numbers
+containing zero can be complicated, so once again the murky details
+are in \textsf{biblatex-chicago.pdf}.
+
+\mylittlespace The main \texttt{noteref} option has six possible
+values, four of which are, I would guess, those most likely to prove
+useful: \texttt{none} (the default), \texttt{page}, \texttt{chapter},
+and \texttt{section}, with \texttt{subsection} and \texttt{part} as
+additional possibilities.  The names of the options correspond to the
+\LaTeX\ counter tracked by that option in addition to the note number
+itself, so that \texttt{none} produces a \texttt{noteref} that just
+provides the note number, while \texttt{page} provides page and note
+number, \texttt{chapter} gives chapter and note number, and so on.
+Here, with \texttt{section} being the top-level division in the
+\texttt{article} class, I've used that option.
+
+\mylittlespace You can suppress the appearance of a \texttt{noteref}
+by using the \cmd{shortcite*} or \cmd{shorthandcite*} commands, as
+I've shown with the Euripides citation below.  You can also set the
+\texttt{noterefin\-terval} option to a number greater than zero if you
+want to make sure that a certain number of references have intervened
+before printing a \texttt{noteref}, even if the short note is on a new
+page.  Because this mechanism tracks the \texttt{instcount} counter,
+which is incremented by more things than just new citations, you may
+have to experiment to find a value that suits your document.
+
+\section{A few extra subtleties}
+\label{sec:four}
+
+Another\autocite{jackson:paulina:letter} new\autocite{holiday:fool}
+text\autocite{garaud:gatine} block\autocite{leo:madonna}
+with\autocite{schubert:muellerin} a\autocite{mchugh:wake}
+series\footnote{\cite{euripides:orestes}.
+  \textcolor{DarkSlateBlue}{<--- The \texttt{noteref} does appear
+    here, following its suppression above.}}
+of\autocite{clark:mesopot} footnotes\autocite{ashbrook:brain}
+chosen\autocite{contrib:contrib} randomly.\autocite{frede:inproc}
+
+\mylittlespace When a \texttt{noteref} for a particular source has
+already appeared on a page (or a double-page spread) then another
+won't be printed after subsequent citations of the same source that
+appear on that same page.  With the second Euripides note below, the
+\texttt{noteref} \emph{does} appear because it was suppressed after
+the first reference.
+
+\clearpage
+
+Another\footnote{\cite{jackson:paulina:letter}.
+  \textcolor{DarkSlateBlue}{<--- The form of this \texttt{noteref} and
+    the next indicates that the short notes are in the same section as
+    the long notes to which they refer. Set \texttt{fullnoterefs=true}
+    to get the long form everywhere.}} new\autocite{holiday:fool}
+text\autocite{garaud:gatine} block\autocite{leo:madonna}
+with\autocite{schubert:muellerin} a\autocite{mchugh:wake}
+series\autocite{euripides:orestes} of\autocite{clark:mesopot}
+footnotes\autocite{ashbrook:brain} chosen\autocite{contrib:contrib}
+randomly.\autocite{frede:inproc}
+
+\mylittlespace Once again, after a page break, the \texttt{noterefs}
+appear after all of these short notes.  Because the section number
+hasn't changed, however, the first two footnotes on the page, which
+refer back to long footnotes in the same section, have
+\texttt{noterefs} containing only the note number.  This more
+compact form is the default, but you can set \texttt{fullnoterefs} to
+\texttt{true} when loading \textsf{biblatex-chicago} to see the longer
+form everywhere.
+% and should be unambiguous unless you restart footnote
+% numbering inside the section rather than at section boundaries.
+
+\section{Endnotes}
+\label{cms:endnotes}\citereset
+
+Things are \cmssecref[Endnotes]{cms-sec:endnoterefs}
+slightly more complicated when you are using endnotes instead of
+footnotes, but in standard cases it's still fairly straightforward.
+In this document I have added the line:
+\begin{verbatim}
+\usepackage[split=section]{cmsendnotes}
+\end{verbatim}
+to the preamble \emph{after} loading \textsf{biblatex-chicago} (with
+the options shown on page~\pageref{cms:top}), then printed the
+endnotes below with \textsf{cmsendnotes'}
+\begin{verbatim}
+\theendnotesbypart
+\end{verbatim}
+command.  As this shows you can, as usual with \textsf{biblatex}, mix
+foot- and endnotes in the same document, but if \texttt{noterefs} are
+going to appear in both sorts of note --- surely this situation is
+highly unlikely --- then you need to be careful that they refer back
+\emph{only} to long references in the \emph{same} sort of note.  A
+\texttt{noteref} from an endnote to a long citation in a footnote will
+be inaccurate, so careful use of the \cmd{citereset} command (as here)
+or perhaps of the \textsf{biblatex} \texttt{citereset} option should
+allow you to keep the two sorts of note distinct.
+
+\mylittlespace Text\endnote{\autocite{garaud:gatine}.}
+block\endnote{\autocite{leo:madonna}.}
+with\endnote{\autocite{schubert:muellerin}.}
+a\endnote{\autocite{mchugh:wake}.}
+series\endnote{\autocite{euripides:orestes}.}
+of\endnote{\autocite{clark:mesopot}.}
+endnotes\endnote{\autocite{ashbrook:brain}.}
+chosen\endnote{\autocite{contrib:contrib}.}
+randomly.\endnote{\autocite{frede:inproc}.}
+
+\section{More endnotes}
+\label{sec:moreen}
+
+Text\endnote{\global\toggletrue{cms@forcenoteref}\autocite{garaud:gatine}.
+  \textcolor{DarkSlateBlue}{<--- Page \enquote{break} before this note.}}
+block\endnote{\autocite{leo:madonna}.}
+with\endnote{\autocite{schubert:muellerin}.}
+a\endnote{\autocite{mchugh:wake}.}
+series\endnote{\autocite{euripides:orestes}.}
+of\endnote{\autocite{clark:mesopot}.}
+endnotes\endnote{\autocite{ashbrook:brain}.}
+chosen\endnote{\autocite{contrib:contrib}.}
+randomly.\endnote{\autocite{frede:inproc}.}
+
+\mylittlespace When you peruse the endnotes on the next page, please
+remember that I've simulated a page change in between the two
+sections, thus allowing all the \texttt{noterefs} to appear as they
+do.  The rules about them appearing (or not) on the same page as the
+long reference to which they point are the same as for footnotes, so
+long as you keep in mind that the pages under consideration here are
+those in the endnotes section itself, \emph{not} in the main text.
+Also, in this case the standard \cmd{notesname} command provides
+alternative text for the general header, but \textsf{cmsendnotes.sty}
+organizes the subheaders and facilitates the \texttt{noterefs}, all
+without further intervention from you beyond the single option already
+given to that package.
+
+\mylittlespace I hope that this short demonstration is enough to get
+you started using the \texttt{noteref} functionality.  I admit that
+the processing time for documents using it is somewhat increased, so
+if you have a long document it may require some extra patience.  If
+something doesn't work properly for you, and the main documentation
+doesn't clear up the issue, please let me know.
+
+\def\notesname{Endnotes to \S\S~5--6}
+\theendnotesbypart
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
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 1a7fb7b9253..1401d5bf27f 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 4cfc390da19..f7e9eb234c1 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
@@ -6,8 +6,9 @@
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
-\usepackage[notes,strict,backend=biber,autolang=other,%
-bibencoding=latin1,booklongxref=false,annotation]{biblatex-chicago}
+\usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
+bibencoding=latin1,booklongxref=false,annotation,%
+compresspages]{biblatex-chicago}
 \usepackage{lmodern}
 \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
@@ -15,25 +16,31 @@ bibencoding=latin1,booklongxref=false,annotation]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{6mm}
-\makeatletter 
-\renewcommand{\@makeenmark}{\textcolor{DarkSlateGrey}{\textsf{\@theenmark}}}
-\makeatother
-\usepackage{url}
-\urlstyle{rm}
-\appto\bibsetup{\sloppy}
-\hyphenation{tech-re-port}
+% \usepackage{url}
+% \urlstyle{rm}
+% \appto\bibsetup{\sloppy}
+\usepackage{multicol}
+\hyphenation{tech-re-port Ap-ril}
 \protected\def\onethird{{\mbox{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}}
 \setlength{\parindent}{0pt}
 %\setlength{\parskip}{5pt}
 \setlength{\dimen\footins}{9.5in}
+\setcounter{secnumdepth}{-1}
 \newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{xr-hyper}
-\externaldocument[cms-]{../../Docs/biblatex-chicago}%
+\externaldocument[cms-]{biblatex-chicago}%
 \usepackage[pdftex,hyperref,svgnames]{xcolor}
 \usepackage[pdftex,colorlinks,filecolor=Teal,citecolor=black,
 plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
 linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
+\makeatletter
+\renewcommand{\@makeenmark}{\textcolor{DarkSlateGrey}{\textsf{\@theenmark}}}
+\renewcommand{\section}{\@startsection{section}{1}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\large\bfseries}}
+\makeatother
 \usepackage{cmsdocs}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \newcommand{\mylittlespace}{\vspace{5pt}}%.5\baselineskip}}
@@ -42,29 +49,36 @@ linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
 %\tracingstats=2
 \begin{document}
 
-\section*{The Chicago Notes \&\ Bibliography Specification}
-\label{sec:spec}
+{\Large\bfseries The Chicago Notes \&\ Bibliography Specification}
+\vspace*{1.5ex}
+\begin{multicols}{2}
+  \renewcommand{\contentsname}{\textcolor{darkgray}{Contents}}
+  \footnotesize
+  \tableofcontents
+\end{multicols}
   
 This file is intended as a brief introduction to the Chicago notes \&\
-bibliography specification (16th ed.)\autocite{chicago:manual}\ as
+bibliography specification (17th ed.)\autocite{chicago:manual}\ as
 implemented by \textsf{biblatex-chicago}, and falls somewhere in
 between the \enquote{Quickstart} section of
 \textsf{biblatex-chicago.pdf} and the full documentation as presented
-in section~4 \cmssecref{cms-sec:Spec} of that same document.  I've
-attempted to design this introduction for ease of cross-reference, so
-clicking on long-note citations should bring you to the bibliography
-entry, whence clicking on the entry key in the annotation should
-present you with the entry as it appears in the .bib file, where
-clicking on the entry type should return you to the long note.  If you
-have questions beyond the scope of this introduction, then the full
-documentation is the place to look next --- marginal notes here refer
-to section or page numbers there, and if you've installed the package
-using the standard \TeX\ Live method then clicking on these marginal
-notes should take you to the other document.  If you can't find
-answers there, please write to me at the email address in
-\textsf{biblatex-chicago.pdf}.
-
-\subsection*{Standard entry types}
+in section~4 \cmssecref{cms-sec:Spec} of that same document.  Please
+note that the package functionality as described here depends on using
+\textsf{biber} as your backend; if you use a different backend the
+results will inevitably be disappointing.  I've attempted to design this
+introduction for ease of cross-reference, so clicking on long-note
+citations should bring you to the bibliography entry, whence clicking
+on the entry key in the annotation should present you with the entry
+as it appears in the .bib file, where clicking on the entry type
+should return you to the long note.  If you have questions beyond the
+scope of this introduction, then the full documentation is the place
+to look next --- marginal notes here refer to section or page numbers
+there, and if you've installed the package using the standard \TeX\
+Live method then clicking on these marginal notes should take you to
+the other document.  If you can't find answers there, please write to
+me at the email address in \textsf{biblatex-chicago.pdf}.
+
+\section{Standard entry types}
 \label{sec:standard}
 
 \begin{refsection}
@@ -88,7 +102,7 @@ answers there, please write to me at the email address in
   annotations)]
 \end{refsection}
 
-\subsection*{Other entry types}
+\section{Other entry types}
 \label{sec:other}
 
 \begin{refsection}
@@ -101,10 +115,13 @@ answers there, please write to me at the email address in
   \endnote[\value{Artwork}]{\cite{leo:madonna}.},
   \endnote[\value{Audio}]{\cite{schubert:muellerin}.},
   \endnote[\value{BookInBook}]{\cite{euripides:orestes}.},
+  \endnote[\value{Dataset}]{\cite{genbank:db}.},
   \endnote[\value{InReference}]{\cite{wikiped:bibtex}.},
   \endnote[\value{Letter}]{\cite{jackson:paulina:letter}.},
   \endnote[\value{Music}]{\cite{holiday:fool}.},
+  \endnote[\value{Performance}]{\cite{hamilton:miranda}.},
   \endnote[\value{Review}]{\cite{ratliff:review}.},
+  \endnote[\value{Standard}]{\cite{niso:bibref}.},
   \endnote[\value{SuppBook}]{\cite{polakow:afterw}.}, and
   \endnote[\value{Video}]{\cite{friends:leia}.}.
 
@@ -112,7 +129,7 @@ answers there, please write to me at the email address in
   \printbibliography[title=\normalsize Bibliography Style]
 \end{refsection}
 
-\subsection*{Short notes}
+\section{Short notes}
 \label{sec:short}
 
 \begin{refsection}
@@ -126,14 +143,20 @@ answers there, please write to me at the email address in
   you load \textsf{biblatex-chicago} and you'll get the short form
   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 long notes in previous sections:
+  references.  (In the absence of a full bibliography, you can also
+  use the \texttt{noteref} option \cmssecref{cms-sec:noteref} to
+  provide cross-references from short notes to long ones.  Please
+  consult
+  \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}.)
+  The following are the short forms of all the works 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}.},
   \endnote[\value{Book}]{\shortcite{mchugh:wake}.},
   \endnote[\value{BookInBook}]{\shortcite{euripides:orestes}.},
   \endnote[\value{Booklet}]{\shortcite{clark:mesopot}.},
+  \endnote[\value{Dataset}]{\shortcite{genbank:db}.},
   \endnote[\value{InBook}]{\shortcite{ashbrook:brain}.},
   \endnote[\value{InCollection}]{\shortcite{contrib:contrib}.},
   \endnote[\value{InProceedings}]{\shortcite{frede:inproc}.},
@@ -142,7 +165,9 @@ answers there, please write to me at the email address in
   \endnote[\value{Manual}]{\shortcite{dyna:browser}.},
   \endnote[\value{MastersThesis}]{\shortcite{ross:thesis}.},
   \endnote[\value{Music}]{\shortcite{holiday:fool}.},
+  \endnote[\value{Performance}]{\shortcite{hamilton:miranda}.},
   \endnote[\value{Review}]{\shortcite{ratliff:review}.},
+  \endnote[\value{Standard}]{\shortcite{niso:bibref}.},
   \endnote[\value{SuppBook}]{\shortcite{polakow:afterw}.},
   \endnote[\value{TechReport}]{\shortcite{herwign:office}.},
   \endnote[\value{Unpublished}]{\shortcite{nass:address}.}, and
@@ -151,7 +176,7 @@ answers there, please write to me at the email address in
   {\renewcommand{\notesname}{\normalsize Short-Note Style} \theendnotes}
 \end{refsection}
 
-\subsection*{The \textsf{entrysubtype} field}
+\section{The \textsf{entrysubtype} field}
 \label{sec:subtype}
 
 \begin{refsection}
@@ -170,17 +195,17 @@ answers there, please write to me at the email address in
   \endnote[\value{Article}]{\cite{lakeforester:pushcarts}.} and
   \endnote[\value{Review}]{\cite{bundy:macneil}.}.
 
-  \mylittlespace The \textsf{Misc} type provides a second
-  differentiating function for the \textsf{entrysubtype} field.
-  Without such a field, \textsf{Misc} entries function as they do in
-  standard \textsf{biblatex} and in \textsc{Bib}\TeX, that is, as
-  hold-alls for sources that won't easily fit into other categories.
-  (Ideally, such entries will be very rare when using
-  \textsf{biblatex-chicago}.)  With an \textsf{entrysubtype},
-  \textsf{Misc} entries will present their source as part of an
-  unpublished archive, to be distinguished from \textsf{Unpublished}
-  entries, which usually will have a specific title and won't come
-  from a named archive:
+  \mylittlespace The \textsf{Misc} type likewise uses the
+  \textsf{entrysubtype} field as a toggle to alter the general
+  presentation of a source.  Without such a field, \textsf{Misc}
+  entries function as they do in standard \textsf{biblatex} and in
+  \textsc{Bib}\TeX, that is, as hold-alls for sources that won't
+  easily fit into other categories.  (Ideally, such entries will be
+  very rare when using \textsf{biblatex-chicago}.)  With an
+  \textsf{entrysubtype} \textsf{Misc} entries will present their
+  source as part of an unpublished archive, to be distinguished from
+  \textsf{Unpublished} entries, which usually will have a specific
+  title and won't come from a named archive:
   \endnote[\value{Misc}]{\headlesscite{creel:house}.}.
 
   \mylittlespace The \textsf{entrysubtype} field is, finally, also
@@ -199,7 +224,7 @@ answers there, please write to me at the email address in
   \printbibliography[title=\normalsize Bibliography Style]
 \end{refsection}
 
-\subsection*{Abbreviated references }
+\section{Abbreviated references }
 \label{sec:abbrev}
 
 \begin{refsection}
@@ -248,38 +273,49 @@ preamble when loading \texttt{biblatex-chi\-ca\-go}:
   \printbibliography[title=\normalsize Bibliography Style]
 \end{refsection}
 
-\subsection*{Online materials}
+\section{Online materials}
 \label{sec:online}
 
 \begin{refsection}
 
-  With \cmssecref[online]{cms-sec:online} online sources, the
-  \emph{CMS} emphasizes the nature of the source rather more than the
-  place where that source is found.  This means, for example, that an
-  online edition of a book calls for a
-  \endnote[\value{Book}]{\cite{james:ambassadors}.} entry.  Even an
-  intrinsically online source, if it is structured more or less like a
-  conventional printed periodical, may demand an
-  \endnote[\value{Article}]{\cite{stenger:privacy}.} or
-  \textsf{Review} entry rather than an \textsf{Online} one.  Blogs
-  lend themselves well to the
+  The \cmssecref[online]{cms-sec:online} 17th edition of the
+  \emph{CMS} has extended its treatment of online sources, and has
+  also somewhat altered the principles of that treatment.  Earlier
+  editions emphasized the nature of the source (book-like,
+  journal-like, etc.), rather more than how that source was accessed
+  (printed volume, online, etc.), whereas the current specification
+  places somewhat greater --- though not total --- emphasis on where
+  it was accessed, which can in many cases determine what sort of
+  entry type you need.  I have provided a quick guide to the
+  correspondences between online materials and
+  \textsf{biblatex-chicago} entry types in table~1
+  \cmstabref{cms-tab:online:types} of \textsf{biblatex-chicago.pdf},
+  and include a few examples here.  An online edition of a printed
+  book still calls for a
+  \endnote[\value{Book}]{\cite{james:ambassadors}.} entry, and the
+  rules are similar for a printed journal that has an online portal.
+  For intrinsically online sources, even if they are structured more
+  or less like a conventional printed periodical, you may (at your
+  discretion) choose to present them in an
+  \endnote[\value{Online}]{\cite{stenger:privacy}.}  entry rather than
+  an \textsf{Article} one.  Blogs lend themselves well to the
   \endnote[\value{Article}]{\cite{ellis:blog}.} type, while a comment
-  on a blog becomes a
-  \endnote[\value{Review}]{\cite{ac:comment}.}.  For things like
-  mailing lists or less journalistic web pages, the
+  on a blog becomes a \endnote[\value{Review}]{\cite{ac:comment}.},
+  here using the \texttt{commenton} \textsf{relatedtype}.  Social
+  media posts, by contrast, even of photographs, for example, need an
+  \endnote[\value{Online}]{\cite{souza:obama}.} entry.  For things
+  like mailing lists or less journalistic web pages, the
   \endnote[\value{Online}]{\cite{powell:email}.} type works well, as
   it does for short online videos
   (\endnote[\value{Online}]{\cite{pollan:plant}.}) and for short
   online audio pieces, too:
-  \endnote[\value{Online}]{\cite{coolidge:speech}.}.  (Some of these
-  latter also work well in a \textsf{Misc} entry with an
-  \textsf{entrysubtype}.)
+  \endnote[\value{Online}]{\cite{coolidge:speech}.}.
 
   {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
   \printbibliography[title=\normalsize Bibliography Style]
 \end{refsection}
 
-\subsection*{Related entries}
+\section{Related entries}
 \label{sec:related}
 
 \begin{refsection}
@@ -290,17 +326,24 @@ preamble when loading \texttt{biblatex-chi\-ca\-go}:
   long notes, while \textsf{biblatex-chicago} offers both this
   functionality and some Chicago-specific variants which employ
   different means.  You can find a full discussion of this in
-  \textsf{biblatex-chicago.pdf}, but one of the entries already cited
-  in the previous section (\cmslink{coolidge:speech}) presents the two
-  entries together in both notes and bibliography, whereas a second
-  example places a text and its translation together, but only in the
-  bibliography: \endnote[\value{Book}]{\cite{furet:related}.}.
+  \textsf{biblatex-chicago.pdf}, but two of the entries already cited
+  in the previous section (\cmslink{coolidge:speech} \&\
+  \cmslink{ac:comment}) present the two related entries together in
+  both notes and bibliography, whereas a third example places a text
+  and its translation together, but only in the bibliography:
+  \endnote[\value{Book}]{\cite{furet:related}.}.  Another example
+  shows how to present multi-volume works with the \textsf{maintitle}
+  \emph{before} the \textsf{booktitle} using the \texttt{maintitle}
+  \textsf{relatedtype}, as is sometimes recommended by the \emph{CMS}:
+  \endnote[\value{BookInBook}]{\cite{plato:timaeus:gr}.}.  (The
+  \cmslink{plato:republic:gr} entry on page~\pageref{sec:subtype}
+  shows the more traditional presentation syntax.)
 
   {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
   \printbibliography[title=\normalsize Bibliography Style]
 \end{refsection}
 
-\subsection*{Citation commands}
+\section{Citation commands}
 \label{sec:citation}
 
 \begin{refsection}
@@ -333,7 +376,7 @@ preamble when loading \texttt{biblatex-chi\-ca\-go}:
 %  \printbibliography[title=\large Bibliography Style]
 \end{refsection}
 
-\subsection*{In conclusion}
+\section{In conclusion}
 \label{sec:conclude}
 
 Allow me, finally, to emphasize just how multifarious are the sources
@@ -367,12 +410,13 @@ documentation has left you perplexed, please let me know.
 \begin{lstlisting}[language=BiBTeX,label=ac:comment]
 *\lnbackref{Review}{6}*{ac:comment,
   entrysubtype = {magazine},
-  date = 	 {2008-06-30},
   author = 	 {AC},
-  eventdate = 	 {2008-07-01},
-  nameaddon = 	 {(10:18 a.m.)},
-  crossref = 	 *\hyperlink{\getrefbykeydefault{ellis:blog}{anchor}{}}{\{\colorbox{Gainsboro}{ellis:blog}\}}*,
-  title = 	 {comment on Rhian Ellis, \mkbibquote{Squatters' Rights}}
+  eventdate = 	 {2008-07-01T10:18:00},
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+    {ellis:blog}{anchor}{}}{\colorbox{Gainsboro}{ellis:blog}}*},
+  relatedtype =  {commenton},
+  url =          {http://wardsix.blogspot.com/2008
+    /06/squatters-rights.html}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=ashbrook:brain]
@@ -401,10 +445,10 @@ documentation has left you perplexed, please let me know.
 \begin{lstlisting}[language=BibTeX,label=chicago:manual]
 *\hyperlink{Hfootnote.1}{\color{DarkBlue}@Book}*{chicago:manual,
   title = 	 {The Chicago Manual of Style},
-  year = 	 2010,
+  year = 	 2017,
   author = 	 {{University of Chicago Press}},
   publisher = uchp,
-  edition = 	 16,
+  edition = 	 17,
   location =  {Chicago}
 }
 \end{lstlisting}
@@ -414,7 +458,7 @@ documentation has left you perplexed, please let me know.
   subtitle = 	 {Between Two Rivers},
   author = 	 {Hazel V. Clark},
   howpublished = {End of the Commons General Store},
-  year = 	 {\mkbibbrackets{1957?}},
+  date = 	 {1957?},
   location =     {Mesopotamia, OH}
 }
 \end{lstlisting}
@@ -438,8 +482,9 @@ documentation has left you perplexed, please let me know.
   related = 	 {*\hyperlink{\getrefbykeydefault%
 {loc:leaders}{anchor}{}}{\colorbox{Gainsboro}{loc:leaders}}*},
   options =      {related=true,ptitleaddon=
-        space,ctitleaddon=space},
-  year = 	 {ca.\,1920}
+    space,ctitleaddon=space,nodatebrackets,
+    nodates=false},
+  date = 	 {1920~}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=creel:house]
@@ -467,7 +512,7 @@ documentation has left you perplexed, please let me know.
   title = 	 {By Rail and Stage to Galena},
   crossref =  *\hyperlink{\getrefbykeydefault{prairie:state}%
 {anchor}{}}{\{\colorbox{Gainsboro}{prairie:state}\}}*,
-  pages = 	 {271--79}
+  pages = 	 {271--279}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=ellis:blog]
@@ -561,6 +606,32 @@ documentation has left you perplexed, please let me know.
   shorttitle =	 {Recherches sur les défrichements}
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=genbank:db]
+*\lnbackref{Dataset}{2}*{genbank:db,
+  author = 	 {GenBank},
+  title = 	 {for RP11-322N14 BAC},
+  number = 	 {AC087526.3},
+  type = 	 {accession number},
+  url = 	 {http://www.ncbi.nlm.nih
+      .gov/nuccore/19683167},
+  urldate = 	 {2016-04-06}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=hamilton:miranda]
+*\lnbackref{Performance}{2}*{hamilton:miranda,
+  editor = 	 {Miranda, Lin-Manuel},
+  editortype = 	 {music and lyrics by},
+  editoratype =  {director},
+  editorbtype =  {choreographer},
+  editora = 	 {Kail, Thomas},
+  editorb = 	 {Blakenbuehler, Andy},
+  venue = 	 {Richard Rodgers Theatre},
+  title = 	 {Hamilton},
+  date = 	 {2016-02-02},
+  options = 	 {useeditor=false},
+  location =     {New York, NY}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=harley:ancient:cart]
 *\lnbackref{Collection}{5}*{harley:ancient:cart,
   title = 	 {Cartography in Prehistoric, Ancient, and Medieval Europe and the Mediterranean},
@@ -597,10 +668,9 @@ documentation has left you perplexed, please let me know.
   author = 	 {{van} Herwijnen, Eric},
   title = 	 {Future Office Systems Requirements},
   institution =  {CERN DD internal note},
-  year = 	 1988,
-  month = 	 11
+  date = 	 {1988-11}
 }
-\end{lstlisting}\enlargethispage{-\baselineskip}
+\end{lstlisting}%\enlargethispage{-\baselineskip}
 \begin{lstlisting}[language=BibTeX,label=holiday:fool]
 *\lnbackref{Music}{2}*{holiday:fool,
   title = 	 {I'm a Fool to Want You},
@@ -609,7 +679,8 @@ documentation has left you perplexed, please let me know.
   booktitle = 	 {Lady in Satin},
   author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
   editor = 	 {Holiday, Billie},
-  editortype = 	 {none},
+  editortype = 	 {vocalist},
+  chapter =      1,
   number = 	 {CL 1157},
   publisher = {Columbia},
   type = 	 {33\onethird~rpm},
@@ -667,7 +738,7 @@ documentation has left you perplexed, please let me know.
   title = 	 {Madonna of the Rocks},
   type = 	 {oil on canvas},
   institution =  {Louvre},
-  year = 	 {1480s},
+  date = 	 {148X},
   note = 	 {78 x 48.5 in\adddot},
   location =  {Paris}
 }
@@ -695,9 +766,24 @@ documentation has left you perplexed, please let me know.
 *\lnbackref{Unpublished}{1}*{nass:address,
   author = 	 {Nass, Clifford},
   title = 	 {Why Researchers Treat On-Line Journals Like Real People},
-  note =  {keynote address, annual meeting of the Council of Science Editors},
+  note =         {keynote address},
+  eventtitle =   {annual meeting of the Council of Science Editors},
   location = 	 {San Antonio, TX},
-  date = 	 {2000-05-06/2000-05-09}
+  eventdate = 	 {2000-05-06/2000-05-09}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=niso:bibref]
+*\lnbackref{Standard}{2}*{niso:bibref,
+  title = 	 {Bibliographic References},
+  organization = {National Information Standards Organization},
+  userd = 	 {approved},
+  howpublished = {reaffirmed},
+  eventdate =    {2010-05-13},
+  date = 	 {2005-06-09},
+  series = 	 {ANSI/NISO},
+  number =       {Z39.29-2005},
+  publisher =    {NISO},
+  location =     {Bethesda, MD}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=plato:republic:gr]
@@ -716,6 +802,46 @@ documentation has left you perplexed, please let me know.
   location =  {Oxford}
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=plato:timaeus:gr]
+*\lnbackref{BookInBook}{7}*{plato:timaeus:gr,
+  title = 	 {Timaeus},
+  date = 	 1902,
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{plato:total}{anchor}{}}{\colorbox{Gainsboro}{plato:total}}*},
+  relatedtype =  {maintitle},
+  pages = 	 {17--105},
+  author = 	 {Plato},
+  entrysubtype = {classical}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=plato:tomeiv]
+*\hyperlink{Hendnote.75}{\color{DarkBlue}@Book}*{plato:tomeiv,
+  title = 	 {Clitopho, Res Publica, Timaeus, Critias},
+  date = 	 1902,
+  maintitle = 	 {Opera},
+  volume = 	 4,
+  author = 	 {Plato},
+  editor = 	 {Burnet, J.},
+  publisher =    {Clarendon Press},
+  location =     {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=plato:total]
+*\hyperlink{Hendnote.75}{\color{DarkBlue}@MVBook}*{plato:total,
+  author = 	 {Plato},
+  title = 	 {Opera},
+  year = 	 1902,
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{plato:tomeiv}{anchor}{}}{\colorbox{Gainsboro}{plato:tomeiv}}*},
+  editor = 	 {Burnet, J.},
+  relatedtype =  {maintitle},
+  volumes = 	 5,
+  options = 	 {hidevolumes=false},
+  series = 	 {Oxford Classical Texts},
+  publisher =    {Clarendon Press},
+  location =     {Oxford}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=polakow:afterw]
 *\lnbackref{SuppBook}{2}*{polakow:afterw,
   author =	 {Polakow, Valerie},
@@ -733,11 +859,11 @@ documentation has left you perplexed, please let me know.
   author = 	 {Pollan, Michael},
   title = {Michael Pollan Gives a Plant's-Eye View},
   organization = {TED video, 17:31},
-  url = 	 {http://www.ted.com/index.php/
-        talks/michael_pollan_gives_a_
-        plant_s_eye_view.html},
+  titleaddon =   {filmed March 2007},
+  url = 	 {http://www.ted.com/index.php
+        /talks/michael_pollan_gives_a
+        _plant_s_eye_view.html},
   urldate = 	 {2008-02},
-  date = 	 {2007-03},
   userd = 	 {posted}
 }
 \end{lstlisting}
@@ -745,9 +871,12 @@ documentation has left you perplexed, please let me know.
 *\lnbackref{Online}{6}*{powell:email,
   author = 	 {Powell, John},
   date = 	 {1998-04-23},
-  titleaddon = {e-mail to Grapevine mailing list},
-  url =        {http://www.electriceditors.net/ grapevine/issues/83.txt},
-  shorttitle =  {\autocap{e}-mail to Grapevine mailing list}
+  titleaddon =   {Grapevine digest mailing list archives},
+  organization = {Electric Editors},
+  title =        {Pattern Matching},
+  url =          {http://www.electriceditors.net
+       /grapevine/archives.php},
+  shorttitle =   {\autocap{e}-mail to Grapevine mailing list}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=prairie:state]
@@ -791,16 +920,32 @@ documentation has left you perplexed, please let me know.
   date = 	 1895,
   shorttitle = 	 {Das Wandern},
   booktitle = 	 {Die sch\"one M\"ullerin (The Maid of the Mill)},
-  maintitle = 	 {First Vocal Album \mkbibemph{(for high voice)}},
+  maintitle = 	 {First Vocal Album},
+  maintitleaddon = {(for high voice)},
+  options =      {ctitleaddon=space},
   author = 	 {Schubert, Franz},
   publisher = {G.~Schirmer},
   address = 	 {New York}
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=souza:obama]
+*\lnbackref{Online}{6}*{souza:obama,
+  author = 	 {Souza, Pete},
+  title = 	 {President Obama bids farewell
+         to President Xi of China at the
+         conclusion of the Nuclear
+         Security Summit},
+  date = 	 {2016-04-01},
+  shorttitle = 	 {President Obama},
+  nameaddon = 	 {(@petesouza)},
+  url = 	 {https://www.instagram.com/p
+       /BDrmfXTtNCt/},
+  organization = {Instagram photo}
+}
+\end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=stenger:privacy]
-*\lnbackref{Article}{6}*{stenger:privacy,
-  journaltitle = {CNN.com},
-  entrysubtype = {magazine},
+*\lnbackref{Online}{6}*{stenger:privacy,
+  organization = {CNN.com},
   date = 	 {1999-12-20},
   author = 	 {Stenger, Richard},
   title = 	 {Tiny Human-Borne Monitoring Device Sparks Privacy Fears},
@@ -812,9 +957,11 @@ documentation has left you perplexed, please let me know.
 *\lnbackref{InReference}{2}*{wikiped:bibtex,
   title = 	 {Wikipedia},
   lista = {BibTeX},
-  url = 	 {http://en.wikipedia.org/ wiki/BibTeX},
-  urldate = 	 {2011-09-03},
-  userd = 	 {last modified}
+  entrysubtype = {online},
+  url = 	 {http://en.wikipedia.org
+       /wiki/BibTeX},
+  urldate = 	 {2019-11-15T20:59:00},
+  userd = 	 {last edited}
 }
 \end{lstlisting}
 
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 fec20977dae..0108ce813cf 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 080d8217c41..82752774541 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
@@ -4,8 +4,8 @@
 \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
-\usepackage[document]{ragged2e}
-\usepackage[notes,strict,backend=biber,autolang=other,%
+%\usepackage[document]{ragged2e}
+\usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
 bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago}
 \usepackage{lmodern}
 \usepackage{gentium}
@@ -15,45 +15,53 @@ bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
+\hyphenation{A-p-ril}
 %\renewcommand{\sfdefault}{phv}
 %\renewcommand{\ttdefault}{pcr}
-\usepackage{url}
-\urlstyle{rm}
-\appto\bibsetup{\sloppy}
+% \usepackage{url}
+% \urlstyle{rm}
+%\def\UrlNoBreaks{\do\-}
+%\appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% If someone prints annotations
 \protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 %\appto\biburlsetup{\Urlmuskip=0mu plus 4mu\relax}
-\setlength{\dimen\footins}{9.5in}
+\setlength{\dimen\footins}{9.5in}\setlength{\parindent}{0pt}
 \bibliography{notes-test}
+%\tracingmacros=1
 %%\onehalfspacing
 \begin{document}
 Note\autocite{ac:comment} note\autocite{adorno:benj}
-note\autocite{aristotle:metaphy:gr} note\autocite{adorno:benj}
-note\autocite[23]{adorno:benj} note\autocite{ashbrook:brain}
+note\autocite{american:crime} note\autocite{amlen:hoot}
+note\autocite{amlen:wordplay} note\autocite{aristotle:metaphy:gr}
+note\autocite{adorno:benj} note\autocite[23]{adorno:benj}
+note\autocite{ashbrook:brain} note\autocite{american:crime}
+note\autocite{amlen:hoot} note\autocite{amlen:wordplay}
 note\autocite[3.2.996b5--8]{aristotle:metaphy:gr}
-note\autocite{ac:comment} note\autocite{assocpress:gun}
-note\autocite{auden:reading} note\autocite[149]{ashbrook:brain}
+note\autocite{ac:comment} note\autocite{assocpress:gun}.
+
+Note\autocite{auden:reading} note\autocite[149]{ashbrook:brain}
 note\autocite{author:forthcoming} note\autocite{assocpress:gun}
-note\autocite{babb:peru}.
+note\autocite{babb:peru} note\autocite{author:forthcoming}
+note\autocite{auden:reading} note\autocite{barcott:review}
+note\autocite{batson} note\autocite{babb:peru}
+note\autocite{barcott:review} note\autocite[339]{batson}
+note\autocite{beattie:crime}.
 
-Note\autocite{author:forthcoming} note\autocite{auden:reading}
-note\autocite{barcott:review} note\autocite{batson}
-note\autocite{babb:peru} note\autocite{barcott:review}
-note\autocite[339]{batson} note\autocite{beattie:crime}
-note\autocite{bedford:photo} note\autocite{babb:peru}
+Note\autocite{bedford:photo} note\autocite{babb:peru}
 note\autocite{beethoven:sonata29} note\autocite{bernhard:boris}
+note\autocite{bernhard:ritter} note\autocite{bernstein:shostakovich}
+note\autocite{black:infectious} note\autocite{boxer:china}
+note\autocite{beattie:crime} note\autocite{braun:reply}
+note\autocite{brown:bremer} note\autocite{beethoven:sonata29}
 note\autocite{bernhard:ritter}.
 
-Note\autocite{bernstein:shostakovich} note\autocite{boxer:china}
-note\autocite{beattie:crime}  note\autocite{brown:bremer}
-note\autocite{beethoven:sonata29} note\autocite{bernhard:ritter}
-note\autocite{bernstein:shostakovich} note\autocite{bernhard:boris}
+Note\autocite{bernstein:shostakovich} note\autocite{bernhard:boris}
+note\autocite{black:infectious} note\autocite{braun:reply}
 note\autocite{boxer:china} note\autocite{browning:aurora}
 note\autocite[pt.\ 2, 55]{brown:bremer} note\autocite{bundy:macneil}
-note\autocite{centinel:letters}.
-
-Note\autocite{chaucer:liferecords} note\autocite{browning:aurora}
+note\autocite{centinel:letters}.  Note\autocite{chaucer:liferecords}
+note\autocite{browning:aurora}
 note\autocite[\printdate]{bundy:macneil}
 note\autocite[29]{centinel:letters}.
 
@@ -73,14 +81,17 @@ note\autocite{cotton:manufacture} note\autocite{creasey:morton:hide}
 note\autocite{coolidge:speech} note\autocite{creasey:ashe:blast}
 note.\footnote{\headlessfullcite{creel:house}.}
 
-Note\autocite{davenport:attention} note\autocite{creasey:york:death}
-note\autocite{creasey:morton:hide}
-note\footnote{\headlesscite[\letterdatelong]{creel:house}.}
-note\autocite{dinkel:agassiz} note\autocite{donne:var}
+Note\autocite{danforth:podcast} note\autocite{davenport:attention}
+note\autocite{creasey:york:death} note\autocite{creasey:morton:hide}.
+
+Note\footnote{\headlesscite[\letterdatelong]{creel:house}.}
+note\autocite{diaz:surprise} note\autocite{dinkel:agassiz}
+note\autocite{donne:var} note\autocite{danforth:podcast}
 note\autocite{davenport:attention} note\autocite{dunn:revolutions}
-note\autocite{dyna:browser} note\autocite{dinkel:agassiz}
-note\autocite{eliot:pound} note\autocite{ellet:galena}
-note\autocite{donne:var} note\autocite{dyna:browser}.
+note\autocite{diaz:surprise} note\autocite{dyna:browser}
+note\autocite{dinkel:agassiz} note\autocite{eliot:pound}
+note\autocite{ellet:galena} note\autocite{donne:var}
+note\autocite{dyna:browser}.
 
 Note\autocite{ellis:blog} note\autocite{emerson:nature}
 note\footfullcite{ency:britannica} note\autocite{dunn:revolutions}
@@ -95,138 +106,160 @@ note\autocite{evanston:library} note\autocite{feydeau:farces}
 note\autocite{floyd:atom} note\autocite{frede:inproc}
 note\autocite{friedman:learning} note\autocite{friends:leia}
 note\autocite{furet:passing:eng} note\autocite{garaud:gatine}
-note\autocite{garrett} note\autocite{gibbard}.
+note\autocite{garrett} note\autocite{genbank:db}
+note\autocite{naraya}.
 
-Note\autocite{friends:leia} note\autocite{furet:passing:eng}
-note\autocite{garrett} note\autocite{good:wholeissue}
-note\autocite{gourmet:052006} note\autocite{garaud:gatine}
-note\autocite{greek:filmstrip} note\autocite{grove:sibelius}
+Note\autocite{gibbard} note\autocite{friends:leia}
+note\autocite{furet:passing:eng} note\autocite{garrett}
+note\autocite{genbank:db} note\autocite{naraya}
+note\autocite{good:wholeissue} note\autocite{gourmet:052006}
+note\autocite{garaud:gatine} note\autocite{gems:print}
+note\autocite{gems:ipad} note\autocite{greek:filmstrip}
+note\autocite{grove:sibelius} note\autocite{hamilton:miranda}
 note\autocite{handel:messiah} note\autocite{harley:cartography}
 note\autocite{harley:ancient:cart} note\autocite{harwood:biden}
-note\autocite{gibbard} note\autocite{hitchcock:nbynw}.
+note\autocite{gibbard} note\autocite{harleymt:hoc}
+note\autocite{harleymt:hoc-harleymt:ancient:cart}
+note\autocite{harleymt:hoc-harleymt:cartography}.
 
-Note\autocite{good:wholeissue} note\autocite{hlatky:hrt}
-note\autocite{greek:filmstrip} note\autocite{gourmet:052006}
+Note\autocite{hitchcock:nbynw} note\autocite{gems:print}
+note\autocite{gems:ipad} note\autocite{good:wholeissue}
+note\autocite{hlatky:hrt} note\autocite{greek:filmstrip}
+note\autocite{gourmet:052006} note\autocite{hamilton:miranda}
 note\autocite{handel:messiah} note\autocite{harwood:biden}
 note\autocite[Sibelius, Jean]{grove:sibelius}
 note\autocite{hitchcock:nbynw} note\autocite{holiday:fool}
 note\autocite{horsley:prosodies} note\autocite{harley:cartography}
 note\autocite{horowitz:youtube}.
 
-Note\autocite{harley:ancient:cart}
-note\autocite{jackson:paulina:letter} note\autocite{hlatky:hrt}
-note\autocite{james:ambassadors} note\autocite{holiday:fool}
-note\autocite{horowitz:youtube} note\autocite{horsley:prosodies}
-note\autocite{keating:dearborn} note\autocite{jackson:paulina:letter}
-note\autocite{kern} note\autocite{james:ambassadors}
-note\autocite{kimluu:diethyl}.
+note\autocite{harley:ancient:cart} note\footfullcite{quora:thread}
+note\autocite{jackson:paulina:letter} note\autocite{harleymt:hoc}
+note\autocite[43]{harleymt:hoc-harleymt:ancient:cart}
+note\autocite[54]{harleymt:hoc-harleymt:cartography}
+note\autocite{hlatky:hrt} note\autocite{james:ambassadors}
+note\autocite{holiday:fool} note\autocite{horowitz:youtube}
+note\autocite{horsley:prosodies} note\autocite{quora:thread}.
 
-Note\autocite{keating:dearborn} note\autocite{kozinn:review}
+Note\autocite{keating:dearborn} note\autocite{jackson:paulina:letter}
+note\autocite{kern} note\autocite{kessler:nyt}
+note\autocite{james:ambassadors} note\autocite{kimluu:diethyl}
+note\autocite{keating:dearborn} note\autocite{kozinn:review}
 note\autocite{kern} note\autocite{lach:asia}
-note\autocite{kimluu:diethyl} note\autocite{lakeforester:pushcarts}
-note\autocite{kozinn:review} note\autocite{levistrauss:savage}
-note\autocite{lach:asia} note\autocite{leo:madonna}
-note\autocite{lewis} note\autocite{lakeforester:pushcarts}
+note\autocite{kessler:nyt} note\autocite{kimluu:diethyl}.
+
+Note\autocite{lakeforester:pushcarts} note\autocite{kozinn:review}
+note\autocite{levistrauss:savage} note\autocite{lach:asia}
+note\autocite{leo:madonna} note\autocite{lewis}
+note\autocite{lakeforester:pushcarts}
 note\autocite{levistrauss:savage} note\autocite{lecarre:quest}
 note\autocite[29]{lewis} note\autocite{lecarre:quest}
-note\autocite{lippincott:chicago}.
+note\autocite{licis:diazcomment} note\autocite{lippincott:chicago}
+note\autocite{loften:hamlet} note\autocite{maisonneuve:relations}
+note\autocite{licis:diazcomment} note\autocite{lippincott:chicago}
+note\autocite{loften:hamlet} note\autocite{mayberry:brady}
 
-Note\autocite{loften:hamlet} note\autocite{maisonneuve:relations}
-note\autocite{lippincott:chicago} note\autocite{loften:hamlet}
-note\autocite{mchugh:wake} note\autocite{mcmillen:antebellum}
-note\autocite{maisonneuve:relations}
+note\autocite{mccurry:afghangirl} note\autocite{mchugh:wake}
+note\autocite{mcmillen:antebellum}.
+
+Note\autocite{maisonneuve:relations}
 note\footnote{\headlessfullcite[2:218]{meredith:letters}.}
+note\autocite{mayberry:brady} note\autocite{mccurry:afghangirl}
 note\autocite{mchugh:wake} note\autocite[6.9.4]{mla:style}
-note\autocite{morgenson:market} note\autocite{mozart:figaro}.
-
-Note\autocite{murphy:silent} note\autocite{nasa:db}
-note\autocite{nass:address} note\autocite{mcmillen:antebellum}
-note\autocite{natrecoff:camera} note\autocite[2:25]{meredith:letters}
-note\autocite[6.9.5]{mla:style} note\autocite{morgenson:market}
-note\autocite{murphy:silent} note\autocite{mozart:figaro}
-note\autocite{nasa:db} note\autocite{nass:address}.
-
-Note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}
-note\autocite{nytrumpet:art} note\autocite{osborne:poison}
-note\autocite{oed:cdrom} note\autocite{natrecoff:camera}
-note\autocite{palmatary:pottery} note\autocite{nyt:obittrevor}
-note\autocite{nyt:trevorobit} note\autocite[arithmetical]{oed:cdrom}
-note\autocite{nytrumpet:art} note\autocite{pelikan:christian}
-note\autocite{petroff:impurity} note\autocite{osborne:poison}
-note\autocite{phibbs:diary}.
-
-Note\autocite{palmatary:pottery} note\autocite{pirumova}
-note\autocite{pelikan:christian} note\autocite{petroff:impurity}
-note\autocite{plato:republic:gr} note\autocite{polakow:afterw}
-note\autocite{phibbs:diary}
-note\autocite[360e--361b]{plato:republic:gr} note\autocite{pirumova}
+note\autocite{morgenson:market} note\autocite{mozart:figaro}
+note\autocite{murphy:silent} note\autocite{nasa:db}
+note\autocite{nass:address} note\autocite{mcmillen:antebellum}.
+
+Note\autocite{niso:bibref} note\autocite{natrecoff:camera}
+note\autocite[2:25]{meredith:letters} note\autocite[6.9.5]{mla:style}
+note\autocite{morgenson:market} note\autocite{murphy:silent}
+note\autocite{mozart:figaro} note\autocite{nasa:db}
+note\autocite{nass:address} note\autocite{niso:bibref}
+note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}.
+
+Note\autocite{nytrumpet:art} note\autocite{obrien:recycle}
+note\autocite{osborne:poison} note\autocite{oed:cdrom}
+note\autocite{natrecoff:camera} note\autocite{palmatary:pottery}
+note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}
+note\autocite{obrien:recycle} note\autocite[arithmetical]{oed:cdrom}
+note\autocite{nytrumpet:art} note\autocite{pelikan:christian}.
+
+Note\autocite{petroff:impurity} note\autocite{osborne:poison}
+note\autocite{phibbs:diary} note\autocite{palmatary:pottery}
+note\autocite{pirumova} note\autocite{pelikan:christian}
+note\autocite{petroff:impurity} note\autocite{plato:republic:gr}
+note\autocite{plato:total} note\autocite{plato:timaeus:gr}
+note\autocite{polakow:afterw} note\autocite{phibbs:diary}.
+
+Note\autocite[360e--361b]{plato:republic:gr} note\autocite{pirumova}
 note\autocite{polakow:afterw} note\autocite{pollan:plant}
-note\autocite{powell:email}.
+note\autocite{powell:email} note\autocite{plato:total}
+note\autocite[37d]{plato:timaeus:gr} note\autocite{prose:intro}
+note\autocite{ratliff:review} note\autocite{reaves:rosen}
+note\autocite{pollan:plant} note\autocite{powell:email}.
 
-Note\autocite{prose:intro} note\autocite{ratliff:review}
-note\autocite{reaves:rosen} note\autocite{pollan:plant}
-note\autocite{powell:email} note\autocite{prose:intro}
-note\autocite{rodman:walk} note\autocite{roosevelt:speech}
+Note\autocite{prose:intro} note\autocite{rodman:walk}
+note\autocite{roosevelt:speech} note\autocite{angry:birds}
 note\autocite{ross:thesis} note\autocite{ratliff:review}
-note\autocite{rozner:liberation} note\autocite{rubinstein:chopin}.
-
-Note\autocite{saberhagen:beluga} note\autocite{schellinger:novel}
-note\autocite{reaves:rosen} note\autocite{schubert:muellerin}
-note\autocite{rodman:walk} note\autocite{schweitzer:bach}
-note\autocite{roosevelt:speech} note\autocite{ross:thesis}
 note\autocite{rozner:liberation} note\autocite{rubinstein:chopin}
-note\autocite{sechzer:women} note\autocite{schellinger:novel}
-note\autocite{sereny:cries} note\autocite{schubert:muellerin}
-note\autocite{saberhagen:beluga}.
+note\autocite{saberhagen:beluga} note\autocite{schellinger:novel}
+note\autocite{reaves:rosen} note\autocite{schubert:muellerin}
+note\autocite{rodman:walk} note\autocite{schweitzer:bach}.
 
-Note\autocite{schweitzer:bach}
-note\footnote{\headlessfullcite{sewall:letter}.}
-note\autocite{shapey:partita} note\autocite{sechzer:women}
+note\autocite{roosevelt:speech}.  note\autocite{ross:thesis}
+note\autocite{angry:birds} note\autocite{rozner:liberation}.
+note\autocite{rubinstein:chopin} note\autocite{sechzer:women}
+note\autocite{schellinger:novel} note\autocite{sereny:cries}
+note\autocite{schubert:muellerin} note\autocite{saberhagen:beluga}
+note\autocite{schweitzer:bach}
+note.\footnote{\headlessfullcite{sewall:letter}.}
+
+Note\autocite{shapey:partita} note\autocite{sechzer:women}
 note\autocite{sirosh:visualcortex} note\autocite{sereny:cries}
 note\autocite{silver:gawain}
 note\footnote{\headlesscite{sewall:letter}.}
 note\autocite{soltes:georgia} note\autocite{sirosh:visualcortex}
-note\autocite{spock:interview} note\autocite{shapey:partita}.
+note\autocite{spock:interview} note\autocite{shapey:partita}
+note\autocite{stenger:privacy} note\autocite{silver:gawain}.
 
-Note\autocite{stenger:privacy} note\autocite{silver:gawain}
-note\autocite{tillich:system} note\autocite{soltes:georgia}
+Note\autocite{tillich:system} note\autocite{soltes:georgia}
 note\autocite{spock:interview} note\autocite{times:guide}
 note\autocite{twain:audio} note\autocite{virginia:plantation}
-note\autocite{stenger:privacy} note\autocite{chicago:manual}
-note\autocite{twain:audio} note\autocite[2:45]{tillich:system}.
-
-Note\autocite[police ranks]{times:guide}
+note\autocite{rihanna:umbrella} note\autocite{stenger:privacy}
+note\autocite{chicago:manual} note\autocite{twain:audio}
+note\autocite[2:45]{tillich:system} note\autocite[police
+ranks]{times:guide} note\autocite{rihanna:umbrella}
 note\autocite{virginia:plantation} note\autocite{chicago:manual}
 note\autocite{unsigned:ranke} note\autocite{herwign:office}
-note\autocite{verdi:corsaro} note\autocite{wallraff:word}
+note\autocite{verdi:corsaro}.
+
+Note\autocite{viv:amlen} note\autocite{wallraff:word}
 note\autocite{unsigned:ranke} note\autocite{warr:ellison}
 note\autocite{herwign:office} note\autocite{wallraff:word}
-note\autocite{verdi:corsaro} note\autocite{wauchope:ceramics}.
+note\autocite{verdi:corsaro} note\autocite{wauchope:ceramics}
+note\autocite{viv:amlen} note\autocite{weed:flatiron}
+note\autocite{weresz} note\autocite{white:callimachus}.
 
-Note\autocite{weed:flatiron} note\autocite{weresz}.
-note\autocite{white:callimachus} note\autocite{white:ross:memo}
-note\autocite{warr:ellison} note\autocite{weed:flatiron}
-note\autocite{wikiped:bibtex} note\autocite{will:cohere}
-note\autocite{wauchope:ceramics}.  As \textcite{zukowsky:chicago}
-says.
+Note\autocite{white:ross:memo} note\autocite{warr:ellison}
+note\autocite{weed:flatiron} note\autocite{wikiped:bibtex}
+note\autocite{will:cohere} note\autocite{wauchope:ceramics}.  As
+\textcite{zukowsky:chicago} says.  Note\autocite{weresz}
+note\autocite{white:russ} note\autocite{w3c:xml}.
 
-Note\autocite{weresz} note\autocite{white:russ}
-note\autocite{white:callimachus} note\autocite{white:ross:memo}
+Note\autocite{white:callimachus} note\autocite{white:ross:memo}
 note\autocite{white:russ} note\autocite[BibTeX]{wikiped:bibtex}
-note\autocite{will:cohere} note\footnote{\textcite{zukowsky:chicago}
-  makes a similar point.}
+note\autocite{will:cohere} note\autocite{w3c:xml}
+note\footnote{\textcite{zukowsky:chicago} makes a similar point.}
 note\autocites[See][3.2.996b5--8]{aristotle:metaphy:gr}[360e--361b]
 {plato:republic:gr}[and also][for additional
 information]{white:callimachus} note\autocite{aristotle:metaphy:trans}
 note\autocites[See][]{mchugh:wake}[and][569]{warr:ellison}
-note.\footnote{\citetitles{warr:ellison}{mchugh:wake}.}
+note\footnote{\citetitles{warr:ellison}{mchugh:wake}.}
+note.\footnote{\Citetitle{powell:email}.}
 
-Note\footnote{\Citetitle{powell:email}.}
-note\footnote{\headlessfullcite[3:126]{meredith:letters}.}
+Note\footnote{\headlessfullcite[3:126]{meredith:letters}.}
 note\autocite[3:126]{meredith:letters} note\footfullcite[2]{weresz}
 note\autocite[2]{weresz} note\footnote{\fullcite{zukowsky:chicago}.}
 note.\footnote{\cite*{zukowsky:chicago}.}
-
 \nocite{furet:related,house:papers}
 
 \printshorthands
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 042c5a7b463..0a771acc107 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 79f284a89d6..a2c8e654de9 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
@@ -37,7 +37,7 @@ plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey]{hyperref}
 %%\onehalfspacing
 \begin{document}
 
-\nocite{barcott:review:15,donne:var:15,shapey:partita:15}
+\nocite{barcott:review:15,donne:var:15,shapey:partita:15,viv:amlen:15}
 \section*{Appendix: \texttt{authordate-trad} References}
 \label{sec:trad:appendix}
 \printbibliography[heading=none]
@@ -93,6 +93,16 @@ plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey]{hyperref}
   institution =  {University of Chicago}
 }
 \end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=viv:amlen:15]
+*\adlnbackref{Review}{viv:amlen:15}*,
+  author = 	 {Viv},
+  entrysubtype = {magazine},
+  title = 	 {comment on Amlen, Hoot},
+  nameaddon = 	 {(Jerusalem, Isr.)},
+  crossref = 	 {amlen:hoot},
+  eventdate = 	 {2015-01-27}
+}
+\end{lstlisting}
 \end{document}
 %%% Local Variables: 
 %%% mode: latex
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 da398677180..f678ffcaf89 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 78be328258a..f6a1a88e031 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
@@ -25,7 +25,7 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
-\protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
+\protected\def\onethird{\mbox{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \usepackage[colorlinks,urlcolor=blue,citecolor=black,
@@ -38,23 +38,9 @@ plainpages=false,breaklinks=true]{hyperref}
   \ Testing Only}
 \label{sec:spec}
 
-\subsection*{Please see cms-dates-intro.pdf first}
+\subsection*{Please don't read on. See cms-dates-intro.pdf first}
 \label{bibernote}
 
-Starting with \textsf{biblatex} version 1.5, in order to adhere to the
-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.10) and \textsf{biblatex} (3.10), 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
-\textsf{biblatex} version 1.4c and \textsf{biblatex-chicago} 0.9.7a.
-(Please contact me at the email address in
-\textsf{biblatex-chicago.pdf} if you have any difficulty obtaining a
-copy of this earlier release.)
-
 \subsection*{Editions}
 \label{editions}
 
@@ -464,7 +450,7 @@ InCollection: \autocite{centinel:letters}; \autocite{ellet:galena};
 \autocite{keating:dearborn}; \autocite{lippincott:chicago};
 \autocite{sirosh:visualcortex}; \autocite{wiens:avian}.
 
-InProceedings: \autocite{frede:inproc}.
+InProceedings: \autocite{frede:inproc:trad}.
 
 InReference: \autocite[absolute]{oed:cdrom}.
 
@@ -496,6 +482,40 @@ Unpublished: \autocite{nass:address}.
 
 Video: \autocite{cleese:holygrail}; \autocite{hitchcock:nbynw}.
 
+\subsubsection*{Additions and changes for the 17th edition}
+\label{ed17}
+
+Article: \autocite{amlen:hoot}; \autocite{black:infectious};
+\autocite{kessler:nyt}; \autocite{saberhagen:beluga};
+\autocite{stoffle:ghost}.
+
+Artwork: \autocite{mccurry:afghangirl}.
+
+Audio: \autocite{danforth:podcast}; \autocite{strayed:audiobook}.
+
+Book: \autocite{angry:birds}; \autocite{gems:ipad};
+\autocite{gems:print}.
+
+Dataset: \autocite{genbank:db}; \autocite{nasa:db}.
+
+Music: \autocite{naraya}; \autocite{rihanna:umbrella}.
+
+Online: \autocite{diaz:surprise}; \autocite{obrien:recycle};
+\autocite{quora:thread}; \autocite{souza:obama}; comments with
+\texttt{commenton}: \autocites{braun:reply}{quora:thread-customc};
+\autocites{licis:diazcomment}{diaz:surprise-customc}.
+
+Performance: \autocite{hamilton:miranda}.
+
+Periodical: \autocite{amlen:wordplay}.
+
+Review: blog comment without \texttt{commenton}:
+\autocite{viv:amlen:15}; blog comment with \texttt{commenton}:
+\autocites{ac:comment}{ellis:blog-customc}.
+
+Standard: \autocite{niso:bibref}; \autocite{w3c:xml}.
+
+Video: \autocite{american:crime}; \autocite{mayberry:brady}.
 
 % \printshorthands % No longer necessary in author-date.
 % \nocite{*}
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 296de365a64..4f455ebc0fc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -21,75 +21,67 @@
   entrysubtype = {magazine},
   author = 	 {Clemens, David},
   date = 	 {2000-04-21},
-  title = {letter to the editor},
+  title =        {letter to the editor},
   annotation = 	 {A typical letter to an editor, using a Review entry
-                  by necessity in the 16th edition, though you can use
-                  an Article entry in the 15th edition, where either
-                  will work.  Note the use of the lower-case initial
-                  letter in the title, which isn't strictly necessary
-                  in author-date, though it works fine.}
-}
-
-@CustomC{abbrev:BSI,
-  author = 	 {BSI},
-  title = 	 {British Standards Institute},
-  annotation = 	 {A CustomC entry presenting the expansion of a
-                  shorthand from another entry (bsi:abbreviation).  It
-                  allows the presentation of that expansion in the
-                  correct, alphabetized place in the list of
-                  references. 15th Edition Only.}
-}
-
-@CustomC{abbrev:ISO,
-  entrysubtype = {classical},
-  author = 	 {ISO},
-  title = 	 {International Organization for Standardization},
-  annotation = 	 {A CustomC entry presenting the expansion of a
-                  shorthand from another entry (iso:electrodoc).  It
-                  allows the presentation of that expansion in the
-                  correct, alphabetized place in the list of
-                  references.  The entrysubtype allows you to print
-                  the expansion elsewhere, e.g., in a footnote. 15th
-                  edition only.}
+                  Note the use of the lower-case initial letter in the
+                  title, which isn't strictly necessary in
+                  author-date, though it works fine.}
 }
 
 @Review{ac:comment,
   entrysubtype = {magazine},
   author = 	 {AC},
-  eventdate = 	 {2008-07-01},
-  nameaddon = 	 {(10:18 a.m.)},
-  crossref = 	 {ellis:blog},
+  eventdate = 	 {2008-07-01T10:18:00},
+  related = 	 {ellis:blog},
+  relatedtype =  {commenton},
   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
-                  material.  With only a generic title, it takes a
-                  Review entry instead of an Article one, and the
-                  crossref field points to the blog to which the
-                  comment is attached.  The eventdate gives the date
-                  of the comment, and if additional temporal
-                  specificity is required then you can use the
-                  nameaddon field to give a timestamp, inside
-                  parentheses.}
+  annotation = 	 {The 17th edition is more explicit about how to
+                  present comments on online material. For blog
+                  comments with their generic titles a \textsf{Review}
+                  entry presents a comment, while the blog itself is
+                  in an \textsf{Article} entry. Here the
+                  \textsf{related} field points to the blog, and the
+                  \texttt{commenton} \textsf{relatedtype} helps manage
+                  the presentation. By default, without any
+                  \texttt{cmsdate} or \texttt{skipbib} option in the
+                  \textsf{options} field, using this
+                  \textsf{relatedtype} prevents the entry from
+                  appearing in the reference list and presents the
+                  full date of the comment in citations, as the
+                  \emph{Manual} prefers. A virtual entry,
+                  ellis:blog-customc, is created that you can include
+                  in an \cmd{autocites} command with the comment
+                  itself, allowing the citation also to point to the
+                  entry on which it is a comment. The eventdate gives
+                  the date of the comment, and if additional
+                  specificity is required then you can provide a time
+                  stamp in ISO8601-2 format in the same field. This
+                  entry works perfectly well for both author-date
+                  styles, but if you don't want to use the
+                  \texttt{commenton} \textsf{relatedtype} then
+                  ac:comment:trad shows how to construct an entry by
+                  hand, allowing it to appear in the reference list,
+                  as well.}
 }
 
 @Review{ac:comment:trad,
   entrysubtype = {magazine},
   author = 	 {AC},
-  eventdate = 	 {2008-07-01},
-  nameaddon = 	 {(10:18 a.m.)},
+  eventdate = 	 {2008-07-01T10:18:00},
   crossref = 	 {ellis:blog},
   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
-                  or other online material.  Note the sentence-style
-                  capitalization in the title field, and the crossref
-                  field which points to the blog to which the comment
-                  is attached.  The eventdate gives the date of the
-                  comment, and if additional temporal specificity is
-                  required then you can use the nameaddon field to
-                  give a timestamp, inside parentheses.}
+  annotation = 	 {If, despite the preferences of the 17th edition, you
+                  want to include a blog comment in the reference
+                  list, and if you don't want to use the "commenton"
+                  relatedtype, then this authordate-trad entry shows
+                  how. Note the sentence-style capitalization in the
+                  title field, and the crossref field which points to
+                  the blog to which the comment is attached. The
+                  eventdate gives the date of the comment, and if
+                  additional specificity is required then a time stamp
+                  in ISO8601-2 format in that same field will provide
+                  it.}
 }
 
 @Book{adorno:benj,
@@ -99,7 +91,7 @@
   author = 	 {Adorno, Theodor W. and Benjamin, Walter},
   editor = 	 {Lonitz, Henri},
   translator = 	 {Nicholas Walker},
-  location =  {Cambridge, MA},
+  location =     {Cambridge, MA},
   annotation = 	 {A published collection of letters, in a
                   \textsf{Book} entry rather than \textsf{Letter}.
                   Citations of it could provide details of the
@@ -107,6 +99,93 @@
                   cite by page number.}
 }
 
+@Video{american:crime,
+  title = 	 {{Marcia, Marcia, Marcia}},
+  eventdate = 	 {2016-03-08},
+  editora = 	 {DeVincentis, D.~V\adddot},
+  booktitle = 	 {American Crime Story},
+  editortype = 	 {director},
+  editoratype =  {written by},
+  editorbtype =  {featuring},
+  usera = 	 {FX},
+  entrysubtype = {tvepisode},
+  editor = 	 {Murphy, Ryan},
+  editorb = 	 {Brown, Sterling~K\adddot and Choi, Kenneth and
+                  Paulson, Sarah},
+  booksubtitle = {The People v. {O.~J. Simpson}},
+  booktitleaddon = {episode 6},
+  url = 	 {https://www.amazon.com/dp/B01ARVPCOA},
+  annote =       {The 17th edition recommends a change in the syntax
+                  of entries presenting episodes of TV series, whereby
+                  the title of the series (in \textsf{booktitle})
+                  comes before the title of the episode (in
+                  \textsf{title}). The \texttt{tvepisode}
+                  \textsf{entrysubtype} provides this. Note here also
+                  the numerous editors and editortypes allowing the
+                  specification of various sorts of contributions to
+                  the show, and the \textsf{usera} field containing
+                  the broadcast network. In this instance the
+                  \textsf{editor} field provides the name for
+                  citations and the head of the entry. The
+                  \textsf{eventdate}, which provides the labeldate,
+                  has both month and day in addition to year, so the
+                  whole date will be printed in full in the body of
+                  the reference list entry.}}
+
+@Article{amlen:hoot,
+  author = 	 {Amlen, Deb},
+  title = 	 {One Who Gives a Hoot},
+  journaltitle = {Wordplay},
+  entrysubtype = {magazine},
+  maintitle = 	 {New York Times},
+  location = 	 {blog},
+  date = 	 {2015-01-26},
+  url = 	 {http://wordplay.blogs.nytimes.com/2015/01/26/one-who-gives-a-hoot/},
+  annote =       {The 17th edition suggests an \textsf{Article} entry
+                  like this for a blog post, and when the blog is part
+                  of a larger, usually periodical, publication, the
+                  latter should appear in the \textsf{maintitle}
+                  field. As usual, the \textsf{location} field
+                  indicates that it's a blog. Cf.\
+                  \cmslink{viv:amlen}, which presents a comment on the
+                  blog.}}
+
+@Periodical{amlen:wordplay,
+  editor = 	 {Amlen, Deb},
+  entrysubtype = {magazine},
+  options = 	 {authortitle},
+  title =        {Wordplay},
+  maintitle =    {New York Times},
+  location =     {blog},
+  url = 	 {http://wordplay.blogs.nytimes.com},
+  annote =       {Although the 17th edition indicates that citations
+                  of entire blogs (\textsf{Periodical} type), rather
+                  than individual posts (\textsf{Article} type), need
+                  appear only in the text and not in the reference
+                  list, this entry shows how to present such
+                  material. As there isn't any \textsf{date}
+                  associated with the entry, the \texttt{authortitle}
+                  option means that citations will appear in that more
+                  informative format, although \textt{n.d.} will still
+                  appear in the reference list. As with amlen:hoot,
+                  the \textsf{maintitle} field contains the larger
+                  publication of which the blog is a part.}}
+
+@Book{angry:birds,
+  author = 	 {{Rovio Entertainment}},
+  title = 	 {Angry Birds Transformers},
+  date = 	 2014,
+  publisher =    {Rovio Entertainment},
+  version = 	 {1.4.25},
+  type = 	 {Android 4.0 or later},
+  addendum =     {soundtrack by Vince DiCola and Kenny Meriedeth},
+  annote =       {The 17th edition's recommendations for multimedia
+                  app content make it a good fit for the \textsf{Book}
+                  type, with the addition of the \textsf{version}
+                  field for the software version and the \textsf{type}
+                  field for the operating system environment in which
+                  it runs.}}
+
 @Book{anon:stanze,
   title = 	 {Stanze in lode della donna brutta},
   date = 	 1547,
@@ -117,47 +196,37 @@
                   a \textsf{shorttitle} for in-text citations.}
 }
 
-@Book{anon:stanze:15,
-  title = 	 {Stanze in lode della donna brutta},
-  date = 	 1547,
-  author = 	 {Anon\adddot},
-  address = 	 {Florence},
-  annotation = 	 {One 15th edition only solution for an anonymous
-                  work in an author-date reference list.  All such
-                  works will be grouped together in the list.}
-}
-
 @Book{aristotle:metaphy:gr,
   shorttitle = 	 {Metaph\adddot},
   title = 	 {Metaphysics},
   options = 	 {skipbib},
   entrysubtype = {classical},
   origdate = 	 1924,
-  date = 1997,
+  date =         1997,
   author = 	 {Aristotle},
   editor = 	 {Ross, W.~D.},
-  publisher = {Oxford Univ.\ Press and Sandpiper Books},
+  publisher =    {Oxford Univ.\ Press and Sandpiper Books},
   pubstate = 	 {reprint},
   volumes = 	 2,
-  location =  {Oxford},
+  location =     {Oxford},
   annotation = 	 {A work from classical antiquity, presented in a
                   \textsf{Book} entry with \texttt{classical}
                   \textsf{entrysubtype}, hence in-text citations will
-                  be author-title rather than author-date.  This
+                  be author-title rather than author-date. This
                   assumes you are using the traditional, fixed
                   divisions of the text, in this case those of
                   Bekker's edition, instead of page references to this
-                  particular edition.  In the latter case, you
-                  wouldn't need the \textsf{entrysubtype}.  Putting
+                  particular edition. In the latter case, you wouldn't
+                  need the \textsf{entrysubtype}. Putting
                   \texttt{skipbib} in the \textsf{options} field means
                   it won't be printed separately in the reference
                   list, because it will be appended to the entry for
-                  the English translation, given below.  This volume
-                  is a reprint edition, identified as such in the
-                  \textsf{pubstate} field.  The absence of any
+                  the English translation, given below. This volume is
+                  a reprint edition, identified as such in the
+                  \textsf{pubstate} field. The absence of any
                   \texttt{cmsdate} instruction in the \textsf{options}
                   field means that the reprint information is
-                  presented as you see it here.  The
+                  presented as you see it here. The
                   \textsf{shorttitle} provides the
                   officially-sanctioned abbreviation for this work in
                   citations, should you want to use such
@@ -175,9 +244,9 @@
   origlanguage = {greek},
   userf = 	 {aristotle:metaphy:gr},
   maintitle = 	 {The Works of {Aristotle}, Translated into {English}},
-  publisher = {Clarendon Press},
+  publisher =    {Clarendon Press},
   edition = 	 2,
-  location =  {Oxford},
+  location =     {Oxford},
   annotation = 	 {The translation of the previous entry, in this case
                   also using \textsf{Book} with \texttt{classical}
                   \textsf{entrysubtype}, as citations will be by the
@@ -200,10 +269,10 @@
   author = 	 {Ashbrook, James~B. and Albright, Carol Rausch},
   title = 	 {The Frontal Lobes, Intending, and a Purposeful {God}},
   booktitle = 	 {The Humanizing Brain},
-  publisher = {Pilgrim Press},
+  publisher =    {Pilgrim Press},
   year = 	 1997,
   chapter = 	 7,
-  location =  {Cleveland, OH},
+  location =     {Cleveland, OH},
   annotation = 	 {A typical \textsf{InBook} entry, identified by
                   \textsf{title} and also, in this case, by
                   \textsf{chapter} number rather than page range.}
@@ -230,8 +299,8 @@
   title = 	 {Westchester Approves Measure on Gun Safety},
   annotation = 	 {A fairly typical Article entry from a newspaper,
                   with the keyword "magazine" as entrysubtype, and
-                  with a corporate author inside an extra set of curly
-                  braces.}
+                  with a news service as author inside an extra set of
+                  curly braces.}
 }
 
 @Music{auden:reading,
@@ -250,25 +319,6 @@
                   \textsf{dates-test.bib}.}
 }
 
-@Music{auden:reading:15,
-  title = 	 {Poems},
-  author = 	 {Auden, W. H.},
-  number = 	 7137,
-  series = 	 {Spoken Arts},
-  type = 	 {compact disc},
-  entrysubtype = {classical},
-  note = 	 {read by the author},
-  annotation = 	 {An audiobook, lacking traditional publishing
-                  information, presented in a Music entry, with which
-                  cp. twain:audio, an Audio entry.  Here, the type
-                  field contains the medium, while the series and
-                  number field contain the label information for the
-                  CD, as is standard in Music entries.  The
-                  entrysubtype may help with in-text citations of a
-                  source like this in the author-date style. 15th
-                  edition only.}
-}
-
 @Article{author:forthcoming,
   author = 	 {Author, Margaret~M.},
   title = 	 {Article Title},
@@ -278,7 +328,7 @@
   annotation = 	 {An example of how to deal with a forthcoming
                   \textsf{Article} by placing the string
                   \texttt{forthcoming} into the \textsf{pubstate}
-                  field.  Cf.\ the alternate way of doing this in
+                  field. Cf.\ the alternate way of doing this in
                   \cmslink{contrib:contrib}.}
 }
 
@@ -287,9 +337,9 @@
   subtitle = 	 {The Political Economy of Marketwomen in {Peru}},
   year = 	 1989,
   author = 	 {Babb, Florence},
-  publisher = {University of Texas Press},
+  publisher =    {University of Texas Press},
   edition = 	 {\bibstring{revisededition}},
-  location =  {Austin},
+  location =     {Austin},
   annotation = 	 {A revised edition, with the \cmd{bibstring}
                   \texttt{revisededition} in the \textsf{edition}
                   field.}
@@ -306,10 +356,10 @@
   annote = 	 {A \textsf{Review} entry presenting a review from a
                   newspaper, with keyword \texttt{magazine} in
                   \textsf{entrysubtype}, and with the \cmd{bibstring}
-                  \texttt{reviewof} in the \textsf{title} field.  You
+                  \texttt{reviewof} in the \textsf{title} field. You
                   could just write \enquote{review of} instead, but
                   the \cmd{bibstring} makes the entry portable across
-                  languages.  Note the formatting of the reviewed
+                  languages. Note the formatting of the reviewed
                   book's title using \cmd{mkbibemph}, and the
                   headline-style capitalization you have to provide by
                   hand inside that formatting, which makes this entry
@@ -327,19 +377,19 @@
   annotation = 	 {Because of the absence of quotation marks around the
                   \textsf{title} in the \texttt{trad} style, the
                   \textsf{Article} and \textsf{Review} entry types are
-                  more or less interchangeable.  This entry presents a
+                  more or less interchangeable. This entry presents a
                   review from a newspaper, with keyword
                   \texttt{magazine} in \textsf{entrysubtype}, and with
                   \cmd{bibstring\{reviewof\}} in the \textsf{title}
-                  field.  You could just write \enquote{review of}
+                  field. You could just write \enquote{review of}
                   instead, but the \cmd{bibstring} makes the entry
-                  portable across languages.  Note the formatting of
+                  portable across languages. Note the formatting of
                   the reviewed book's title using \cmd{mkbibemph}, and
                   the sentence-style capitalization you have to
                   provide by hand for the \texttt{trad} style, because
                   the curly braces of \cmd{mkbibemph} protect the text
                   from the automatic sentence-style capitalization
-                  provided by the package.  \textsf{Biblatex-chicago}
+                  provided by the package. \textsf{Biblatex-chicago}
                   never modifies the capitalization of the
                   \textsf{journaltitle}, so that field should always
                   work properly across styles.}
@@ -351,7 +401,7 @@
   volume = 	 1,
   author = 	 {Barrows, Herbert},
   editor = 	 {Ray, {Gordon~N.}},
-  publisher = {Houghton Mifflin},
+  publisher =    {Houghton Mifflin},
   maintitle = 	 {An Introduction to Literature},
   address = 	 {Boston},
   annotation = 	 {An entry citing one volume of a multi-volume work.
@@ -388,19 +438,19 @@
   title = 	 {Stratford on {Avon} Church from the {Avon}},
   type = 	 {albumen print of collodion negative},
   note = 	 {18.8 x 28.0 cm\adddot},
-  year = 	 {1860s},
+  date = 	 {186X},
   institution =  {International Museum of Photography at George
                   Eastman House},
-  location =  {Rochester},
+  location =     {Rochester},
   annotation = 	 {A typical Image entry, for presenting a photograph.
                   Note the type field, and the fact that it begins
                   with a lowercase letter, allowing biblatex to
                   capitalize it contextually if needed, though this is
-                  less important in the author-date style.  In the
-                  16th edition, Image is an alias for Artwork, as
-                  photographs are now treated just the same as works
-                  in other media, but you still need the Image entry
-                  type for the 15th edition.}
+                  less important in the author-date style. The date
+                  field uses the ISO8601-2 extended notation for
+                  presenting a decade. In recent releases Image is
+                  an alias for Artwork, as photographs are now treated
+                  just the same as works in other media.}
 }
 
 @Music{beethoven:sonata29,
@@ -415,9 +465,9 @@
                   peculiarities common to the audiovisual entry types.
                   Here, the composer goes in the \textsf{author}
                   field, while the performer goes into the
-                  \textsf{editor} field.  The \textsf{editortype}
+                  \textsf{editor} field. The \textsf{editortype}
                   \texttt{none} prevents any identifying string being
-                  used for the performer, as none is needed.  As in
+                  used for the performer, as none is needed. As in
                   most \textsf{Music} entries, the \textsf{series} and
                   \textsf{number} give label identifying information.
                   In the absence of any sort of date whatsoever, the
@@ -434,14 +484,14 @@
   year =	 1990,
   annotation = 	 {A BookInBook entry, presenting part of a book that
                   could in other contexts be a book in its own right.
-                  The title here will therefore be italicized.  This
-                  example shows the new abbreviated references
-                  available in this entry type when a crossref or xref
-                  is used, assuming the booklongxref option is set
-                  properly - which it isn't by default - either in the
-                  preamble or in the options field.  Such treatment, I
-                  note, isn't explicitly condoned by the Chicago
-                  specification.  See the next entry.}
+                  The title here will therefore be italicized. This
+                  example shows the abbreviated references available
+                  in this entry type when a crossref or xref is used,
+                  assuming the booklongxref option is set properly -
+                  which it isn't by default - either in the preamble
+                  or in the options field. Such treatment, I note,
+                  isn't explicitly condoned by the Chicago
+                  specification. See the next entry.}
 }
 
 @BookInBook{bernhard:ritter,
@@ -463,15 +513,15 @@
   subtitle = 	 {Three Plays},
   date = 	 1990,
   author = 	 {Bernhard, Thomas},
-  publisher = uchp,
-  location =  {Chicago},
+  publisher =    uchp,
+  location =     {Chicago},
   annotation = 	 {This entry provides the booktitle for the previous
-                  two.  It will be printed in the list of references,
+                  two. It will be printed in the list of references,
                   and the entries there for its two children -
                   bernhard:boris and bernhard:ritter - will be
                   abbreviated references to it, assuming the
                   booklongxref option is set properly, which it isn't
-                  by default.  Biber automatically converts the title
+                  by default. Biber automatically converts the title
                   of the Book to the booktitle of the BookInBook.}
 }
 
@@ -486,7 +536,7 @@
   series = 	 {CBS},
   options = 	 {useauthor=false},
   annotation = 	 {This is a rather abbreviated \textsf{Music} entry,
-                  lacking a \textsf{date} and a \textsf{type}.  It
+                  lacking a \textsf{date} and a \textsf{type}. It
                   does, however, show the method for emphasizing the
                   conductor instead of the composer (the
                   \textsf{options} field), and also for identifying
@@ -494,33 +544,63 @@
                   Here, the performing orchestra goes in the
                   \textsf{editora} field, and the \textsf{editoratype}
                   \texttt{none} prevents any string attaching to the
-                  orchestra, as one isn't needed.  The usual
+                  orchestra, as one isn't needed. The usual
                   \textsf{series} and \textsf{number} give the label
-                  information.  The \emph{CMS} strongly encourages you
+                  information. The \emph{CMS} strongly encourages you
                   to find a date for such an entry -- online resources
                   should be able to help.}
 }
 
+@Article{black:infectious,
+  author = 	 {Black, Steven},
+  title = 	 {Changing Epidemiology of Invasive Pneumococcal Disease},
+  journaltitle = {Clinical Infectious Diseases},
+  userd = 	 {published electronically},
+  subtitle =     {A Complicated Story},
+  volume = 	 47,
+  doi = 	 {10.1086/590002},
+  urldate = 	 {2008-07-14},
+  annote =       {An Article pre-published online.}}
+
 @Book{boxer:china,
   title = 	 {South {China} in the Sixteenth Century},
   year = 	 1953,
   editor = 	 {Boxer, Charles~R.},
   number = 	 {2nd ser., 106},
   series = 	 {Hakluyt Society Publications},
-  location =  {London},
+  location =     {London},
   annotation = 	 {A \textsf{Book} entry with a \textsf{series} and a
-                  \textsf{number}.  In all book-like entries (as
+                  \textsf{number}. In all book-like entries (as
                   opposed to \textsf{Article}, \textsf{Periodical},
                   and \textsf{Review} entries, for example) the
                   \textsf{series} field will be a name, as here, while
                   the \textsf{number} field may contain such
                   information as \enquote{2nd ser.} or
-                  \enquote{vol. 3,} or just a plain number.  Putting
+                  \enquote{vol. 3,} or just a plain number. Putting
                   \enquote{2nd ser.} in the \textsf{number} field may
                   seem counter-intuitive, but it's necessary for
                   getting the punctuation to work out right.}
 }
 
+@Online{braun:reply,
+  author = 	 {Braun, Caroline},
+  date = 	 {2016-08-09},
+  relatedtype =  {commenton},
+  related = 	 {quora:thread},
+  relatedstring = {reply to},
+  annote = 	 {The 17th edition suggests such an entry for
+                  presenting a reply to an online forum or mailing
+                  list. The commenton relatedtype does most of the
+                  hard work for you, automatically withholding this
+                  entry from the reference list and printing it with
+                  its full date. It also creates a virtual entry
+                  (quora:thread-customc) you can cite as part of an
+                  autocites command to provide a comment identifying
+                  the piece to which this is a reply. The initial
+                  posting (quora:thread) will appear in the reference
+                  list.}
+}
+
 @Article{brown:bremer,
   title = 	 {A {Swedish} Traveler in Early {Wisconsin}},
   subtitle = 	 {The Observations of {Frederika Bremer}},
@@ -534,14 +614,14 @@
   editor = 	 {Brown, George~C.},
   annotation = 	 {An unusual Article entry, combining into one
                   reference a two-part article using both the
-                  titleaddon field and the pages field.  This is a
+                  titleaddon field and the pages field. This is a
                   kludge, and at some point I hope to implement a
-                  better system.  You could, also, simply refer to
-                  each part separately.  Note also the issue field,
-                  with the name of a season, and the lowercase letter
-                  starting the titleaddon field, which will
-                  automatically capitalize the data depending on the
-                  context within an entry.}
+                  better system. You could, also, simply refer to each
+                  part separately. Note also the issue field, with the
+                  name of a season, and the lowercase letter starting
+                  the titleaddon field, which will automatically
+                  capitalize the data depending on the context within
+                  an entry.}
 }
 
 @Book{browning:aurora,
@@ -561,51 +641,34 @@
 @Collection{brush:ornithology,
   date = 	 1983,
   title = 	 {Perspectives in Ornithology},
-  booktitle = 	 {Perspectives in Ornithology},
   editor = 	 {Brush, A.~H. and Clark, Jr., G.~A.},
-  publisher = cup,
+  publisher =    cup,
   address = 	 {Cambridge},
   annotation = 	 {A collection, cited along with one of its component
-                  essays.  The latter, wiens:avian, will be
-                  abbreviated when printed in the reference list.
-                  Note the provision of a booktitle for the use of
-                  child references.}}
+                  essays. The latter, wiens:avian, will be abbreviated
+                  when printed in the reference list.}}
 
 @Manual{bsi:abbreviation,
   title = 	 {Specification for Abbreviation of Title Words and
                   Titles of Publications},
   date = 	 1985,
   organization = {British Standards Institute},
-  sortname = 	 {BSI},
   address = 	 {Linford Woods, Milton Keynes, UK},
   shorthand = 	 {BSI},
   annotation = 	 {A \textsf{Manual} entry providing an author in the
                   \textsf{organization} field and a \textsf{shorthand}
-                  field for in-text citations.  By default, the
+                  field for in-text citations. By default, the
                   \textsf{shorthand} will be printed at the head of
-                  the entry, followed by the expansion in parentheses.
-                  The \textsf{sortname} field ensures that the entry
-                  is correctly alphabetized by the first thing you see
-                  in the entry, i.e., the \textsf{shorthand}.}
-}
-
-@Manual{bsi:abbreviation:15,
-  title = 	 {Specification for Abbreviation of Title Words and
-                  Titles of Publications},
-  date = 	 1985,
-  organization = {British Standards Institute},
-  userc = 	 {abbrev:BSI},
-  sortkey = 	 {British},
-  address = 	 {Linford Woods, Milton Keynes, UK},
-  shorthand = 	 {BSI},
-  annotation = 	 {A Manual entry providing an organizational author
-                  and a shorthand field for in-text citations.  For
-                  the 15th edition, the userc field points to a
-                  CustomC entry which provides the expansion of the
-                  shorthand inside the reference list, rather than in
-                  a list of shorthands.  Using the field in this way
-                  ensures that the expansion will be printed if this
-                  entry is cited.}
+                  the entry, followed by the expansion in
+                  parentheses. Also by default, the entry will be
+                  sorted by that \textsf{shorthand}.\
+                  \textsf{Biblatex-chicago} now has a
+                  \textsf{Standard} entry type for national and
+                  international standards, but an entry such as this,
+                  with only one date and only an organizational
+                  author, needn't be altered. Cf.\ niso:bibref and
+                  w3c:xml for entries that require the
+                  \textsf{Standard} type.}
 }
 
 @Review{bundy:macneil,
@@ -616,8 +679,7 @@
   author = 	 {Bundy, McGeorge},
   title = 	 {interview by {Robert MacNeil}},
   annotation = 	 {A television interview presented in a Review entry,
-                  with "magazine" entrysubtype.  In the 15th edition,
-                  you could use an Article entry. Note that the
+                  with "magazine" entrysubtype. Note that the
                   interviewee is presented as the author, and that the
                   broadcast network is given in the usera field. Note
                   also the use of a lowercase letter to start the
@@ -632,16 +694,16 @@
   nameaddon = 	 {\bibstring{pseudonym}},
   titleaddon = 	 {letters},
   booktitle = 	 {The Complete {Anti-Federalist}},
-  publisher = uchp,
+  publisher =    uchp,
   year = 	 1981,
   editor = 	 {Storing, Herbert J.},
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {A rare example of a generic, unformatted title in an
                   InCollection entry, it therefore has a titleaddon
                   field and no title field, though actually in
                   author-date it works just as well with a title.
                   Note use of lowercase initial letter in that
-                  titleaddon field.  "Centinel" is a pseudonym and the
+                  titleaddon field. "Centinel" is a pseudonym and the
                   actual author isn't known, so the bibstring
                   pseudonym is put in the nameaddon field.}
 }
@@ -651,16 +713,16 @@
   year = 	 1966,
   editor = 	 {Crow, Martin~M. and Olson, Clair~C.},
   namec = 	 {Manly, John~M. and Richert, Edith},
-  publisher = oup,
+  publisher =    oup,
   note = 	 {with the assistance of Lilian~J. Redstone
                   and others},
-  location =  {London},
+  location =     {London},
   annotation = 	 {In the author-date system, unlike in a bibliography
                   or note, an entry will generally need some sort of
                   name to precede the \textsf{date}, so here the
                   \textsf{editors} provide that name. The compilers go
                   in \textsf{namec}, and other information in
-                  \textsf{note}.  Cf.\ this entry in
+                  \textsf{note}. Cf.\ this entry in
                   \textsf{notes-test.bib}.}
 }
 
@@ -682,12 +744,12 @@
 
 @Book{chicago:manual,
   title = 	 {The {Chicago} Manual of Style},
-  year = 	 2010,
+  year = 	 2017,
   author = 	 {{University of Chicago Press}},
   shortauthor =  {\mkbibemph{CMS}},
-  publisher = uchp,
-  edition = 	 16,
-  location =  {Chicago},
+  publisher =    uchp,
+  edition = 	 17,
+  location =     {Chicago},
   annote = 	 {A manual presented in a \textsf{Book} entry.  Note
                   the extra curly brackets around the corporate
                   \textsf{author}, which is printed twice, both as
@@ -699,22 +761,11 @@
                   inside a parenthesized citation.}
 }
 
-@Book{chicago:manual:15,
-  title = 	 {The {Chicago} Manual of Style},
-  year = 	 2003,
-  author = 	 {{Univ. of Chicago  Press}},
-  publisher = uchp,
-  edition = 	 15,
-  location =  {Chicago},
-  annotation = 	 {A manual presented in a Book entry.  Note curly
-                  brackets around corporate author, which is printed
-                  twice, both as author and publisher.}
-}
-
 @Article{chu:panda,
-  author = 	 {{Chu Ching} and Long Zhi},
+  author = 	 {{Chu Ching} and {Long Zhi}},
   title = 	 {The Vicissitudes of the Giant Panda,
                   \mkbibemph{Ailuropoda melanoleuca} {(David)}},
+  shortauthor =  {Chu and Long},
   journaltitle = {Acta Zoologica Sinica},
   date = 	 1983,
   language = 	 {Chinese},
@@ -726,12 +777,7 @@
                   language field contains the name of the original
                   language, capitalized here because to this point
                   Chinese hasn't been included in the usual biblatex
-                  bibstring mechanism.  17.177 (15th ed.) and 14.194
-                  (16th ed.) in the Manual present this entry with
-                  what seems to me to be punctuation inconsistent with
-                  their practice elsewhere, so the processed entries
-                  in cms15-dates-sample.pdf and cms-dates-sample.pdf
-                  don't match it.}
+                  bibstring mechanism.}
 }
 
 @Book{churchill:letters,
@@ -752,13 +798,15 @@
   subtitle = 	 {Between Two Rivers},
   author = 	 {Hazel V. Clark},
   howpublished = {End of the Commons General Store},
-  year = 	 {\mkbibbrackets{1957?}},
-  location =  {Mesopotamia, OH},
+  date = 	 {1957?},
+  location =     {Mesopotamia, OH},
   annotation = 	 {A standard \textsf{Booklet} entry, though the same
                   information could be presented in a \textsf{Book}
                   entry, using \textsf{publisher} instead of
-                  \textsf{howpublished}.  Note the brackets around the
-                  \textsf{year}, as this is obviously a best guess.}
+                  \textsf{howpublished}. Note the ISO8601-2
+                  \enquote{uncertain} \textsf{date} specification,
+                  which by default presents the year in brackets, but
+                  allows numerical sorting by \textsf{biblatex}.}
 }
 
 @Video{cleese:holygrail,
@@ -770,7 +818,7 @@
                   Jones, Terry and Palin, Michael},
   editor = 	 {Gilliam, Terry and Jones, Terry},
   editortype = 	 {director},
-  publisher = {Columbia Tristar Home Entertainment},
+  publisher =    {Columbia Tristar Home Entertainment},
   type = 	 {DVD},
   address = 	 {Culver City, CA},
   edition = 	 {special \bibstring{edition}},
@@ -796,10 +844,13 @@
   subtitle =	 {A Study in {American} Leadership},
   year =	 1999,
   author =	 {Cohen, Naomi~W.},
-  publisher =	 {University Press of New England and Brandeis
-                  University Press},
+  publisher =	 {Brandeis University Press, an imprint of University
+                  Press of New England},
   location =	 {Hanover, NH},
-  annotation = 	 {A Book with two publishers.}
+  annotation = 	 {A Book printed by a publishing consortium. The 17th
+                  edition suggests it is often possible to omit the
+                  parent company or consortium, but also allows you to
+                  specify the relationship between imprints, as here.}
 }
 
 @Article{conley:fifthgrade,
@@ -842,13 +893,13 @@
   author = 	 {Contributor, Anna},
   title = 	 {Contribution},
   booktitle = 	 {Edited Volume},
-  publisher = {Publisher},
+  publisher =    {Publisher},
   year = 	 {\autocap{f}orthcoming},
   editor = 	 {Editor, Ellen},
-  location =  {Place},
+  location =     {Place},
   annotation = 	 {A forthcoming essay in an \textsf{InCollection}
-                  entry.  Note the \cmd{autocap} command in the
-                  \textsf{year} field.  The
+                  entry. Note the \cmd{autocap} command in the
+                  \textsf{year} field. The
                   \cmslink{author:forthcoming} entry presents an
                   alternate way of providing the same information.}
 }
@@ -873,8 +924,8 @@
   author = 	 {Cook, Ebenezer},
   authortype = 	 {anon?},
   note = 	 {\bibstring{by} \mkbibquote{E.~C. Gent}},
-  location =  {Annapolis},
-  annotation = 	 {A complicated \textsf{Book} entry.  First, the
+  location =     {Annapolis},
+  annotation = 	 {A complicated \textsf{Book} entry. First, the
                   \textsf{author} is unknown, but guessed at, hence
                   the \texttt{anon?} in the \textsf{authortype} field.
                   The \textsf{note} field gives the author as printed
@@ -887,38 +938,37 @@
 @Online{coolidge:speech,
   author = 	 {Coolidge, Calvin},
   title = 	 {Equal Rights},
-  note = 	 {copy of an undated 78 rpm disc},
+  note = 	 {copy of an undated 78 rpm disc, 3:45},
   options = 	 {ptitleaddon=space},
   titleaddon = 	 {(speech)},
   related = 	 {loc:leaders},
-  year = 	 {[1920?]},
-  relatedstring = {from},
+  date = 	 {1920~},
+  relatedstring = {in},
   annotation = 	 {This is a recording from an online archive, using an
-                  \textsf{Online} entry.  The \textsf{related} field
+                  \textsf{Online} entry. The \textsf{related} field
                   cites the archive itself using an \textsf{Online}
                   entry, and the \textsf{relatedstring} links the two
-                  references.  The \textsf{options} field replaces the
+                  references. The \textsf{options} field replaces the
                   period with a space before the parenthesized
-                  \textsf{titleaddon}.  Cp.\ \texttt{weed:flatiron}
-                  and \texttt{loc:city}, which cite a film from an
-                  online archive, both using a \textsf{Video} entry.
-                  Note that if you use the \textsf{Online} type for
-                  this, instead of \textsf{Misc} with an
-                  \textsf{entrysubtype}, it will work just as well in
-                  the \textsf{authordate-trad} style.}
+                  \textsf{titleaddon}. The \textsf{date} field
+                  presents a \enquote{circa} date in ISO8601-2
+                  format. Cp.\ \texttt{weed:flatiron} and
+                  \texttt{loc:city}, which cite a film from an online
+                  archive, both using a \textsf{Video} entry.}
 }
 
 @Misc{coolidge:speech:trad,
   author = 	 {Coolidge, Calvin},
   title = 	 {Equal rights (speech)},
   entrysubtype = {speech},
-  note = 	 {copy of an undated 78 rpm disc},
-  addendum = 	 {from \fullcite{loc:leaders}},
-  year = 	 {[1920?]},
+  note = 	 {copy of an undated 78 rpm disc, 3:45},
+  addendum = 	 {in \fullcite{loc:leaders}},
+  date = 	 {1920~},
   annotation = 	 {This is a recording from an online archive, using a
                   Misc entry with an entrysubtype, and intended for
-                  authordate-trad only.  The addendum cites the
-                  archive itself using an Online entry.
+                  authordate-trad only. The addendum cites the archive
+                  itself using an Online entry. The date field
+                  presents a "circa" date in ISO8601-2 format.
                   Cp. weed:flatiron and loc:city, which cite a film
                   from an online archive, both using a Video entry.}}
 
@@ -930,10 +980,7 @@
   author =	 {{Cotton Manufacturer}},
   shortauthor =  {{Cotton Manufac\adddot}},
   publisher = 	 {Bury, UK},
-  annotation = 	 {A Book with a corporate author.  You can, for the
-                  16th edition, eliminate the indefinite article at
-                  the start of the author's name, which also allows
-                  you to eliminate the sortkey field.  The shortauthor
+  annotation = 	 {A Book with a corporate author. The shortauthor
                   field may help shorten the in-text citation.}
 }
 
@@ -943,24 +990,23 @@
   userc = 	 {ashe:creasey},
   author = 	 {Creasey, John},
   nameaddon = 	 {Gordon Ashe, \bibstring{pseudonym}},
-  publisher = {Holt, Rinehart \& Winston},
-  location =  {New York},
+  publisher =    {Holt, Rinehart \& Winston},
+  location =     {New York},
   annotation = 	 {The first of 3 Books written by the same author
-                  under three different pseudonyms.  You have
+                  under three different pseudonyms. You have
                   considerable latitude in how to present these, but
                   the method chosen here allows all three to be
-                  grouped together in the bibliography.  Note the
+                  grouped together in the bibliography. Note the
                   pseudonym in nameaddon, identified with the
                   bibstring pseudonym. Also note ampersand in
                   publisher, which prevents the two parts of the
                   publisher's name from being taken as two different
-                  publishers.  The 16th edition makes it a requirement
-                  in such entries that you also include a cross
-                  reference from the different pseudonyms back to the
-                  author's name, something accomplished using a
-                  CustomC entry and the userc field which
-                  automatically makes sure the cross-reference
-                  prints.}
+                  publishers. Recent editions make it a requirement in
+                  such entries that you also include a cross reference
+                  from the different pseudonyms back to the author's
+                  name, something accomplished using a CustomC entry
+                  and the userc field which automatically makes sure
+                  the cross-reference prints in the reference list.}
 }
 
 @Book{creasey:morton:hide,
@@ -969,8 +1015,8 @@
   author = 	 {Creasey, John},
   userc = 	 {morton:creasey},
   nameaddon = 	 {Anthony Morton, \bibstring{pseudonym}},
-  publisher = {Walker},
-  location =  {New York},
+  publisher =    {Walker},
+  location =     {New York},
   annotation = 	 {Second of three Book entries by same author under
                   different pseudonyms.}
 }
@@ -981,8 +1027,8 @@
   author = 	 {Creasey, John},
   userc = 	 {york:creasey},
   nameaddon = 	 {Jeremy York, \bibstring{pseudonym}},
-  publisher = {Macmillan},
-  location =  {New York},
+  publisher =    {Macmillan},
+  location =     {New York},
   annotation = 	 {Third of three Book entries by same author under
                   different pseudonyms.}
 }
@@ -993,20 +1039,20 @@
   title = 	 {George Creel to Colonel House},
   note = 	 {Edward~M. House Papers},
   origdate = 	 {1918-09-25},
-  organization =  {Yale University Library},
+  organization = {Yale University Library},
   annotation = 	 {An unpublished letter from an archive, presented in
                   a \textsf{Misc} entry with an \textsf{entrysubtype}.
                   The \texttt{cmsdate} option is no longer needed in
-                  such an entry.  The manuscript collection is found
-                  in the \textsf{note} and \textsf{organization}
-                  fields -- depending on the entry, you can use
+                  such an entry. The manuscript collection is found in
+                  the \textsf{note} and \textsf{organization} fields
+                  -- depending on the entry, you can use
                   \textsf{note}, \textsf{organization},
                   \textsf{institution}, and/or \textsf{location}, in
                   ascending order of generality, though you should
                   consistently put the most specific collection name
-                  in the \textsf{note} field.  If you are citing
+                  in the \textsf{note} field. If you are citing
                   several items from the same collection, then the
-                  \emph{CMS}, 15.49, suggests not having individual
+                  \emph{CMS}, 15.54, suggests not having individual
                   entries but only one for the collection
                   (\cmslink{house:papers}), with more specific
                   information forming part of the flow of the text.
@@ -1016,6 +1062,29 @@
                   \cmslink{spock:interview}.}
 }
 
+@Audio{danforth:podcast,
+  title = 	 {F-Bombs, Chicken, and Exclamation Points},
+  eventdate = 	 {2015-04-21},
+  author = 	 {Danforth, Mike and Chillag, Ian},
+  type =         {MP3 audio, 18:46},
+  booktitle = 	 {How to Do Everything},
+  editor = 	 {Donovan, Gillian},
+  url =          {http://www.npr.org/podcasts/510303/how-to-do-everything},
+  editortype =   {producer},
+  note = 	 {podcast},
+  annote =       {The 17th edition specifies something like this
+                  \textsf{Audio} entry for podcasts, with the presence
+                  of an \textsf{eventdate} letting the style know that
+                  it is a podcast, while the \textsf{note} field lets
+                  your readers know the same. The \textsf{title} is
+                  for the specific episode of the
+                  \textsf{booktitle}. The \textsf{type} field
+                  specifies the medium, as usual in audio-visual entry
+                  types. When the main (label) date in any entry
+                  presents both a month and a day in addition to the
+                  year, that date will, as here, be printed again in
+                  full in the main body of the reference list entry.}}
+		  
 @Book{davenport:attention,
   title =	 {The Attention Economy},
   subtitle =	 {Understanding the New Currency of Business},
@@ -1026,8 +1095,23 @@
   location =	 {Cambridge, MA},
   annotation = 	 {An example of the use of an \textsf{addendum} in a
                   \textsf{Book} entry, in this case to identify that
-                  the work is an e-book.}
-}
+                  the work is an e-book. You could also use the
+                  \textsf{type} field for this.}
+}
+
+@Online{diaz:surprise,
+  author = 	 {D\'iaz, Juno},
+  title = 	 {Always surprises my students when {I} tell them that
+                  the \enquote{real} medieval was more diverse than
+                  the fake ones most of us consume},
+  organization = {Facebook},
+  shorttitle =   {Always surprises},
+  date = 	 {2016-02-24},
+  url = 	 {https://www.facebook.com/junotdiaz.writer/posts/972495572815454},
+  annote =       {The 17th edition specifies an \textsf{Online} entry
+                  for social media posts like this one.  Cf.\
+                  licis:diazcomment for how to present a comment on
+                  such a post.}}
 
 @Misc{dinkel:agassiz,
   author = 	 {Dinkel, Joseph},
@@ -1036,30 +1120,29 @@
   year = 	 {\bibstring{nodate}},
   entrysubtype = {yes},
   note = 	 {Agassiz Papers},
-  location =  {Harvard University},
-  organization =  {Houghton Library},
+  location =     {Harvard University},
+  organization = {Houghton Library},
   annotation = 	 {A manuscript presented in a \textsf{Misc} entry with
                   a randomly-selected \textsf{entrysubtype} to
                   distinguish it from a traditional \textsf{Misc}
-                  entry. The \textsf{title} begins with a generic
-                  term, hence the initial lowercase letter.  This
-                  entry uses three fields to locate the manuscript,
-                  starting with \textsf{note} and ascending in
-                  generality through \textsf{organization} to
-                  \textsf{location}.  If you are citing several items
-                  from the same collection, then the \emph{CMS},
-                  15.49, suggests not having individual entries but
-                  only one for the collection, with specific
-                  information forming part of the flow of the text.
-                  If, however, you cite only one item from a
-                  collection, then you can use an entry like this one.
-                  Note that, in \textsf{Misc} entries and a few
-                  others, an empty \textsf{year} field will not
-                  automatically produce a no date
-                  (\enquote{n.d\adddot} in English) abbreviation, so
-                  if you want one to be present you'll have to provide
-                  it yourself, as here.  Cf.\ \cmslink{creel:house}
-                  and \cmslink{house:papers}.}
+                  entry. The \textsf{title} begins\vadjust{\eject}
+                  with a generic term, hence the initial lowercase
+                  letter. This entry uses three fields to locate the
+                  manuscript, starting with \textsf{note} and
+                  ascending in generality through
+                  \textsf{organization} to \textsf{location}. If you
+                  are citing several items from the same collection,
+                  then the \emph{CMS}, 15.54, suggests not having
+                  individual entries but only one for the collection,
+                  with specific information forming part of the flow
+                  of the text.  If, however, you cite only one item
+                  from a collection, then you can use an entry like
+                  this one.  Note that, in \textsf{Misc} entries, an
+                  empty \textsf{year} field will not automatically
+                  produce a no date (\enquote{n.d\adddot} in English)
+                  abbreviation, so if you want one to be present
+                  you'll have to provide it yourself, as here. Cf.\
+                  \cmslink{creel:house} and \cmslink{house:papers}.}
 }
 
 @Book{donne:var,
@@ -1075,11 +1158,11 @@
   location =	 {Bloomington},
   annote = 	 {A \textsf{Book} entry with a \textsf{maintitle}
                   editor (\textsf{editor} field) and a \textsf{title}
-                  editor (\textsf{namea} field).  Also, inside an
+                  editor (\textsf{namea} field). Also, inside an
                   italicized title, all other titles are put in
                   quotation marks, and using \cmd{mkbibquote} will
                   automatically move appropriate punctuation inside
-                  the closing quotation mark.  It also, however, means
+                  the closing quotation mark. It also, however, means
                   that this entry won't be correctly presented for the
                   \textsf{authordate-trad} style.}
 }
@@ -1112,11 +1195,14 @@
   subtitle = 	 {French Lightning, {American} Light},
   year = 	 1999,
   author = 	 {Dunn, Susan},
-  publisher = {Faber \& Faber and Farrar, Straus \& Giroux},
-  location =  {New York},
+  publisher =    {Faber \& Faber and Farrar, Straus \& Giroux},
+  location =     {New York},
   annotation = 	 {A \textsf{Book} with two \textsf{publishers},
                   showing ampersands to prevent them being treated as
-                  four.}
+                  four. The 17th edition clarifies that you can
+                  usually choose just one of the publishers for your
+                  reference apparatus, i.e., whichever is closer
+                  geographically or more relevant for your readers.}
 }
 
 @Manual{dyna:browser,
@@ -1125,7 +1211,7 @@
   address = 	 {Providence, RI},
   year = 	 1991,
   annotation = 	 {A technical manual presented in a \textsf{Manual}
-                  entry.  In absence of a named author the
+                  entry. In absence of a named author the
                   \textsf{organization} is printed twice, as author
                   and as publisher. Note that you no longer need a
                   \textsf{sortkey} when using the default sorting
@@ -1134,32 +1220,33 @@
 
 @Book{eliot:pound,
   title = 	 {Literary Essays},
-  options = {useauthor=false},
+  options =      {useauthor=false},
   year = 	 1953,
   author = 	 {Pound, Ezra},
-  editor =  {Eliot, T.~S.},
-  publisher = {New Directions},
-  location =  {New York},
+  editor =       {Eliot, T.~S.},
+  publisher =    {New Directions},
+  location =     {New York},
   annotation = 	 {A \textsf{Book} listed by its (famous)
                   \textsf{editor} rather than by its (equally-famous)
-                  \textsf{author}.  The \textsf{options} field allows
+                  \textsf{author}. The \textsf{options} field allows
                   such presentation.}
 }
 
 @InCollection{ellet:galena,
   author = 	 {Ellet, Elizabeth~F.~L.},
   title = 	 {By Rail and Stage to {Galena}},
-  crossref =  {prairie:state},
+  crossref =     {prairie:state},
   pages = 	 {271--279},
   annotation = 	 {First of three InCollection entries
                   cross-referencing the same Collection.
-                  Cf. keating:dearborn and lippincott:chicago.  All
+                  Cf. keating:dearborn and lippincott:chicago. All
                   three entries will have an abbreviated form in the
-                  list of references.  If you don't want this
+                  list of references. If you don't want this
                   space-saving measure, you can, for example, set
-                  longcrossref=true in the options field.  With Biber,
-                  an empty subtitle field is no longer necessary to
-                  prevent inheritance from a parent entry.}
+                  longcrossref to true in the options field. With
+                  Biber, an empty subtitle field is no longer
+                  necessary to prevent inheritance from a parent
+                  entry.}
 }
 
 @Article{ellis:blog,
@@ -1170,13 +1257,14 @@
   date = 	 {2008-06-30},
   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
-                  the identification of the material as a blog using
-                  the location field, which is usually reserved for
-                  identifying the place of publication of obscure
-                  journals.  See ac:comment, a Review entry, for how
-                  to reference comments on such online material.}
+  annotation = 	 {Recent editions of the \emph{CMS} specify an
+                  \textsf{Article}-like presentation for blogs, the
+                  main peculiarity being the identification of the
+                  material as a blog using the \textsf{location}
+                  field, which is usually reserved for identifying the
+                  place of publication of obscure journals. See
+                  \cmslink{ac:comment}, a \textsf{Review} entry, for
+                  how to reference comments on such online material.}
 }
 
 @Book{emerson:nature,
@@ -1191,8 +1279,8 @@
                   \bibstring{introduction} by Jaroslav Pelikan},
   annotation = 	 {A reprinted \textsf{Book}, in this case a facsimile,
                   with the \textsf{note} field giving the relevant
-                  information.  The \textsf{origdate} field gives the
-                  date of original publication.  Note the use of a
+                  information. The \textsf{origdate} field gives the
+                  date of original publication. Note the use of a
                   lowercase letter to start the \textsf{note} field.
                   With the amount of information given in the note
                   field, it may be less awkward to use a
@@ -1205,68 +1293,28 @@
 @InReference{ency:britannica,
   title = 	 {Encyclopaedia Britannica},
   shorttitle = 	 {Ency. {Brit}., \mkbibemph{15th ed}\adddot},
+  date = 	 {1980},
   keywords = 	 {nosample},
-  edition = 	 {15},
   options = 	 {hypertitle},
+  edition = 	 {15},
   annotation = 	 {An \textsf{InReference} entry, citing a well-known
                   reference work, and therefore generally not to
-                  appear in the list of references, but for
-                  demonstration purposes I here allow it to do so.
-                  With an \textsf{options} field set to
-                  \texttt{skipbib}, you'd only need the
-                  \textsf{shorttitle} for citations.  As it stands,
-                  the \textsf{options} field contains
-                  \texttt{hypertitle}, which ensures that the
-                  \textsf{title} acts as a hyperlink between the
-                  in-text citation and the entry in the list of
-                  references.  The \emph{CMS} is not altogether clear
+                  appear in the list of references, but
+                  for\vadjust{\eject} demonstration purposes I here
+                  allow it to do so. With an \textsf{options} field
+                  set to \texttt{skipbib}, you'd only need the
+                  \textsf{shorttitle} for citations. As it stands, the
+                  \textsf{options} field contains \texttt{hypertitle},
+                  which ensures that the \textsf{title} acts as a
+                  hyperlink between the in-text citation and the entry
+                  in the list of references. Please note that the 17th
+                  edition requires a date if you cite a printed
+                  edition. The \emph{CMS} is not altogether clear
                   about how to present such information in the
                   author-date style, so this should be looked upon as
                   a possible style of presentation only.}
 }
 
-@Video{episode:tv,
-  title = 	 {Episode Title},
-  booktitleaddon = 	 {series 5, episode 2},
-  options = 	 {cmsdate=on},
-  entrysubtype = {tv},
-  editor = 	 {{Production Company}},
-  editortype = 	 {producer},
-  date = 	 {2000/2007},
-  origdate = 	 2004,
-  pubstate = 	 {reprint},
-  booktitle = 	 {Series Title},
-  publisher = {Production Company},
-  type = 	 {DVD},
-  annotation = 	 {The 15th edition of the Manual doesn't, that I can
-                  find, provide guidance for citing television
-                  programs, so I guessed, using the analogy of films,
-                  at how to present one using the Video entry type.
-                  (The 16th edition does give an example -- see
-                  friends:leia -- but I have retained this entry only
-                  for the 15th edition, as there are significant
-                  structural changes between the two editions when
-                  presenting audio-visual material.)  The title of the
-                  episode will be presented in the main text font, as
-                  there is a booktitle presenting the name of the TV
-                  series.  The booktitleaddon -- in a slight change
-                  from previous releases -- gives details about the
-                  episode, and the type gives the medium, as usual.
-                  The origdate is the year of original transmission,
-                  while the date provides the year range for the whole
-                  series, though it would perhaps make more sense in
-                  this situation to provide the date the DVD was
-                  released, instead.  The entrysubtype isn't
-                  necessary, but may be of some use in the author-date
-                  style if you want the origdate to appear in
-                  parentheses after the main part of the entry, for
-                  which you would also require the pubstate field as
-                  shown.  Repeating the publisher as the editor, and
-                  giving an editortype, may help to present this entry
-                  in the list of references and, possibly, in textual
-                  citatons, as well.}
-}
-
 @BookInBook{euripides:orestes,
   title = 	 {Orestes},
   year = 	 1958,
@@ -1276,12 +1324,12 @@
   volume = 	 4,
   author = 	 {Euripides},
   editor = 	 {Grene, David and Lattimore, Richmond},
-  publisher = uchp,
+  publisher =    uchp,
   pages = 	 {185--288},
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {A work from antiquity, cited by pages in a modern
                   edition, hence not needing \texttt{classical} in
-                  \textsf{entrysubtype}.  Since the titles of such
+                  \textsf{entrysubtype}. Since the titles of such
                   works are uniformly italicized, we need to use a
                   \textsf{BookInBook} entry with a \textsf{title} and
                   a \textsf{booktitle} (\enquote{book within a book}),
@@ -1293,7 +1341,7 @@
 
 @Online{evanston:library,
   author = 	 {{Evanston Public Library Board of Trustees}},
-  shortauthor = {{Evanston Public Library}},
+  shortauthor =  {{Evanston Public Library}},
   title = 	 {Evanston Public Library Strategic Plan, 2000--2010},
   subtitle = 	 {A Decade of Outreach},
   organization = {Evanston Public Library},
@@ -1313,7 +1361,7 @@
   year = 	 1970,
   translator = 	 {Shapiro, Norman R.},
   author = 	 {Feydeau, Georges},
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {A standard Book entry, with a translator.}
 }
 
@@ -1324,34 +1372,56 @@
   author = 	 {{Pink Floyd}},
   pubstate = 	 {reprint},
   number = 	 {CDP 7 46381 2},
-  publisher = {Capitol},
+  publisher =    {Capitol},
   type = 	 {compact disc},
-  annotation = 	 {16th edition only An example of a re-released
-                  album.  The original release date will appear in
-                  citations and at the head of the reference list
-                  entry, while the CD re-release date appears later.
-                  Because the origdate is used at the head of the
-                  entry, the pubstate field here has no effect, though
-                  in other circumstances, and in the notes and
-                  bibliography style, it will print a notice at the
-                  end of the entry clarifying that it is indeed a
-                  re-release.}
+  annotation = 	 {An example of a re-released album. The original
+                  release date will appear in citations and at the
+                  head of the reference list entry, while the CD
+                  re-release date appears later. Because the origdate
+                  is used at the head of the entry, the pubstate field
+                  here has no effect, though in other circumstances,
+                  and in the notes and bibliography style, it will
+                  print a notice at the end of the entry clarifying
+                  that it is indeed a re-release.}
 }
 
 @inproceedings{frede:inproc,
-    keywords={secondary},
-    author = {Dorothea Frede}, 
-    title = {\mkbibemph{Nicomachean Ethics} VII. 11--12},
-    subtitle = {Pleasure},
-    booktitle = {Aristotle},
-    booksubtitle = {\mkbibquote{Nicomachean Ethics}, Book VII},
-    series = {Symposium Aristotelicum},
-    editor = {Carlo Natali},
-    publisher = {Oxford University Press},
-    address  = {Oxford},
-    year = {2009},
-    pages = {183-207},
-  annotation = 	 {A standard inproceedings entry.}
+  keywords=      {secondary},
+  author =       {Dorothea Frede}, 
+  title =        {\mkbibemph{Nicomachean Ethics} VII. 11--12},
+  subtitle =     {Pleasure},
+  booktitle =    {Aristotle},
+  booksubtitle = {\mkbibquote{Nicomachean Ethics}, Book VII},
+  series =       {Symposium Aristotelicum},
+  editor =       {Carlo Natali},
+  publisher =    {Oxford University Press},
+  address  =     {Oxford},
+  year =         {2009},
+  pages =        {183-207},
+  annotation = 	 {A standard inproceedings entry, showing some of the
+                  complications of formatting titles within titles in
+                  both the \textsf{title} and the
+                  \textsf{booksubtitle} fields.}
+}
+
+@inproceedings{frede:inproc:trad,
+  keywords=      {secondary},
+  author =       {Dorothea Frede}, 
+  title =        {\mkbibemph{Nicomachean ethics} VII. 11--12},
+  subtitle =     {Pleasure},
+  booktitle =    {Aristotle},
+  booksubtitle = {\mkbibquote{Nicomachean ethics}, Book VII},
+  series =       {Symposium Aristotelicum},
+  editor =       {Carlo Natali},
+  publisher =    {Oxford University Press},
+  address  =     {Oxford},
+  year =         {2009},
+  pages =        {183-207},
+  annotation = 	 {An \textsf{inproceedings} entry for the
+                  \texttt{trad} style, showing some of the
+                  complications of formatting titles within titles in
+                  both the \textsf{title} and the
+                  \textsf{booksubtitle} fields.}
 }
 
 @SuppBook{friedman:intro,
@@ -1363,13 +1433,13 @@
   pages = 	 {ix--xx},
   publisher = 	 uchp,
   note = 	 {Anniversary ed.},
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {An introduction to a work by someone else, presented
-                  in a SuppBook entry.  Note that for an introduction,
+                  in a SuppBook entry. Note that for an introduction,
                   afterword or foreword you need only define the
                   relevant field, and leave the others undefined, and
-                  the style will provide the rest automatically.  The
-                  16th edition now requires page numbers in the list
+                  the style will provide the rest automatically.
+                  Recent editions now require page numbers in the list
                   of references for this sort of entry.}
 }
 
@@ -1381,10 +1451,9 @@
   volume = 	 98,
   number = 	 1,
   doi = 	 {10.1006/jeth.2000.2694},
-  url = 	 {http://www.idealibrary.com/links/doi/10.1006/jeth.2000.2694},
-  annotation = 	 {Standard Article entry with a DOI and a URL
-                  provided.  The 16th edition prefers a DOI if one is
-                  available.}
+  annotation = 	 {Standard Article entry with a DOI. Recent editions
+                  strongly prefer a DOI, if one is available, to a
+                  URL.}
 }
 
 @Video{friends:leia,
@@ -1396,17 +1465,20 @@
   eventdate = 	 {1996-09-19},
   editor = 	 {Mancuso, Gail},
   editortype = 	 {director},
-  publisher = {Warner Home Video},
+  publisher =    {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA},
-  annotation = 	 {This is a template for citing television shows.  The
+  annotation = 	 {This is a template for citing television shows. The
                   \textsf{eventdate} is the original broadcast date,
-                  while the \textsf{date} applies to the
-                  \vadjust{\eject}medium you are citing.  As in other
-                  audiovisual entries, the earliest date automatically
-                  goes at the head of the entry.  Note that
-                  information about the season and episode numbers
-                  goes in \textsf{booktitleaddon}.}
+                  while the \textsf{date} applies to the medium you
+                  are citing. As in other audiovisual entries, the
+                  earliest date automatically goes at the head of the
+                  entry. Note that information about the season and
+                  episode numbers goes in \textsf{booktitleaddon}.
+                  Cf.\ american:crime for an example using the new
+                  17th edition \enquote{tvepisode} entrysubtype which
+                  reverses the traditional order of \textsf{title} and
+                  \textsf{booktitle}.}
 }
 
 @Book{furet:passing:eng,
@@ -1414,14 +1486,14 @@
   year = 	 1999,
   author = 	 {Furet, François},
   translator = 	 {Furet, Deborah},
-  publisher = uchp,
-  location =  {Chicago},
+  publisher =    uchp,
+  location =     {Chicago},
   annotation = 	 {A translation, with the original presented in a
-                  separate entry (furet:passing:fr).  In that entry, a
+                  separate entry (furet:passing:fr). In that entry, a
                   related field refers to this entry, which will be
                   printed after its parent in the list of references,
                   connected by the default strings associated with the
-                  bytranslator relatedtype.  By default, this entry
+                  bytranslator relatedtype. By default, this entry
                   will not appear separately in the reference list
                   unless you cite it directly.}
 }
@@ -1432,15 +1504,15 @@
   related = 	 {furet:passing:eng},
   relatedtype =  {bytranslator},
   author = 	 {Furet, François},
-  publisher = {Éditions Robert Laffont},
-  location =  {Paris},
+  publisher =    {Éditions Robert Laffont},
+  location =     {Paris},
   annotation = 	 {The original of the previous entry. The related
                   field calls that entry, and the relatedtype
-                  determines how that entry will be presented.  In
+                  determines how that entry will be presented. In
                   citations this is all ignored, but in the list of
                   references the original and translation are
                   presented in the same entry, connected by bibstrings
-                  and the name of the translator.  These two entries
+                  and the name of the translator. These two entries
                   show one of the two options suggested by the Manual
                   for presenting an original and a translation in the
                   same reference list entry.}
@@ -1453,26 +1525,26 @@
   journaltitle = {Bulletin de la Société des antiquaires de l'Ouest},
   year =	 1967,
   volume =	 9,
-  langid =  {french},
+  langid =       {french},
   series =	 4,
   pages =	 {11--27},
   annotation = 	 {An Article in a journaltitle which is into its 4th
-                  series.  This entry illustrates several
-                  language-related issues.  The Manual recommends
+                  series. This entry illustrates several
+                  language-related issues. The Manual recommends
                   preserving sentence-style capitalization in
                   languages that ordinarily use it, as here in both
-                  title and journaltitle.  Because of the way the
+                  title and journaltitle. Because of the way the
                   capitalization code works for the title field in the
                   authordate-trad style, you would need to use extra
                   curly braces around words you wished to remain
-                  capitalized in the output.  However, because I've
+                  capitalized in the output. However, because I've
                   identified the language of the entry as French using
                   the langid field, the code, independently of any
                   "otherlang" setting, leaves the title as presented
                   here, which is correct without needing to use extra
-                  braces.  The journaltitle field is always exempt
-                  from the sentence capitalization code, so you
-                  needn't worry about extra braces there.}
+                  braces. The journaltitle field is always exempt from
+                  the sentence capitalization code, so you needn't
+                  worry about extra braces there.}
 }
 
 @Article{garrett,
@@ -1488,8 +1560,8 @@
                   immediately recognizable to your readership, or
                   indeed that may be shared by a number of different
                   journals, so you add a location field to tell where
-                  the journaltitle originates.  Also note formatting
-                  in the title field.}
+                  the journaltitle originates. Also note formatting in
+                  the title field.}
 }
 
 @Article{garrett:15,
@@ -1505,10 +1577,58 @@
                   immediately recognizable to your readership, or
                   indeed that may be shared by a number of different
                   journals, so you add a location field to tell where
-                  the journaltitle originates.  Also note formatting
-                  in the title field, where you need sentence-style
-                  capitalization for the 15th edition.}
-}
+                  the journaltitle originates. Also note formatting in
+                  the title field, where you need sentence-style
+                  capitalization for the trad style.}
+}
+
+@Book{gems:ipad,
+  author = 	  {Grande, Lance and Augustyn, Allison},
+  title = 	  {Gems and Jewels},
+  date = 	  2011,
+  version = 	  {1.01},
+  related = 	  {gems:print},
+  edition = 	  {{}iPad ed\adddot},
+  relatedstring = {adapted from},
+  publisher =     {Touchpress},
+  annote =        {An example of how the 17th edition presents app
+                  content, here an iPad edition of a book, with its
+                  print edition presented via a related field.}}
+
+@Book{gems:print,
+  author = 	 {Grande, Lance and Augustyn, Allison},
+  title = 	 {Gems and Gemstones},
+  subtitle = 	 {Timeless Natural Beauty of the Mineral World},
+  date = 	 2009,
+  publisher =    uchp,
+  location =     {Chicago},
+  annote =       {Print edition of the previous.}}
+
+@Dataset{genbank:db,
+  author = 	 {GenBank},
+  title = 	 {for RP11-322N14 BAC},
+  number = 	 {AC087526.3},
+  type = 	 {accession number},
+  url = 	 {http://www.ncbi.nlm.nih.gov/nuccore/19683167},
+  urldate = 	 {2016-04-06},
+  annote =       {The \textsf{Dataset} type helps to present
+                  scientific databases as specified by the 17th
+                  edition. The name of the database appears in the
+                  \textsf{author} field, while the \textsf{title},
+                  \textsf{type}, and \textsf{number} fields present
+                  locating and/or explanatory information about
+                  particular parts of the data. A \textsf{url} locates
+                  the database and the \textsf{urldate} documents when
+                  you accessed it. When the \textsf{urldate} is an
+                  access date, and is the only date available, as
+                  here, then the 17th edition requires
+                  \enquote{n.d\adddot} to appear in the list of
+                  references. As in \textsf{Misc} entries, I have
+                  turned this off in \textsf{Dataset}
+                  entries. Further, given the frequent difficulty of
+                  assigning a date to material in a database, I have
+                  set this type to provide, by default, author-title
+                  references in citations.}}
 
 @Misc{genesis,
   shorttitle = 	 {Gen\adddot},
@@ -1518,11 +1638,10 @@
   annotation = 	 {A simple \textsf{Misc} entry (w/
                   \textsf{entrysubtype} \texttt{classical}) that would
                   allow you easily to cite the Qur'an or individual
-                  books of the Bible.  Ordinarily it wouldn't appear
-                  in the list of references, but it does here for
-                  demonstration purposes.  Some other sacred works may
-                  need italicized titles.  Cf.\ \emph{CMS},
-                  14.253-255.}
+                  books of the Bible. Ordinarily it wouldn't appear in
+                  the list of references, but it does here for
+                  demonstration purposes. Some other sacred works may
+                  need italicized titles. Cf.\ \emph{CMS}, 14.238-41.}
 }
 
 @Article{gibbard,
@@ -1536,10 +1655,10 @@
   pages =	 {140--164},
   titleaddon =	 {\bibstring{reviewof} \mkbibemph{The Sources of
                   Normativity}, \bibstring{by} {Christine M. Korsgaard}},
-  annote = 	 {A book review as an Article.  It has a specific
-                  title (title field) as well as a generic one
-                  (titleaddon field).  Note bibstring macro and
-                  formatting in the titleaddon.}
+  annote = 	 {A book review as an Article. It has a specific title
+                  (title field) as well as a generic one (titleaddon
+                  field). Note bibstring macro and formatting in the
+                  titleaddon.}
 }
 
 @Article{gibbard:15,
@@ -1553,16 +1672,16 @@
   pages =	 {140--64},
   titleaddon =	 {\bibstring{reviewof} \mkbibemph{The sources of
                   normativity}, \bibstring{by} {Christine M. Korsgaard}},
-  annotation = 	 {A book review as an Article.  It has a specific
-                  title (title field) as well as a generic one
-                  (titleaddon field).  Note bibstring macro and
-                  formatting in the titleaddon, with sentence-style
-                  capitalization for the 15th ed.}
+  annotation = 	 {A book review as an Article. It has a specific title
+                  (title field) as well as a generic one (titleaddon
+                  field). Note bibstring macro and formatting in the
+                  titleaddon, with sentence-style capitalization for
+                  the trad style.}
 }
 
 @Periodical{good:wholeissue,
   issuetitle = 	 {Non-subject-matter Outcomes of Schooling},
-  title = {Elementary School Journal},
+  title =        {Elementary School Journal},
   date = 	 {1999},
   volume = 	 99,
   number = 	 5,
@@ -1573,10 +1692,9 @@
                   goes in the issuetitle field, while the name of the
                   journal goes in title rather than journaltitle. The
                   nature of the issue once again goes in the note
-                  field, with an initial lowercase letter.
-                  Cf. conley:fifthgrade for an example of an Article
-                  entry presenting one article from this special
-                  issue.}
+                  field, with an initial lowercase letter.  Cf.\
+                  conley:fifthgrade for an example of an Article entry
+                  presenting one article from this special issue.}
 }
 
 @Review{gourmet:052006,
@@ -1586,8 +1704,8 @@
   title =        {Kitchen {Notebook}},
   annotation = 	 {A regular column in a magazine, presented in a
                   \textsf{Review} entry (with \texttt{magazine}
-                  \textsf{entrysubtype}).  This name is capitalized
-                  headline style.  Since there is no \textsf{author},
+                  \textsf{entrysubtype}). This name is capitalized
+                  headline style. Since there is no \textsf{author},
                   the \textsf{journaltitle} will be used instead;
                   there is no longer any need for a \textsf{sortkey}.}
 }
@@ -1595,57 +1713,68 @@
 @Audio{greek:filmstrip,
   title = 	 {The {Greek} and {Roman} World},
   date = 	 1977,
-  publisher = {Society for Visual Education},
+  publisher =    {Society for Visual Education},
   type = 	 {filmstrip, 44 min\adddot},
   address = 	 {Chicago},
   sortkey = 	 {Greek and Roman},
-  annotation = 	 {For the 16th edition only, the title will
-                  automatically appear at the head of such an entry,
-                  and in citations, as well.  The sortkey is needed
-                  because of the definite article in the title.}
-}
-
-@Audio{greek:filmstrip:15,
-  title = 	 {The {Greek} and {Roman} World},
-  date = 	 1977,
-  publisher = 	 {Society for Visual Education},
-  author = 	 {{Society for Visual Education}},
-  type = 	 {filmstrip},
-  address = 	 {Chicago},
-  annotation = 	 {An Audio entry for a filmstrip, the medium being
-                  given in the type field.  For the author-date style,
-                  it probably makes sense to give the publisher as the
-                  author, also, so that the entry in the reference
-                  list doesn't start with the date. 15th edition
-                  only}
+  annotation = 	 {For recent editions, the title will automatically
+                  appear at the head of such an entry, and in
+                  citations, as well. The sortkey is needed because of
+                  the definite article in the title.}
 }
 
 @InReference{grove:sibelius,
   title = 	 {The New {Grove} Dictionary of Music and Musicians},
   author = 	 {Hepokoski, James},
   shorttitle = 	 {New {Grove} Dict\adddot},
-  lista = {Sibelius, Jean},
+  lista =        {Sibelius, Jean},
   url = 	 {http://www.grovemusic.com/},
   urldate = 	 {2002-01-03},
   sortkey = 	 {New Grove},
   annotation = 	 {An example of an online \textsf{InReference} entry,
                   which I have allowed, as an example, to appear in
-                  the list of references.  The \textsf{author} field
+                  the list of references. The \textsf{author} field
                   refers to the author of the specific entry in
                   \textsf{lista}, and will be printed after the name
-                  of that entry, set off by a comma.  If you need to
+                  of that entry, set off by a comma. If you need to
                   provide the author or editor of a reference work as
                   a whole, then you should probably use a
-                  \textsf{Book} entry.  (Cf.\
-                  \texttt{schellinger:novel}.)  Note the
-                  \textsf{sortkey}, needed because otherwise the
-                  author's name will be used for sorting in the list
-                  of references.  Note also that in citations of
-                  \textsf{InReference} entries, you can put an
-                  alphabetized article title in the \textsf{postnote}
-                  field, and it will be formatted for you
-                  automatically.}
-}
+                  \textsf{Book} entry. (Cf.\
+                  \texttt{schellinger:novel}.) Note the
+                  \textsf{sortkey}, so\vadjust{\eject} that the entry
+                  doesn't sort by the definite article. Note also that
+                  in citations of \textsf{InReference} entries, you
+                  can put an alphabetized article title in the
+                  \textsf{postnote} field, and it will be formatted
+                  for you automatically. The 17th edition has new
+                  instructions for treating online material that
+                  doesn't have, and never had, a printed
+                  counterpart. Specifically, the \textsf{title} can,
+                  at your discretion, appear in roman rather than
+                  italics, as in \textsf{Online} entries. To keep the
+                  features of \textsf{InReference} entries available
+                  to such resources you can add an
+                  \textsf{entrysubtype} to such an entry, rather than
+                  lose those features by using an \textsf{Online}
+                  entry. Cf. wikiped:bibtex.}
+}
+
+@Performance{hamilton:miranda,
+  editor = 	 {Miranda, Lin-Manuel},
+  editortype = 	 {music and lyrics},
+  editoratype =  {director},
+  editorbtype =  {choreographer},
+  editora = 	 {Kail, Thomas},
+  editorb = 	 {Blakenbuehler, Andy},
+  venue = 	 {Richard Rodgers Theatre},
+  title = 	 {Hamilton},
+  date = 	 {2016-02-02},
+  location =     {New York, NY},
+  annote =       {New in the 17th-edition styles, the
+                  \textsf{Performance} entry type allows you to cite
+                  individual live performances, usually including a
+                  number of \textsf{editortypes} for specifying
+                  various contributors.}}
 
 @Video{handel:messiah,
   title = 	 {Messiah},
@@ -1658,16 +1787,16 @@
   editora = 	 {Shaw, Robert},
   editoratype =  {none},
   author = 	 {Handel, George Frederic},
-  publisher = {Video Artists International},
+  publisher =    {Video Artists International},
   address = 	 {Ansonia Station, NY},
   annotation = 	 {This is a videotape of a performance, presented
                   therefore as a \textsf{Video} entry rather than as
-                  \textsf{Music}.  The composer goes in
+                  \textsf{Music}. The composer goes in
                   \textsf{author}, the performers and conductor in
-                  \textsf{editor} and \textsf{editora}.  Note the
+                  \textsf{editor} and \textsf{editora}. Note the
                   \texttt{none} in both \textsf{editortypes}, as the
                   context presumably makes it clear what role Shaw is
-                  playing.  The usual \textsf{type} field identifies
+                  playing. The usual \textsf{type} field identifies
                   the medium. The \textsf{eventdate}, which will
                   provide the date for the head of the entry and for
                   citations, identifies when the performance took
@@ -1675,27 +1804,6 @@
                   specify just what sort of \textsf{eventdate} it is.}
 }
 
-@Video{handel:messiah:15,
-  title = 	 {Messiah},
-  date = 	 1988,
-  titleaddon = 	 {selections},
-  type = 	 {VHS},
-  editor = 	 {{Atlanta Symphony Orchestra and Chamber Chorus}},
-  editortype = 	 {none},
-  editora = 	 {Shaw, Robert},
-  editoratype =  {none},
-  author = 	 {Handel, George Frederic},
-  publisher = {Video Treasures},
-  address = 	 {Batavia, OH},
-  annotation = 	 {15th edition only This is a videotape of an
-                  oratorio, presented therefore as a Video entry
-                  rather than as Music.  The composer goes in author,
-                  the performers and conductor in editor and editora.
-                  Note the "none" in both editortypes, as the context
-                  presumably makes it clear what role Shaw is playing.
-                  The usual type field identifies the medium.}
-}
-
 @Collection{harley:ancient:cart,
   title = 	 {Cartography in Prehistoric, Ancient, and Medieval
                   {Europe} and the {Mediterranean}},
@@ -1705,7 +1813,7 @@
   annotation = 	 {A Collection entry, with the maintitle coming from
                   the MVCollection entry cited in the crossref field.
                   With the booklongxref option set properly, and not
-                  by default, this and the next entry will now produce
+                  by default, this and the next entry will produce
                   abbreviated references in the list of references.
                   Cf. lach:asia.},
 }
@@ -1719,12 +1827,12 @@
   part = 	 {2},
   annotation = 	 {A Collection entry, with its maintitle's logical
                   volumes published in separate physical parts, hence
-                  a volume and a part number.  The maintitle itself
+                  a volume and a part number. The maintitle itself
                   comes from the MVCollection entry cited in the
-                  crossref field.  With the booklongxref option set
+                  crossref field. With the booklongxref option set
                   properly, and not by default, this and the previous
-                  entry will now produce abbreviated references in the
-                  list of references.  Cf. lach:asia.}
+                  entry will produce abbreviated references in the
+                  list of references. Cf. lach:asia.}
 }
 
 @MVCollection{harley:hoc,
@@ -1734,18 +1842,18 @@
   volumes = 	 {3},
   publisher = uchp,
   location =  {Chicago},
-  annotation = 	 {This entry shows the new MVCollection type used as
-                  the parent to two child Collection entries --
-                  harley:ancient:cart and harley:cartography.  It will
+  annotation = 	 {This entry shows the MVCollection type used as the
+                  parent to two child Collection entries --
+                  harley:ancient:cart and harley:cartography. It will
                   be presented in the list of references when more
                   than one of its children are cited, and those
                   children's entries will be abbreviated in the list
                   as well, assuming the option booklongxref is set
-                  properly (it won't be by default).  Biber
+                  properly (it won't be by default). Biber
                   automatically transforms the title of this entry
-                  into a maintitle for the children.  Please note that
-                  this treatment isn't explicitly allowed in the
-                  Chicago specification.}
+                  into a maintitle for the children. (Please note that
+                  this space-saving treatment isn't explicitly allowed
+                  in the Chicago specification.)}
 }
 
 @Online{harwood:biden,
@@ -1754,9 +1862,11 @@
   organization = {\mkbibemph{New York Times} video, 2:00},
   date = 	 {2008-08-23},
   url = 	 {http://video.on.nytimes.com/?fr_story=a425c9aca92f51bd19f2a621fd93b5e266507191},
-  annotation = 	 {An online video using an Online entry.  Note the
-                  formatting in the organization field.
-                  Cf. horowitz:youtube.}
+  annotation = 	 {An online video from a traditional journalistic site
+                  using an Online entry. You could use an Article
+                  entry with magazine entrysubtype instead, removing
+                  the need for special formatting in the organization
+                  field. Cf. kessler:nyt.}
 }
 
 @TechReport{herwign:office,
@@ -1778,25 +1888,17 @@
   origdate = 	 1959,
   editor = 	 {Hitchcock, Alfred},
   editortype = 	 {director},
-  publisher = {Warner Home Video},
+  publisher =    {Warner Home Video},
   type = 	 {DVD},
-  pubstate = 	 {reprint},
   address = 	 {Burbank, CA},
   annotation = 	 {This Video entry cites one scene (title) from a film
-                  (booktitle).  By contrast with the notes &
+                  (booktitle). By contrast with the notes &
                   bibliography style, we don't need an options field
                   here, as we allow the director to appear at the head
-                  of the entry.  The editortype field identifies the
+                  of the entry. The editortype field identifies the
                   directorial role, while the origdate and date give
                   the original year of release and the year of DVD
-                  release, respectively.  In the 15th edition, the
-                  pubstate field means that the origdate will be
-                  printed in parentheses after the main part of the
-                  entry, with a bibstring identifying it as the year
-                  of original release.  In the 16th edition, by
-                  contrast, the origdate will appear automatically at
-                  the head of the entry and in citations, and
-                  therefore the pubstate field will be ignored}
+                  release, respectively.}
 }
 
 @Article{hlatky:hrt,
@@ -1830,9 +1932,9 @@
   booktitle = 	 {Lady in Satin},
   author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
   editor = 	 {Holiday, Billie},
-  editortype = 	 {none},
+  editortype = 	 {vocalist},
   number = 	 {CL 1157},
-  publisher = {Columbia},
+  publisher =    {Columbia},
   type = 	 {33\onethird\ rpm},
   note = 	 {with Ray Ellis},
   options = 	 {useauthor=false},
@@ -1841,52 +1943,49 @@
                   The writers of the song go in \textsf{author}, while
                   the \textsf{options} field prevents these writers
                   from appearing in citations or at the head of the
-                  entry in the list of references.  The performer goes
+                  entry in the list of references. The performer goes
                   in \textsf{editor}, with the \textsf{editortype}
-                  ensuring that no identifying string appears.  The
-                  \textsf{eventdate} gives the recording date of a
-                  song -- you would use \textsf{origdate} if the
-                  recording date applied to the album as a whole.  The
-                  \textsf{date} gives the release date of the album.}
+                  giving, as the 17th edition seems to like, what sort
+                  of performer she is. The \textsf{eventdate} gives
+                  the recording date of a song -- you would use
+                  \textsf{origdate} if the recording date applied to
+                  the album as a whole. The \textsf{date} gives the
+                  release date of the album, while the \textsf{type}
+                  field gives the medium of the release.}
 }
 
 @Book{hopp:attalid,
   title = 	 {Untersuchungen zur Geschichte der letzten Attaliden},
   date = 	 1977,
   author = 	 {Hopp, Joachim},
-  publisher = {C.~H. Beck'sche Verlagsbuchhandlung},
+  publisher =    {C.~H. Beck'sche Verlagsbuchhandlung},
   number = 	 25,
   series = 	 {Vestigia: Beitr\"age zur alten Geschichte},
   hyphenation =  {german},
   address = 	 {Munich},
-  annotation = 	 {A book in a series.  The latter is given in the
+  annotation = 	 {A book in a series. The latter is given in the
                   series field, and the volume within the series in
-                  the number field.  Note also the hyphenation field
-                  to preserve German capitalization in the title,
-                  which therefore doesn't require extra curly braces.}
+                  the number field. Note also the hyphenation field to
+                  preserve German capitalization in the title, which
+                  therefore doesn't require extra curly braces.}
 }
 
 @Online{horowitz:youtube,
   title = 	 {{HOROWITZ AT CARNEGIE HALL} 2-{Chopin Nocturne} in Fm Op.55},
   organization = {YouTube video, 5:53},
-  sortkey = 	 {Horowitz},
   url = 	 {http://www.youtube.com/watch?v=cDVBtuWkMS8},
   urldate = 	 {2009-01-09},
   userd = 	 {posted by \mkbibquote{hubanj},},
   note = 	 {from a performance televised by CBS on\nopunct},
   date = 	 {1968-09-22},
-  shorttitle = {HOROWITZ},
+  shorttitle =   {HOROWITZ},
   annotation = 	 {A YouTube video, presented in an \textsf{Online}
                   entry.  The \textsf{userd} field allows you to
                   modify what is printed before the \textsf{urldate},
                   while the \textsf{note} field here is used for a
                   similar purpose, to clarify the \textsf{date} field.
                   The \textsf{shorttitle} abbreviates what will appear
-                  in citations of this author-less entry, and the
-                  \textsf{sortkey} is required because, in this corner
-                  case, the \textsf{organization} would otherwise be
-                  used for alphabetization, an arrangement that works
-                  for many entries, but not this one.}
+                  in citations of this author-less entry.}
 }
 
 @Book{horsley:prosodies,
@@ -1908,24 +2007,23 @@
   annotation = 	 {An example of a \textsf{Misc} entry (with an
                   \textsf{entrysubtype}) specifically for a reference
                   list, assuming that more than one item has been
-                  cited from this same collection.  If you cite just
+                  cited from this same collection. If you cite just
                   one item from such a collection, then the entry
-                  might look like \cmslink{creel:house}.  In this
-                  entry type the absence of a \textsf{date} field does
-                  not trigger the automatic provision of the
+                  might look like \cmslink{creel:house}. In this entry
+                  type the absence of a \textsf{date} field does not
+                  trigger the automatic provision of the
                   \enquote{n.d\adddot} \cmd{bibstring}, which means
                   that the reference list entry will not contain one
-                  if it isn't wanted.  The \textsf{entrysubtype}
+                  if it isn't wanted. The \textsf{entrysubtype}
                   \texttt{classical} makes the in-text citations
                   provide name + title instead of just name, which may
                   help clarify the reference in some circumstances.
                   This entry also illustrates the use of a comma in a
                   reference list to set off a middle initial from a
                   following plain-text title, only used when the
-                  period alone might lead to ambiguity.  Cf.\
-                  \emph{CMS}, 14.241.  The \cmd{adddot} and
-                  \cmd{addcomma} commands you see here are the most
-                  effective way of doing this.}
+                  period alone might lead to ambiguity. The
+                  \cmd{adddot} and \cmd{addcomma} commands you see
+                  here are the most effective way of doing this.}
 }
 
 @Book{howell:marriage,
@@ -1935,93 +2033,62 @@
   date = 	 1998,
   author = 	 {Howell, M.~C.},
   number = 	 {\partedit C.~R. Stimpson},
-  publisher = uchp,
+  publisher =    uchp,
   series = 	 {Women in Culture and Society},
   address = 	 {Chicago},
   annotation = 	 {A book in a series, providing also the series editor
                   in the number field, which is the only way to get
-                  the name to follow the series.  Note also the
+                  the name to follow the series. Note also the
                   partedit macro, though in the author-date style you
-                  could just provide the correct string ("ed." in the
-                  15th edition, "edited by" in the 16th) if you're
-                  sure you know it.}
+                  could just provide the correct string if you're sure
+                  you know it.}
 }
 
-@Book{iso:electrodoc,
-  title = 	 {Electronic Documents or Parts thereof.  {Excerpts}
-                  from {International Standard ISO} 690-2},
-  part = 	 {part 2},
-  date = 	 2001,
-  maintitle = 	 {Information and Documentation},
-  mainsubtitle = {Bibliographic References},
+@Standard{iso:electrodoc,
+  date = 	 1997,
+  title = 	 {Information and Documentation---Rules for the
+                  Abbreviation of Title Words and Titles of
+                  Publications},
   author = 	 {{International Organization for Standardization}},
-  shorthand =  {ISO},
-  publisher = {National Library of Canada},
-  sortname = 	 {ISO},
-  address = 	 {Ottawa},
-  url = 	 {http://www.nlc-bnc.ca/iso/tc46sc9/standard/690-2e.htm},
-  annote = 	 {A \textsf{Book} with a \textsf{maintitle} and an
-                  organizational \textsf{author}.  You can use the
-                  \textsf{part} field on its own to define how the
-                  \textsf{title} relates to the \textsf{maintitle},
-                  assuming that the usual \textsf{volume} and
-                  \textsf{part} fields don't provide an appropriate
-                  solution.  Any non-numeric \textsf{part} field will
-                  be printed as-is.  The \textsf{shorthand} for
-                  \vadjust{\eject}the organization will appear in the
-                  in-text citations, and at the head of the reference
+  shorthand =    {ISO},
+  series =       {ISO},
+  number =       {4:1997},
+  publisher =    {ISO},
+  address = 	 {Paris},
+  annote = 	 {An entry using the new \textsf{Standard} type, with
+                  a \textsf{shorthand} for presenting the
+                  organizational \textsf{author}. The
+                  \textsf{shorthand} will by default appear in the
+                  in-text citations and at the head of the reference
                   list entry, followed by its expansion (the
-                  \textsf{author}) in parentheses.  The
-                  \textsf{sortname} ensures that the entry is
-                  alphabetized by the first thing that appears there,
-                  that is, the \textsf{shorthand}.}
+                  \textsf{author}) in parentheses. Also by default,
+                  the entry will be alphabetized by the first thing
+                  that appears there, which here is the
+                  \textsf{shorthand}. The \textsf{series} and
+                  \textsf{number} fields identify the standard. Cf.\
+                  niso:bibref and w3c:xml for other entries using the
+                  \textsf{Standard} type, and
+                  \cmslink{bsi:abbreviation} for a similar entry that
+                  uses the \textsf{Manual} type.}
 }
 
-@Book{iso:electrodoc:15,
-  title = 	 {Electronic Documents or Parts thereof.  {Excerpts}
-                  from {International Standard ISO} 690-2},
-  titleaddon = 	 {Part 2 of\nopunct},
-  date = 	 2001,
-  maintitle = 	 {Information and Documentation},
-  userc = 	 {abbrev:ISO},
-  mainsubtitle = {Bibliographic References},
-  shorthand = 	 {ISO},
-  author = 	 {{International Organization for Standardization}},
-  publisher = {National Library of Canada},
-  address = 	 {Ottawa},
-  url = 	 {http://www.nlc-bnc.ca/iso/tc46sc9/standard/690-2e.htm},
-  annotation = 	 {A book with a maintitle and an organizational
-                  author.  You can use the titleaddon field to
-                  identify how the title relates to the maintitle,
-                  assuming that the usual volume and part fields don't
-                  provide an appropriate solution.  The nopunct
-                  command suppresses the following punctuation.  The
-                  shorthand for the organization will appear in the
-                  in-text citations.  For the 15th edition, the userc
-                  field points to a CustomC entry which provides the
-                  expansion of the shorthand inside the reference
-                  list, rather than in a list of shorthands.  Using
-                  the field in this way ensures that the expansion
-                  will be printed if this entry is cited.}}
-
 @Book{james:ambassadors,
   title = 	 {The Ambassadors},
   year = 	 1996,
   origdate = 	 1909,
   options = 	 {cmsdate=on},
   author = 	 {James, Henry},
-  publisher = {Project Gutenberg},
+  publisher =    {Project Gutenberg},
   url = 	 {ftp://ibiblio.org/pub/docs/books/gutenberg/etext96/ambas10.txt},
-  annotation = 	 {This entry presents an online edition of a book
-                  which, not being inherently an online text, still
-                  uses a \textsf{Book} entry.  The \textsf{origyear}
-                  field is the date of the print publication of the
-                  text that is now online, and the \texttt{cmsdate=on}
-                  option tells the style to use the \textsf{origdate}
-                  in both reference list and citations, something that
-                  isn't part of the specification for the 16th
-                  edition, which would probably recommend
-                  \texttt{both} here.}
+  annotation = 	 {This entry presents an online edition of a printed
+                  book which therefore still uses a \textsf{Book}
+                  entry. The \textsf{origyear} field is the date of
+                  the print publication of the text that is now
+                  online, and the \texttt{cmsdate=on} option tells the
+                  style to use the \textsf{origdate} in both reference
+                  list and citations, something that isn't part of the
+                  specification for the 17th edition, which would
+                  probably recommend \texttt{both} here.}
 }
 
 @Collection{kamrany:economic,
@@ -2038,7 +2105,7 @@
   crossref =  {prairie:state},
   pages = 	 {84--87},
   annotation = 	 {Second of three InCollection pieces from the same
-                  Collection, using the crossref field.  The entry in
+                  Collection, using the crossref field. The entry in
                   the list of references will be shortened.}
 }
 
@@ -2053,12 +2120,29 @@
   pages = 	 {271--273},
   annotation = 	 {An Article with a Dutch title that may need
                   translating for a significant portion of your
-                  readership.  You give the translation in the usere
-                  field, using sentence-style capitalization.  The
+                  readership. You give the translation in the usere
+                  field, using sentence-style capitalization. The
                   hyphenation field allows you not to use extra curly
                   braces in the title.}
 }
 
+@Article{kessler:nyt,
+  author = 	 {Kessler, Aaron M\adddot},
+  title = 	 {The Driverless Now},
+  journaltitle = {New York Times},
+  type = 	 {video, 2:01},
+  entrysubtype = {magazine},
+  editortype = 	 {producer},
+  date = 	 {2015-05-02},
+  editor = 	 {Teng, Poh Si and Naudziunas, Jessica},
+  url = 	 {http://www.nytimes.com/video/business/100000003662208/the-driverless-now.html},
+  annote =       {An online video from a traditional journalistic
+                  site, using an Article entry and a type field for
+                  identifying the sort of material involved, and its
+                  duration. You can also use an Online entry with
+                  special formatting in the organization field, but
+                  this method is somewhat simpler. Cf. harwood:biden.}}
+
 @Article{kimluu:diethyl,
   author =	 {Kim Luu, Diane-Dinh},
   title =	 {Diethylstilbestrol and Media Coverage of the
@@ -2070,9 +2154,9 @@
   location =	 {Indiana University South Bend},
   annote = 	 {Another Article from a journaltitle that may need
                   further specification for your readership, hence the
-                  use of the location field. For the 16th edition
-                  only, Note also the quoted phrase inside the title,
-                  with headline-style capitalization.}
+                  use of the location field. Note also the quoted
+                  phrase inside the title, with headline-style
+                  capitalization.}
 }
 
 @Article{kimluu:diethyl:15,
@@ -2086,10 +2170,10 @@
   location =	 {Indiana University South Bend},
   annotation = 	 {Another Article from a journaltitle that may need
                   further specification for your readership, hence the
-                  use of the location field.  For the 15th edition
-                  only, note also the quoted phrase inside the title,
-                  with sentence-style capitalization you need to
-                  provide yourself.}
+                  use of the location field. For the trad style only,
+                  note also the quoted phrase inside the title, with
+                  sentence-style capitalization you need to provide
+                  yourself.}
 }
 
 @Review{kozinn:review,
@@ -2102,15 +2186,15 @@
                   (piano), 92nd {Street Y, New York}},
   pages =	 {Weekend section},
   annotation = 	 {A Review entry presenting a review in a newspaper,
-                  with "magazine" in entrysubtype.  Note the use of
-                  the bibstrings in title, which help but do not
-                  complete the internationalization of the entry.
-                  Beginning the field without a bibstring and with
-                  lower-case letters in a chosen language
-                  (e.g. "review of") is possibly a better alternative.
-                  Note also the pages field, which gives a more
-                  general reference than page number, as sometimes the
-                  latter might change between editions.}
+                  with "magazine" in entrysubtype. Note the use of the
+                  bibstrings in title, which help but do not complete
+                  the internationalization of the entry. Beginning the
+                  field without a bibstring and with lower-case
+                  letters in a chosen language (e.g. "review of") is
+                  possibly a better alternative. Note also the pages
+                  field, which gives a more general reference than
+                  page number, as sometimes the latter might change
+                  between editions.}
 }
 
 @Book{lach:asia,
@@ -2120,8 +2204,8 @@
   volume = 	 {2},
   part = 	 {3},
   author = 	 {Lach, Donald},
-  publisher = uchp,
-  location =  {Chicago},
+  publisher =    uchp,
+  location =     {Chicago},
   annotation = 	 {A Book with a maintitle, its logical volumes
                   published in several physical parts, hence both a
                   volume and part number. Cf. harley:cartography.}
@@ -2133,20 +2217,20 @@
   entrysubtype = {magazine},
   title = 	 {Pushcarts Evolve to Trendy Kiosks},
   options = 	 {cmsdate=full},
-  location =  {Lake Forest, IL},
+  location =     {Lake Forest, IL},
   annotation = 	 {An \textsf{Article} entry from a newspaper, using a
-                  \texttt{magazine} \textsf{entrysubtype}.  The
-                  article doesn't have an author, so the
-                  \textsf{journaltitle} will be used at the head of
-                  the entry and in citations.  The newspaper might not
-                  be well known, so the \textsf{location} field helps
-                  your readers out in this case.  There is no longer
-                  any need for a \textsf{sortkey}.  Finally, note the
-                  \texttt{full} key for the \texttt{cmsdate} option,
-                  which prints a full date specification in citations
-                  and means you wouldn't need this entry to appear in
-                  the reference list, though I have allowed it to
-                  appear here as an example.}
+                  \texttt{magazine} \textsf{entrysubtype}. The article
+                  doesn't have an author, so the \textsf{journaltitle}
+                  will be used at the head of the entry and in
+                  citations. The newspaper might not be well known, so
+                  the \textsf{location} field helps your readers out
+                  in this case. There is no longer any need for a
+                  \textsf{sortkey}. Finally, note the \texttt{full}
+                  key for the \texttt{cmsdate} option, which prints a
+                  full date specification in citations and means you
+                  wouldn't need this entry to appear in the reference
+                  list, though I have allowed it to appear here as an
+                  example.}
 }
 
 @Book{lecarre:quest,
@@ -2155,11 +2239,11 @@
   year = 	 1982,
   author = 	 {Le Carr{\'e}, John},
   nameaddon = 	 {David John Moore Cornwell},
-  location =  {New York},
-  options =   {useprefix=true},
+  location =     {New York},
+  options =      {useprefix=true},
   annotation = 	 {A fairly standard Book entry, with, however, the
                   pseudonym in the author field and the real name in
-                  nameaddon.  This isn't strictly necessary in this
+                  nameaddon. This isn't strictly necessary in this
                   case, as one normally refers to this author by the
                   pseudonym, but if it is of particular interest this
                   is how you would present such information.}
@@ -2171,22 +2255,23 @@
   title = 	 {Madonna of the Rocks},
   type = 	 {oil on canvas},
   note = 	 {78 x 48.5 in\adddot},
-  year = 	 {1480s},
+  date = 	 {148X},
   institution =  {Louvre},
-  location =  {Paris},
-  annotation = 	 {A typical Artwork entry.  Note the type field and
-                  the fact that it begins with a lowercase letter,
+  location =     {Paris},
+  annotation = 	 {A typical Artwork entry. Note the type field and the
+                  fact that it begins with a lowercase letter,
                   allowing biblatex to capitalize it contextually when
                   needed, though this isn't strictly necessary for
-                  author-date.}
+                  author-date. Note also the ISO8601-2 decade
+                  specification in the date field.}
 }
 
 @Book{levistrauss:savage,
   title = 	 {The Savage Mind},
   year = 	 1962,
   author = 	 {Lévi-Strauss, Claude},
-  publisher = {Weidenfeld \& Nicolson},
-  location =  {Chicago: University of Chicago Press; London},
+  publisher =    {Weidenfeld \& Nicolson},
+  location =     {Chicago: University of Chicago Press; London},
   annotation = 	 {A standard Book entry, showing a kludge in the
                   location field for including two publishers in two
                   different countries.  The simplest thing to do in
@@ -2205,9 +2290,9 @@
   year =	 1998,
   volume =	 37,
   pages =	 {26--53},
-  annote = 	 {16th edition only An Article entry showing a
-                  quotation inside a title.  Note the headline-style
-                  capitalization inside the formatting.}
+  annote = 	 {An Article entry showing a quotation inside a title.
+                  Note the headline-style capitalization inside the
+                  formatting.}
 }
 
 @Article{lewis:15,
@@ -2220,20 +2305,46 @@
   year =	 1998,
   volume =	 37,
   pages =	 {26--53},
-  annotation = 	 {15th edition only An Article entry showing a
-                  quotation inside a title.  Note the sentence-style
-                  capitalization inside the formatting.}
-}
+  annotation = 	 {An Article entry showing a quotation inside a
+                  title. Note the sentence-style capitalization inside
+                  the formatting, for use with the trad style.}
+}
+
+@Online{licis:diazcomment,
+  author = 	 {Licis, Kristaps},
+  title = 	 {But what is the surprise here?},
+  related = 	 {diaz:surprise},
+  relatedtype =  {commenton},
+  date = 	 {2016-02-24},
+  url = 	 {https://www.facebook.com/junotdiaz.writer/posts/972495572815454?comment_id=972558569475821},
+  annote =       {The 17th edition recommends an Online entry like
+                  this for presenting a comment on a social media
+                  thread. You can use time stamps in the date fields
+                  to distinguish multiple comments by the same
+                  author. Since this comment has its own title, the
+                  "commenton" relatedtype is pretty much required if
+                  you want it to appear in the list of references,
+                  with the related field containing the entry upon
+                  which this is a comment. As a rule, such material
+                  need appear only in the text, so by default when
+                  biblatex-chicago sees this relatedtype it sets both
+                  skipbib and cmsdate=full for the entry, and also
+                  provides a virtual entry (diaz:surprise-customc)
+                  that you can use in an autocites command to provide
+                  a comment that presents the entry on which this is a
+                  comment. You can certainly provide all of this by
+                  hand, but the use of the relatedtype is meant to be
+                  more convenient.}}
 
 @InCollection{lippincott:chicago,
   author = 	 {Lippincott, Sarah Clarke},
   title = 	 {Chicago},
-  crossref =  {prairie:state},
+  crossref =     {prairie:state},
   pages = 	 {362--370},
   annotation = 	 {Third and last of the InCollection entries referring
-                  to the same Collection.  The reference list entries
-                  of all three are abbreviated. Cf. ellet:galena
-                  and keating:dearborn.}
+                  to the same Collection. The reference list entries
+                  of all three are abbreviated. Cf. ellet:galena and
+                  keating:dearborn.}
 }
 
 @Video{loc:city,
@@ -2245,7 +2356,7 @@
   urldate = 	 {2001-08-14},
   annotation = 	 {This Video entry gives the online location of the
                   weed:flatiron film, providing an MPEG file for
-                  download.  As the parent entry calls this using a
+                  download. As the parent entry calls this using a
                   related field, you no longer need a skipbib option
                   to keep it from appearing in the reference list, nor
                   do you need a kludge in the year field to keep the
@@ -2253,19 +2364,19 @@
 }
 
 @Online{loc:leaders,
-  author = 	 {Library of Congress},
+  organization = {Library of Congress},
   title = 	 {American Leaders Speak},
   subtitle = 	 {Recordings from {World War I} and the 1920 Election,
                   1918--1920},
-  url = 	 {http://memory.loc.gov/ammem/nfhtml/nforSpeakers01.html},
+  url = 	 {http://memory.loc.gov/ammem/nfhtml/},
   note = 	 {RealAudio and WAV formats},
   annotation = 	 {This \textsf{Online} entry provides the online
-                  location of the \cmslink{coolidge:speech} entry.  As
+                  location of the \cmslink{coolidge:speech} entry. As
                   the parent entry calls this using a \textsf{related}
                   field, you no longer need a \texttt{skipbib} option
                   to keep it from appearing in the reference list, nor
                   do you need a kludge in the \textsf{year} field to
-                  keep a spurious \enquote{n.d.}  from appearing.}
+                  keep a spurious \enquote{n.d.} from appearing.}
 }
 
 @Article{loften:hamlet,
@@ -2287,8 +2398,8 @@
   date = 	 1960,
   volume = 	 75,
   pages = 	 {149--151},
-  annote = 	 {16th edition only An article entry with a quoted
-                  title within its title}
+  annote = 	 {An article entry with a quoted title within its
+                  title.}
 }
 
 @Article{loomis:structure:15,
@@ -2298,8 +2409,8 @@
   date = 	 1960,
   volume = 	 75,
   pages = 	 {149--51},
-  annotation = 	 {15th edition only An article entry with a quoted
-                  title within its title}
+  annotation = 	 {An article entry with a quoted title within its
+                  title, for the trad style}
 }
 
 @Book{lynch:webstyle,
@@ -2324,21 +2435,21 @@
 }
 
 @Book{maitland:canon,
-  title = 	 {Roman canon law in the {Church of England}},
+  title = 	 {Roman Canon Law in the {Church of England}},
   date = 	 1998,
   origdate = 	 1898,
   author = 	 {Maitland, Frederic W.},
-  publisher = {Lawbook Exchange},
+  publisher =    {Lawbook Exchange},
   address = 	 {Union, NJ},
   options = 	 {cmsdate=new},
   pubstate = 	 {reprint},
-  annotation = 	 {A reprint edition.  The \emph{CMS} gives many
-                  options for presenting this information.  This
-                  example provides both dates at the head of the entry
-                  in the reference list and in citations, using
+  annotation = 	 {A reprint edition. The \emph{CMS} gives many options
+                  for presenting this information. This example
+                  provides both dates at the head of the entry in the
+                  reference list and in citations, using
                   \texttt{cmsdate=new} in the \textsf{options} field.
                   It is identified as a reprint with the
-                  \textsf{pubstate} field.  Cf.\
+                  \textsf{pubstate} field. Cf.\
                   \cmslink{james:ambassadors} and
                   \cmslink{maitland:equity} for other alternatives.}
 }
@@ -2350,54 +2461,80 @@
   origdate = 	 1909,
   author = 	 {Maitland, Frederic W.},
   editor = 	 {Chaytor, A.~H. and others},
-  publisher = cup,
+  publisher =    cup,
   address = 	 {Cambridge},
   pubstate = 	 {reprint},
   sortyear = 	 {2010},
   annotation = 	 {Another reprint edition, showing an alternative way
-                  of presenting the information.  This example
-                  provides just the \textsf{date} of the reprint at
-                  the head of the reference list and in the citation
-                  -- there's no \texttt{cmsdate} option, which means
+                  of presenting the information. This example provides
+                  just the \textsf{date} of the reprint at the head of
+                  the reference list and in the citation -- there's no
+                  \texttt{cmsdate} option, which means
                   \texttt{cmsdate=off} -- and then gives the date of
                   the original, identified as such by a string, after
-                  the publication data.  The string \texttt{reprint}
-                  in the \textsf{pubstate} field, even though it isn't
+                  the publication data. The string \texttt{reprint} in
+                  the \textsf{pubstate} field, even though it isn't
                   printed in the entry, is necessary to make this
                   original publication information appear (unless you
                   decide to use the \textsf{relatedtype}
-                  \texttt{origpubin}).  Also, the \textsf{sortyear}
+                  \texttt{origpubin}). Also, the \textsf{sortyear}
                   field is necessary here because \textsf{biblatex}
                   sorts automatically by the \textsf{year} rather than
                   the \textsf{origyear}, and this entry from 1926
                   should come after \cmslink{maitland:canon} which
-                  prints its \textsf{origdate} (1898) first.  Cf.\
+                  prints its \textsf{origdate} (1898) first. Cf.\
                   \cmslink{james:ambassadors}}
 }
 
+@Video{mayberry:brady,
+  title = 	 {Her Sister's Shadow},
+  eventdate = 	 {1971-11-19},
+  editortype = 	 {director},
+  entrysubtype = {tvepisode},
+  booktitle = 	 {The {Brady} Bunch},
+  usera = 	 {ABC},
+  editor = 	 {Mayberry, Russ},
+  booktitleaddon = {season 3, episode 10},
+  url = 	 {https://www.hulu.com/the-brady-bunch},
+  annote =       {Another TV episode presented with the series title
+                  before the episode title, using the "tvepisode"
+                  entrysubtype. This episode comes from a streaming
+                  service, indicated by the url field.}}
+
+@Artwork{mccurry:afghangirl,
+  author = 	 {McCurry, Steve},
+  title = 	 {Afghan Girl},
+  date = 	 {1984-12},
+  eventdate = 	 {1985-06},
+  howpublished = {\mkbibemph{National Geographic}, cover,},
+  type = 	 {photograph},
+  annote =       {The 17th edition has multiplied the number of
+                  relevant dates in an Artwork entry. This entry
+                  presents a photograph with its creation date in the
+                  date field and also a date for its appearance in
+                  print in the eventdate. The howpublished field gives
+                  the circumstances of that print appearance.}}
+
 @Book{mchugh:wake,
   title = 	 {Annotations to \mkbibquote{Finnegans Wake}},
   year = 	 1980,
   author = 	 {McHugh, Roland},
-  publisher = {Johns Hopkins University Press},
-  location =  {Baltimore},
-  type = 	 {plain},
-  annote = 	 {16th edition only A Book with a quoted title
-                  inside an italicized one.  Remember to use
-                  \mkbibquote.  See next entry.}
+  publisher =    {Johns Hopkins University Press},
+  location =     {Baltimore},
+  annote = 	 {A Book with a quoted title inside an italicized one.
+                  Remember to use \mkbibquote. See next entry.}
 }
 
 @Book{mchugh:wake:15,
   title = 	 {Annotations to \mkbibquote{Finnegans wake}},
   year = 	 1980,
   author = 	 {McHugh, Roland},
-  publisher = {Johns Hopkins Univ.\ Press},
-  location =  {Baltimore},
-  type = 	 {plain},
-  annotation = 	 {15th edition only A Book with a quoted title
-                  inside an italicized one.  Remember to use
-                  \mkbibquote, and to provide sentence-style
-                  capitalization inside the formatting.}
+  publisher =    {Johns Hopkins Univ.\ Press},
+  location =     {Baltimore},
+  annotation = 	 {A Book with a quoted title inside an italicized one.
+                  Remember to use \mkbibquote, and to provide
+                  sentence-style capitalization inside the
+                  formatting for the trad style.}
 }
 
 @Book{menchu:crossing,
@@ -2406,7 +2543,7 @@
   author = 	 {Mench\'u, Rigoberta},
   editor = 	 {Wright, Ann},
   translator = 	 {Wright, Ann},
-  publisher = {Verso},
+  publisher =    {Verso},
   address = 	 {New York},
   annotation = 	 {Book with translator and editor, who are the same}}
 
@@ -2417,25 +2554,25 @@
   author = 	 {Meredith, George},
   editor = 	 {Cline, C.~L.},
   volumes = 	 3,
-  location =  {Oxford},
+  location =     {Oxford},
   annotation = 	 {A published collection of letters referred to by
                   page rather than by individual letter, hence using a
-                  Book entry rather than Letter.  You should be aware
+                  Book entry rather than Letter. You should be aware
                   that, because there are three volumes of letters,
                   the postnote field of any cite command should
                   contain both volume and page references, as in
-                  "2:234".  For the author-date style the Manual
+                  "2:234". For the author-date style the Manual
                   recommends using entries of this sort for all
                   published letters, giving references to the dates of
-                  individual letters in the text itself (15th
-                  ed. 17.77, 16th ed. 15.40).}
+                  individual letters in the text itself (17th
+                  ed.\ 15.43).}
 }
 
 @Book{michelangelo:poems,
   title = 	 {The Complete Poems of {Michelangelo}},
   date = 	 1999,
   author = 	 {Michelangelo},
-  publisher = uchp,
+  publisher =    uchp,
   address = 	 {Chicago},
   translator = 	 {Nims, J.~F.},
   annotation = 	 {Plain book entry with translator}}
@@ -2444,10 +2581,10 @@
   title = 	 {{MLA} Style Manual and Guide to Scholarly Publishing},
   editor = 	 {Gibaldi, Joseph},
   year = 	 1998,
-  publisher = {Modern Language Association of America},
+  publisher =    {Modern Language Association of America},
   edition = 	 2,
-  location =  {New York},
-  annotation =       {In the notes + bibliography style I used a Reference
+  location =     {New York},
+  annotation =   {In the notes + bibliography style I used a Reference
                   entry to present this data, with useeditor=false in
                   the options field to allow the work to be
                   alphabetized by the title in the bibliography.
@@ -2464,12 +2601,12 @@
   date = 	 {2000-04-23},
   author = 	 {Morgenson, Gretchen},
   title = 	 {Applying a Discount to Good Earnings News},
-  titleaddon = {Market Watch},
+  titleaddon =   {Market Watch},
   annotation = 	 {An Article entry (entrysubtype "magazine")
                   presenting a regular column in a newspaper, which
                   column also has an individual, specific title. The
                   latter goes in the title field and the former in the
-                  titleaddon field.  Note also the reference to the
+                  titleaddon field. Note also the reference to the
                   section in the pages field.}
 }
 
@@ -2479,7 +2616,7 @@
   annotation = 	 {This CustomC entry provides a cross-reference from
                   the pseudonym in the author field to the real name
                   in the title field, allowing your readers to find
-                  the cited work under the author's real name.  The
+                  the cited work under the author's real name. The
                   entry for that work, creasey:morton:hide, contains a
                   userc field which refers to this entry, ensuring
                   that this cross-reference will be printed if the
@@ -2488,7 +2625,6 @@
 
 @Music{mozart:figaro,
   title = 	 {Le nozze di {Figaro}},
-  howpublished = {\textsf{\small\textcircledP}},
   date = 	 {1987},
   author = 	 {Mozart, Wolfgang Amadeus},
   editor = 	 {{Vienna Philharmonic}},
@@ -2496,18 +2632,16 @@
   editora = 	 {Muti, Riccardo},
   editoratype =  {conductor},
   number = 	 {CDS~7~47978~8},
-  publisher = {EMI Records Ltd.},
+  publisher =    {EMI Records Ltd.},
   type = 	 {3 compact discs},
   note = 	 {with Thomas Allen, Margaret Price, Jorma Hynninen,
                   Ann Murray, Kurt Rydl, and the Konzertvereinigung
                   Wiener Staatsopernchor},
-  annotation = 	 {This Music entry shows how a single such entry can
-                  work in both the 15th and 16th editions of the
-                  author-date style.  Because the 16th edition ignores
-                  the howpublished field, if you use it to provide
-                  copyright details for the 15th edition it won't get
-                  in the way of the 16th.  The other fields are the
-                  same for both specifications.}
+  annotation = 	 {This Music entry is a characteristic example of how
+                  to present a variety of roles within a recorded
+                  performance. Recent editions of the CMS might prefer
+                  you to provide a recording date using the origdate
+                  field.}
 }
 
 @PhdThesis{murphy:silent,
@@ -2516,11 +2650,10 @@
   subtitle = 	 {\mkbibemph{Silent Spring} and Media-Borne Public Debate},
   school = 	 {University of North Carolina},
   year = 	 2000,
-  annote = 	 {16th edition only A Thesis entry, using the
-                  PhdThesis alias to define the type field.  The
-                  school field is an alias for biblatex's institution.
-                  Note also the formatting of a title within a quoted
-                  title.}
+  annote = 	 {A Thesis entry, using the PhdThesis alias to define
+                  the type field. The school field is an alias for
+                  biblatex's institution. Note also the formatting of
+                  a title within a quoted title.}
 }
 
 @PhdThesis{murphy:silent:15,
@@ -2529,28 +2662,60 @@
   subtitle = 	 {\mkbibemph{Silent spring} and Media-Borne Public Debate},
   school = 	 {University of North Carolina},
   year = 	 2000,
-  annotation = 	 {15th edition only A Thesis entry, using the
-                  PhdThesis alias to define the type field.  The
-                  school field is an alias for biblatex's institution.
-                  Note also the formatting of a title within a quoted
-                  title.}
+  annotation = 	 {A Thesis entry, using the PhdThesis alias to define
+                  the type field. The school field is an alias for
+                  biblatex's institution. Note also the formatting of
+                  a title within a quoted title, with sentence casing
+                  for the trad style.}
+}
+
+@Music{naraya,
+  title =         {Ghost Dancing Music},
+  related =       {stoffle:ghost},
+  entrysubtype =  {song},
+  relatedstring = {cited in},
+  note =          {Naraya no.~2},
+  type =          {MP3 audio},
+  annote =        {This Music entry contains an online supplement to a
+                  printed Article (stoffle:ghost). The entrysubtype
+                  here allows you to cite a song outside of the
+                  context of an album.}}
+
+@Dataset{nasa:db,
+  author = 	 {{NASA/IPAC Extragalactic Database}},
+  title = 	 {object name IRAS F00400+4059},
+  url = 	 {http://ned.ipac.caltech.edu},
+  urldate = 	 {2016-04-06},
+  annote = 	 {The 17th edition of the \emph{CMS} provides examples
+                  for citing scientific databases, and the
+                  \textsf{Dataset} type supplies a way of complying
+                  with its specifications. The \textsf{author} field
+                  holds the name of the database, and the
+                  \textsf{title} holds the specific piece of data you
+                  are citing. See genbank:db for how you can further
+                  identify the part of the database in which you are
+                  interested. The \textsf{url} and \textsf{urldate}
+                  locate the database and inform the reader when you
+                  accessed it. This type makes entries behave, by
+                  default, as author-title rather than author-date.}
 }
 
 @Unpublished{nass:address,
   author = 	 {Nass, Clifford},
   title = 	 {Why Researchers Treat On-Line Journals Like Real People},
-  note = 	 {keynote address, annual meeting of the Council of
-                  Science Editors},
+  note = 	 {keynote address},
+  eventtitle =   {annual meeting of the Council of Science Editors},
   location = 	 {San Antonio, TX},
-  date = 	 {2000-05-06/2000-05-09},
-  annotation = 	 {A typical Unpublished entry, presenting an
-                  unpublished piece that isn't part of a formal
-                  archive, which would usually require a Misc entry.
-                  The note field provides the details of what sort of
-                  piece it is, and whence it came.  The date field
-                  gives the range for the whole meeting, which will be
-                  printed at the end of the entry, while the year
-                  alone will appear at the head and in citations.}
+  eventdate = 	 {2000-05-06/2000-05-09},
+  annotation = 	 {An Unpublished entry, presenting an unpublished
+                  piece that isn't part of a formal archive, which
+                  would usually require a Misc entry. The note field
+                  provides the details of what sort of piece it is,
+                  while the eventtitle and eventdate tell where and
+                  when it appeared. The eventdate gives the range for
+                  the whole meeting, which will be printed in full at
+                  the end of the entry, while the year alone will
+                  appear at the head and in citations.}
 }
 
 @Book{natrecoff:camera,
@@ -2560,105 +2725,123 @@
   publisher =	 {National Photographic Interpretation Center},
   addendum =	 {now declassified and also available online},
   location = 	 {Washington, DC},
-  url =
-                  {http://www.fas.org/spp/military/program/imint/kh-4%20camera%20system.htm},
+  url =          {http://www.fas.org/spp/military/program/imint/kh-4%20camera%20system.htm},
   annotation = 	 {A technical manual presented in a Book entry. The
                   addendum gives extra details, and there's a url for
-                  easier access.  Note initial lowercase letter in
+                  easier access. Note initial lowercase letter in
                   addendum, and corporate author with extra curly
-                  braces.  If you're going to be citing this text
+                  braces. If you're going to be citing this text
                   frequently, you might want to use a shorthand field
                   to save space in the body of your text.}
 }
 
+@Standard{niso:bibref,
+  title = 	 {Bibliographic References},
+  organization = {National Information Standards Organization},
+  userd = 	 {approved},
+  howpublished = {reaffirmed},
+  eventdate =    {2010-05-13},
+  date = 	 {2005-06-09},
+  series = 	 {ANSI/NISO},
+  number =       {Z39.29-2005},
+  publisher =    {NISO},
+  shorthand =    {NISO},
+  location =     {Bethesda, MD},
+  annote =       {The 17th edition has added some information to
+                  entries presenting national or international
+                  standards, so \textsf{biblatex-chicago} now has a
+                  separate entry type for them. Here you can see two
+                  dates, one when first approved (\textsf{date}) and
+                  another when reaffirmed (\textsf{eventdate}). Each
+                  of these dates has a field for informing readers
+                  just what sort of date it is, \textsf{userd} and
+                  \textsf{howpublished}, respectively. The
+                  \textsf{series} and \textsf{number} fields identify
+                  the standard, while the organization responsible for
+                  the standard appears in the \textsf{organization}
+                  field, and also, in shortened form if you wish it,
+                  in the \textsf{publisher} field. The
+                  \textsf{shorthand} field will by default appear both
+                  in citations and at the head of reference list
+                  entries, followed in the latter by the
+                  \textsf{organization} in parentheses. The entry will
+                  in this case sort by the \textsf{shorthand}. Cf.\
+                  w3c:xml.}}
+
 @Review{nyt:trevorobit,
   journaltitle = {New York Times},
   entrysubtype = {magazine},
   date = 	 {2000-04-10},
-  title = {obituary of {Claire Trevor}},
+  title =        {obituary of {Claire Trevor}},
   options = 	 {cmsdate=full},
   pages = 	 {national edition},
   annotation = 	 {An obituary in a \textsf{Review} entry
-                  (\textsf{entrysubtype} \texttt{magazine}).  Without
+                  (\textsf{entrysubtype} \texttt{magazine}). Without
                   an author, the \textsf{journaltitle} will head the
-                  entry and appear in citations.  The lowercase letter
-                  beginning the \textsf{title} field isn't
-                  \vadjust{\eject}strictly necessary in the
-                  author-date style, but does no harm and maintains
-                  compatibility with the notes + bibliography style,
-                  just in case.  The \textsf{sortkey} field is no
-                  longer needed.  Note also the \texttt{full} key for
-                  the \texttt{cmsdate} option, which prints a full
-                  date specification in citations and means you
-                  wouldn't need this entry to appear in the reference
-                  list, though I have allowed it to appear here as an
-                  example.}
+                  entry and appear in citations. The lowercase letter
+                  beginning the \textsf{title} field isn't strictly
+                  necessary in the author-date style, but does no harm
+                  and maintains compatibility with the notes +
+                  bibliography style, just in case. Note also the
+                  \texttt{full} key for the \texttt{cmsdate} option,
+                  which prints a full date specification in citations
+                  and means you wouldn't need this entry to appear in
+                  the reference list, though I have allowed it to
+                  appear here as an example.}
 }
 
 @Music{nytrumpet:art,
   title = 	 {Art of the Trumpet},
   date = 	 1982,
   origdate = 	 {1981-06-01/1981-06-02},
-  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
+  author = 	 {{New York Trumpet Ensemble, with Edward Carroll
                   (trumpet) and Edward Brewer (organ)}},
   shortauthor =  {{New York Trumpet Ensemble}},
   number = 	 {PVT 7183},
   series = 	 {Vox/Turnabout},
   userd = 	 {recorded at the Madeira Festival,},
-  sortkey = 	 {New York Trumpet},
   type = 	 {compact disc},
-  annotation = 	 {A well-populated \textsf{Music} entry.  The
+  annotation = 	 {A well-populated \textsf{Music} entry. The
                   \textsf{title}, \textsf{date}, \textsf{author},
                   \textsf{shortauthor}, \textsf{number},
-                  \textsf{series}, \textsf{sortkey}, and \textsf{type}
-                  fields are fairly standard, and you can also specify
-                  the recording date of the album, which goes in the
-                  \textsf{origdate} field.  The \textsf{userd} field
-                  acts as a sort of date type field.  In this example,
+                  \textsf{series}, and \textsf{type} fields are fairly
+                  standard, and you can also specify the recording
+                  date of the album, which goes in the
+                  \textsf{origdate} field. The \textsf{userd} field
+                  acts as a sort of date type field. In this example,
                   the \textsf{origdate} would by default be preceded
                   by the \cmd{bibstring} \texttt{recorded}, but the
-                  \textsf{userd} field allows you to provide your own
-                  here.}
+                  \textsf{userd} field allows you to provide more
+                  detail here.}
 }
 
-@Music{nytrumpet:art:15,
-  title = 	 {Art of the Trumpet},
-  date = 	 1982,
-  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
-                  (trumpet) and Edward Brewer (organ)}},
-  shortauthor =  {{New York Trumpet Ensemble}},
-  number = 	 {PVT 7183},
-  series = 	 {Vox/Turnabout},
-  publisher =    {The Moss Music Group},
-  howpublished = {\textsf{\small\textcircledP}\ and
-                  \textsf{\small\textcopyright}},
-  sortkey = 	 {New York Trumpet},
-  type = 	 {compact disc},
-  annotation = 	 {15th edition only This can be considered an
-                  example of a satisfyingly full Music entry,
-                  providing nearly all pertinent information, although
-                  the composers are missing on what is presumably a
-                  compilation CD.  The performers take the composers'
-                  place in the author field, the series and number
-                  field give the label information, and the type field
-                  gives the medium.  The publisher of the label is
-                  also present, along with the date and the
-                  howpublished field, presenting, as the Manual
-                  suggests, the nature of the copyrights asserted by
-                  the publisher.  (The pubstate field, only in this
-                  entry type, could serve as a synonym for
-                  howpublished.)}
+@Online{obrien:recycle,
+  author = 	 {O'Brien, Conan},
+  title = 	 {In honor of {Earth Day, I'm} recycling my tweets},
+  nameaddon = 	 {(@ConanOBrien)},
+  date = 	 {2015-04-22T11:10:00},
+  url = 	 {https://twitter.com/ConanOBrien/status/590940792967016448},
+  organization = {Twitter},
+  annote = 	 {17th-edition citations of social media follow a
+                  template like this. Note the date field with a time
+                  stamp, in case that sort of precision might be
+                  important. The author's screen name can go in the
+                  nameaddon field, though that field can hold other
+                  sorts of information. Cf. viv:amlen.}
 }
 
 @InReference{oed:cdrom,
   title = 	 {Oxford {English} Dictionary},
-  publisher = oup,
+  publisher =    oup,
   edition = 	 2,
+  date = 	 {2009},
   shorttitle = 	 {{OED}, \mkbibemph{2nd ed}\adddot},
-  note = 	 {CD-ROM, version 2.0},
+  note = 	 {CD-ROM, version 4.0},
   annotation = 	 {An example of a reference work on CD-ROM, presented
-                  in an InReference entry.  The shorttitle is for
-                  in-text citations.}
+                  in an InReference entry. The shorttitle is for
+                  in-text citations. The 17th edition prefers that you
+                  provide a date when citing a physical format, which
+                  apparently includes CD-Rom.}
 }
 
 @Article{osborne:poison,
@@ -2670,15 +2853,15 @@
   titleaddon =	 {\bibstring{reviewof} \emph{The Collaborator: The
                   Trial and Execution of Robert Brasillach},
                   \bibstring{by} Alice Kaplan},
-  url =   {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
+  url =          {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
   urldate =	 {2001-07-10},
-  annote = 	 {16th edition only A review from a magazine, but
-                  with both specific (title field) and generic
-                  (titleaddon field) titles, presented in an Article
-                  entry, entrysubtype "magazine."  Note formatting in
-                  the titleaddon, where you provide the headline-style
-                  capitalization yourself.  The entry also gives a url
-                  to the online version.  See next entry.}
+  annote = 	 {A review from a magazine, but with both specific
+                  (title field) and generic (titleaddon field) titles,
+                  presented in an Article entry, entrysubtype
+                  "magazine." Note the formatting in the titleaddon,
+                  where you provide the headline-style capitalization
+                  yourself. The entry also gives a url to the online
+                  version. See next entry.}
 }
 
 @Article{osborne:poison:15,
@@ -2690,16 +2873,16 @@
   titleaddon =	 {\bibstring{reviewof} \emph{The collaborator: The
                   trial and execution of Robert Brasillach},
                   \bibstring{by} Alice Kaplan},
-  url =   {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
+  url =          {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
   urldate =	 {2001-07-10},
-  annotation = 	 {15th edition only A review from a magazine, but
-                  with both specific (title field) and generic
-                  (titleaddon field) titles, presented in an Article
-                  entry, entrysubtype "magazine."  Note formatting in
-                  the titleaddon, where you need to provide
-                  sentence-style capitalization yourself, as this
+  annotation = 	 {A review from a magazine, but with both specific
+                  (title field) and generic (titleaddon field) titles,
+                  presented in an Article entry, entrysubtype
+                  "magazine." Note the formatting in the titleaddon,
+                  where you need to provide sentence-style
+                  capitalization yourself for the trad style, as this
                   field doesn't take advantage of the package's
-                  automatic routines for doing so.  The entry also
+                  automatic routines for doing so. The entry also
                   gives a url to the online version.}
 }
 
@@ -2740,14 +2923,14 @@
                   field, a bibstring in the type field, the filing
                   date in origdate, and the issue date in date. Note
                   the sentence-style capitalization of the title of
-                  Patent entries, which you now have to provide
-                  yourself, as the 16th edition style doesn't do it
-                  automatically.  Note also that the bibstring in the
-                  type field is not identified as such -- the
-                  formatting macros, in this instance, detect that it
-                  is a bibstring and treat it accordingly. This
-                  functionality isn't widespread, so you shouldn't
-                  always count on it being present elsewhere.}
+                  Patent entries, though the style does this for you
+                  automatically if you forget. Note also that the
+                  bibstring in the type field is not identified as
+                  such -- the formatting macros, in this instance,
+                  detect that it is a bibstring and treat it
+                  accordingly. This functionality isn't widespread, so
+                  you shouldn't always count on it being present
+                  elsewhere.}
 }
 
 @InBook{phibbs:diary,
@@ -2757,7 +2940,7 @@
   booktitle = 	 {The Other Side of Time},
   booksubtitle = {A Combat Surgeon in {World War II}\@},
   pages = 	 {117--163},
-  publisher = {Little, Brown},
+  publisher =    {Little, Brown},
   year = 	 1987,
   address = 	 {Boston},
   annotation = 	 {A named part of a larger book, hence we use the
@@ -2780,10 +2963,9 @@
                   rather than the original, making it easier for a
                   readership assumed to be without Russian to parse.
                   In such a case, the language of the original goes in
-                  the \textsf{language} field.  Also note the
-                  quotation marks around part of the
-                  \textsf{publisher's} name, with \textsf{biblatex}
-                  providing the punctuation.}
+                  the \textsf{language} field. Also note the quotation
+                  marks around part of the \textsf{publisher's} name,
+                  with \textsf{biblatex} providing the punctuation.}
 }
 
 @Book{pirumova:russian,
@@ -2792,15 +2974,15 @@
   date = 	 1977,
   usere = 	 {The zemstvo liberal movement: Its social roots and
                   evolution to the beginning of the twentieth century},
-  langid =  {russian},
+  langid =       {russian},
   author = 	 {Pirumova, N.~M.},
-  publisher = {Izdatel'stvo \mkbibquote{Nauka}},
+  publisher =    {Izdatel'stvo \mkbibquote{Nauka}},
   address = 	 {Moscow},
   annotation = 	 {The same work as the preceding entry, but giving the
                   transliteration of the Russian \textsf{title} rather
-                  than the translation.  In such a case, the
+                  than the translation. In such a case, the
                   translation of the \textsf{title} goes in the
-                  \textsf{usere} field.  The \textsf{langid} field
+                  \textsf{usere} field. The \textsf{langid} field
                   means that the \textsf{subtitle} doesn't require any
                   additional curly braces in the \texttt{trad} style.}
 }
@@ -2816,20 +2998,20 @@
   shortauthor =  {Pl\adddot},
   booktitle = 	 {{Clitophon, Republic, Timaeus, Critias}},
   maintitle = 	 {Opera},
-  publisher = {Clarendon Press},
-  series = {Oxford Classical Texts},
+  publisher =    {Clarendon Press},
+  series =       {Oxford Classical Texts},
   pages = 	 {327--621},
-  location =  {Oxford},
+  location =     {Oxford},
   annotation = 	 {A work from antiquity, which will be cited by the
-                  traditional divisions, and which therefore requires
-                  the \texttt{classical} \textsf{entrysubtype}.  The
-                  \textsf{title} of such a work being italicized, it
-                  needs a \textsf{BookInBook} entry, and it has all
-                  three sorts of title, plus a \textsf{series} to
-                  boot.  The \textsf{shortauthor} and
-                  \textsf{shorttitle} fields provide the
-                  officially-sanctioned abbreviations for use in
-                  citations.}
+                  traditional divisions of Stephanus' edition, and
+                  which therefore requires the \texttt{classical}
+                  \textsf{entrysubtype}. The \textsf{title} of such a
+                  work being italicized, it needs a
+                  \textsf{BookInBook} entry, and it has all three
+                  sorts of title, plus a \textsf{series} to boot. The
+                  \textsf{shortauthor} and \textsf{shorttitle} fields
+                  provide the officially-sanctioned abbreviations for
+                  use in citations.}
 }
 
 @SuppBook{polakow:afterw,
@@ -2844,11 +3026,12 @@
   location =	 {Chicago},
   annotation = 	 {A standard example of a SuppBook entry, specifically
                   citing an afterword written by the main author of
-                  the book.  Note that you need only put something in
+                  the book. Note that you need only put something in
                   the afterword field (and not define a foreword or
-                  introduction field) to make the reference work.  The
-                  16th edition requires, for the entry in the list of
-                  references, a page range for the part being cited.}
+                  introduction field) to make the reference work.
+                  Recent editions require, for the entry in the list
+                  of references, a page range for the part being
+                  cited.}
 }
 
 @Online{pollan:plant,
@@ -2856,35 +3039,34 @@
   title = 	 {Michael {Pollan} Gives a Plant's-Eye View},
   organization = {TED video, 17:31},
   url = 	 {http://www.ted.com/index.php/talks/michael_pollan_gives_a_plant_s_eye_view.html},
+  note = 	 {filmed in\nopunct},
   urldate = 	 {2008-02},
   date = 	 {2007-03},
   userd = 	 {posted},
   annotation = 	 {Another online video, presented in an
-                  \textsf{Online} entry.  Note the \textsf{userd}
-                  field to modify the string printed before the
-                  \textsf{urldate}.  Cf.\ \texttt{harwood:biden},
+                  \textsf{Online} entry. Note the \textsf{userd} field
+                  to modify the string printed before the
+                  \textsf{urldate}. The \textsf{note} field is a
+                  kludge to provide \textsf{userd}-like functionality
+                  for the \textsf{date}. Cf.\ \texttt{harwood:biden},
                   \cmslink{horowitz:youtube}.}
 }
 
 @Online{powell:email,
   author = 	 {Powell, John},
   date = 	 {1998-04-23},
-  titleaddon = {e-mail to {Grapevine} mailing list},
-  url = 	 {http://www.electriceditors.net/grapevine/issues/83.txt},
-  annotation = 	 {An Online entry showing how in the 16th edition of
-                  the author-date style a generic title should go into
-                  a titleaddon field, rather than into title, so that
-                  it won't be placed inside quotation marks.  This
-                  works just fine in the 15th edition as well.  Note
-                  also the absence of any organization or owner of the
-                  site as whole.}
+  titleaddon =   {Grapevine digest mailing list archives},
+  organization = {Electric Editors},
+  title = 	 {Pattern Matching},
+  url = 	 {http://www.electriceditors.net/grapevine/archives.php},
+  annotation = 	 {A fairly standard \textsf{Online} entry with a
+                  \textsf{title} and a \textsf{titleaddon}, the latter
+                  giving somewhat more specific locating information
+                  than the \textsf{organization} field.}
 }
 
 @Collection{prairie:state,
-  booktitle =	 {Prairie State},
   title =	 {Prairie State},
-  booksubtitle = {Impressions of {Illinois}, 1673--1967, by Travelers
-                  and Other Observers},
   subtitle =	 {Impressions of {Illinois}, 1673--1967, by Travelers
                   and Other Observers},
   year =	 1968,
@@ -2893,12 +3075,10 @@
   location =	 {Chicago},
   annotation = 	 {A Collection entry, the one that has been
                   cross-referenced by three other entries in this
-                  bibliography.  Note the usual duplication of title
-                  and booktitle in a parent entry when the children
-                  use crossref, and note the editor instead of an
-                  author.  If more than one child cross-references the
-                  parent, the parent will be printed in the
-                  bibliography even if not independently cited.}
+                  reference list. Note the editor instead of an
+                  author. If more than one child cross-references the
+                  parent, the parent will be printed in the reference
+                  list even if not independently cited.}
 }
 
 @SuppBook{prose:intro,
@@ -2911,17 +3091,36 @@
   year =	 2000,
   location =	 {New York},
   pages = 	 {xvii--xxxviii},
-  introduction = {yes},
+  type =         {introduction to},
   publisher =	 {Harcourt},
   annotation = 	 {A typical SuppBook entry, with an author providing
                   an introduction to someone else's book. That someone
-                  else goes in bookauthor.  The introduction field
-                  just needs defining any which way, with afterword
-                  and foreword not defined at all.  The 16th edition
-                  requires, for the entry in the list of references, a
+                  else goes in bookauthor. Instead of the mechanism
+                  using a defined introduction field, here I use the
+                  alternative of putting the type of supplemental
+                  material in the type field, with the appropriate
+                  preposition, and starting with a lowercase
+                  letter. Note that this method isn't portable across
+                  languages, but it may help you to identify the less
+                  common types of supplements. Recent editions
+                  require, for the entry in the list of references, a
                   page range for the part being cited.}
 }
 
+@Online{quora:thread,
+  date = 	 {2016-08-09},
+  title = 	 {How did the \enquote{cool kids} from high school
+                  turn out?},
+  shorttitle = 	 {How did the \enquote{cool kids} turn out?},
+  url = 	 {https://www.quora.com/How-did-the-cool-kids-from-high-school-turn-out/},
+  organization = {Quora},
+  annote = 	 {The 17th edition suggests such an entry for
+                  presenting the initial post to an online forum or
+                  mailing list. The shorttitle helps with citations,
+                  including those of replies to this thread. Such
+                  replies might look like braun:reply.}
+}
+
 @Review{ratliff:review,
   author =	 {Ratliff, Ben},
   title =	 {\bibstring{reviewof} \mkbibemph{The Mystery of
@@ -2932,22 +3131,21 @@
   date = 	 {1999-04},
   volume =	 9,
   pages =	 {B13--B14},
-  annote = 	 {16th edition only A Review entry presenting a
-                  review from a scholarly journaltitle, hence no
-                  entrysubtype needed.  Note the bibstrings in the
-                  title of the review, and the formatting of the title
-                  of the book reviewed there.  Also note the use of
-                  parteditandtrans.  The author-date system doesn't
-                  absolutely require the use of these mechanisms,
-                  which were invented to cope with the differences
-                  between notes and bibliography in the other Chicago
-                  style.  Still, although simply writing "edited and
-                  translated by" yourself will suffice, using these
-                  mechanisms will make your .bib file work across
-                  multiple languages, and will also allow it to work,
-                  with fewer modifications, in the notes \&
-                  bibliography style, should that be needed.  See next
-                  entry.}
+  annote = 	 {A Review entry presenting a review from a scholarly
+                  journaltitle, hence no entrysubtype needed. Note the
+                  bibstrings in the title of the review, and the
+                  formatting of the title of the book reviewed there.
+                  Also note the use of parteditandtrans. The
+                  author-date system doesn't absolutely require the
+                  use of these mechanisms, which were invented to cope
+                  with the differences between notes and bibliography
+                  in the other Chicago style. Still, although simply
+                  writing "edited and translated by" yourself will
+                  suffice, using these mechanisms will make your .bib
+                  file work across multiple languages, and will also
+                  allow it to work, with fewer modifications, in the
+                  notes \& bibliography style, should that be needed.
+                  See next entry.}
 }
 
 @Article{ratliff:review:15,
@@ -2960,17 +3158,17 @@
   date = 	 {1999-04},
   volume =	 9,
   pages =	 {B13--B14},
-  annotation = 	 {15th edition only An Article entry presenting a
-                  review from a scholarly journaltitle, hence no
-                  entrysubtype needed.  Note the bibstrings in the
-                  title of the review, and the formatting of the title
-                  of the book reviewed there.  Also note the use of
-                  parteditandtrans.  The author-date system doesn't
-                  absolutely require the use of these mechanisms,
-                  which were invented to cope with the differences
-                  between notes and bibliography in the other Chicago
-                  style.  Still, although simply writing "ed. and
-                  trans." yourself will suffice, using these
+  annotation = 	 {An Article entry presenting a review from a
+                  scholarly journaltitle, hence no entrysubtype
+                  needed. Note the bibstrings in the title of the
+                  review, and the formatting of the title of the book
+                  reviewed there, for the trad style. Also note the
+                  use of parteditandtrans. The author-date system
+                  doesn't absolutely require the use of these
+                  mechanisms, which were invented to cope with the
+                  differences between notes and bibliography in the
+                  other Chicago style. Still, although simply writing
+                  "ed. and trans." yourself will suffice, using these
                   mechanisms will make your .bib file work across
                   multiple languages, and will also allow it to work,
                   with fewer modifications, in the notes \&
@@ -2984,17 +3182,41 @@
   author = 	 {Reaves, Jessica},
   title = 	 {A Weighty Issue},
   subtitle = 	 {Ever-Fatter Kids},
-  titleaddon = {interview with James Rosen},
-  url =  {http://www.time.com/time/nation/article/0,8599,102443,00.html},
+  titleaddon =   {interview with James Rosen},
+  url =      {http://www.time.com/time/nation/article/0,8599,102443,00.html},
   annotation = 	 {A magazine interview with its own, specific title,
                   presented in an Article entry with "magazine"
-                  entrysubtype.  The generic title goes in titleaddon,
+                  entrysubtype. The generic title goes in titleaddon,
                   with the style taking care of capitalization of the
-                  first word.  The author of this article is different
+                  first word. The author of this article is different
                   from the interviewee, which suggests a certain
                   flexibility in the Manual's requirements for such
-                  things.  The url field gives the online location.}
-}
+                  things. The url field gives the online location.}
+}
+
+@Music{rihanna:umbrella,
+  editor = 	 {Rihanna},
+  editortype =   {vocalist},
+  nameaddon =    {Robin Fenty},
+  booktitle =    {Good Girl Gone Bad},
+  bookauthor =   {Rihanna},
+  title = 	 {Umbrella},
+  date = 	 2007,
+  chapter =      1,
+  howpublished = {Spotify},
+  publisher =    {Island Def Jam},
+  note = 	 {featuring Jay-Z},
+  annote =       {This Music entry illustrates two of the new fields
+                  available to you in this type. The chapter field
+                  gives the track number on an album, and the
+                  howpublished field gives the streaming service,
+                  though it could alternately contain the digital
+                  format for downloads. The nameaddon field gives the
+                  artist's real name, and the editortype specifies,
+                  something favored by the 17th edition, what the
+                  artist's contribution was. The bookauthor field
+                  ensures that we know that the album as a whole is by
+                  the same artist.}}
 
 @Book{rodman:walk,
   title = 	 {Walk on the Wild Side},
@@ -3002,7 +3224,7 @@
   year = 	 1997,
   author = 	 {Rodman, Dennis},
   note = 	 {with Michael Silver},
-  location =  {New York},
+  location =     {New York},
   annotation = 	 {A Book entry with a named ghostwriter, given in the
                   note field.}
 }
@@ -3011,27 +3233,37 @@
   author = 	 {Roosevelt, Eleanor},
   title = 	 {\mkbibquote{Is America Facing World Leadership?}},
   entrysubtype = {speech},
-  note = 	 {radio broadcast, Windows Media Audio, 47:46},
-  titleaddon = {convocation speech, Ball State Teacher's College},
-  url = 	 {http://libx.bsu.edu/cdm4/item_viewer.php?CISOROOT=/ElRoos&CISOPTR=0&CISOBOX=1&REC=2},
+  note = 	 {radio broadcast, reel-to-reel tape, MPEG copy, 1:12:49},
+  titleaddon =   {convocation speech},
+  venue =        {Ball State Teacher's College},
+  origlocation = {Muncie, IN},
+  url = 	 {http://libx.bsu.edu/cdm/singleitem/collection/ElRoos/id/1},
   date = 	 {1959-05-06},
   annotation = 	 {Another speech from an online archive, presented in
-                  a Misc entry with an entrysubtype.  Note the
-                  formatting of the title.  Cp. coolidge:speech.}
+                  a Misc entry with an entrysubtype, as it's somewhat
+                  like an unpublished letter. Note the formatting of
+                  the title, and also the use of the venue and
+                  origlocation fields, which straddle the date in this
+                  entry type. Cp. coolidge:speech, which uses the
+                  Online entry type -- it's primarily a question of
+                  the placement of the date, either before or after
+                  the note field.}
 }
 
 @Misc{roosevelt:speech:trad,
   author = 	 {Roosevelt, Eleanor},
   title = 	 {Is {America} facing world leadership?},
   entrysubtype = {speech},
-  note = 	 {radio broadcast, Windows Media Audio, 47:46},
-  titleaddon = {convocation speech, Ball State Teacher's College},
-  url = 	 {http://libx.bsu.edu/cdm4/item_viewer.php?CISOROOT=/ElRoos&CISOPTR=0&CISOBOX=1&REC=2},
+  note = 	 {radio broadcast, reel-to-reel tape, MPEG copy, 1:12:49},
+  titleaddon =   {convocation speech},
+  venue =        {Ball State Teacher's College},
+  origlocation = {Muncie, IN},
+  url = 	 {http://libx.bsu.edu/cdm/singleitem/collection/ElRoos/id/1},
   date = 	 {1959-05-06},
   annotation = 	 {Another speech from an online archive, presented in
                   a Misc entry with an entrysubtype, and intended for
-                  authordate-trad only.  Note the formatting of the
-                  title.  Cp. coolidge:speech.}
+                  authordate-trad only. Note the formatting of the
+                  title. Cp. coolidge:speech.}
 }
 
 @MastersThesis{ross:thesis,
@@ -3068,23 +3300,41 @@
   title = 	 {The {Chopin} Collection},
   date = 	 1991,
   author = 	 {Rubinstein, Artur},
-  publisher = {RCA Victor/BMG},
+  publisher =    {RCA Victor/BMG},
   number = 	 {60822-2-RG},
   type = 	 {11 compact discs},
   origdate = 	 {1946/1967},
-  annotation = 	 {16 edition only.  A Music entry giving the
-                  original recording dates of a later compilation.  In
-                  the author-date style, you don't see the "recorded"
-                  bibstring, so there may be some ambiguity as to what
-                  the origdate represents.  Cf. floyd:atom.}
+  annotation = 	 {A Music entry giving the original recording dates of
+                  a later compilation. In the author-date style, you
+                  don't see the "recorded" bibstring, so there may be
+                  some ambiguity as to what the origdate represents.
+                  Cf. floyd:atom.}
+}
+
+@Article{saberhagen:beluga,
+  author = 	 {Saberhagen, Kelvin},
+  title = 	 {Lake {Superior} Beluga?},
+  journaltitle = {Sturgeon Review},
+  date = 	 {1928-24},
+  pages = 	 {21--45},
+  annote = 	 {This is an Article entry with no volume or number,
+                  so the date becomes the indispensable identifying
+                  detail. When printed, it will look rather like an
+                  Article with "magazine" entrysubtype, but the
+                  package provides this formatting with no manual
+                  intervention from the user. The date field uses an
+                  extended date specification to give both year and
+                  season, though of course the usual biblatex issue
+                  field is still available for the latter.}
 }
 
 @Book{schellinger:novel,
   title = 	 {Encyclopedia of the Novel},
   publisher = 	 {Fitzroy Dearborn},
   year = 	 1998,
-  editor = {Schellinger, Paul and Hudson, Christopher and Rijsberman, Marijk},
-  location =  {Chicago},
+  editor =       {Schellinger, Paul and Hudson, Christopher and
+                  Rijsberman, Marijk},
+  location =     {Chicago},
   annotation = 	 {As this isn't one of the universally-known reference
                   works, its entry will have (in the absence of an
                   author) the editors at its head, hence the choice of
@@ -3101,9 +3351,9 @@
   volume = 	 56,
   pages = 	 {191--198},
   annotation = 	 {An article in German with the title left
-                  untranslated.  The hyphenation field means you don't
+                  untranslated. The hyphenation field means you don't
                   need additional curly braces in the title to
-                  preserve the capitalization.  Cf. pirumova:russian.}
+                  preserve the capitalization. Cf. pirumova:russian.}
 }
 
 @Audio{schubert:muellerin,
@@ -3114,12 +3364,20 @@
   maintitle = 	 {First Vocal Album},
   options = 	 {ctitleaddon=space},
   author = 	 {Schubert, Franz},
-  publisher = {G.~Schirmer},
+  publisher =    {G.~Schirmer},
   address = 	 {New York},
-  annotation = 	 {An \textsf{Audio} entry presenting a published
-                  musical score.  Note the presence of all three sorts
-                  of \textsf{title}, and the \textsf{options} field
-                  providing a space in place of a comma before the
+  annotation = 	 {The \textsf{Audio} entry type is the most
+                  \enquote{book-like} of the three audio-visual entry
+                  types, but does differ in several ways from an
+                  ordinary \textsf{book}, and therefore requires a
+                  separate type. This is a citation of a published
+                  musical score, with the composer in the
+                  \textsf{author} field. It cites one song
+                  (\textsf{title}) from a cycle (\textsf{booktitle}),
+                  while the \textsf{maintitle} in this instance refers
+                  to the \textsf{publisher's} collection of the
+                  composer's works. The \textsf{options} field changes
+                  the punctuation to \cmd{addspace} before the
                   parenthesized \textsf{maintitleaddon}.}
 }
 
@@ -3133,21 +3391,21 @@
   addendum = 	 {Citations refer to the Dover edition},
   options = 	 {cmsdate=both},
   translator = 	 {Newman, Ernest},
-  publisher = {Dover},
+  publisher =    {Dover},
   pubstate = 	 {reprint},
-  location =  {New York},
+  location =     {New York},
   annotation = 	 {A reprinted \textsf{Book}, showing how to present
                   this information by putting \texttt{reprint} in the
                   \textsf{pubstate} field, the origdate into the
                   \textsf{date} field, and the date into
-                  \textsf{origdate}.  The style notices that the years
+                  \textsf{origdate}. The style notices that the years
                   have been switched with a simple numerical test, and
-                  prints them in their proper places.  This would
-                  allow you to present several reprinted works from
-                  the same year by the same author, and have the years
-                  suffixed with a,b,c, etc. as required by the spec.
-                  The \texttt{cmsdate=both} option prints both dates.
-                  The \textsf{origlocation} and \textsf{origpublisher}
+                  prints them in their proper places. This would allow
+                  you to present several reprinted works from the same
+                  year by the same author, and have the years suffixed
+                  with a,b,c, etc. as required by the spec. The
+                  \texttt{cmsdate=both} option prints both dates. The
+                  \textsf{origlocation} and \textsf{origpublisher}
                   fields allow you to present further information
                   about the original edition, if you should so wish,
                   and the \textsf{addendum} clarifies which edition
@@ -3173,8 +3431,8 @@
   subtitle = 	 {Why Children Kill; {The} Story of {Mary Bell}},
   year = 	 1999,
   author = 	 {Sereny, Gitta},
-  publisher = {Metropolitan Books and Henry Holt},
-  location =  {New York},
+  publisher =    {Metropolitan Books and Henry Holt},
+  location =     {New York},
   annotation = 	 {A Book with two subtitles, the second separated by a
                   semicolon, according to the spec.}
 }
@@ -3188,7 +3446,7 @@
   pages =	 {412--415},
   series =	 2,
   annotation = 	 {A letter presented as an article in a scholarly
-                  journal, hence the Article entry.  Note plain number
+                  journal, hence the Article entry. Note plain number
                   in series field of an Article entry.}
 }
 
@@ -3204,7 +3462,7 @@
   annotation = 	 {An example of an unpublished musical score,
                   presented in a \textsf{Misc} (with
                   \textsf{entrysubtype}) rather than an \textsf{Audio}
-                  entry.  Note that, having a non-generic title, you
+                  entry. Note that, having a non-generic title, you
                   need to provide quotation marks in the
                   \textsf{title} in the author-date style, which means
                   that the entry is incorrect for the \texttt{trad}
@@ -3224,12 +3482,12 @@
                   presented in a \textsf{Misc} entry (with
                   \textsf{entrysubtype}) rather than an \textsf{Audio}
                   entry, which is what you would use for a published
-                  score.  Because \textsf{Misc} entries with an
+                  score. Because \textsf{Misc} entries with an
                   \textsf{entrysubtype} don't provide any formatting
                   of the \textsf{title} at all, when you use the
                   \texttt{trad} style you may need to pay special
-                  attention to them, as here, where no quotation
-                  marks are necessary in the \textsf{title}}
+                  attention to them, as here, where no quotation marks
+                  are necessary in the \textsf{title}}
 }
 
 @Book{silver:gawain,
@@ -3237,7 +3495,7 @@
   publisher = 	 uchp,
   year = 	 1974,
   translator = 	 {Silverstein, Theodore},
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {Here, neither \textsf{author} nor \textsf{editor}
                   are available, so the reference list entry and
                   citations will start with the \textsf{translator}.}
@@ -3253,7 +3511,7 @@
   publisher =	 {UTCS Neural Networks Research Group},
   year =	 1996,
   editor =	 {Sirosh, J. and Miikkulainen, R. and Choe, Y.},
-  url =   {http://www.cs.utexas.edu/users/nn/web-pubs/htmlbook96/},
+  url =          {http://www.cs.utexas.edu/users/nn/web-pubs/htmlbook96/},
   urldate =	 {2001-08-27},
   location =	 {Austin, TX},
   annotation = 	 {Part of a collection with its own title, hence
@@ -3266,11 +3524,26 @@
   publisher = 	 {Philip Wilson},
   year = 	 1999,
   editor = 	 {Soltes, Ori Z.},
-  location =  {London},
+  location =     {London},
   annotation = 	 {A Book entry without an author, hence with the
                   editor at the head of citations.}
 }
 
+@Online{souza:obama,
+  author = 	 {Souza, Pete},
+  title = 	 {{President Obama} bids farewell to {President Xi of
+                  China} at the conclusion of the {Nuclear Security
+                  Summit}},
+  date = 	 {2016-04-01},
+  nameaddon = 	 {(@petesouza)},
+  url = 	 {https://www.instagram.com/p/BDrmfXTtNCt/},
+  organization = {Instagram photo},
+  annote = 	 {A 17th-edition social media citation, presented as
+                  an \textsf{Online} entry even though the actual
+                  material of the citation is a photograph. Note the
+                  \textsf{nameaddon} field for the screen name.}
+}
+
 @Misc{spock:interview,
   author = 	 {Spock, Benjamin},
   entrysubtype = {letter},
@@ -3279,23 +3552,23 @@
   note = 	 {interview 67A, transcript},
   organization = {Senn Oral History Collection},
   institution =  {National Library of Medicine},
-  location =  {Bethesda, MD},
+  location =     {Bethesda, MD},
   annotation = 	 {An unpublished interview from an archive, hence
                   requiring the \textsf{Misc} entry type with an
-                  \textsf{entrysubtype}.  The interview is dated, but
+                  \textsf{entrysubtype}. The interview is dated, but
                   isn't letter-like, so you put the date in the
-                  \textsf{date} field.  The interviewee is the
+                  \textsf{date} field. The interviewee is the
                   \textsf{author}, and the \textsf{title}, with its
                   initial lowercase letter, names the interviewer.
                   This \textsf{Misc} entry has all 4 locating fields
                   in increasing generality: \textsf{note},
                   \textsf{organization}, \textsf{institution}, and
-                  \textsf{location}.  The first of these also starts
-                  with a lowercase letter.  The \emph{CMS} suggests
+                  \textsf{location}. The first of these also starts
+                  with a lowercase letter. The \emph{CMS} suggests
                   that if you refer to more than one piece from such
                   an archive, that you include only the archive in the
                   reference list, with more specific information
-                  forming part of the flow of text.  Cf.\
+                  forming part of the flow of text. Cf.\
                   \cmslink{creel:house} and \cmslink{house:papers}.}
 }
 
@@ -3304,7 +3577,7 @@
   date = 	 1925,
   author = 	 {Stendhal},
   nameaddon = 	 {Marie Henri Beyle},
-  publisher = {Boni \& Liveright},
+  publisher =    {Boni \& Liveright},
   address = 	 {New York},
   translator = 	 {Scott-Moncrieff, C.~K.},
   annotation = 	 {A \textsf{Book} entry with the real name of the
@@ -3312,19 +3585,48 @@
                   the pseudonym, in the \textsf{author} field.}
 }
 
-@Article{stenger:privacy,
-  journaltitle = {CNN.com},
-  entrysubtype = {magazine},
+@Online{stenger:privacy,
+  organization = {CNN.com},
   date = 	 {1999-12-20},
   author = 	 {Stenger, Richard},
   title = 	 {Tiny Human-Borne Monitoring Device Sparks Privacy Fears},
   url = 	 {http://www.cnn.com/1999/TECH/ptech/12/20/implant.device/},
   annotation = 	 {This is an intrinsically-online source, but is
-                  structured like a newspaper, so we use the Article
-                  entry type and "magazine" entrysubtype. The Manual
-                  is specific about this, and it limits the range of
-                  things you might put into an Online entry.}
-}
+                  structured like a newspaper, so in previous editions
+                  of the Manual it would have required an
+                  \textsf{Article} entry type and \texttt{magazine}
+                  \textsf{entrysubtype}. For the 17th edition, at your
+                  discretion, such sources may be treated, as here,
+                  like a website rather than a newspaper, though the
+                  older style may be retained.}
+}
+
+@Article{stoffle:ghost,
+  author = 	 {Stoffle, Richard W. and others},
+  title = 	 {Ghost Dancing the {Grand Canyon}},
+  journaltitle = {Current Anthropology},
+  date = 	 2000,
+  volume = 	 41,
+  number = 	 1,
+  doi = 	 {10.1086/30010},
+  annote = 	 {This Article entry appears only as a related entry
+                  in naraya, which presents an online supplement (a
+                  song) to the Article.}
+}
+
+@Audio{strayed:audiobook,
+  author = 	 {Strayed, Cheryl},
+  title = 	 {Wild},
+  date = 	 {2012},
+  editor = 	 {Dunne, Bernadette},
+  type = 	 {Audible audio ed., 13hr., 6 min\adddot},
+  editortype = 	 {read by},
+  subtitle =     {From Lost to Found on the {Pacific Crest Trail}},
+  publisher =    {Random House Audio},
+  location =     {New York},
+  annote =       {Here an audiobook appears in an Audio entry, with an
+                  editortype field to identify the reader and a type
+                  field for details about the audio edition.}}
 
 @Book{suangtho:tectona,
   title = 	 {Flowering and Seed Production in \mkbibemph{Tectona
@@ -3336,8 +3638,8 @@
   address = 	 {Chiang Mai, Thailand},
   annotation = 	 {A book title showing "reverse italics," where a
                   normally italicized term is in roman inside an
-                  italicized title.  Note the formatting of the
-                  species name.}
+                  italicized title. Note the formatting of the species
+                  name.}
 }
 
 @Article{terborgh:preservation,
@@ -3354,21 +3656,23 @@
   title = 	 {The Making of the {English} Working Class},
   date = 	 1964,
   author = 	 {Thompson, E.~P.},
-  publisher = {Pantheon},
+  publisher =    {Pantheon},
   address = 	 {New York},
   addendum = 	 {(Published in UK in 1963.)},
   annotation = 	 {A book published in different years in the US and
-                  the UK.  It's possible you may want to remove the
-                  parentheses in the addendum for the 16th edition.}
+                  the UK, with the addendum field alerting readers to
+                  this fact, in case it's relevant. If it's not
+                  relevant, it's generally better to omit this
+                  information.}
 }
 
 @Book{tillich:system,
   title = 	 {Systematic Theology},
-  year = 	 {1951\bibdatedash 63},
+  date = 	 {1951/1963},
   author = 	 {Tillich, Paul},
-  publisher = uchp,
+  publisher =    uchp,
   volumes = 	 3,
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {A Book entry with 3 volumes published over time.
                   Any postnote fields in citation commands should
                   provide volume and page, like so: "2:157."}
@@ -3377,56 +3681,57 @@
 @Book{times:guide,
   title = 	 {The {Times} Guide to {English} Style and Usage},
   edition = 	 {\bibstring{revisededition}},
-  lista = {police ranks and postal addresses},
+  lista =        {police ranks and postal addresses},
   namec = 	 {Austin, Tim},
   year = 	 1999,
   publisher = 	 {Times Books},
-  location =  {London},
+  location =     {London},
   annotation =   {In the notes+bibliography style, I presented this
                   text as an InReference entry, so that citations
                   started with the title and and you could use a
                   postnote field to cite other alphabetized articles
                   without having to provide the "s.v." string
-                  yourself.  In the author-date style you may
-                  sometimes want to choose the book type, allowing the
+                  yourself. In the author-date style you may sometimes
+                  want to choose the book type, allowing the
                   reference-list entry to begin with the compiler's
-                  name.  The disadvantage to this is that in text
+                  name. The disadvantage to this is that in text
                   citations you'll have to provide that "s.v." string
-                  yourself in the postnote field.  Perhaps the
-                  simplest solution is the one I've used in
-                  ency:britannica and grove:sibelius, providing a
-                  shorttitle for the in-text citations and
-                  automatically producing "s.v." for you when you have
-                  a postnote.}
+                  yourself in the postnote field. Perhaps the simplest
+                  solution is the one I've used in ency:britannica and
+                  grove:sibelius, providing a shorttitle for the
+                  in-text citations and automatically producing "s.v."
+                  for you when you have a postnote.}
 }
 
 @Book{turabian:manual,
   title = 	 {A Manual for Writers of Term Papers, Theses, and
                   Dissertations},
-  date = 	 1996,
+  date = 	 2013,
   author = 	 {Turabian, Kate~L.},
-  publisher = uchp,
+  publisher =    uchp,
   address = 	 {Chicago},
-  edition = 	 6,
-  note = 	 {Rev. John Grossman and Alice Bennett},
-  annotation = 	 {A book with edition information included in the note
-                  field.  For the 16th edition you might want to
-                  include the full string "revised by."}
+  edition = 	 8,
+  editor = 	 {Booth, Wayne~C. and Colomb, Gregory~G. and Williams,
+                  Joseph~M. and {the University of Chicago Press
+                  Staff}},
+  editortype = 	 {revised by},
+  annotation = 	 {A Book with an editorial function specified by the
+                  editortype field.}
 }
 
 @Audio{twain:audio,
   title = 	 {The Humor of {Mark Twain}},
   author = 	 {Twain, Mark},
   series = 	 {Commuters' Library},
-  publisher = {Entertainment Software},
+  publisher =    {Entertainment Software},
   type = 	 {6 cassettes},
   address = 	 {Arlington, TX},
   annotation = 	 {An Audio entry presenting an audiobook, which means
                   the publishing information will be presented as it
-                  would be in the standard book-like entries.  The
+                  would be in the standard book-like entries. The
                   Manual sometimes presents this sort of material
                   somewhat differently, requiring a Music entry --
-                  cf. auden:reading.  Here, the type field gives the
+                  cf. auden:reading. Here, the type field gives the
                   medium.}
 }
 
@@ -3438,16 +3743,15 @@
                   romanischen und germanischen Völker}, by {Leopold von
                   Ranke}},
   number =	 {23--24},
-  sortkey = 	 {Erg},
   shortjournal =  {Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.},
   annotation = 	 {A rather unusual \textsf{Review} entry
                   (\textsf{entrysubtype} \texttt{magazine}), without
-                  an author.  In the author-date style we allow the
+                  an author. In the author-date style we allow the
                   \textsf{journaltitle} to come first in the
                   reference-list entry and provide an abbreviated
-                  \textsf{shortjournal} for citations.  Note the
+                  \textsf{shortjournal} for citations. Note the
                   formatting of the reviewed title in the
-                  \textsf{title} field.  The \textsf{number} field
+                  \textsf{title} field. The \textsf{number} field
                   provides the consecutive numbers of the magazine in
                   which the review appeared, and the style
                   automatically provides the correct (plural)
@@ -3456,22 +3760,26 @@
 
 @Audio{verdi:corsaro,
   title = 	 {Il corsaro (melodramma tragico \mkbibemph{in three acts})},
-  titleaddon = 	 {libretto by Francesco Maria Piave},
+  editortype = 	 {libretto by},
+  editor =       {Piave, Francesco Maria},
   date = 	 1998,
   author = 	 {Verdi, Giuseppe},
-  editor = 	 {Hudson, Elizabeth},
+  editora = 	 {Hudson, Elizabeth},
   number = 	 {\bibstring{jourser} 1, Operas},
   series = 	 {The Works of Giuseppe Verdi},
-  publisher = {University of Chicago Press; Milan: G.\ Ricordi},
+  publisher =    {University of Chicago Press; Milan: G.\ Ricordi},
   volumes = 	 2,
   address = 	 {Chicago},
   annotation = 	 {An \textsf{Audio} entry presenting a published
-                  operatic score.  Note the \enquote{reverse italics}
-                  in the \textsf{title}, and also the
-                  \textsf{titleaddon}, which identifies the
-                  librettist.  Note also the two publishers, and two
-                  places of publication, presented in a modified
-                  \textsf{publisher} field.}
+                  operatic score. Note the \enquote{reverse italics}
+                  in the \textsf{title}, and also the distribution of
+                  roles between an \textsf{editor} (with an
+                  \textsf{editortype} to identify the librettist) and
+                  an \textsf{editora}. Note also the two publishers,
+                  and two places of publication, presented in a
+                  modified \textsf{publisher} field. You can always
+                  choose just to present one of these publishers,
+                  generally whichever is closest.}
 }
 
 @Book{virginia:plantation,
@@ -3484,31 +3792,66 @@
   shorttitle = 	 {True and Sincere Declaration},
   year = 	 1610,
   annote = 	 {An anonymous \textsf{Book} entry with a very long
-                  \textsf{title}.  The \emph{CMS} prefers such entries
+                  \textsf{title}. The \emph{CMS} prefers such entries
                   generally to appear under their titles rather than
-                  under \enquote{Anon.}  Here, the \textsf{shorttitle}
+                  under \enquote{Anon.} Here, the \textsf{shorttitle}
                   removes the indefinite article, and the
                   \textsf{sorttitle} does the same.}
 }
 
-@Book{virginia:plantation:15,
-  title =	 {A True and Sincere Declaration of the Purpose and
-                  Ends of the Plantation Begun in {Virginia}, of the
-                  Degrees Which It Hath Received, and Means by Which
-                  It Hath Been Advanced},
-  author = 	 {Anon\adddot},
-  year = 	 1610,
-  annotation = 	 {An anonymous Book entry with a very long title.
-                  Providing the author "Anon." simplifies the
-                  presentation in the author-date style.  15th
-                  edition only}
-}
+@Review{viv:amlen,
+  author = 	 {Viv},
+  entrysubtype = {magazine},
+  title = 	 {comment on Amlen, \mkbibquote{Hoot}},
+  nameaddon = 	 {(Jerusalem, Isr.)},
+  crossref = 	 {amlen:hoot},
+  eventdate = 	 {2015-01-27},
+  annote =       {An example of a blog comment presented without the
+                  \texttt{commenton} \textsf{relatedtype}. Here the
+                  \textsf{crossref} to the main blog and special
+                  formatting in the \textsf{title} field provide the
+                  necessary information. The \textsf{nameaddon} field
+                  here holds the commenter's location, but it can also
+                  hold, especially in social media posts, a screen
+                  name or similar. The entry will appear in the list
+                  of references, and will produce a standard
+                  citation. Cf. \cmslink{amlen:hoot},
+                  \texttt{amlen:wordplay}, and \texttt{viv:amlen:15}
+                  and also cp. \cmslink{ellis:blog} and
+                  \cmslink{ac:comment} for an example of how to use
+                  the new \texttt{commenton} \textsf{relatedtype} in
+                  this context.}}
+
+@Review{viv:amlen:15,
+  author = 	 {Viv},
+  entrysubtype = {magazine},
+  title = 	 {comment on Amlen, Hoot},
+  nameaddon = 	 {(Jerusalem, Isr.)},
+  crossref = 	 {amlen:hoot},
+  eventdate = 	 {2015-01-27},
+  annote =       {An example of a blog comment presented without the
+                  \texttt{commenton} \textsf{relatedtype}. Here the
+                  \textsf{crossref} to the main blog and the
+                  \textsf{title} field provide the necessary
+                  information, in this case requiring a different
+                  entry for the trad style. Were you to use
+                  \texttt{commenton} it would work fine for both
+                  author-date specifications. The \textsf{nameaddon}
+                  field here holds the commenter's location, but it
+                  can also hold, especially in social media posts, a
+                  screen name or similar. The entry will appear in the
+                  list of references, and will produce a standard
+                  citation. Cf. \texttt{amlen:hoot} and
+                  \texttt{amlen:wordplay}, and also
+                  cp. \texttt{ellis:blog} and \texttt{ac:comment} for
+                  an example of how to use the new \texttt{commenton}
+                  \textsf{relatedtype} in this context.}}
 
 @Book{walker:columbia,
   title = 	 {The {Columbia} Guide to Online Style},
   date = 	 1998,
   author = 	 {Walker, J.~R. and Taylor, T.},
-  publisher = {Columbia Univ. Press},
+  publisher =    {Columbia Univ. Press},
   address = 	 {New York},
   annotation = 	 {A plain book entry with two authors}}
 
@@ -3530,13 +3873,30 @@
   entrysubtype = {magazine},
   author = 	 {Wallraff, Barbara},
   date = 	 {2000-04},
-  title = {Word {Court}},
+  title =        {Word {Court}},
   annotation = 	 {A regular column in a magazine, without an
                   individual title, hence the use of a Review entry
                   type, entrysubtype "magazine," with a title and no
-                  titleaddon.  In the 15th edition, you can use the
-                  Article type, but Review works just as well.}
-}
+                  titleaddon.}
+}
+
+@Standard{w3c:xml,
+  editor = 	 {Bray, Tim and Paoli, Jean and Sperberg-McQueen,
+                  C.~M\adddot and Maler, Eve and Yergeau, Fran\c{c}ois},
+  title = 	 {Extensible Markup Language \mkbibparens{XML} 1.0},
+  date = 	 {2008-11-26},
+  edition = 	 5,
+  organization = {Worldwide Web Consortium},
+  shorthand =    {W3C},
+  publisher =    {W3C},
+  url = 	 {http://www.w3.org/TR/2008/REC-xml-20081126/},
+  annote =       {A Standard entry showing one of the type's
+                  peculiarities, that is, the appearance of the
+                  organization ahead of either editors or compilers,
+                  should they be present. In this case the shorthand
+                  will appear first in the reference list entry,
+                  followed by the organization in parentheses. The
+                  entry will sort by the shorthand. Cf. niso:bibref.}}
 
 @Article{warr:ellison,
   author = 	 {Warr, Mark and Ellison, Christopher~G.},
@@ -3560,7 +3920,7 @@
   series =	 {Middle American Research Records},
   number = 	 {\bibstring{volume} 1, \bibstring{number} 14},
   location =	 {New Orleans, LA},
-  annotation = 	 {A Book with a series and number.  The name of the
+  annotation = 	 {A Book with a series and number. The name of the
                   series alone goes in series, the rest in number.}
 }
 
@@ -3569,14 +3929,11 @@
   date = 	 1928,
   author = 	 {Weber, M. and de Burlet, H.~M. and Abel, O.},
   volumes = 	 2,
-  publisher = {Gustav Fischer},
+  publisher =    {Gustav Fischer},
   hyphenation =  {german},
   address = 	 {Jena},
   edition = 	 2,
-  annotation = 	 {A multi-volume work, in its second edition.  The
-                  hyphenation field tells the style to leave the
-                  title's capitalization alone, hence the absence of
-                  extra curly braces.}
+  annotation = 	 {A multi-volume work, in its second edition.}
 }
 
 @Video{weed:flatiron,
@@ -3585,17 +3942,17 @@
   related = 	 {loc:city},
   relatedstring = {from},
   author = 	 {Weed, A.~E.},
-  publisher = {American Mutoscope {and} Biograph Company},
-  type = 	 {35~mm; 2 min., 19 sec.},
+  publisher =    {American Mutoscope {and} Biograph Company},
+  type = 	 {35~mm; 2:19 at 15~fps},
   annotation = 	 {This complete film taken from an online archive uses
-                  a Video entry.  The creator of the film goes in the
+                  a Video entry. The creator of the film goes in the
                   author field, and the medium w/ running length in
-                  the type field.  The related field cites another
+                  the type field. The related field cites another
                   (Video) entry, containing information about the
                   online location of the MPEG version of the original
-                  35mm film.  Linked by the relatedstring field, these
+                  35mm film. Linked by the relatedstring field, these
                   two entries will be presented together in the
-                  reference list, as suggested by the Manual 14.280.}
+                  reference list, as suggested by the Manual 14.267.}
 }
 
 @Book{weresz,
@@ -3604,7 +3961,7 @@
   usere = 	 {The end of the Three Emperors' League},
   publisher = 	 {PWN},
   year = 	 1977,
-  location =  {Warsaw},
+  location =     {Warsaw},
   annotation = 	 {A Book in Polish, with the title given in Polish
                   (though lacking diacritics) and a translation given
                   for a readership who might not know that language.
@@ -3630,22 +3987,22 @@
   xref = 	 {white:total},
   pages = 	 273,
   origdate = 	 {1946-05-02},
-  annotation = 	 {In the author-date style, the \emph{CMS} (15.40)
-                  recommends that the list of references contain only
-                  the whole collection of published letters
+  annotation = 	 {In the author-date style, the \emph{CMS} recommends
+                  that the list of references contain only the whole
+                  collection of published letters
                   (\cmslink{white:total}, below), with any further
                   information being provided as part of the running
-                  text.  (If you follow this method, then the
+                  text. (If you follow this method, then the
                   \textsf{Letter} entry type needn't ever be used.)
                   If, for some reason, you still want to cite
                   individual letters in the list of references, this
                   and the \cmslink{white:russ} entry demonstrate how
-                  to do so.  Chicago's mechanism for shortened
+                  to do so. Chicago's mechanism for shortened
                   cross-references is operative in \textsf{Letter}
                   entries using \textsf{crossref} or \textsf{xref} (as
                   in \textsf{InCollection} and \textsf{InProceedings}
                   entries), so the information printed in the list of
-                  references will be abbreviated.  You can simply use
+                  references will be abbreviated. You can simply use
                   the \textsf{origdate} field for the date of the
                   letter, and you'll get separate letters, ordered by
                   date, and with a,b,c, etc. appended to differentiate
@@ -3655,12 +4012,12 @@
 @Letter{white:russ,
   author = 	 {White, E.~B.},
   title = 	 {EBW to B.~Russell},
-  xref =  {white:total},
+  xref =         {white:total},
   pages = 	 283,
   origdate = 	 {1946-09-02},
   annotation = 	 {This is a spurious entry I've just made up to show
                   the cross-referencing mechanism at work in
-                  \textsf{Letter} entries.  See
+                  \textsf{Letter} entries. See
                   \cmslink{white:ross:memo} for the details.}
 }
 
@@ -3669,8 +4026,8 @@
   year = 	 1976,
   author = 	 {White, E.~B.},
   editor = 	 {Guth, Dorothy Lobrano},
-  publisher = {Harper \&\ Row},
-  location =  {New York},
+  publisher =    {Harper \&\ Row},
+  location =     {New York},
   annotation = 	 {The parent entry of the two preceding child entries.
                   Note that it is a \textsf{Book} entry, and will
                   appear in the reference list if more than one child
@@ -3682,7 +4039,7 @@
   title = 	 {World Development},
   date = 	 1991,
   editor = 	 {Whittington, D. and others},
-  issuetitle = {A Study of Water Vending and Willingness to Pay for
+  issuetitle =   {A Study of Water Vending and Willingness to Pay for
                   Water in {Onitsha, Nigeria}},
   note = 	 {special issue},
   volume = 	 19,
@@ -3695,10 +4052,10 @@
   author = 	 {Wiens, J.~A.},
   title = 	 {Avian Community Ecology},
   subtitle = 	 {An Iconoclastic View},
-  crossref =  {brush:ornithology},
+  crossref =     {brush:ornithology},
   pages = 	 {355--403},
   annotation = 	 {An essay in a collection, the child entry of the
-                  parent given in the crossref field.  The presence of
+                  parent given in the crossref field. The presence of
                   this field means that the entry in the list of
                   references will be abbreviated, and include a
                   shortened reference to the parent.
@@ -3708,21 +4065,34 @@
 
 @InReference{wikiped:bibtex,
   title = 	 {Wikipedia},
-  lista = {BibTeX},
-  userd = 	 {last modified},
+  lista =        {BibTeX},
+  userd = 	 {last edited},
+  entrysubtype = {online},
   url = 	 {http://en.wikipedia.org/wiki/BibTeX},
-  urldate = 	 {2012-05-18},
-  annotation =   {An online \textsf{InReference} entry, usually not
-                  presented in a list of references.  Here is how you
-                  might do so, with the \textsf{urldate}, in the
-                  absence of the other three kinds of date, providing
-                  the year for citations and the list of references.
-                  It is strongly recommended that you at least have a
-                  \textsf{urldate} field, as such sources change
-                  rather rapidly, though the \emph{CMS} would prefer
-                  that you use a revision date or the like instead of
-                  an access date.  Here, the \textsf{userd} field
-                  identifies which sort of date is at stake.}
+  urldate = 	 {2019-11-15T20:59:00},
+  annotation =   {\textsf{InReference} entries are designed to allow
+                  you to cite particular articles in an
+                  alphabetically-arranged reference work. The
+                  \textsf{lista} field holds the name of the article,
+                  and for printed works you can use the standard
+                  \textsf{postnote} field to make a single .bib entry
+                  work for references to several different articles.
+                  For an online work, you must have a \textsf{urldate}
+                  field, as such sources change rather rapidly, and in
+                  the case of heavily contested articles it could well
+                  be useful to also to include a time stamp in the
+                  same field, as here (though this isn't necessary at
+                  all for this article). The \textsf{userd} field
+                  allows you to identify which sort of date is at
+                  stake - the \emph{CMS} strongly prefers revision
+                  dates or similar to access dates. Online works which
+                  haven't had any sort of printed existence can, at
+                  your discretion, have titles in plain roman (like an
+                  \textsf{Online} entry). Defining an
+                  \textsf{entrysubtype} field achieves
+                  this. Ordinarily, such an entry need not be printed
+                  in the reference list, but here it will appear there
+                  for the sake of example.}
 }
 
 @InBook{will:cohere,
@@ -3732,11 +4102,11 @@
   booksubtitle = {Toward Clarity and Grace},
   bookauthor = 	 {Williams, Joseph~M.},
   pages = 	 {81--95},
-  publisher = uchp,
+  publisher =    uchp,
   year = 	 1990,
-  location =  {Chicago},
+  location =     {Chicago},
   annotation = 	 {A chapter in a book that has a different authorship
-                  from the book as a whole.  In such a case, you can
+                  from the book as a whole. In such a case, you can
                   use an InBook entry, with the author(s) of the
                   chapter in the author field, and the author(s) of
                   the whole book in the bookauthor field.}
@@ -3744,16 +4114,14 @@
 
 @Book{wright:evolution,
   title = 	 {Evolution and the Genetics of Populations},
-  year = 	 {1968--78},
-  sortyear = 	 {1968},
+  date = 	 {1968/1978},
   author = 	 {Wright, Sewell},
-  publisher = uchp,
+  publisher =    uchp,
   address = 	 {Chicago},
   volumes = 	 4,
   annotation = 	 {A multi-volume work published over several years, so
-                  the year field provides the range.  Such a year
-                  field doesn't sort properly in recent iterations of
-                  biblatex, so the sortyear field makes it work.}}
+                  the date field provides the range, which will by
+                  default be compressed by biblatex-chicago.}}
 
 @Book{wright:theory,
   title = 	 {Theory of Gene Frequencies},
@@ -3761,7 +4129,7 @@
   maintitle = 	 {Evolution and the Genetics of Populations},
   volume = 	 2,
   author = 	 {Wright, Sewell},
-  publisher = uchp,
+  publisher =    uchp,
   address = 	 {Chicago},
   annotation = 	 {One volume of the multi-volume work from the
                   previous entry.}}
@@ -3772,7 +4140,7 @@
   annotation = 	 {This CustomC entry provides a cross-reference from
                   the pseudonym in the author field to the real name
                   in the title field, allowing your readers to find
-                  the cited work under the author's real name.  The
+                  the cited work under the author's real name. The
                   entry for that work, creasey:york:death, contains a
                   userc field which refers to this entry, ensuring
                   that this cross-reference will be printed if the
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/legal-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/legal-test.bib
index 76354c872fb..086b9de037c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/legal-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/legal-test.bib
@@ -155,6 +155,15 @@
   date = 	 2006,
   volume = 	 547,
   pages = 	 1071}
+  
+@Jurisdiction{scotus:case:runningtext,
+  journaltitle = {United States Supreme Court Reports},
+  title =        {United States v\adddotspace Sokolow},
+  shorttitle =   {Sokolow},
+  shortjournal = {U.S\adddot},
+  date = 	 1989,
+  volume = 	 490,
+  pages = 	 1}
 
 @Jurisdiction{state:case:2reps,
   title = 	 {Henningsen v\adddotspace Bloomfield Motors, Inc\adddot},
@@ -225,9 +234,10 @@
   entrysubtype = {uk}}
 
 @Legislation{uk:hansard,
-  journaltitle = {Parl.\ Deb., H.C\adddot},
-  year = 	 {1944--45},
+  journaltitle = {Parl.\ Deb\adddotspace H.C\adddot},
+  date = 	 {1944/1945},
   series = 	 5,
+  bookpagination = {column},
   entrysubtype = {hansard},
   volume = 	 {407},
   pages = 	 {425-446}}
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 115bb180650..ff9755f7a97 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
@@ -11,8 +11,8 @@
   entrysubtype = {magazine},
   date = 	 {2000-04-21},
   author = 	 {Clemens, David},
-  title = {letter to the editor},
-  shorttitle = {letter to the editor},
+  title =        {letter to the editor},
+  shorttitle =   {letter to the editor},
   annote = 	 {A typical letter to an editor -- note the use of
                   lowercase letter in title and shorttitle, using the
                   automatic capitalization function of those fields in
@@ -21,23 +21,30 @@
 
 @Review{ac:comment,
   entrysubtype = {magazine},
-  date = 	 {2008-06-30},
   author = 	 {AC},
-  eventdate = 	 {2008-07-01},
+  eventdate = 	 {2008-07-01T10:18:00},
   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}},
-  annote = 	 {The 16th edition suggests a format such as this for
-                  presenting comments on blogs or other online
-                  material.  With only a generic title, it takes a
-                  \textsf{Review} entry instead of an \textsf{Article}
-                  one, and the \textsf{crossref} field points to the
-                  blog to which the comment is attached.  The
+  related = 	 {ellis:blog},
+  relatedtype =  {commenton},
+  annote = 	 {The 17th edition suggests a \textsf{Review} entry
+                  such as this for presenting comments on blogs or
+                  other similar online material, achievable either
+                  with hand-formatting in the \textsf{title} field or,
+                  as here, using the \texttt{commenton}
+                  \textsf{relatedtype}. The \textsf{related} field
+                  (\cmslink{ellis:blog}) indicates the entry upon
+                  which it is a comment, and by default the generic
+                  title derives from the \textsf{relatedtype}, though
+                  you can change it by providing a
+                  \textsf{relatedstring}. With such a title it's a
+                  \textsf{Review} instead of an \textsf{Article}. The
                   \textsf{eventdate} gives the date of the comment,
-                  and if additional temporal specificity is required
-                  then you can use the \textsf{nameaddon} field to
-                  give a timestamp, inside parentheses.}
+                  including a time stamp for additional specificity if
+                  needed. \textsf{Biblatex-chicago} automatically sets
+                  the \texttt{related} option to \texttt{true} for
+                  this \textsf{relatedtype}, so you'll see all the
+                  relevant data both in notes and, if you choose to
+                  print it there, in the bibliography.}
 }
 
 @Book{adorno:benj,
@@ -47,37 +54,112 @@
   author = 	 {Adorno, Theodor W. and Benjamin, Walter},
   editor = 	 {Lonitz, Henri},
   translator = 	 {Nicholas Walker},
-  location =  {Cambridge, MA},
-  shorttitle = {Complete Correspondence},
+  location =     {Cambridge, MA},
+  shorttitle =   {Complete Correspondence},
   annote = 	 {A published collection of letters, in a Book entry
                   rather than Letter. References to it would be by
                   page rather than by individual letter.}
 }
 
+@Video{american:crime,
+  title = 	 {Marcia, Marcia, Marcia},
+  eventdate = 	 {2016-03-08},
+  editora = 	 {DeVincentis, D.~V\adddot},
+  booktitle = 	 {American Crime Story},
+  editortype = 	 {director},
+  editoratype =  {written by},
+  editorbtype =  {featuring},
+  options = 	 {useeditor=false},
+  usera = 	 {FX},
+  entrysubtype = {tvepisode},
+  editor = 	 {Murphy, Ryan},
+  editorb = 	 {Brown, Sterling~K\adddot and Choi, Kenneth and
+                  Paulson, Sarah},
+  booksubtitle = {The People v. O.~J. Simpson},
+  booktitleaddon = {episode 6},
+  url = 	 {https://www.amazon.com/dp/B01ARVPCOA},
+  annote =       {The 17th edition recommends a change in the syntax
+                  of entries presenting episodes of TV series, whereby
+                  the title of the series (in \textsf{booktitle})
+                  comes before the title of the episode (in
+                  \textsf{title}). The \texttt{tvepisode}
+                  \textsf{entrysubtype} provides this, including also
+                  in short note forms. Note here also the numerous
+                  editors and editortypes allowing the specification
+                  of various sorts of contributions to the show, and
+                  the \textsf{usera} field containing the broadcast
+                  network.}}
+
+@Article{amlen:hoot,
+  author = 	 {Amlen, Deb},
+  title = 	 {One Who Gives a Hoot},
+  journaltitle = {Wordplay},
+  entrysubtype = {magazine},
+  maintitle = 	 {New York Times},
+  location = 	 {blog},
+  date = 	 {2015-01-26},
+  url = 	 {http://wordplay.blogs.nytimes.com/2015/01/26/one-who-gives-a-hoot/},
+  annote =       {The 17th edition suggests such a format for a blog
+                  post when the blog is part of a larger, usually
+                  periodical, publication, which appears in the
+                  \textsf{maintitle} field. As usual, the
+                  \textsf{location} field indicates that it's a blog.}}
+
+@Periodical{amlen:wordplay,
+  editor = 	 {Amlen, Deb},
+  entrysubtype = {magazine},
+  title =        {Wordplay},
+  maintitle =    {New York Times},
+  location =     {blog},
+  url = 	 {http://wordplay.blogs.nytimes.com},
+  annote =       {The 17th edition recommends this format for
+                  presenting a whole blog, rather than an individual
+                  blog post, in keeping with how a \textsf{Periodical}
+                  entry presents an entire issue of a periodical
+                  instead of a single \textsf{Article} within it. As
+                  with amlen:hoot, the \textsf{maintitle} field
+                  contains the larger publication of which the blog is
+                  a part.}}
+
+@Book{angry:birds,
+  author = 	 {{Rovio Entertainment}},
+  title = 	 {Angry Birds Transformers},
+  date = 	 2014,
+  publisher =    {Rovio Entertainment},
+  version = 	 {1.4.25},
+  type = 	 {Android 4.0 or later},
+  addendum =     {soundtrack by Vince DiCola and Kenny Meriedeth},
+  annote =       {The 17th edition's recommendations for multimedia
+                  app content make it a good fit for the \textsf{Book}
+                  type, with the addition of the \textsf{version}
+                  field for the software version and the \textsf{type}
+                  field for the operating system environment in which
+                  it runs.}}
+
 @Book{aristotle:metaphy:gr,
   shorttitle = 	 {Metaphysics},
   title = 	 {Metaphysics},
   keywords = 	 {original},
   entrysubtype = {classical},
   origdate = 	 1924,
-  year = 1997,
+  year =         1997,
   author = 	 {Aristotle},
   editor = 	 {Ross, W.~D.},
-  publisher = {Oxford University Press and Sandpiper Books},
+  publisher =    {Oxford University Press and Sandpiper Books},
   pubstate = 	 {reprint},
   volumes = 	 2,
-  location =  {Oxford},
+  location =     {Oxford},
   annote = 	 {A work from classical antiquity, presented in a Book
                   entry with "classical" entrysubtype, hence
                   references to it will have a special form in short
-                  notes.  This assumes you are using the traditional,
+                  notes. This assumes you are using the traditional,
                   fixed divisions of the text, in this case those of
                   Bekker's edition, instead of page references to this
-                  edition.  In the latter case, you don't need the
-                  entrysubtype.  Also note keywords field, which means
+                  edition. In the latter case, you don't need the
+                  entrysubtype. Also note keywords field, which means
                   it won't be printed separately in the bibliography,
                   because it will be appended to the entry for the
-                  english translation, given in the next entry.  This
+                  english translation, given in the next entry. This
                   volume is a reprint edition, notice the use of the
                   string "reprint" in the pubstate field, and the
                   origyear field holding date of original publication.
@@ -96,34 +178,34 @@
   origlanguage = {greek},
   userf = 	 {aristotle:metaphy:gr},
   maintitle = 	 {The Works of Aristotle, Translated into English},
-  publisher = {Clarendon Press},
+  publisher =    {Clarendon Press},
   edition = 	 2,
-  location =  {Oxford},
+  location =     {Oxford},
   annote = 	 {Translation of the previous entry, in this case also
                   using Book with "classical" entrysubtype, as
                   references will be by the pages of Bekker's edition.
                   The userf field contains the entry key for the Greek
                   original, which means the bibliography entry will
                   contain the reference to the translation followed by
-                  that to the Greek text.  The origlanguage field
-                  means that the connecting text between the two books
-                  in the bibliography will read "Greek edition:"
-                  instead of "Originally published as."  Note also
-                  nameb, the translator of this particular volume of
-                  the maintitle, as distinct from the editor of the
-                  whole series, even though in this case they happen
-                  to be the same person.}
+                  that to the Greek text. The origlanguage field means
+                  that the connecting text between the two books in
+                  the bibliography will read "Greek edition:" instead
+                  of "Originally published as." Note also nameb, the
+                  translator of this particular volume of the
+                  maintitle, as distinct from the editor of the whole
+                  series, even though in this case they happen to be
+                  the same person.}
 }
 
 @InBook{ashbrook:brain,
   author = 	 {Ashbrook, James~B. and Albright, Carol Rausch},
   title = 	 {The Frontal Lobes, Intending, and a Purposeful God},
   booktitle = 	 {The Humanizing Brain},
-  publisher = {Pilgrim Press},
+  publisher =    {Pilgrim Press},
   year = 	 1997,
   chapter = 	 7,
-  location =  {Cleveland, OH},
-  shorttitle = {The Frontal Lobes},
+  location =     {Cleveland, OH},
+  shorttitle =   {The Frontal Lobes},
   annote = 	 {A typical \textsf{InBook} entry, identified both by
                   a \textsf{title} and also, in this case, by a
                   \textsf{chapter} number rather than a \textsf{pages}
@@ -136,7 +218,7 @@
   annote = 	 {This CustomC entry provides a cross-reference from
                   the pseudonym in the author field to the real name
                   in the title field, allowing your readers to find
-                  the cited work under the author's real name.  The
+                  the cited work under the author's real name. The
                   entry for that work, creasey:ashe:blast, contains a
                   userc field which refers to this entry, ensuring
                   that this cross-reference will be printed if the
@@ -149,11 +231,11 @@
   date = 	 {2000-06-12},
   author = 	 {{Associated Press}},
   title = 	 {Westchester Approves Measure on Gun Safety},
-  shorttitle = {Westchester Approves Measure},
+  shorttitle =   {Westchester Approves Measure},
   annote = 	 {A fairly typical Article entry from a newspaper,
                   with the keyword "magazine" as entrysubtype, and
-                  with a corporate author inside an extra set of curly
-                  braces.}
+                  with a corporate news service as author inside an
+                  extra set of curly braces.}
 }
 
 @Music{auden:reading,
@@ -165,7 +247,7 @@
   date = 	 {1991},
   note = 	 {read by the author},
   annote = 	 {An audiobook presented in a Music entry, with which
-                  cp. twain:audio, an Audio entry.  Here, the type
+                  cp. twain:audio, an Audio entry. Here, the type
                   field contains the medium, while the series and
                   number field contain the label information for the
                   cassette, as is standard in Music entries.}
@@ -175,10 +257,15 @@
   author = 	 {Author, Margaret~M.},
   title = 	 {Article Title},
   journaltitle = {Journal Name},
-  year = 	 {forthcoming},
+  pubstate = 	 {forthcoming},
   volume = 	 98,
-  annote = 	 {An example of how to deal with a forthcoming
-                  article.}
+  annote = 	 {For the 17th edition I have generalized the
+                  functioning of the \textsf{pubstate} field, which in
+                  this case (and a few others - see section 4.2 of
+                  biblatex-chicago.pdf) will actually end up providing
+                  a \textsf{year} for the entry. The main convenience
+                  is that it provides a bibstring rather than plain
+                  text, so it's portable across languages.}
 }
 
 @Book{babb:peru,
@@ -186,9 +273,9 @@
   subtitle = 	 {The Political Economy of Marketwomen in Peru},
   year = 	 1989,
   author = 	 {Babb, Florence},
-  publisher = {University of Texas Press},
+  publisher =    {University of Texas Press},
   edition = 	 {\bibstring{revisededition}},
-  location =  {Austin},
+  location =     {Austin},
   annote = 	 {A revised edition, with the bibstring revisededition
                   in the edition field.}
 }
@@ -208,7 +295,7 @@
                   fields. You could just write "review of" instead,
                   but the bibstring makes the entry portable across
                   languages. Note the formatting of the reviewed
-                  book's title using \mkbibemph.}
+                  book's title using mkbibemph.}
 }
 
 @Article{batson,
@@ -235,7 +322,7 @@
   year = 	 1974,
   number = 	 62,
   pages = 	 {47--95},
-  shorttitle = {The Pattern of Crime in England},
+  shorttitle =   {The Pattern of Crime in England},
   annote = 	 {Article entry with number instead of volume.}
 }
 
@@ -245,16 +332,21 @@
   type = 	 {albumen print of collodion negative},
   institution =  {International Museum of Photography at George
                   Eastman House},
-  year = 	 {1860s},
+  date = 	 {186X},
   note = 	 {18.8 x 28 cm\adddot},
-  location =  {Rochester},
+  location =     {Rochester},
   annote =       {A typical Image entry, for presenting a photograph.
-                  In the 16th edition, there is no longer any
-                  difference between the presentation of photographs
-                  and works in other media, so this entry type is a
-                  clone of Artwork.  Note the type field, and the fact
-                  that it begins with a lowercase letter, allowing
-                  biblatex to capitalize it contextually if needed.}
+                  There is no longer any difference between the
+                  presentation of photographs and works in other
+                  media, so this entry type is a clone of
+                  Artwork. Note particularly the date field, with the
+                  ISO8601-2 extended formatting for presenting a
+                  decade. This not only provides portability across
+                  languages, it also ensures that numerical sorting
+                  tests will work without any additional help from
+                  you. Note the type field, and the fact that it
+                  begins with a lowercase letter, allowing biblatex to
+                  capitalize it contextually if needed.}
 }
 
 @Music{beethoven:sonata29,
@@ -269,12 +361,12 @@
   annote = 	 {A musical recording exhibiting several of the
                   peculiarities common to the audiovisual entry types.
                   Here, the composer goes in the author field, while
-                  the performer goes into the editor field.  The
+                  the performer goes into the editor field. The
                   editortype "none" prevents any identifying string
-                  being used for the performer, as none is needed.  As
+                  being used for the performer, as none is needed. As
                   in most Music entries, the series and number give
                   label identifying information, but the Manual hasn't
-                  provided a medium for the type field.  (I'm assuming
+                  provided a medium for the type field. (I'm assuming
                   that one is supposed to be able to gather this
                   information from the number and series field, but
                   the absence of a date doesn't help, either.)}
@@ -286,14 +378,14 @@
   crossref = 	 {bernhard:themacher},
   annote = 	 {A BookInBook entry, presenting part of a book that
                   could in other contexts be a book in its own right.
-                  The title here will therefore be italicized.  This
-                  example shows the new abbreviated references
-                  available in this entry type when a crossref or xref
-                  is used, assuming the booklongxref option is set
-                  properly - which it isn't by default - either in the
-                  preamble or in the options field.  Such treatment, I
-                  note, isn't explicitly condoned by the Chicago
-                  specification.  See the next entry.}
+                  The title here will therefore be italicized. This
+                  example shows the abbreviated references available
+                  in this entry type when a crossref or xref is used,
+                  assuming the booklongxref option is set properly -
+                  which it isn't by default - either in the preamble
+                  or in the options field. Such treatment, I note,
+                  isn't explicitly condoned by the Chicago
+                  specification. See the next entry.}
 }
 
 @BookInBook{bernhard:ritter,
@@ -313,14 +405,14 @@
   subtitle = 	 {Three Plays},
   date = 	 1990,
   author = 	 {Bernhard, Thomas},
-  publisher = uchp,
-  location =  {Chicago},
+  publisher =    uchp,
+  location =     {Chicago},
   annote = 	 {This entry provides the booktitle for the previous
-                  two.  It will be printed in the bibliography, and
+                  two. It will be printed in the bibliography, and
                   the entries for its two children -- bernhard:boris
                   and bernhard:ritter -- will be abbreviated
                   references to it, assuming the booklongxref option
-                  is set properly, which it isn't by default.  Please
+                  is set properly, which it isn't by default. Please
                   note that this style of cross-reference, with the
                   title of the Book automatically converted to the
                   booktitle of the BookInBook, is only available with
@@ -345,11 +437,22 @@
                   Here, the performing orchestra goes in the editora
                   field, and the editoratype "none" prevents any
                   string attaching to the orchestra, as one isn't
-                  needed.  The usual series and number give the label
-                  information.  The 16th edition strongly encourages
-                  you to find a date for such an entry -- online
-                  resources should be able to help.}
-}
+                  needed. The usual series and number give the label
+                  information. Recent editions strongly encourage you
+                  to find a date for such an entry -- online resources
+                  should be able to help.}
+}
+
+@Article{black:infectious,
+  author = 	 {Black, Steven},
+  title = 	 {Changing Epidemiology of Invasive Pneumococcal Disease},
+  journaltitle = {Clinical Infectious Diseases},
+  userd = 	 {published electronically},
+  subtitle =     {A Complicated Story},
+  volume = 	 47,
+  doi = 	 {10.1086/590002},
+  urldate = 	 {2008-07-14},
+  annote =       {An Article pre-published online.}}
 
 @Book{boxer:china,
   title = 	 {South China in the Sixteenth Century},
@@ -357,16 +460,29 @@
   editor = 	 {Boxer, Charles~R.},
   number = 	 {2nd ser., 106},
   series = 	 {Hakluyt Society Publications},
-  location =  {London},
-  shorttitle = {South China},
-  annote = 	 {Book entry with series and number.  In all book-like
+  location =     {London},
+  shorttitle =   {South China},
+  annote = 	 {Book entry with series and number. In all book-like
                   entries (as opposed to Article, Periodical, and
                   Review entries) the series field will be a name, as
                   here, while the number field may contain such
                   information as "2nd ser." or "vol. 3," or just a
-                  plain number.  Putting "2nd ser." in the number
-                  field may seem counter-intuitive, but it's necessary
-                  for getting the punctuation to work out right.}
+                  plain number. Putting "2nd ser." in the number field
+                  may seem counter-intuitive, but it's necessary for
+                  getting the punctuation to work out right.}
+}
+
+@Online{braun:reply,
+  author = 	 {Braun, Caroline},
+  relatedtype =  {commenton},
+  related = 	 {quora:thread},
+  url = 	 {https://www.quora.com/How-did-the-cool-kids-from-high-school-turn-out/},
+  relatedstring = {reply to},
+  annote = 	 {The 17th edition suggests such an entry for
+                  presenting a reply to an online forum or mailing
+                  list. If the reply's date is different from the
+                  initial posting (quora:thread) then you could
+                  include it in the date field.}
 }
 
 @Article{brown:bremer,
@@ -382,14 +498,14 @@
   editor = 	 {Brown, George~C.},
   annote = 	 {An unusual Article entry, combining into one
                   reference a two-part article using both the
-                  titleaddon field and the pages field.  This is a
+                  titleaddon field and the pages field. This is a
                   kludge, and at some point I hope to implement a
-                  better system.  You could, also, simply refer to
-                  each part separately.  Note also the issue field,
-                  with the name of a season, and the lowercase letter
-                  starting the titleaddon field, which will
-                  automatically capitalize the data depending on the
-                  context within an entry.}
+                  better system. You could, also, simply refer to each
+                  part separately. Note also the issue field, with the
+                  name of a season, and the lowercase letter starting
+                  the titleaddon field, which will automatically
+                  capitalize the data depending on the context within
+                  an entry.}
 }
 
 @Book{browning:aurora,
@@ -412,19 +528,19 @@
   date = 	 {1990-02-07},
   author = 	 {Bundy, McGeorge},
   title = 	 {interview by Robert MacNeil},
-  shorttitle = {interview},
+  shorttitle =   {interview},
   annote = 	 {A television interview, with a generic title,
                   presented in a \textsf{Review} entry, with
-                  \texttt{magazine} \textsf{entrysubtype}.  The
+                  \texttt{magazine} \textsf{entrysubtype}. The
                   \emph{CMS} often treats such sources, including
                   online ones, as \textsf{journaltitles} in
                   \textsf{Article} or \textsf{Review} entries, the
                   \textsf{entrysubtype} indicating the distance from
-                  traditional scholarly journals.  Note here that the
+                  traditional scholarly journals. Note here that the
                   interviewee is presented as the \textsf{author}, and
                   that the broadcast network is given in the
-                  \textsf{usera} field.  Note also the use of
-                  lowercase letters to start both \textsf{title} and
+                  \textsf{usera} field. Note also the use of lowercase
+                  letters to start both \textsf{title} and
                   \textsf{shorttitle}, allowing automatic contextual
                   capitalization of a generic title in a
                   \textsf{Review} entry.}
@@ -435,16 +551,16 @@
   nameaddon = 	 {\bibstring{pseudonym}},
   titleaddon = 	 {letters},
   booktitle = 	 {The Complete Anti-Federalist},
-  publisher = uchp,
+  publisher =    uchp,
   shorttitle = 	 {\autocap{l}etters},
   year = 	 1981,
   editor = 	 {Storing, Herbert J.},
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {A rare example of a generic, unformatted title in an
                   InCollection entry, it therefore has a titleaddon
-                  field and no title field.  Note use of lowercase
+                  field and no title field. Note use of lowercase
                   initial letter in that titleaddon field, and of
-                  \autocap in the shorttitle.  "Centinel" is a
+                  \autocap in the shorttitle. "Centinel" is a
                   pseudonym and the actual author isn't known, so the
                   bibstring pseudonym is put in the nameaddon field.}
 }
@@ -455,25 +571,16 @@
   year = 	 1966,
   editor = 	 {Crow, Martin~M. and Olson, Clair~C.},
   namec = 	 {Manly, John~M. and Richert, Edith},
-  sortkey = 	 {Chaucer},
-  publisher = oup,
+  publisher =    oup,
   note = 	 {with the assistance of Lilian~J. Redstone
                   and others},
-  location =  {London},
+  location =     {London},
   annote = 	 {One way of presenting a Book so that the title comes
-                  first in the entry.  Here, we disable the use of
-                  author, editor, translator, and compiler in the
-                  options field, so the title is all that remains.
-                  Note that we have to disable translator even though
-                  there isn't one in the entry -- this is necessary to
-                  make sure that no name will be found to place before
-                  the title.  The compilers go in namec, and other
-                  information in note, which starts with a lowercase
-                  letter.  If you are using Biber, then you need the
-                  sortkey field, as this entry triggers boundary
-                  behavior caused by the sorting algorithms continuing
-                  to use the namec field even though that name isn't
-                  placed at the head of the entry.  Cf. next entry.}
+                  first in the entry. Here, we disable the use of
+                  editor and compiler in the options field, so the
+                  title is all that remains. The compilers go in
+                  namec, and other information in note, which starts
+                  with a lowercase letter. Cf. next entry.}
 }
 
 @Book{chaucer:liferecords,
@@ -485,54 +592,42 @@
                   Richert, with the assistance of Lilian J. Redstone
                   and others},
   location =	 {London},
-  annote = 	 {A second way of presenting the same Book.  There's
-                  no author, editor, or compiler, so the title goes
-                  first in the entry.  All other information appears
-                  in the note field, using the \partedit macro to get
-                  the initial strings right in bibliography and
-                  notes. (If your bibliography is in French, you'll
-                  need to add "de" after this \partedit command.)
+  annote = 	 {A second way of presenting the same Book. There's no
+                  author, editor, or compiler, so the title goes first
+                  in the entry. All other information appears in the
+                  note field, using the \partedit macro to get the
+                  initial strings right in bibliography and notes.
                   Cf. the previous entry.}
 }
 
 @Book{chicago:manual,
   title = 	 {The Chicago Manual of Style},
-  year = 	 2010,
+  date = 	 2017,
   author = 	 {{University of Chicago Press}},
   shorthand = 	 {\mkbibemph{CMS}},
-  publisher = uchp,
-  edition = 	 16,
-  location =  {Chicago},
-  annote = 	 {A manual presented in a \textsf{Book} entry.  Note
+  publisher =    uchp,
+  edition = 	 17,
+  location =     {Chicago},
+  annote = 	 {A manual presented in a \textsf{Book} entry. Note
                   curly braces around corporate \textsf{author}, which
                   is printed twice, both as \textsf{author} and
                   \textsf{publisher}.}
 }
 
-@Book{chicago:manual:15,
-  title = 	 {The Chicago Manual of Style},
-  year = 	 2003,
-  author = 	 {{University of Chicago Press}},
-  publisher = uchp,
-  edition = 	 15,
-  location =  {Chicago},
-  annote = 	 {A manual presented in a Book entry.  Note curly
-                  brackets around corporate author, which is printed
-                  twice, both as author and publisher.}
-}
-
 @Booklet{clark:mesopot,
   title = 	 {Mesopotamia},
   subtitle = 	 {Between Two Rivers},
   author = 	 {Hazel V. Clark},
   howpublished = {End of the Commons General Store},
-  year = 	 {\mkbibbrackets{1957?}},
+  date = 	 {1957?},
   location =  {Mesopotamia, OH},
   annote = 	 {A standard \textsf{Booklet} entry, though the same
                   information could be presented in a \textsf{Book}
                   entry, using \textsf{publisher} instead of
-                  \textsf{howpublished}.  Note the brackets around the
-                  \textsf{year}, indicating that this is a guess.}
+                  \textsf{howpublished}. Note the ISO8601-2
+                  \enquote{uncertain} \textsf{date} specification,
+                  which by default presents the year in brackets, but
+                  allows numerical sorting by \textsf{biblatex}.}
 }
 
 @Video{cleese:holygrail,
@@ -552,15 +647,15 @@
                   It focusses on some of the DVD extras, so the actors
                   providing the commentary appear in the author field.
                   The directors go in the editor field, as usual, with
-                  the identifying string in editortype.  The booktitle
+                  the identifying string in editortype. The booktitle
                   provides the film title in this instance -- the
                   title in this case will appear in quotation marks
                   rather than italicized, because of the presence of a
-                  booktitle.  The titleaddon tells where in the DVD
-                  set the commentaries are to be found, and the type
-                  field gives the medium.  The date field contains the
-                  date the DVD was released, and the original release
-                  date (origdate) isn't needed here, according to the
+                  booktitle. The titleaddon tells where in the DVD set
+                  the commentaries are to be found, and the type field
+                  gives the medium. The date field contains the date
+                  the DVD was released, and the original release date
+                  (origdate) isn't needed here, according to the
                   Manual, because the entry cites the DVD extras
                   rather than the film itself.}
 }
@@ -570,10 +665,13 @@
   subtitle =	 {A Study in American Leadership},
   year =	 1999,
   author =	 {Cohen, Naomi~W.},
-  publisher =	 {University Press of New England and Brandeis
-                  University Press},
+  publisher =	 {Brandeis University Press, an imprint of University
+                  Press of New England},
   location =	 {Hanover, NH},
-  annote = 	 {A Book with two publishers.}
+  annote = 	 {A Book printed by a publishing consortium. The 17th
+                  edition suggests it is often possible to omit the
+                  parent company or consortium, but also allows you to
+                  specify the relationship between imprints, as here.}
 }
 
 @Article{conley:fifthgrade,
@@ -591,9 +689,9 @@
   pages =	 {131--146},
   shorttitle =	 {Fifth-Grade Boys' Decisions},
   annote = 	 {An Article that is part of a special issue of a
-                  journal. Title of the issue goes in issuetitle,
-                  editor of the issue in editor, and the sort of issue
-                  in note, with lowercase initial letter.
+                  journal. The title of the issue goes in issuetitle,
+                  the editor of the issue in editor, and the sort of
+                  issue in note, with lowercase initial letter.
                   Cf. good:wholeissue for how to refer to the special
                   issue as a whole, rather than to one article in it,
                   using a Periodical entry.}
@@ -609,7 +707,8 @@
   location =  {Place},
   annote = 	 {A fabricated \textsf{InCollection} entry, showing
                   how to present a \texttt{forthcoming} essay using
-                  the \textsf{pubstate} field.}
+                  the \textsf{pubstate} field.
+                  Cf. author:forthcoming.}
 }
 
 @Book{cook:sotweed,
@@ -621,18 +720,16 @@
   shorttitle = 	 {Sotweed Redivivus},
   note = 	 {\bibstring{by} \mkbibquote{E.~C. Gent}},
   location =  {Annapolis},
-  annote = 	 {A complicated Book entry.  First, the author is
+  annote = 	 {A complicated Book entry. First, the author is
                   unknown, but guessed at, hence the "anon?" in the
-                  authortype field.  Because he's unknown, it may be
+                  authortype field. Because they're unknown, it may be
                   best in this case to put extra curly brackets in
                   shortauthor, so that in the short note form it's
                   clearer who's at stake, though this is optional. The
                   note field gives the author as printed in the book,
                   presented as a citation inside quotation marks. If
-                  you remember to use \mkbibquote here, then
-                  appropriate punctuation will automatically be
-                  provided, so there's no more need for \custpunct or
-                  "plain" in the type field.}
+                  you remember to use mkbibquote here then appropriate
+                  punctuation will automatically be provided.}
 }
 
 @Online{coolidge:speech,
@@ -641,19 +738,25 @@
   titleaddon = 	 {(speech)},
   related = 	 {loc:leaders},
   note = 	 {copy of an undated 78 rpm disc},
-  options = 	 {related=true,ptitleaddon=space,ctitleaddon=space},
-  year = 	 {ca.\,1920},
+  options = 	 {related=true,ptitleaddon=space,ctitleaddon=space,
+                  nodatebrackets,nodates=false},
+  date = 	 {1920~},
   annote = 	 {This is a recording from an online archive, using an
-                  \textsf{Online} entry.  The two \texttt{titleaddon}
+                  \textsf{Online} entry. The two \texttt{titleaddon}
                   options allow the parenthesized \textsf{titleaddon}
                   to appear with only a space intervening, both in
-                  notes and bibliography.  The \textsf{related} field
+                  notes and bibliography. The \textsf{related} field
                   cites the archive itself, another \textsf{Online}
                   entry, and the \texttt{related=true} option causes
                   the archive reference to be printed both in notes
-                  and bibliography.  Cp.\ \texttt{weed:flatiron} and
-                  \texttt{loc:city}, which cite a film from an online
-                  archive, both using a \textsf{Video} entry.}
+                  and bibliography. The \textsf{date} field presents a
+                  \enquote{circa} date in ISO8601-2 format, and the
+                  options \texttt{nodatebrackets} and \texttt{nodates}
+                  format the circa date as it appears, in this
+                  instance, in the \emph{Manual}. Cp.\
+                  \texttt{weed:flat\-iron} and \texttt{loc:city},
+                  which cite a film from an online archive, both using
+                  a \textsf{Video} entry.}
 }
 
 @Book{cotton:manufacture,
@@ -664,27 +767,8 @@
   author =	 {{Cotton Manufacturer}},
   location =	 {Bury, UK},
   shorttitle =	 {Inquiry into the Causes},
-  annote = 	 {A Book with a corporate author.  In the 15th
-                  edition, a sortkey field helped alphabetize the
-                  entry in the bibliography, as the author started
-                  with the indefinite article, which you want ignored
-                  in this context.  For the 16th edition, you can
-                  eliminate the indefinite article, and therefore also
-                  the sortkey.}
-}
-
-@Book{cotton:manufacture:15,
-  title =	 {An Inquiry into the Causes of the Present
-                  Long-Continued Depression in the Cotton Trade, with
-                  Suggestions for Its Improvement},
-  year =	 1869,
-  author =	 {{A Cotton Manufacturer}},
-  publisher = 	 {Bury, UK},
-  sortkey = 	 {Cott},
-  shorttitle =	 {Inquiry into the Causes},
-  annote = 	 {15th-edition version of the previous entry, with the
-                  article in the author field and the required
-                  sortkey.}
+  annote = 	 {A Book with a corporate author and a very long
+                  title, hence the shorttitle field for short notes.}
 }
 
 @Book{creasey:ashe:blast,
@@ -696,15 +780,15 @@
   publisher = {Holt, Rinehart \& Winston},
   location =  {New York},
   annote = 	 {The first of 3 Books written by the same author
-                  under three different pseudonyms.  You have
+                  under three different pseudonyms. You have
                   considerable latitude in how to present these, but
                   the method chosen here allows all three to be
-                  grouped together in the bibliography.  Note the
+                  grouped together in the bibliography. Note the
                   pseudonym in nameaddon, identified with the
                   bibstring pseudonym. Also note ampersand in
                   publisher, which prevents the two parts of the
                   publisher's name from being taken as two different
-                  publishers.  The 16th edition makes it a requirement
+                  publishers. The 16th edition makes it a requirement
                   in such entries that you also include a cross
                   reference from the different pseudonyms back to the
                   author's name, something accomplished using a
@@ -747,26 +831,45 @@
   annote = 	 {An unpublished letter from an archive, presented in
                   a \textsf{Misc} entry with an \textsf{entrysubtype}.
                   You can avoid the awkward repetition of the author's
-                  name in notes by using \cmd{headlessfullcite} or
-                  \cmd{headlesscite} instead of the usual citation
-                  commands.  The manuscript collection
-                  \vadjust{\eject}is found in the \textsf{note} and
-                  \textsf{organization} fields --- depending on the
-                  entry, you can use \textsf{note},
+                  name in notes by using \cmd{headlesscite} or
+                  \cmd{headlessfullcite} instead of the usual citation
+                  commands. The manuscript collection is found in the
+                  \textsf{note} and \textsf{organization} fields ---
+                  depending on the entry, you can use \textsf{note},
                   \textsf{organization}, \textsf{institution}, and/or
                   \textsf{location}, in ascending order of generality,
                   though you should consistently put the most specific
-                  collection name in the \textsf{note} field.  As in
+                  collection name in the \textsf{note} field. As in
                   \textsf{Letter} entries the date of the letter goes
                   in \textsf{origdate}, and in the short note form you
                   can use the macro \cmd{letterdatelong} in the
                   \textsf{postnote} field to identify the letter by
-                  this date, if it helps disambiguate.  (In other
+                  this date, if it helps disambiguate. (In other
                   non-letter-like \textsf{Misc} entries, you would use
                   the \textsf{date} field instead of
                   \textsf{origdate}.)}
 }
 
+@Audio{danforth:podcast,
+  title = 	 {F-Bombs, Chicken, and Exclamation Points},
+  eventdate = 	 {2015-04-21},
+  author = 	 {Danforth, Mike and Chillag, Ian},
+  type =         {MP3 audio, 18:46},
+  booktitle = 	 {How to Do Everything},
+  editor = 	 {Donovan, Gillian},
+  url =          {http://www.npr.org/podcasts/510303/how-to-do-everything},
+  editortype =   {producer},
+  note = 	 {podcast},
+  annote =       {The 17th edition specifies something like this
+                  \textsf{Audio} entry for podcasts, with the presence
+                  of an \textsf{eventdate} letting the style know that
+                  it is a podcast, while the \textsf{note} field lets
+                  your readers know the same. The \textsf{title} is
+                  for the specific episode of the
+                  \textsf{booktitle}. The \textsf{type} field
+                  specifies the medium, as usual in audio-visual entry
+                  types.}}
+
 @Book{davenport:attention,
   title =	 {The Attention Economy},
   subtitle =	 {Understanding the New Currency of Business},
@@ -776,8 +879,23 @@
   addendum =	 {TK3 Reader e-book},
   location =	 {Cambridge, MA},
   annote = 	 {Example of the use of addendum in a Book entry, in
-                  this case to identify that the work is an e-book.}
-}
+                  this case to identify that the work is an
+                  e-book. You could also use the type field for this.}
+}
+
+@Online{diaz:surprise,
+  author = 	 {D\'iaz, Juno},
+  title = 	 {Always surprises my students when I tell them that
+                  the \enquote{real} medieval was more diverse than
+                  the fake ones most of us consume},
+  organization = {Facebook},
+  shorttitle =   {Always surprises},
+  date = 	 {2016-02-24},
+  url = 	 {https://www.facebook.com/junotdiaz.writer/posts/972495572815454},
+  annote =       {The 17th edition specifies an \textsf{Online} entry
+                  for social media posts like this one.
+                  Cf. licis:diazcomment for how to present a comment
+                  on such a post.}}
 
 @Misc{dinkel:agassiz,
   author = 	 {Dinkel, Joseph},
@@ -824,10 +942,14 @@
   subtitle = 	 {French Lightning, American Light},
   year = 	 1999,
   author = 	 {Dunn, Susan},
-  publisher = {Faber \& Faber and Farrar, Straus \& Giroux},
-  location =  {New York},
+  publisher =    {Faber \& Faber and Farrar, Straus \& Giroux},
+  location =     {New York},
   annote = 	 {Book with two publishers, showing ampersands to
-                  prevent them being treated as four.}
+                  prevent them being treated as four. The 17th edition
+                  clarifies that you can usually choose just one of
+                  the publishers for your reference apparatus, i.e.,
+                  whichever is closer geographically or more relevant
+                  for your readers.}
 }
 
 @Manual{dyna:browser,
@@ -835,11 +957,11 @@
   organization = {Electronic Book Technology Inc.},
   address = 	 {Providence, RI},
   year = 	 1991,
-  shorttitle = {Dynatext},
+  shorttitle =   {Dynatext},
   annote = 	 {A technical manual presented in a \textsf{Manual}
-                  entry.  In the absence of a named author the
+                  entry. In the absence of a named author the
                   \textsf{organization} is printed twice, as
-                  \textsf{author} and as \textsf{publisher}.  If you
+                  \textsf{author} and as \textsf{publisher}. If you
                   are using \textsf{Biber}, you don't need a
                   \textsf{sortkey} to help with alphabetization,
                   though with \textsc{Bib}\TeX\ it would still be
@@ -848,16 +970,16 @@
 
 @Book{eliot:pound,
   title = 	 {Literary Essays},
-  options = {useauthor=false},
+  options =      {useauthor=false},
   year = 	 1953,
   author = 	 {Pound, Ezra},
-  editor =  {Eliot, T.~S.},
-  publisher = {New Directions},
-  location =  {New York},
+  editor =       {Eliot, T.~S.},
+  publisher =    {New Directions},
+  location =     {New York},
   annote = 	 {A Book listed by its (famous) editor rather than by
-                  its (equally-famous) author.  The options field
-                  makes it happen.  This is a simple example, but
-                  remember that if you have a namea defined then
+                  its (equally-famous) author. The options field makes
+                  it happen. This is a simple example, but remember
+                  that if you have a namea defined then
                   biblatex-chicago-notes will use that, and then
                   you'll need to provide a shorteditor for the short
                   note form and, if you're not using Biber, a sortkey
@@ -867,20 +989,20 @@
 @InCollection{ellet:galena,
   author = 	 {Ellet, Elizabeth~F.~L.},
   title = 	 {By Rail and Stage to Galena},
-  crossref =  {prairie:state},
+  crossref =     {prairie:state},
   pages = 	 {271--279},
   annote = 	 {First of two \textsf{InCollection} entries
                   cross-referencing the same \textsf{Collection}.
-                  Since it is cited first in this file, its long note
-                  reference contains the full bibliographical data for
-                  the \textsf{Collection} entry, whereas the
+                  Since it is cited first in the test file, its long
+                  note reference contains the full bibliographical
+                  data for the \textsf{Collection} entry, whereas the
                   subsequent long note --- \cmslink{keating:dearborn}
                   --- contains an abbreviated reference to the
                   \textsf{Collection}.  Both parts have an abbreviated
-                  reference in the bibliography.  If you don't want
+                  reference in the bibliography. If you don't want
                   this space-saving measure, then you can, for
                   example, set \texttt{longcrossref=true} in the
-                  \textsf{options} field.  With \textsf{Biber}, an
+                  \textsf{options} field. With \textsf{Biber}, an
                   empty \textsf{subtitle} field is no longer necessary
                   to prevent inheritance from the parent entry, and
                   the \textsf{title} of a \textsf{Collection} will
@@ -895,14 +1017,14 @@
   date = 	 {2008-06-30},
   url = 	 {http://wardsix.blogspot.com/2008/06/squatters-rights.html},
   entrysubtype = {magazine},
-  annote = 	 {The 16th edition of the \emph{CMS} specifies an
+  annote = 	 {Recent editions of the \emph{CMS} specify an
                   \textsf{Article}-like presentation for blogs, the
                   main peculiarity being the identification of the
                   material as a blog using the \textsf{location}
                   field, which is usually reserved for identifying the
-                  place of publication of obscure journals.  See
-                  ac:comment, a \textsf{Review} entry, for how to
-                  reference comments on such online material.}
+                  place of publication of obscure journals. See
+                  \cmslink{ac:comment}, a \textsf{Review} entry, for
+                  how to reference comments on such online material.}
 }
 
 @Book{emerson:nature,
@@ -915,7 +1037,7 @@
                   introduction by Jaroslav Pelikan},
   location =	 {Boston},
   annote = 	 {A reprinted Book, in this case a facsimile, with the
-                  note field giving the relevant information.  The
+                  note field giving the relevant information. The
                   origdate field gives date of original publication.
                   Note use of lowercase letter to start note field.}
 }
@@ -925,37 +1047,13 @@
   keywords = {original},
   edition = 	 15,
   lista = {Salvation},
+  date = 	 {1980},
   annote =       {A simple InReference entry, citing a well-known
                   reference work, and therefore not to appear in the
-                  bibliography.  The lista field gives the name of the
-                  (alphabetically-arranged) article from which the
-                  citation is taken.}
-}
-
-@Video{episode:tv,
-  title = 	 {Episode Title},
-  booktitleaddon = 	 {series 5, episode 2},
-  entrysubtype = {tv},
-  date = 	 {2000/2007},
-  origdate = 	 2004,
-  booktitle = 	 {Series Title},
-  publisher = {Production Company},
-  type = 	 {DVD},
-  annote = 	 {The 15th edition of the Manual doesn't, that I can
-                  find, provide guidance for citing television
-                  programs, so I have guessed, using the analogy of
-                  films, at how to present one using the Video entry
-                  type.  The title of the episode will be presented
-                  within quotation marks, as there is a booktitle
-                  presenting the name of the TV series.  The
-                  booktitleaddon gives details about the episode, and
-                  the type gives the medium, as usual.  The origdate
-                  is the year of original transmission, while the date
-                  provides the year range for the whole series, though
-                  it would perhaps make more sense in this situation
-                  to provide the date the DVD was released, instead.
-                  The entrysubtype isn't necessary, but may be of some
-                  use in the author-date style.}
+                  bibliography. The 17th edition requires a date if
+                  you cite a printed edition. The lista field gives
+                  the name of the (alphabetically-arranged) article
+                  from which the citation is taken.}
 }
 
 @BookInBook{euripides:orestes,
@@ -967,12 +1065,12 @@
   volume = 	 4,
   author = 	 {Euripides},
   editor = 	 {Grene, David and Lattimore, Richmond},
-  publisher = uchp,
+  publisher =    uchp,
   pages = 	 {185--288},
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {A work from antiquity, cited by pages in a modern
                   edition, hence not needing \texttt{classical} in the
-                  \textsf{entrysubtype} field.  Since the titles of
+                  \textsf{entrysubtype} field. Since the titles of
                   such works are uniformly italicized, we need to use
                   a \textsf{BookInBook} entry with a \textsf{title}
                   and a \textsf{booktitle} (\enquote{book within a
@@ -985,13 +1083,13 @@
 
 @Online{evanston:library,
   author = 	 {{Evanston Public Library Board of Trustees}},
-  shortauthor = {{Evanston Public Library}},
+  shortauthor =  {{Evanston Public Library}},
   title = 	 {Evanston Public Library Strategic Plan, 2000--2010},
   subtitle = 	 {A Decade of Outreach},
   organization = {Evanston Public Library},
   url = 	 {http://www.epl.org/library/strategic-plan-00.html},
   urldate = 	 {2002-07-18},
-  shorttitle = {Strategic Plan},
+  shorttitle =   {Strategic Plan},
   annote = 	 {An Online entry, with a corporate author, hence
                   extra curly braces in author and shortauthor. The
                   title field holds the title of the specific web
@@ -1005,8 +1103,8 @@
   year = 	 1970,
   translator = 	 {Shapiro, Norman R.},
   author = 	 {Feydeau, Georges},
-  location =  {Chicago},
-  shorttitle = {Four Farces},
+  location =     {Chicago},
+  shorttitle =   {Four Farces},
   annote = 	 {A standard Book entry, but one which may prompt you
                   to use the \headlessfullcite citation command for
                   your first reference to it, as the title contains
@@ -1021,35 +1119,35 @@
   author = 	 {{Pink Floyd}},
   pubstate = 	 {reprint},
   number = 	 {CDP 7 46381 2},
-  publisher = {Capitol},
+  publisher =    {Capitol},
   type = 	 {compact disc},
-  annote = 	 {16th edition only.  An example of a re-released
-                  album, using the pubstate field to print a notice at
-                  the end of the entry clarifying that it is indeed a
-                  re-release.  If you don't use the pubstate field in
-                  this way, biblatex-chicago will assume that the
-                  origdate is a recording date rather than a release
-                  date.  You could also use a userd field to identify
-                  what sort of date the origdate is, though this would
-                  print the information in the middle of the entry
-                  rather than at the end.  As far as I can tell from
-                  the Manual, this is a matter of taste.}
+  annote = 	 {An example of a re-released album, using the
+                  pubstate field to print a notice at the end of the
+                  entry clarifying that it is indeed a re-release. If
+                  you don't use the pubstate field in this way,
+                  biblatex-chicago will assume that the origdate is a
+                  recording date rather than a release date. You could
+                  also use a userd field to identify what sort of date
+                  the origdate is, though this would print the
+                  information in the middle of the entry rather than
+                  at the end. As far as I can tell from the Manual,
+                  this is a matter of taste.}
 }
 
 @inproceedings{frede:inproc,
-    keywords={secondary},
-    author = {Dorothea Frede}, 
-    title = {\mkbibemph{Nicomachean Ethics} VII. 11--12},
-    subtitle = {Pleasure},
-    booktitle = {Aristotle},
-    booksubtitle = {\mkbibquote{Nicomachean Ethics,} Book VII},
-    series = {Symposium Aristotelicum},
-    editor = {Carlo Natali},
-    publisher = {Oxford University Press},
-    address  = {Oxford},
-    year = {2009},
-    pages = {183--207},
-    annote = 	 {A fairly standard \textsf{InProceedings} entry,
+  keywords=      {secondary},
+  author =       {Dorothea Frede}, 
+  title =        {\mkbibemph{Nicomachean Ethics} VII. 11--12},
+  subtitle =     {Pleasure},
+  booktitle =    {Aristotle},
+  booksubtitle = {\mkbibquote{Nicomachean Ethics,} Book VII},
+  series =       {Symposium Aristotelicum},
+  editor =       {Carlo Natali},
+  publisher =    {Oxford University Press},
+  address  =     {Oxford},
+  year =         {2009},
+  pages =        {183--207},
+  annote = 	 {A fairly standard \textsf{InProceedings} entry,
                   showing some of the complications of formatting
                   titles within titles in both the \textsf{title} and
                   the \textsf{booksubtitle} fields.}
@@ -1063,11 +1161,10 @@
   volume = 	 98,
   number = 	 1,
   doi = 	 {10.1006/jeth.2000.2694},
-  url = 	 {http://www.idealibrary.com/links/doi/10.1006/jeth.2000.2694},
-  shorttitle = {Learning in Games},
-  annote = 	 {Standard Article entry with a doi and a url
-                  provided.  The 16th edition prefers a DOI if one is
-                  available.}
+  shorttitle =   {Learning in Games},
+  annote = 	 {Standard Article entry with a doi. Recent editions
+                  strongly prefer a DOI, if one is available, to a
+                  URL.}
 }
 
 @Video{friends:leia,
@@ -1079,27 +1176,31 @@
   eventdate = 	 {1996-09-19},
   editor = 	 {Mancuso, Gail},
   editortype = 	 {director},
-  publisher = {Warner Home Video},
+  publisher =    {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA},
   annote = 	 {This is a template for citing an episode of a
-                  television series using a \textsf{Video} entry.  The
+                  television series using a \textsf{Video} entry. The
                   name of the episode goes in the \textsf{title} field
                   while the name of the series goes in
-                  \textsf{booktitle}.  (Were you to cite an entire
+                  \textsf{booktitle}. (Were you to cite an entire
                   series rather than a single episode, you wouldn't
                   need the \textsf{booktitle} for it, but only a
-                  \textsf{title}.)  The writers of the episode go in
+                  \textsf{title}.) The writers of the episode go in
                   \textsf{author}, while the director goes in
                   \textsf{editor}, using an \textsf{editortype} field
                   to specify her role, something of frequent
-                  occurrence in the audio-visual types.  The
+                  occurrence in the audio-visual types. The
                   \textsf{eventdate} is the original broadcast date,
                   while the \textsf{date} applies to the medium you
-                  are citing.  That medium itself goes in the
-                  \textsf{type} field.  Note that information about
-                  the season and episode numbers goes in
-                  \textsf{booktitleaddon}.}
+                  are citing. That medium itself goes in the
+                  \textsf{type} field. Note that information about the
+                  season and episode numbers goes in
+                  \textsf{booktitleaddon}. Cf.\
+                  \texttt{american:crime} for an example using the new
+                  17th edition \texttt{tvepisode}
+                  \textsf{entrysubtype} which reverses the traditional
+                  order of \textsf{title} and \textsf{booktitle}.}
 }
 
 @Book{furet:passing:eng,
@@ -1115,17 +1216,17 @@
                   If it isn't cited independently, it will appear only
                   after that entry in the bibliography, connected to
                   it using the format defined by the
-                  \textsf{relatedtype} \texttt{bytranslator}.  You
+                  \textsf{relatedtype} \texttt{bytranslator}. You
                   could also give this entry a \textsf{userf} field
                   referring to the original text,
                   \texttt{furet:passing:fr}, or indeed a
                   \textsf{related} field referring to the same .bib
                   entry, along with a \textsf{relatedtype}
-                  \texttt{origpubas}.  In notes, by default, neither
-                  of these mechanisms would have any effect, but in
-                  the bibliography the translation and the original
-                  would be presented in the same entry, connected (in
-                  the absence of an \textsf{origlanguage} or
+                  \texttt{origpubas}. In notes, by default, neither of
+                  these mechanisms would have any effect, but in the
+                  bibliography the translation and the original would
+                  be presented in the same entry, connected (in the
+                  absence of an \textsf{origlanguage} or
                   \textsf{relatedstring} field, respectively) by the
                   string \enquote{Originally published as.}}
 }
@@ -1153,9 +1254,9 @@
   annote = 	 {This entry presents the same \textsf{Book} as
                   \texttt{furet:passing:fr}, but does so using the
                   \textsf{relatedtype} \texttt{bytranslator}
-                  functionality.  This is the alternate Chicago form
+                  functionality. This is the alternate Chicago form
                   for presenting a text and its translation together
-                  in a single bibliography entry.  Cp.\
+                  in a single bibliography entry. Cp.\
                   furet:passing:eng.}
 }
 
@@ -1172,8 +1273,8 @@
   annote = 	 {An \textsf{Article} entry with \textsf{author},
                   \textsf{title}, \textsf{journaltitle},
                   \textsf{year}, \textsf{volume}, \textsf{series}, and
-                  \textsf{pages} fields.  Note also the preservation
-                  of French capitalization in the two titles.}
+                  \textsf{pages} fields. Note also the preservation of
+                  French capitalization in the two titles.}
 }
 
 @Article{garrett,
@@ -1189,9 +1290,48 @@
                   immediately recognizable to your readership, or
                   indeed that may be shared by a number of different
                   journals, so you add a location field to tell where
-                  the journaltitle originates.  Also note formatting
-                  in the title field.}
-}
+                  the journaltitle originates. Also note formatting in
+                  the title field.}
+}
+
+@Book{gems:ipad,
+  author = 	 {Grande, Lance and Augustyn, Allison},
+  title = 	 {Gems and Jewels},
+  date = 	 2011,
+  version = 	 {1.01},
+  related = 	 {gems:print},
+  edition = 	 {{}iPad ed\adddot},
+  relatedstring = {adapted from},
+  publisher =    {Touchpress},
+  annote =       {An example of how the 17th edition presents app
+                  content, here an iPad edition of a book, with its
+                  print edition presented via a related field.}}
+
+@Book{gems:print,
+  author = 	 {Grande, Lance and Augustyn, Allison},
+  title = 	 {Gems and Gemstones},
+  subtitle = 	 {Timeless Natural Beauty of the Mineral World},
+  date = 	 2009,
+  publisher =    uchp,
+  location =     {Chicago},
+  annote =       {Print edition of the previous.}}
+
+@Dataset{genbank:db,
+  author = 	 {GenBank},
+  title = 	 {for RP11-322N14 BAC},
+  number = 	 {AC087526.3},
+  type = 	 {accession number},
+  url = 	 {http://www.ncbi.nlm.nih.gov/nuccore/19683167},
+  urldate = 	 {2016-04-06},
+  annote =       {The \textsf{Dataset} type helps to present
+                  scientific databases as specified by the 17th
+                  edition. The name of the database appears in the
+                  \textsf{author} field, while the \textsf{title},
+                  \textsf{type}, and \textsf{number} fields present
+                  locating and/or explanatory information about
+                  particular parts of the data. A \textsf{url} locates
+                  the database and the \textsf{urldate} documents when
+                  you accessed it.}}
 
 @Article{gibbard,
   author =	 {Gibbard, Allan},
@@ -1206,13 +1346,13 @@
                   Normativity}, by Christine M. Korsgaard},
   annote = 	 {A book review as an Article, because it has a
                   specific title (title field) as well as a generic
-                  one (titleaddon field).  Note \bibstring macro and
+                  one (titleaddon field). Note the bibstring macro and
                   formatting in the titleaddon.}
 }
 
 @Periodical{good:wholeissue,
   issuetitle = 	 {Non-subject-matter Outcomes of Schooling},
-  title = {Elementary School Journal},
+  title =        {Elementary School Journal},
   year = 	 1999,
   volume = 	 99,
   number = 	 5,
@@ -1234,18 +1374,16 @@
   entrysubtype = {magazine},
   date = 	 {2000-05},
   title =        {Kitchen Notebook},
-  sortkey = 	 {Gourmet},
-  shorttitle = {Kitchen Notebook, May 2000},
+  shorttitle =   {Kitchen Notebook, May 2000},
   annote = 	 {A regular column in a magazine, presented in a
                   Review entry (with "magazine" entrysubtype) because
                   there is no specific title, only the generic one of
                   the name of the column, which is nonetheless
                   capitalized. Since there is no author, the
                   journaltitle will be used instead, in notes, short
-                  notes, and bibliography.  Also, if you use Biber and
-                  the 16th edition style, you no longer need a sortkey
-                  to alphabetize by the journaltitle rather than by
-                  the title.}
+                  notes, and bibliography. Also, if you use Biber you
+                  don't need a sortkey to alphabetize by the
+                  journaltitle rather than by the title.}
 }
 
 @Audio{greek:filmstrip,
@@ -1255,7 +1393,7 @@
   type = 	 {filmstrip, 44 min\adddot},
   address = 	 {Chicago},
   sortkey = 	 {Greek and Roman},
-  annote = 	 {A standard Audio entry presenting a filmstrip.  The
+  annote = 	 {A standard Audio entry presenting a filmstrip. The
                   type field explains what sort of content it is, and
                   the sortkey helps with alphabetization, preventing
                   biblatex from using "The" for that purpose.}
@@ -1270,18 +1408,46 @@
   sortkey = 	 {New Grove},
   annote =       {An example of an online InReference entry, which I
                   have allowed, as an example, to appear in the
-                  bibliography.  The author field refers to the author
+                  bibliography. The author field refers to the author
                   of the specific entry in lista, and will be printed
-                  after the name of that entry, parenthesized in the
-                  15th edition, merely set off by a comma in the 16th.
+                  after the name of that entry, set off by a comma.
                   If you need to provide the author or editor of a
                   reference work as a whole, then you should probably
-                  use a Book entry. (Cf. schellinger:novel.)  Note
-                  also the short citation, where you can now put an
-                  alphabetized article title in the postnote field,
-                  and it will be formatted for you automatically in
-                  InReference entries.}
-}
+                  use a Book entry. (Cf. schellinger:novel.) Note also
+                  the short citation, where you can put an article
+                  title in the postnote field, and it will be
+                  formatted for you automatically. The 17th edition
+                  has new instructions for treating online material
+                  that doesn't have, and never had, a printed
+                  counterpart. Specifically, the title can, at your
+                  discretion, appear in roman rather than italics, as
+                  in Online entries. To keep the features of
+                  InReference entries available to such resources you
+                  can add an entrysubtype to such an entry, rather
+                  than lose those features by using an Online
+                  entry. Cf. wikiped:bibtex.}
+}
+
+@Performance{hamilton:miranda,
+  editor = 	 {Miranda, Lin-Manuel},
+  editortype = 	 {music and lyrics by},
+  editoratype =  {director},
+  editorbtype =  {choreographer},
+  editora = 	 {Kail, Thomas},
+  editorb = 	 {Blakenbuehler, Andy},
+  venue = 	 {Richard Rodgers Theatre},
+  title = 	 {Hamilton},
+  date = 	 {2016-02-02},
+  options = 	 {useeditor=false},
+  location =     {New York, NY},
+  annote =       {New in the 17th-edition styles, the
+                  \textsf{Performance} entry type allows you to cite
+                  individual live performances, usually including a
+                  number of \textsf{editortypes} for specifying
+                  various contributors. The \textsf{options} field
+                  \texttt{useeditor=false} means that the
+                  \textsf{title} of the piece will come first in notes
+                  and bibliography.}}
 
 @Video{handel:messiah,
   title = 	 {Messiah},
@@ -1294,18 +1460,18 @@
   editora = 	 {Shaw, Robert},
   editoratype =  {none},
   author = 	 {Handel, George Frederic},
-  publisher = {Video Artists International},
+  publisher =    {Video Artists International},
   address = 	 {Ansonia Station, NY},
-  annote = 	 {16th edition only.  This is a videotape of an
-                  oratorio, presented therefore as a Video entry
-                  rather than as Music.  The composer goes in author,
-                  the performers and conductor in editor and editora.
-                  Note the "none" in both editortypes, as the context
-                  presumably makes it clear what role Shaw is playing.
-                  The usual type field identifies the medium.  The
-                  eventdate identifies when the performance took
-                  place, and the new userd field allows you to specify
-                  just what sort of eventdate it is.}
+  annote = 	 {This is a videotape of an oratorio, presented
+                  therefore as a Video entry rather than as Music.
+                  The composer goes in author, the performers and
+                  conductor in editor and editora. Note the "none" in
+                  both editortypes, as the context presumably makes it
+                  clear what role Shaw is playing. The usual type
+                  field identifies the medium. The eventdate
+                  identifies when the performance took place, and the
+                  userd field allows you to specify just what sort of
+                  eventdate it is.}
 }
 
 @Collection{harley:ancient:cart,
@@ -1364,15 +1530,86 @@
                   only available with \textsf{Biber} as your backend.}
 }
 
+@Collection{harleymt:ancient:cart,
+  title = 	 {Cartography in Prehistoric, Ancient, and Medieval
+                  Europe and the Mediterranean},
+  date = 	 1987,
+  crossref = 	 {harleymt:hoc},
+  volume = 	 1,
+  annote = 	 {The three harleymt* entries demonstrate how to use
+                  the maintitle (or maintitlenc) relatedtype to
+                  present multivolume works using the Manual's
+                  reversed syntax, whereby the maintitle appears first
+                  in long notes and bibliography, followed by the
+                  title of the individual volume. Short notes contain
+                  only the maintitle and the specifying volume
+                  number. In the presentation selected here, you
+                  wouldn't actually cite the individual volumes,
+                  rather you would cite a virtual entry consisting of
+                  an amalgam of the MVCollection and the Collection,
+                  so in this case it would be
+                  harleymt:hoc-harleymt:ancient:cart, while ensuring
+                  that the MVCollection is cited (or nocited)
+                  somewhere in your document. The Collection entry's
+                  crossref field ensures it obtains data it needs from
+                  the parent, though you could optionally omit that
+                  field and produce something like an abbreviated
+                  crossref to the parent. Do please note that citing
+                  this entry on its own wouldn't give good results, so
+                  for each set of volumes you want to cite you should
+                  choose which syntax suits best and stick with
+                  it. See harleymt:cartography and harleymt:hoc.}
+}
+
+@Collection{harleymt:cartography,
+  title =	 {Cartography in the Traditional East and Southeast
+                  Asian Societies},
+  date =	 {1994},
+  volume =	 {2},
+  options = 	 {hidevolumes=false},
+  crossref = 	 {harleymt:hoc},
+  part = 	 {2},
+  shorttitle =	 {Cartography in East and Southeast Asia},
+  annote = 	 {See the preceding entry for details on the maintitle
+                  relatedtype used by the parent MVCollection
+                  entry. This volume has a volume and a part number,
+                  and I've also set the hidevolumes option to false so
+                  that the citation includes how many volumes there
+                  are in the whole set.}
+}
+
+@MVCollection{harleymt:hoc,
+  title = 	 {The History of Cartography},
+  date = 	 {1987/},
+  editor = 	 {Harley, J.~B. and Woodward, David},
+  volumes = 	 {3},
+  related =      {harleymt:cartography,harleymt:ancient:cart},
+  relatedtype =  {maintitlenc},
+  publisher =    uchp,
+  location =     {Chicago},
+  annote =       {The parent entry for the two preceding; citing or
+                  nociting it produces two virtual entries
+                  (harleymt:hoc-harleymt:ancient:cart and
+                  harleymt:hoc-harleymt:cartography) in the .bbl file
+                  that you can cite to produce maintitle-first
+                  citations. Citations of this entry itself produce
+                  normal MVCollection references, though if there were
+                  only one key in the related field then this entry
+                  would itself function like the virtual entries
+                  above.}}
+
 @Online{harwood:biden,
   author = 	 {Harwood, John},
   title = 	 {The Pros and Cons of Biden},
-  organization = {\mkbibemph{New York Times} video, 2:00},
+  organization = {\mkbibemph{New York Times}},
+  type =         {video, 2:00},
   date = 	 {2008-08-23},
   url = 	 {http://video.on.nytimes.com/?fr_story=a425c9aca92f51bd19f2a621fd93b5e266507191},
-  annote = 	 {An online video using an Online entry.  Note the
-                  formatting in the organization field.
-                  Cf. horowitz:youtube.}
+  annote = 	 {An online video from a traditional journalistic site
+                  using an Online entry. You could use an Article
+                  entry with magazine entrysubtype instead, removing
+                  the need for special formatting in the organization
+                  field. Cf. kessler:nyt.}
 }
 
 @TechReport{herwign:office,
@@ -1380,8 +1617,7 @@
   author = 	 {{van} Herwijnen, Eric},
   title = 	 {Future Office Systems Requirements},
   institution =  {CERN DD internal note},
-  year = 	 1988,
-  month = 	 11,
+  date = 	 {1988-11},
   annote = 	 {A \textsf{Report} entry, with the \textsf{type}
                   field automatically set by using the
                   \textsf{TechReport} alias instead of
@@ -1396,7 +1632,7 @@
   origdate = 	 1959,
   editor = 	 {Hitchcock, Alfred},
   editortype = 	 {director},
-  publisher = {Warner Home Video},
+  publisher =    {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA},
   options = 	 {useauthor=false,useeditor=false},
@@ -1440,51 +1676,50 @@
   booktitle = 	 {Lady in Satin},
   author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
   editor = 	 {Holiday, Billie},
-  editortype = 	 {none},
+  editortype = 	 {vocalist},
+  chapter =      1,
   number = 	 {CL 1157},
-  publisher = {Columbia},
+  publisher =    {Columbia},
   type = 	 {33\onethird\ rpm},
   note = 	 {with Ray Ellis},
   options = 	 {useauthor=false},
   annote = 	 {This entry illustrates some of the peculiarities of
-                  \textsf{Music} entries.  It cites a song
+                  \textsf{Music} entries. It cites a song
                   (\textsf{title}) from an album (\textsf{booktitle}).
                   (Were you to cite a whole album, then you wouldn't
                   need the \textsf{booktitle}, only the album title in
-                  \textsf{title}.)  The writers of the song go in
-                  \textsf{author}, while the \textsf{options} field
-                  prevents these writers from appearing at the head of
-                  notes or of the entry in the bibliography.  The
-                  performer goes in \textsf{editor}, with the
-                  \textsf{editortype} ensuring that no identifying
-                  string appears.  The \textsf{eventdate} gives the
-                  recording date of a song --- you would use
-                  \textsf{origdate} if the recording date applied to
-                  the album as a whole.  The \textsf{date} gives the
-                  release date of the album, while the \textsf{type}
-                  field gives the medium of the release.}
+                  \textsf{title}.)  The \textsf{chapter} gives the
+                  track number on the album. The writers of the song
+                  go in \textsf{author}, while the \textsf{options}
+                  field prevents these writers from appearing at the
+                  head of notes or of the entry in the
+                  bibliography. The performer goes in \textsf{editor},
+                  with the \textsf{editortype} giving, as the 17th
+                  edition seems to like, what sort of performer she
+                  is. The \textsf{eventdate} gives the recording date
+                  of a song --- you would use \textsf{origdate} if the
+                  recording date applied to the album as a whole. The
+                  \textsf{date} gives the release date of the album,
+                  while the \textsf{type} field gives the medium of
+                  the release.}
 }
 
 @Online{horowitz:youtube,
   title = 	 {HOROWITZ AT CARNEGIE HALL 2-Chopin Nocturne in Fm Op.55},
-  organization = {YouTube video, 5:53},
-  sortkey = 	 {Horowitz},
+  organization = {YouTube},
+  type =         {video, 5:53},
   url = 	 {http://www.youtube.com/watch?v=cDVBtuWkMS8},
   urldate = 	 {2009-01-09},
   userd = 	 {posted by \mkbibquote{hubanj},},
   note = 	 {from a performance televised by CBS on\nopunct},
   date = 	 {1968-09-22},
   shorttitle = {HOROWITZ AT CARNEGIE HALL},
-  annote = 	 {A YouTube video, presented in an Online entry.  The
-                  new userd field allows you to modify what is printed
+  annote = 	 {A YouTube video, presented in an Online entry. The
+                  userd field allows you to modify what is printed
                   before the urldate, while the note field here is
                   used for a similar purpose, to clarify the date
-                  field.  The shorttitle abbreviates what will appear
-                  in citations of this author-less entry, and the
-                  sortkey is required because, in this corner case,
-                  the organization would otherwise be used for
-                  alphabetization, an arrangement that works for many
-                  entries, but not this one.}
+                  field. The shorttitle abbreviates what will appear
+                  in citations of this author-less entry.}
 }
 
 @Book{horsley:prosodies,
@@ -1494,7 +1729,7 @@
   authortype =	 {anon},
   shorttitle =	 {Prosodies},
   annote = 	 {An anonymous Book, with the author known, though not
-                  named on the title page.  The string "anon" goes in
+                  named on the title page. The string "anon" goes in
                   the authortype field.}
 }
 
@@ -1506,16 +1741,15 @@
   annote = 	 {An example of a Misc entry (with an entrysubtype)
                   specifically for a bibliography, assuming that more
                   than one item has been cited from this same
-                  collection.  The individual items cited would look
+                  collection. The individual items cited would look
                   like creel:house, and in such a case would not
-                  appear in the bibliography.  This entry also
+                  appear in the bibliography. This entry also
                   illustrates the use of a comma in a bibliography
                   entry to set off a middle initial from a following
                   plain-text title, only used when the period alone
-                  might lead to ambiguity.  Cf. Manual, 15th
-                  ed. 17.231, 16th ed 14.241.  The \adddot and
-                  \addcomma commands you see here are the most
-                  effective way of doing this.}
+                  might lead to ambiguity. The \adddot and \addcomma
+                  commands you see here are the most effective way of
+                  doing this.}
 }
 
 @Letter{jackson:paulina:letter,
@@ -1531,10 +1765,10 @@
   location =	 {Oxford},
   annote = 	 {An individual letter from a published collection,
                   hence the \textsf{Letter} entry, designed
-                  specifically for this sort of reference.  The
+                  specifically for this sort of reference. The
                   \textsf{title} field should always look like this,
                   and the \textsf{author} won't be printed in notes,
-                  as this field already specifies it.  The
+                  as this field already specifies it. The
                   \textsf{shorttitle's} form is specific to this entry
                   type, eventually printing the \textsf{author's}
                   surname followed by the contents of this field,
@@ -1542,11 +1776,11 @@
                   The \textsf{origdate} field holds the date of the
                   original letter, while the \textsf{year} (or
                   \textsf{date}) holds the date of the publication of
-                  the collection as a whole.  The \textsf{pages} field
+                  the collection as a whole. The \textsf{pages} field
                   in this example holds not the page, but the number
                   in the collection -- notice the \cmd{bibstring} --
                   while the \textsf{booktitle} is the title of that
-                  published collection.  If you refer to more than one
+                  published collection. If you refer to more than one
                   letter from such a collection, then only the name of
                   the collection need appear in the bibliography.}
 }
@@ -1590,10 +1824,27 @@
   shorttitle = {Pigafetta},
   annote = 	 {An Article with a Dutch title that may need
                   translating for a significant portion of your
-                  readership.  You give the translation in the usere
+                  readership. You give the translation in the usere
                   field, using sentence-style capitalization. }
 }
 
+@Article{kessler:nyt,
+  author = 	 {Kessler, Aaron M\adddot},
+  title = 	 {The Driverless Now},
+  journaltitle = {New York Times},
+  type = 	 {video, 2:01},
+  entrysubtype = {magazine},
+  editortype = 	 {producer},
+  date = 	 {2015-05-02},
+  editor = 	 {Teng, Poh Si and Naudziunas, Jessica},
+  url = 	 {http://www.nytimes.com/video/business/100000003662208/the-driverless-now.html},
+  annote =       {An online video from a traditional journalistic
+                  site, using an Article entry and a type field for
+                  identifying the sort of material involved, and its
+                  duration. You can also use an Online entry with
+                  special formatting in the organization field, but
+                  this method is somewhat simpler. Cf. harwood:biden.}}
+
 @Article{kimluu:diethyl,
   author =	 {Kim Luu, Diane-Dinh},
   title =	 {Diethylstilbestrol and Media Coverage of the
@@ -1621,10 +1872,10 @@
   shorttitle =	 {\bibstring{reviewof} Fain \bibstring{and} Beck
                   concert},
   annote = 	 {A typical Review entry from a newspaper, with
-                  "magazine" in entrysubtype.  Note the use of the
+                  "magazine" in entrysubtype. Note the use of the
                   bibstrings in title and shorttitle, which help but
                   do not complete the internationalization of the
-                  entry.  Beginning the fields without bibstrings and
+                  entry. Beginning the fields without bibstrings and
                   with lower-case letters in a chosen language
                   (e.g. "review of") is possibly a better
                   alternative. Note also the pages field, which gives
@@ -1653,19 +1904,19 @@
   title = 	 {Pushcarts Evolve to Trendy Kiosks},
   location =  {Lake Forest, IL},
   shorttitle = {Pushcarts Evolve},
-  annote = 	 {An \textsf{Article} entry from a newspaper.  As the
+  annote = 	 {An \textsf{Article} entry from a newspaper. As the
                   source isn't a traditional scholarly one, the entry
                   requires \texttt{magazine} in the
-                  \textsf{entrysubtype} field.  The article doesn't
+                  \textsf{entrysubtype} field. The article doesn't
                   have an \textsf{author}, so the \textsf{title} will
-                  be used at the head of the entry in notes and short
-                  notes, while the \textsf{journaltitle} appears there
-                  in the bibliography.  (The \emph{CMS} suggests
-                  that such sources needn't appear in the bibliography
-                  at all, assuming that the note contains a full
-                  enough reference.)  The newspaper might not be well
-                  known, so the \textsf{location} field helps your
-                  readers out in this case.  If you are using
+                  be used at the head of the entry in long notes,
+                  while the \textsf{journaltitle} appears there in
+                  short notes and the bibliography. (The \emph{CMS}
+                  suggests that such sources needn't appear in the
+                  bibliography at all, assuming that the note contains
+                  a full enough reference.) The newspaper might not be
+                  well known, so the \textsf{location} field helps
+                  your readers out in this case. If you are using
                   \textsf{Biber}, a \textsf{sortkey} field isn't
                   necessary to alphabetize by \textsf{journaltitle}
                   rather than by \textsf{title}.}
@@ -1706,26 +1957,32 @@
   title = 	 {Madonna of the Rocks},
   type = 	 {oil on canvas},
   institution =  {Louvre},
-  year = 	 {1480s},
+  date = 	 {148X},
   note = 	 {78 x 48.5 in\adddot},
-  location =  {Paris},
+  location =     {Paris},
   annote = 	 {This is a typical \textsf{Artwork} entry, with the
-                  artist presented in the \textsf{author} field.  Note
+                  artist presented in the \textsf{author} field. Note
                   the \textsf{type} field for the medium of the work,
                   and also the fact that it begins with a lowercase
                   letter, allowing \textsf{biblatex} to capitalize it
-                  contextually when needed.}
+                  contextually when needed. Note also the ISO8601-2
+                  decade specification in the \textsf{date}
+                  field. \textsf{Biblatex-chicago} now supports
+                  multiple dates in \textsf{Artwork} entries, allowing
+                  you to identify, e.g., when a photograph was printed
+                  as well as when it was taken. See the main
+                  documentation for details.}
 }
 
 @Book{levistrauss:savage,
   title = 	 {The Savage Mind},
   year = 	 1962,
   author = 	 {Lévi-Strauss, Claude},
-  publisher = {Weidenfeld \& Nicolson},
-  location =  {Chicago: University of Chicago Press; London},
+  publisher =    {Weidenfeld \& Nicolson},
+  location =     {Chicago: University of Chicago Press; London},
   annote = 	 {A standard Book entry, showing a kludge in the
                   location field for including two publishers in two
-                  different countries.  The simplest thing to do in
+                  different countries. The simplest thing to do in
                   such a situation is to pick the one nearest to you
                   and just use it, but this may be necessary
                   sometimes.}
@@ -1743,22 +2000,40 @@
   shorttitle =	 {\mkbibquote{'Tis a Misfortune to Be a Great Ladie}},
   annote = 	 {An Article entry showing a quotation inside a title
                   that will itself take quotation marks in
-                  bibliography and notes.  (You may need to experiment
+                  bibliography and notes. (You may need to experiment
                   with some kernings if the cluster of quotation marks
-                  at the start is unreadable.) Using \mkbibquote will
+                  at the start is unreadable.) Using mkbibquote will
                   ensure that all the punctuation comes out right.}
 }
 
+@Online{licis:diazcomment,
+  author = 	 {Licis, Kristaps},
+  title = 	 {But what is the surprise here?},
+  related = 	 {diaz:surprise},
+  relatedtype =  {commenton},
+  date = 	 {2016-02-24},
+  url = 	 {https://www.facebook.com/junotdiaz.writer/posts/972495572815454?comment_id=972558569475821},
+  annote =       {The 17th edition recommends an Online entry like
+                  this for presenting a comment on a social media
+                  thread. Since this comment has its own title, the
+                  "commenton" relatedtype is pretty much required,
+                  with the related field containing the entry upon
+                  which this is a comment. You can use time stamps in
+                  the date fields to distinguish multiple comments by
+                  the same author. As a rule, such material need
+                  appear only in notes, but I've allowed this one to
+                  appear in the bibliography as well.}}
+
 @InCollection{lippincott:chicago,
   author = 	 {Lippincott, Sarah Clarke},
   title = 	 {Chicago},
-  crossref =  {prairie:state},
+  crossref =     {prairie:state},
   pages = 	 {362--370},
   annote = 	 {Third and last of the InCollection entries referring
-                  to the same Collection.  The first, long note will
+                  to the same Collection. The first, long note will
                   have abbreviated data for the collection, because
                   other citations of entries in that collection have
-                  already occurred.  The bibliography entries of all
+                  already occurred. The bibliography entries of all
                   three are also abbreviated. Cf. ellet:galena and
                   keating:dearborn.}
 }
@@ -1767,7 +2042,7 @@
   title = 	 {The Life of a City},
   subtitle = 	 {Early Films of New York, 1898--1906},
   author = 	 {{Library of Congress}},
-  type = 	 {MPEG},
+  type = 	 {MPEG video},
   url = 	 {http://lcweb2.loc.gov/ammem/papr/nychome.html},
   urldate = 	 {2001-08-14},
   annote = 	 {This Video entry provides the online location of the
@@ -1779,29 +2054,23 @@
 }
 
 @Online{loc:leaders,
-  author = 	 {Library of Congress},
+  author = 	 {{Library of Congress}},
   title = 	 {American Leaders Speak},
   subtitle = 	 {Recordings from World War I and the 1920 Election,
                   1918--1920},
   url = 	 {http://memory.loc.gov/ammem/nfhtml/nforSpeakers01.html},
   note = 	 {RealAudio and WAV formats},
-  annote = 	 {This Online entry provides the online archive
-                  location of the coolidge:speech entry, which
-                  references it using a related field.  You no longer
-                  need skipbib in the options field, as by default
-                  entries cited only by the related system won't
-                  appear on their own.  Cp. loc:city and
-                  weed:flatiron.},
   annote = 	 {It's worth noting that the annotations to this
                   \textsf{related} entry appear \emph{before} those of
-                  the parent entry.  Here, an \textsf{Online} entry
+                  the parent entry. Here, an \textsf{Online} entry
                   provides the online archive location of the
                   \cmslink{coolidge:speech} entry, which references it
-                  using a \textsf{related} field.  You no longer need
+                  using a \textsf{related} field. You no longer need
                   \texttt{skipbib} in the \textsf{options} field, as
                   by default entries cited only by the
-                  \textsf{related} system won't appear on their own.
-                  Cp.\ \texttt{loc:city} and \texttt{weed:flatiron}.}
+                  \textsf{related} system won't appear on their
+                  own. Cp.\ \texttt{loc:city} and
+                  \texttt{weed:flatiron}.}
 }
 
 @Article{loften:hamlet,
@@ -1829,14 +2098,43 @@
                   capitalization.}
 }
 
+@Video{mayberry:brady,
+  title = 	 {Her Sister's Shadow},
+  eventdate = 	 {1971-11-19},
+  editortype = 	 {director},
+  entrysubtype = {tvepisode},
+  booktitle = 	 {The Brady Bunch},
+  usera = 	 {ABC},
+  editor = 	 {Mayberry, Russ},
+  booktitleaddon = {season 3, episode 10},
+  url = 	 {https://www.hulu.com/the-brady-bunch},
+  annote =       {Another TV episode presented with the series title
+                  before the episode title, using the "tvepisode"
+                  entrysubtype. This episode comes from a streaming
+                  service, indicated by the url field.}}
+
+@Artwork{mccurry:afghangirl,
+  author = 	 {McCurry, Steve},
+  title = 	 {Afghan Girl},
+  date = 	 {1984-12},
+  eventdate = 	 {1985-06},
+  howpublished = {\mkbibemph{National Geographic}, cover,},
+  type = 	 {photograph},
+  annote =       {The 17th edition has multiplied the number of
+                  relevant dates in an Artwork entry. This entry
+                  presents a photograph with its creation date in the
+                  date field and also a date for its appearance in
+                  print in the eventdate. The howpublished field gives
+                  the circumstances of that print appearance.}}
+
 @Book{mchugh:wake,
   title = 	 {Annotations to \mkbibquote{Finnegans Wake}},
   year = 	 1980,
   author = 	 {McHugh, Roland},
-  publisher = {Johns Hopkins University Press},
-  location =  {Baltimore},
+  publisher =    {Johns Hopkins University Press},
+  location =     {Baltimore},
   annote = 	 {A \textsf{Book} with a quoted \textsf{title} inside
-                  an italicized one.  If you use \cmd{mkbibquote} the
+                  an italicized one. If you use \cmd{mkbibquote} the
                   package will automatically do the right thing,
                   moving punctuation inside the quotation marks.}
 }
@@ -1867,31 +2165,26 @@
   annote = 	 {A published collection of letters referred to by
                   page rather than by individual letter, hence using a
                   Book entry rather than Letter. You may wish to use
-                  the \headlessfullcite command for the first
+                  the headlessfullcite command for the first
                   reference, avoiding the repetition of the author's
                   name. Also, you should be aware that, because there
                   are three volumes of letters, the postnote field of
                   any cite command should contain both volume and page
-                  references, as in "2:234". The postnote will follow
-                  the shorttitle without intervening punctuation, as
-                  per the specification.}
+                  references, as in "2:234".}
 }
 
 @Reference{mla:style,
   title = 	 {MLA Style Manual and Guide to Scholarly Publishing},
-  options = 	 {useeditor=false},
   editor = 	 {Gibaldi, Joseph},
   year = 	 1998,
-  publisher = {Modern Language Association of America},
+  publisher =    {Modern Language Association of America},
   edition = 	 2,
-  location =  {New York},
+  location =     {New York},
   annote =       {A Reference entry, which I use here instead of
                   InReference because this work will be cited by
                   section number, rather than by alphabetized entry.
                   Once again, I have allowed this to appear in the
-                  bibliography, hence the options field, which
-                  prevents biblatex from alphabetizing the entry under
-                  Gibaldi instead of MLA.}
+                  bibliography.}
 }
 
 @Article{morgenson:market,
@@ -1901,13 +2194,13 @@
   date = 	 {2000-04-23},
   author = 	 {Morgenson, Gretchen},
   title = 	 {Applying a Discount to Good Earnings News},
-  titleaddon = {Market Watch},
-  shorttitle = {Applying a Discount},
+  titleaddon =   {Market Watch},
+  shorttitle =   {Applying a Discount},
   annote = 	 {An Article entry (entrysubtype "magazine")
                   presenting a regular column in a newspaper, which
                   column also has an individual, specific title. The
                   latter goes in the title field and the former in the
-                  titleaddon field.  Note also the reference to the
+                  titleaddon field. Note also the reference to the
                   section in the pages field.}
 }
 
@@ -1926,7 +2219,6 @@
 
 @Music{mozart:figaro,
   title = 	 {Le nozze di Figaro},
-  howpublished = {\texttt{\small\textcircledP}},
   date = 	 {1987},
   author = 	 {Mozart, Wolfgang Amadeus},
   editor = 	 {{Vienna Philharmonic}},
@@ -1934,18 +2226,16 @@
   editora = 	 {Muti, Riccardo},
   editoratype =  {conductor},
   number = 	 {CDS~7~47978~8},
-  publisher = {EMI Records Ltd.},
+  publisher =    {EMI Records Ltd.},
   type = 	 {3 compact discs},
   note = 	 {with Thomas Allen, Margaret Price, Jorma Hynninen,
                   Ann Murray, Kurt Rydl, and the Konzertvereinigung
                   Wiener Staatsopernchor},
-  annote = 	 {This Music entry shows how a single such entry can
-                  work in both the 15th and 16th editions of the notes
-                  and bibliography style.  Because the 16th edition
-                  ignores the howpublished field, if you use it to
-                  provide copyright details for the 15th edition it
-                  won't get in the way of the 16th.  The other fields
-                  are the same for both specifications.}
+  annote = 	 {This Music entry is a characteristic example of how
+                  to present a variety of roles within a recorded
+                  performance. Recent editions of the CMS might prefer
+                  you to provide a recording date using the origdate
+                  field.}
 }
 
 @PhdThesis{murphy:silent,
@@ -1955,38 +2245,57 @@
   school = 	 {University of North Carolina},
   year = 	 2000,
   annote = 	 {A Thesis entry, using the PhdThesis alias to define
-                  the type field.  The school field is an alias for
-                  biblatex's institution.  Note also the formatting of
+                  the type field. The school field is an alias for
+                  biblatex's institution. Note also the formatting of
                   a title within a quoted title.}
 }
 
-@Misc{nasa:db,
+@Music{naraya,
+  title =      {Ghost Dancing Music},
+  related =    {stoffle:ghost},
+  entrysubtype =  {song},
+  options =    {related=true},
+  relatedstring = {cited in},
+  note =       {Naraya no.~2},
+  type =       {MP3 audio},
+  annote =     {This Music entry contains an online supplement to a
+                  printed Article (stoffle:ghost). The entrysubtype
+                  here allows you to cite a song outside of the
+                  context of an album. The options field ensures that
+                  the full citation information appears in both notes
+                  and bibliography.}}
+
+@Dataset{nasa:db,
   author = 	 {{NASA/IPAC Extragalactic Database}},
   title = 	 {object name IRAS F00400+4059},
-  entrysubtype = {defined},
-  url = 	 {http://nedwww.ipac.caltech.edu},
-  urldate = 	 {2009-10-06},
-  annote = 	 {The 16th edition of the Manual provides examples for
-                  citing scientific databases (14.272).  Its
-                  suggestions there don't fit any of the
-                  biblatex-chicago (or biblatex) entry types well, but
-                  this simple Misc entry at least gives all the
-                  relevant information, if not in the appropriate
-                  format.}
+  url = 	 {http://ned.ipac.caltech.edu},
+  urldate = 	 {2016-04-06},
+  annote = 	 {The 17th edition of the Manual provides examples for
+                  citing scientific databases, and the Dataset type
+                  supplies a way of complying with its
+                  specifications. The author field holds the name of
+                  the database, and the title holds the specific piece
+                  of data you are citing. See genbank:db for how you
+                  can further identify the part of the database in
+                  which you are interested. The url and urldate locate
+                  the database and inform the reader when you accessed
+                  it.}
 }
 
 @Unpublished{nass:address,
   author = 	 {Nass, Clifford},
   title = 	 {Why Researchers Treat On-Line Journals Like Real People},
-  note = 	 {keynote address, annual meeting of the Council of
-                  Science Editors},
+  note = 	 {keynote address},
+  eventtitle =   {annual meeting of the Council of Science Editors},
   location = 	 {San Antonio, TX},
-  date = 	 {2000-05-06/2000-05-09},
+  eventdate = 	 {2000-05-06/2000-05-09},
   annote = 	 {An \textsf{Unpublished} entry, presenting an
                   unpublished piece that isn't part of a formal
-                  archive.  The \textsf{note} field provides the
-                  details of what sort of piece it is, and whence it
-                  came, and it begins with a lowercase letter, so that
+                  archive. The \textsf{note} field provides the
+                  details of what sort of piece it is, while the
+                  \textsf{eventtitle} and \textsf{eventdate} tell
+                  where and when it appeared. The \textsf{note} field
+                  begins with a lowercase letter, so that
                   \textsf{biblatex-chicago} can automatically
                   capitalize it when the context demands.}
 }
@@ -1998,15 +2307,40 @@
   publisher =	 {National Photographic Interpretation Center},
   addendum =	 {now declassified and also available online},
   location = 	 {Washington, DC},
-  url =
-                  {http://www.fas.org/spp/military/program/imint/kh-4%20camera%20system.htm},
+  url = {http://www.fas.org/spp/military/program/imint/kh-4%20camera%20system.htm},
   annote = 	 {A technical manual presented in a Book entry. The
                   addendum gives extra details, and there's a url for
-                  easier access.  Note initial lowercase letter in
+                  easier access. Note initial lowercase letter in
                   addendum, and corporate author with extra curly
                   braces.}
 }
 
+@Standard{niso:bibref,
+  title = 	 {Bibliographic References},
+  organization = {National Information Standards Organization},
+  userd = 	 {approved},
+  howpublished = {reaffirmed},
+  eventdate =    {2010-05-13},
+  date = 	 {2005-06-09},
+  series = 	 {ANSI/NISO},
+  number =       {Z39.29-2005},
+  publisher =    {NISO},
+  location =     {Bethesda, MD},
+  annote =       {The 17th edition has added some information to
+                  entries presenting national or international
+                  standards, so \textsf{biblatex-chicago} now has a
+                  separate entry type for them. Here you can see two
+                  dates, one when first approved (\textsf{date}) and
+                  another when reaffirmed (\textsf{eventdate}). Each
+                  of these dates has a field for informing readers
+                  just what sort of date it is, \textsf{userd} and
+                  \textsf{howpublished}, respectively.  The
+                  \textsf{series} and \textsf{number} fields identify
+                  the standard, while the organization responsible for
+                  the standard appears in the \textsf{organization}
+                  field, and also, in shortened form if you wish it,
+                  in the \textsf{publisher} field. Cf.\ w3c:xml.}}
+
 @Review{nyt:obittrevor,
   author = 	 {defined},
   title = 	 {obituary of Claire Trevor},
@@ -2017,8 +2351,8 @@
   date = 	 {2000-04-10},
   sortkey = 	 {Obituary},
   annote = 	 {First of two alternative ways to present an obituary
-                  in a newspaper, both using the Review entry type
-                  (entrysubtype "magazine"), because there is no
+                  in a newspaper, both using the Review entry type and
+                  entrysubtype "magazine", because there is no
                   specific title, only the generic "obituary of"... In
                   this first one, the title heads the entry throughout
                   notes and bibliography, so the author needs to be
@@ -2026,96 +2360,76 @@
                   appearing there. Then, useauthor=false in the
                   options field means that however you've defined the
                   author it won't appear in the output, leaving the
-                  title at the head of the entry.  The title begins
+                  title at the head of the entry. The title begins
                   with a lowercase letter, allowing biblatex to
                   capitalize when needed. Note the pages field, with
-                  the edition specified.  If you are using Biber in
-                  the 16th edition, you'll need a sortkey to
-                  alphabetize by title rather than journaltitle.
-                  Cf. next entry.}
+                  the edition specified. If you are using Biber you'll
+                  need a sortkey to alphabetize by title rather than
+                  journaltitle. Cf. next entry.}
 }
 
 @Review{nyt:trevorobit,
   journaltitle = {New York Times},
   entrysubtype = {magazine},
   date = 	 {2000-04-10},
-  title = {obituary of Claire Trevor},
+  title =        {obituary of Claire Trevor},
   pages = 	 {national edition},
-  sortkey = 	 {New York Times},
-  annote = 	 {The second, standard 16th-edition way to present an
-                  obituary in a Review entry (entrysubtype
-                  "magazine"). Here, without an author, the
-                  journaltitle will head the entry in short notes and
-                  bibliography, while the title will head the long
-                  note.  Once again, the title begins with a lowercase
-                  letter.  When using Biber with the 16th-edition
-                  style the sortkey field is no longer needed to
-                  alphabetize by journaltitle.}
+  annote = 	 {The second, standard way to present an obituary in a
+                  Review entry (entrysubtype "magazine"). Here,
+                  without an author, the journaltitle will head the
+                  entry in short notes and bibliography, while the
+                  title will head the long note. Once again, the title
+                  begins with a lowercase letter. When using Biber the
+                  sortkey field is no longer needed to alphabetize by
+                  journaltitle.}
 }
 
 @Music{nytrumpet:art,
   title = 	 {Art of the Trumpet},
   date = 	 1982,
   origdate = 	 {1981-06-01/1981-06-02},
-  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
+  author = 	 {{New York Trumpet Ensemble, with Edward Carroll
                   (trumpet) and Edward Brewer (organ)}},
   shortauthor =  {{New York Trumpet Ensemble}},
   number = 	 {PVT 7183},
   series = 	 {Vox/Turnabout},
   userd = 	 {recorded at the Madeira Festival,},
-  sortkey = 	 {New York Trumpet},
-  type = 	 {compact disc},
-  annote = 	 {16th edition only This entry is a good example of
-                  the changes between the 15th and 16th editions of
-                  the Manual in Music entries.  The title, date,
-                  author, shortauthor, number, series, sortkey, and
-                  type fields haven't changed.  You can, thankfully,
-                  eliminate the howpublished field with its copyright
-                  specifications, and you can now specify the
-                  recording date of the album, which goes in the
-                  origdate field.  The new userd field acts as a sort
-                  of date type field.  In this example, the origdate
-                  would by default be preceded by the bibstring
-                  "recorded," but the userd field allows you to
-                  provide your own here.}
-}
-
-@Music{nytrumpet:art:15,
-  title = 	 {Art of the Trumpet},
-  date = 	 1982,
-  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
-                  (trumpet) and Edward Brewer (organ)}},
-  shortauthor =  {{New York Trumpet Ensemble}},
-  number = 	 {PVT 7183},
-  series = 	 {Vox/Turnabout},
-  publisher =    {The Moss Music Group},
-  howpublished = {\texttt{\small\textcircledP}\ and
-                  \texttt{\small\textcopyright}},
-  sortkey = 	 {New York Trumpet},
   type = 	 {compact disc},
-  annote = 	 {This can be considered an example of a satisfyingly
-                  full Music entry for the 15th edition only,
-                  providing nearly all pertinent information, although
-                  the composers are missing on what is presumably a
-                  compilation CD.  The performers take the composers'
-                  place in the author field, the series and number
-                  field give the label information, and the type field
-                  gives the medium.  The publisher of the label is
-                  also present, along with the date and the
-                  howpublished field, presenting, as the Manual
-                  suggests, the nature of the copyrights asserted by
-                  the publisher.  (The pubstate field, only in this
-                  entry type, could serve as a synonym for
-                  howpublished.)}
+  annote = 	 {A Music entry with multiple dates; the date field
+                  gives the date of the CD release and the origdate
+                  the recording date of the album. The userd field
+                  acts as a sort of date type field. In this example,
+                  the origdate would by default be preceded by the
+                  bibstring "recorded," but the userd field allows you
+                  to provide more detail here.}
+}
+
+@Online{obrien:recycle,
+  author = 	 {O'Brien, Conan},
+  title = 	 {In honor of Earth Day, I'm recycling my tweets},
+  nameaddon = 	 {(@ConanOBrien)},
+  shorttitle = 	 {In honor of Earth Day},
+  date = 	 {2015-04-22T11:10:00},
+  url = 	 {https://twitter.com/ConanOBrien/status/590940792967016448},
+  organization = {Twitter},
+  annote = 	 {17th-edition citations of social media follow a
+                  template like this. Note the date field with a time
+                  stamp, in case that sort of precision might be
+                  important. The author's screen name can go in the
+                  nameaddon field, though that field can hold other
+                  sorts of information. Cf. viv:amlen.}
 }
 
 @InReference{oed:cdrom,
   title = 	 {Oxford English Dictionary},
-  publisher = oup,
+  publisher =    oup,
   edition = 	 2,
-  note = 	 {CD-ROM, version 2.0},
+  date = 	 {2009},
+  note = 	 {CD-ROM, version 4.0},
   annote = 	 {An example of a reference work on CD-ROM, presented
-                  in an InReference entry.}
+                  in an InReference entry. The 17th edition prefers
+                  that you provide a date when citing a physical
+                  format, which apparently includes CD-Rom.}
 }
 
 @Article{osborne:poison,
@@ -2127,7 +2441,7 @@
   titleaddon =	 {\bibstring{reviewof} \mkbibemph{The Collaborator:
                   The Trial and Execution of Robert Brasillach},
                   \bibstring{by} Alice Kaplan},
-  url =      {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
+  url =          {http://www.salon.com/books/it/2000/03/29/kaplan/index.html},
   urldate =	 {2001-07-10},
   annote = 	 {A review from a magazine, but with both specific
                   (title field) and generic (titleaddon field) titles,
@@ -2178,9 +2492,9 @@
                   instance, detect that it is a \bibstring and treat
                   it accordingly. This functionality isn't widespread,
                   so you shouldn't always count on it being present
-                  elsewhere.  Note also the sentence-style
-                  capitalization in the title, which is newly
-                  recommended in the 16th edition.}
+                  elsewhere. Note also the sentence-style
+                  capitalization in the title, which is recommended in
+                  recent editions.}
 }
 
 @InBook{phibbs:diary,
@@ -2227,10 +2541,10 @@
   editor = 	 {Burnet, J.},
   booktitle = 	 {Clitophon, Republic, Timaeus, Critias},
   maintitle = 	 {Opera},
-  publisher = {Clarendon Press},
-  series = {Oxford Classical Texts},
+  publisher =    {Clarendon Press},
+  series =       {Oxford Classical Texts},
   pages = 	 {327--621},
-  location =  {Oxford},
+  location =     {Oxford},
   annote = 	 {A work from antiquity, which will be cited by the
                   traditional divisions of Stephanus' edition, and
                   which therefore requires the \texttt{classical}
@@ -2240,6 +2554,70 @@
                   sorts of title, plus a \textsf{series} to boot.}
 }
 
+@BookInBook{plato:timaeus:gr,
+  title = 	 {Timaeus},
+  date = 	 1902,
+  related = 	 {plato:total},
+  relatedtype =  {maintitle},
+  pages = 	 {17--105},
+  author = 	 {Plato},
+  entrysubtype = {classical},
+  annote =       {This, \cmslink{plato:tomeiv}, and
+                  \cmslink{plato:total} provide an example of how to
+                  cite a single work from within one volume of a
+                  multi-volume set when you want the multi-volume
+                  title (\textsf{MVBook title}) to appear before the
+                  title of the individual volume (\textsf{Book
+                  title}). A chain of three entries, connected by two
+                  \textsf{related} fields with \texttt{maintitle}
+                  \textsf{relatedtype}, means that when you cite
+                  \cmslink{plato:timaeus:gr} you create a single
+                  reference containing all the information in the
+                  proper order. \textsf{Biblatex-chicago}
+                  automatically sets the \texttt{related} option to
+                  \texttt{true} for this \textsf{relatedtype}, so
+                  you'll see all the relevant data both in notes and
+                  in the bibliography.}}
+
+@Book{plato:tomeiv,
+  title = 	 {Clitopho, Res Publica, Timaeus, Critias},
+  date = 	 1902,
+  maintitle = 	 {Opera},
+  volume = 	 4,
+  author = 	 {Plato},
+  editor = 	 {Burnet, J.},
+  publisher =    {Clarendon Press},
+  location =     {Oxford},
+  annote =       {See \cmslink{plato:total} and
+                  \cmslink{plato:timaeus:gr}.}}
+
+@MVBook{plato:total,
+  author = 	 {Plato},
+  title = 	 {Opera},
+  year = 	 1902,
+  related = 	 {plato:tomeiv},
+  editor = 	 {Burnet, J.},
+  relatedtype =  {maintitle},
+  volumes = 	 5,
+  options = 	 {hidevolumes=false},
+  series = 	 {Oxford Classical Texts},
+  publisher =    {Clarendon Press},
+  location =     {Oxford},
+  annote =       {This may look like a multi-volume book but in truth,
+                  because of the \texttt{maintitle}
+                  \textsf{relatedtype}, citing it actually cites one
+                  volume of it, the one represented by
+                  \cmslink{plato:tomeiv} in the \textsf{related}
+                  field. This indirectness allows you to present such
+                  a citation using the maintitle-first syntax
+                  envisaged by the \emph{Manual}. The
+                  \cmslink{plato:timaeus:gr} entry cites one part of
+                  this volume using the same syntax. The
+                  \texttt{hidevolumes=false} setting in the
+                  \textsf{options} field means that citations will
+                  include the total number of \textsf{volumes} as well
+                  as the specific \textsf{volume} number.}}
+
 @SuppBook{polakow:afterw,
   author =	 {Polakow, Valerie},
   title =	 {Lives on the Edge},
@@ -2254,19 +2632,19 @@
                   \textsf{Review} type, in that it covers texts with
                   generic titles instead of specific ones, only the
                   text, as here, is contained not in a journal but in
-                  a \textsf{Book}.  In its current state, the
+                  a \textsf{Book}. In its current state, the
                   \textsf{SuppBook} type in \textsf{biblatex-chicago}
                   is a little anomolous with respect to general
-                  \textsf{biblatex} usage.  This will evolve in future
+                  \textsf{biblatex} usage. This will evolve in future
                   releases, but for now, in order to cite, for
                   example, an afterword written by the main author of
                   the book, you need only put something in the
                   \textsf{afterword} field (and not define a
                   \textsf{foreword} or \textsf{introduction} field) to
                   make the otherwise \textsf{Book}-like reference
-                  work.  The 16th edition of the \emph{CMS}
-                  requires, for the entry in the bibliography, a
-                  \textsf{pages} range for the part being cited.}
+                  work. Recent editions of the \emph{CMS} require, for
+                  the entry in the bibliography, a \textsf{pages}
+                  range for the part being cited.}
 }
 
 @Online{pollan:plant,
@@ -2278,39 +2656,29 @@
   urldate = 	 {2008-02},
   userd = 	 {posted},
   annote = 	 {An online video, presented in an \textsf{Online}
-                  entry.  Note the \textsf{userd} field to modify the
+                  entry. Note the \textsf{userd} field to modify the
                   string printed before the \textsf{urldate}, and also
                   the \textsf{titleaddon} in place of a \textsf{date}
                   field, in case you want that information in closer
-                  association with the \textsf{title}.
-                  Cf. \texttt{harwood:biden},
-                  \texttt{horowitz:youtube}.}
+                  association with the \textsf{title}. Cf.\
+                  \texttt{harwood:biden}, \texttt{horowitz:youtube}.}
 }
 
 @Online{powell:email,
   author = 	 {Powell, John},
   date = 	 {1998-04-23},
-  titleaddon = {e-mail to Grapevine mailing list},
-  url =        {http://www.electriceditors.net/grapevine/issues/83.txt},
-  shorttitle =  {\autocap{e}-mail to Grapevine mailing list},
-  annote = 	 {An \textsf{Online} entry without a specific title,
-                  hence with no \textsf{title} field, only a
-                  \textsf{titleaddon}.  Note the initial lowercase
-                  letter in the \textsf{titleaddon}, and the
-                  \cmd{autocap} macro in the \textsf{shorttitle},
-                  because the \textsf{Online} type doesn't automate
-                  capitalization in \textsf{title} or
-                  \textsf{shorttitle}, while it does in
-                  \textsf{titleaddon}.  Note also the absence of any
-                  \textsf{organization} or owner of the site as
-                  whole.}
+  titleaddon =   {Grapevine digest mailing list archives},
+  organization = {Electric Editors},
+  title = 	 {Pattern Matching},
+  url =          {http://www.electriceditors.net/grapevine/archives.php},
+  annote = 	 {A fairly standard \textsf{Online} entry with a
+                  \textsf{title} and a \textsf{titleaddon}, the latter
+                  giving somewhat more specific locating information
+                  than the \textsf{organization} field.}
 }
 
 @Collection{prairie:state,
-  booktitle =	 {Prairie State},
   title =	 {Prairie State},
-  booksubtitle = {Impressions of Illinois, 1673--1967, by Travelers
-                  and Other Observers},
   subtitle =	 {Impressions of Illinois, 1673--1967, by Travelers
                   and Other Observers},
   year =	 1968,
@@ -2319,10 +2687,10 @@
   location =	 {Chicago},
   annote = 	 {A \textsf{Collection} entry, the one that has been
                   cross-referenced by two other entries in this
-                  bibliography.  Note the \textsf{editor} instead of
-                  an \textsf{author} in this entry type.  If more than
-                  one child cross-references the parent, the parent
-                  will be printed in the bibliography even if not
+                  bibliography. Note the \textsf{editor} instead of an
+                  \textsf{author} in this entry type. If more than one
+                  child cross-references the parent, the parent will
+                  be printed in the bibliography even if not
                   independently cited, though I have cited it here to
                   illustrate that, as far as \textsf{biblatex-chicago}
                   is concerned, this work has already been cited (by
@@ -2343,7 +2711,7 @@
   location =	 {New York},
   publisher =	 {Harcourt},
   annote = 	 {A SuppBook entry where an author provides an
-                  introduction to someone else's book.  That someone
+                  introduction to someone else's book. That someone
                   else goes in bookauthor. Instead of the mechanism
                   using a defined introduction field, here I use the
                   alternative of putting the type of supplemental
@@ -2351,9 +2719,20 @@
                   preposition, and starting with a lowercase
                   letter. Note that this method isn't portable across
                   languages, but it may help you to identify the less
-                  common types of supplements.  The 16th edition
-                  requires, for the entry in the list of references, a
-                  page range for the part being cited.}
+                  common types of supplements. Recent editions
+                  require, for the entry in the bibliography, a page
+                  range for the part being cited.}
+}
+
+@Online{quora:thread,
+  date = 	 {2016-08-09},
+  title = 	 {How did the \enquote{cool kids} from high school
+                  turn out?},
+  url = 	 {https://www.quora.com/How-did-the-cool-kids-from-high-school-turn-out/},
+  organization = {Quora},
+  annote = 	 {The 17th edition suggests such an entry for
+                  presenting the initial post to an online forum or
+                  mailing list. Replies might look like braun:reply.}
 }
 
 @Review{ratliff:review,
@@ -2372,20 +2751,20 @@
                   the \textsf{Article} type, but is designed to
                   present articles which have only a generic title
                   rather than a specific one, like the book review
-                  cited by this entry.  Note, first, the
+                  cited by this entry. Note, first, the
                   \cmd{bibstrings} in the \textsf{title} and
                   \textsf{shorttitle} --- using them isn't strictly
                   necessary, and you could also just write them out,
                   taking care to start each field with a lowercase
-                  letter to allow for contextual capitalization.  (The
-                  \cmd{bibstrings} make the entry portable
-                  \vadjust{\eject}across languages.)  Note, second,
-                  the formatting in both fields of the title of the
-                  book reviewed. Most especially note the use of
-                  \cmd{parteditandtrans}, which is necessary here to
-                  allow the editor and translator of the reviewed book
-                  to be identified by the correct (different) strings
-                  in notes and bibliography.}
+                  letter to allow for contextual capitalization. (The
+                  \cmd{bibstrings} make the entry portable across
+                  languages.) Note, second, the formatting in both
+                  fields of the title of the book reviewed. Most
+                  especially note the use of \cmd{parteditandtrans},
+                  which is necessary here to allow the editor and
+                  translator of the reviewed book to be identified by
+                  the correct (different) strings in notes and
+                  bibliography.}
 }
 
 @Article{reaves:rosen,
@@ -2395,25 +2774,45 @@
   date = 	 {2001-03-14},
   title = 	 {A Weighty Issue},
   subtitle = 	 {Ever-Fatter Kids},
-  titleaddon = {interview with James Rosen},
-  url =   {http://www.time.com/time/nation/article/0,8599,102443,00.html},
+  titleaddon =   {interview with James Rosen},
+  url =      {http://www.time.com/time/nation/article/0,8599,102443,00.html},
   annote = 	 {A magazine interview with its own, specific title,
                   therefore requiring an Article entry with "magazine"
                   entrysubtype. The generic title goes in titleaddon,
                   with a lowercase letter at the start. The author of
                   this article is different from the interviewee,
                   which suggests a certain flexibility in the Manual's
-                  requirements for such things.  The url field gives
+                  requirements for such things. The url field gives
                   the online location.}
 }
 
+@Music{rihanna:umbrella,
+  bookauthor = 	 {Rihanna},
+  booktitle =    {Good Girl Gone Bad},
+  title = 	 {Umbrella},
+  date = 	 2007,
+  chapter =      1,
+  howpublished = {Spotify},
+  publisher =    {Island Def Jam},
+  note = 	 {featuring Jay-Z},
+  annote =       {This Music entry illustrates two of the new fields
+                  available to you in this type. The chapter field
+                  gives the track number on an album, and the
+                  howpublished field gives the streaming service,
+                  though it could alternately contain the digital
+                  format for downloads. Putting the artist in
+                  bookauthor emphasizes the title of the track, which
+                  will appear first in notes and bibliography, the
+                  artist herself being associated with the album name
+                  instead.}}
+
 @Book{rodman:walk,
   title = 	 {Walk on the Wild Side},
   publisher = 	 {Delacorte Press},
   year = 	 1997,
   author = 	 {Rodman, Dennis},
   note = 	 {with Michael Silver},
-  location =  {New York},
+  location =     {New York},
   annote = 	 {A Book entry with a named ghostwriter, given in the
                   note field.}
 }
@@ -2422,14 +2821,18 @@
   author = 	 {Roosevelt, Eleanor},
   title = 	 {\mkbibquote{Is America Facing World Leadership?}},
   entrysubtype = {speech},
-  note = 	 {radio broadcast, Windows Media Audio, 47:46},
-  titleaddon = {convocation speech, Ball State Teacher's College},
-  url = 	 {http://libx.bsu.edu/cdm4/item_viewer.php?CISOROOT=/ElRoos&CISOPTR=0&CISOBOX=1&REC=2},
+  note = 	 {radio broadcast, reel-to-reel tape, MPEG copy, 1:12:49},
+  titleaddon =   {convocation speech},
+  venue =        {Ball State Teacher's College},
+  url = 	 {http://libx.bsu.edu/cdm/singleitem/collection/ElRoos/id/1},
+  origlocation = {Muncie, IN},
   date = 	 {1959-05-06},
   annote = 	 {Another speech from an online archive, presented in
                   a Misc entry with an entrysubtype, as it's somewhat
-                  like an unpublished letter.  Note the formatting of
-                  the title.  Cp. coolidge:speech, which uses the
+                  like an unpublished letter. Note the formatting of
+                  the title, and also the use of the venue and
+                  origlocation fields, which straddle the date in this
+                  entry type. Cp. coolidge:speech, which uses the
                   Online entry type -- it's primarily a question of
                   the placement of the date, either before or after
                   the note field.}
@@ -2457,7 +2860,7 @@
   number = 	 4,
   language = 	 {russian},
   pages = 	 {51--64},
-  shorttitle = {War of Liberation},
+  shorttitle =   {War of Liberation},
   annote = 	 {This is a Russian journal and while its journaltitle
                   is in transliterated Russian, its title is
                   translated into English, hence the original language
@@ -2468,28 +2871,29 @@
   title = 	 {The Chopin Collection},
   date = 	 1991,
   author = 	 {Rubinstein, Artur},
-  publisher = {RCA Victor/BMG},
+  publisher =    {RCA Victor/BMG},
   number = 	 {60822-2-RG},
   type = 	 {11 compact discs},
   origdate = 	 {1946/1967},
-  annote = 	 {16th edition only.  A Music entry giving the
-                  original recording dates of a later compilation.
-                  Cf. floyd:atom.}
+  annote = 	 {A Music entry giving the original recording dates of
+                  a later compilation. Cf. floyd:atom.}
 }
 
 @Article{saberhagen:beluga,
   author = 	 {Saberhagen, Kelvin},
   title = 	 {Lake Superior Beluga?},
   journaltitle = {Sturgeon Review},
-  date = 	 1928,
-  issue = 	 {Winter},
+  date = 	 {1928-24},
   pages = 	 {21--45},
   annote = 	 {This is an Article entry with no volume or number,
                   so the date becomes the indispensable identifying
-                  detail.  When printed, it will look rather like an
+                  detail. When printed, it will look rather like an
                   Article with "magazine" entrysubtype, but the
                   package provides this formatting with no manual
-                  intervention from the user.}
+                  intervention from the user. The date field uses an
+                  extended date specification to give both year and
+                  season, though of course the usual biblatex issue
+                  field is still available for the latter.}
 }
 
 @Book{schellinger:novel,
@@ -2498,7 +2902,7 @@
   year = 	 1998,
   editor = 	 {Schellinger, Paul and Hudson, Christopher and
                   Rijsberman, Marijk},
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {As this isn't one of the universally-known reference
                   works, its entry will have (in the absence of an
                   author) the editors at its head, hence the choice of
@@ -2514,23 +2918,20 @@
   maintitleaddon = {(for high voice)},
   options = 	 {ctitleaddon=space},
   author = 	 {Schubert, Franz},
-  publisher = {G.~Schirmer},
+  publisher =    {G.~Schirmer},
   address = 	 {New York},
-  annote = 	 {An Audio entry presenting a published musical score.
-                  Note the presence of all three sorts of title, and
-                  the "reverse italics" in the maintitle.},
   annote = 	 {The \textsf{Audio} entry type is the most
                   \enquote{book-like} of the three audio-visual entry
                   types, but does differ in several ways from an
                   ordinary \textsf{book}, and therefore requires a
-                  separate type.  This is a citation of a published
+                  separate type. This is a citation of a published
                   musical score, with the composer in the
-                  \textsf{author} field.  It cites one song
+                  \textsf{author} field. It cites one song
                   (\textsf{title}) from a cycle (\textsf{booktitle}),
                   while the \textsf{maintitle} in this instance refers
                   to the \textsf{publisher's} collection of the
-                  composer's works.  The \textsf{options} field
-                  changes the punctuation to \cmd{addspace} before the
+                  composer's works. The \textsf{options} field changes
+                  the punctuation to \cmd{addspace} before the
                   parenthesized \textsf{maintitleaddon}.}
 }
 
@@ -2543,15 +2944,15 @@
   origlocation = {London},
   origpublisher = {Breitkopf \&\ Härtel},
   translator = 	 {Newman, Ernest},
-  publisher = {Dover},
+  publisher =    {Dover},
   pubstate = 	 {reprint},
-  location =  {New York},
+  location =     {New York},
   annote = 	 {A reprinted Book, hence the string "reprint" in the
                   pubstate field, and the original date of publication
-                  in the origdate field.  In the 16th edition, the new
-                  origlocation and origpublisher fields allow you to
-                  present further information about the original
-                  edition, if you should so wish.}
+                  in the origdate field. The origlocation and
+                  origpublisher fields allow you to present further
+                  information about the original edition, if you
+                  should so wish.}
 }
 
 @Book{sechzer:women,
@@ -2571,8 +2972,8 @@
   subtitle = 	 {Why Children Kill; The Story of Mary Bell},
   year = 	 1999,
   author = 	 {Sereny, Gitta},
-  publisher = {Metropolitan Books and Henry Holt},
-  location =  {New York},
+  publisher =    {Metropolitan Books and Henry Holt},
+  location =     {New York},
   annote = 	 {A Book with two subtitles, the second separated by a
                   semicolon, according to the spec.}
 }
@@ -2586,10 +2987,10 @@
   pages =	 {412--415},
   series =	 2,
   annote = 	 {A letter presented as an article in a scholarly
-                  journal, hence the Article entry.  You can use the
-                  \headlessfullcite and/or \headlesscite commands to
-                  avoid the awkward repetition of the author's name in
-                  notes.  Note plain number in series field of an
+                  journal, hence the Article entry. You can use the
+                  headlessfullcite or headlesscite commands to avoid
+                  the awkward repetition of the author's name in
+                  notes. Note plain number in series field of an
                   Article entry.}
 }
 
@@ -2604,7 +3005,7 @@
   institution =  {University of Chicago},
   annote = 	 {An example of an unpublished musical score,
                   presented in a Misc (with entrysubtype) rather than
-                  an Audio entry.  The title, being more specific than
+                  an Audio entry. The title, being more specific than
                   many archival documents, is manually given quotation
                   marks, as may at times be necessary in such
                   entries.}
@@ -2615,7 +3016,7 @@
   publisher = 	 uchp,
   year = 	 1974,
   translator = 	 {Silverstein, Theodore},
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {Here, neither author nor editor are available, so
                   the Book entry will start with the translator.}
 }
@@ -2630,7 +3031,7 @@
   publisher =	 {UTCS Neural Networks Research Group},
   year =	 1996,
   editor =	 {Sirosh, J. and Miikkulainen, R. and Choe, Y.},
-  url =     {http://www.cs.utexas.edu/users/nn/web-pubs/htmlbook96/},
+  url =          {http://www.cs.utexas.edu/users/nn/web-pubs/htmlbook96/},
   urldate =	 {2001-08-27},
   location =	 {Austin, TX},
   shorttitle =	 {Self-Organization},
@@ -2644,11 +3045,27 @@
   publisher = 	 {Philip Wilson},
   year = 	 1999,
   editor = 	 {Soltes, Ori Z.},
-  location =  {London},
+  location =     {London},
   annote = 	 {A Book entry without an author, hence with the
                   editor at the head of citations.}
 }
 
+@Online{souza:obama,
+  author = 	 {Souza, Pete},
+  title = 	 {President Obama bids farewell to President Xi of
+                  China at the conclusion of the Nuclear Security
+                  Summit},
+  date = 	 {2016-04-01},
+  shorttitle = 	 {President Obama},
+  nameaddon = 	 {(@petesouza)},
+  url = 	 {https://www.instagram.com/p/BDrmfXTtNCt/},
+  organization = {Instagram photo},
+  annote = 	 {A 17th-edition social media citation, presented as
+                  an \textsf{Online} entry even though the actual
+                  material of the citation is a photograph. Note the
+                  \textsf{nameaddon} field for the screen name.}
+}
+
 @Misc{spock:interview,
   author = 	 {Spock, Benjamin},
   entrysubtype = {letter},
@@ -2657,8 +3074,8 @@
   note = 	 {interview 67A, transcript},
   organization = {Senn Oral History Collection},
   institution =  {National Library of Medicine},
-  location =  {Bethesda, MD},
-  shorttitle = {interview},
+  location =     {Bethesda, MD},
+  shorttitle =   {interview},
   annote = 	 {An unpublished interview from an archive, hence
                   requiring the Misc entry type with an
                   entrysubtype. The interview is dated, but is not
@@ -2672,29 +3089,43 @@
                   shorttitle.}
 }
 
-@Article{stenger:privacy,
-  journaltitle = {CNN.com},
-  entrysubtype = {magazine},
+@Online{stenger:privacy,
+  organization = {CNN.com},
   date = 	 {1999-12-20},
   author = 	 {Stenger, Richard},
   title = 	 {Tiny Human-Borne Monitoring Device Sparks Privacy Fears},
   url = 	 {http://www.cnn.com/1999/TECH/ptech/12/20/implant.device/},
-  shorttitle = {Tiny Human-Borne Monitoring Device},
+  shorttitle =   {Tiny Human-Borne Monitoring Device},
   annote = 	 {This is an intrinsically-online source, but is
-                  structured like a newspaper, so we use the
+                  structured like a newspaper, so in previous editions
+                  of the Manual it would have required an
                   \textsf{Article} entry type and \texttt{magazine}
-                  \textsf{entrysubtype}. The \emph{CMS} is specific
-                  about this, limiting the range of things you might
-                  put into an \textsf{Online} entry.}
+                  \textsf{entrysubtype}. For the 17th edition, at your
+                  discretion, such sources may be treated, as here,
+                  like a website rather than a newspaper, though the
+                  older style may be retained.}
+}
+
+@Article{stoffle:ghost,
+  author = 	 {Stoffle, Richard W. and others},
+  title = 	 {Ghost Dancing the Grand Canyon},
+  journaltitle = {Current Anthropology},
+  date = 	 2000,
+  volume = 	 41,
+  number = 	 1,
+  doi = 	 {10.1086/30010},
+  annote = 	 {This Article entry appears only as a related entry
+                  in naraya, which presents an online supplement (a
+                  song) to the Article.}
 }
 
 @Book{tillich:system,
   title = 	 {Systematic Theology},
-  year = 	 {1951--63},
+  date = 	 {1951/1963},
   author = 	 {Tillich, Paul},
-  publisher = uchp,
+  publisher =    uchp,
   volumes = 	 3,
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {A Book entry with 3 volumes published over time.
                   Any postnote fields in citation commands should
                   provide volume and page, like so: "2:157".}
@@ -2703,12 +3134,12 @@
 @InReference{times:guide,
   title = 	 {The Times Guide to English Style and Usage},
   edition = 	 {\bibstring{revisededition}},
-  lista = {police ranks and postal addresses},
-  keywords = {original},
+  lista =        {police ranks and postal addresses},
+  keywords =     {original},
   namec = 	 {Austin, Tim},
   year = 	 1999,
   publisher = 	 {Times Books},
-  location =  {London},
+  location =     {London},
   annote =       {An InReference entry, citing (lista) two different
                   alphabetized articles in a standard style guide, the
                   names of the two separated by "and." The keywords
@@ -2720,22 +3151,25 @@
                   with a lowercase letter and give the abbreviation
                   (rev. ed. in English) yourself. The subsequent short
                   note uses a plain postnote field to refer to one of
-                  the articles.}
+                  the articles. If this entry were to appear in the
+                  bibliography, it would need a sortkey to prevent it
+                  being sorted by the definite article at head of the
+                  title.}
 }
 
 @Audio{twain:audio,
   title = 	 {The Humor of Mark Twain},
   author = 	 {Twain, Mark},
   series = 	 {Commuters' Library},
-  publisher = {Entertainment Software},
+  publisher =    {Entertainment Software},
   type = 	 {6 cassettes},
   address = 	 {Arlington, TX},
   annote = 	 {An Audio entry presenting an audiobook, which means
                   the publishing information will be presented as it
-                  would be in the standard book-like entries.  The
+                  would be in the standard book-like entries. The
                   Manual sometimes presents this sort of material
                   somewhat differently, requiring a Music entry --
-                  cf. auden:reading.  Here, the type field gives the
+                  cf. auden:reading. Here, the type field gives the
                   medium.}
 }
 
@@ -2749,60 +3183,38 @@
   shorttitle = 	 {unsigned review of von Ranke},
   number =	 {23--24},
   annote = 	 {A rather unusual Review entry (entrysubtype
-                  "magazine"), without an author.  In the 16th edition
+                  "magazine"), without an author. In the 17th edition
                   specification we allow the journaltitle to come
                   first in the bibliography (and in short notes),
-                  while the title comes first in long notes.  When
-                  using Biber with the 16th edition, you don't need a
-                  sortkey here.  Note the formatting of the reviewed
-                  title in the title field.  The number field provides
-                  the consecutive numbers of the magazine in which the
-                  review appeared, and the style automatically
-                  provides the correct (plural) bibstring.}
-}
-
-@Review{unsigned:ranke:15,
-  journaltitle = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
-  entrysubtype = {magazine},
-  sortkey = 	 {Unsigned review},
-  date = 	 {1828-02},
-  author =	 {defined},
-  title =	 {unsigned \bibstring{reviewof} \mkbibemph{Geschichten
-                  der romanischen und germanischen Völker},
-                  \bibstring{by} Leopold von Ranke},
-  options = 	 {useauthor=false},
-  number =	 {23--24},
-  shorttitle =	 {unsigned \bibstring{reviewof} von Ranke},
-  annote = 	 {A rather unusual Review entry (entrysubtype
-                  "magazine"), without an author.  For the 15th
-                  edition specification, defining the author keeps the
-                  journaltitle from appearing first, and the options
-                  field prevents this placeholder appearing in the
-                  output, leaving the title at the head of the
-                  entry. Note the lowercase letters beginning both
-                  title and shorttitle. The number field refers to the
-                  consecutive numbers of the magazine in which the
-                  review appeared, and the style automatically
-                  provides the correct (plural) bibstring.}
+                  while the title comes first in long notes. When
+                  using Biber you don't need a sortkey here. Note the
+                  formatting of the reviewed title in the title
+                  field. The number field provides the consecutive
+                  numbers of the magazine in which the review
+                  appeared, and the style automatically provides the
+                  correct (plural) bibstring.}
 }
 
 @Audio{verdi:corsaro,
   title = 	 {Il corsaro (melodramma tragico \mkbibemph{in three acts})},
-  titleaddon = 	 {libretto by Francesco Maria Piave},
+  editortype = 	 {libretto by},
+  editor =       {Piave, Francesco Maria},
   date = 	 1998,
   author = 	 {Verdi, Giuseppe},
   shorttitle = 	 {Il corsaro},
-  editor = 	 {Hudson, Elizabeth},
+  editora = 	 {Hudson, Elizabeth},
   number = 	 {\bibstring{jourser} 1, Operas},
   series = 	 {The Works of Giuseppe Verdi},
-  publisher = {University of Chicago Press; Milan: G.\ Ricordi},
+  publisher =    {University of Chicago Press; Milan: G.\ Ricordi},
   volumes = 	 2,
   address = 	 {Chicago},
   annote = 	 {An Audio entry presenting a published operatic
-                  score.  Note the "reverse italics" in the title, and
-                  also the titleaddon, which identifies the
-                  librettist.  Note also the two publishers, and two
-                  places of publication.}
+                  score. Note the "reverse italics" in the title, and
+                  also the distribution of roles between an editor
+                  (with an editortype to identify the librettist) and
+                  an editora. Note also the two publishers, and two
+                  places of publication, though you can only just
+                  choose the nearest one if that is more convenient.}
 }
 
 @Book{virginia:plantation,
@@ -2820,22 +3232,56 @@
                   alphabetize it under True rather than A.}
 }
 
+@Review{viv:amlen,
+  author = 	 {Viv},
+  entrysubtype = {magazine},
+  title = 	 {comment on Amlen, \mkbibquote{Hoot}},
+  nameaddon = 	 {(Jerusalem, Isr.)},
+  crossref = 	 {amlen:hoot},
+  eventdate = 	 {2015-01-27},
+  annote =       {An example of a blog comment presented without the
+                  "commenton" relatedtype. Here the crossref to the
+                  main blog and special formatting in the title field
+                  provide the necessary information. The nameaddon
+                  field here holds the commenter's location, but it
+                  can also hold, especially in social media posts, a
+                  screen name or similar. Cf. amlen:hoot and
+                  amlen:wordplay, and also cp. ellis:blog and
+                  ac:comment for an example of how to use the new
+                  commenton relatedtype in this context.}}
+
 @Review{wallraff:word,
   journaltitle = {Atlantic Monthly},
   entrysubtype = {magazine},
   date = 	 {2000-04},
   author = 	 {Wallraff, Barbara},
-  title = {Word Court},
-  shorttitle = {Word Court, April 2000},
+  title =        {Word Court},
+  shorttitle =   {Word Court, April 2000},
   annote = 	 {A regular column in a magazine, without an
                   individual title, hence the use of the Review entry
                   type, entrysubtype "magazine." The shorttitle is
                   rather complete here, just in case you refer to
                   another "Word Court" column from another date. An
-                  alternative would be to use \printdate in the
+                  alternative would be to use printdate in the
                   postnote field of a citation.}
 }
 
+@Standard{w3c:xml,
+  editor = 	 {Bray, Tim and Paoli, Jean and Sperberg-McQueen,
+                  C.~M\adddot and Maler, Eve and Yergeau, Fran\c{c}ois},
+  title = 	 {Extensible Markup Language \mkbibparens{XML} 1.0},
+  date = 	 {2008-11-26},
+  edition = 	 5,
+  organization = {Worldwide Web Consortium \mkbibparens{W3C}},
+  publisher =    {W3C},
+  url = 	 {http://www.w3.org/TR/2008/REC-xml-20081126/},
+  annote =       {A Standard entry showing one of the type's
+                  peculiarities, that is, the default placement of the
+                  title at the head of notes, and of the organization
+                  at the head of bibliography entries, both at the
+                  expense of either editors or compilers, should they
+                  be present. Cf. niso:bibref.}}
+
 @Article{warr:ellison,
   author = 	 {Warr, Mark and Ellison, Christopher~G.},
   title = 	 {Rethinking Social Reactions to Crime},
@@ -2859,7 +3305,7 @@
   number = 	 {\bibstring{volume} 1, \bibstring{number} 14},
   location =	 {New Orleans, LA},
   shorttitle =	 {Tentative Sequence of Pre-Classic Ceramics},
-  annote = 	 {A Book with a series and number.  The name of the
+  annote = 	 {A Book with a series and number. The name of the
                   series alone goes in series, the rest in number.}
 }
 
@@ -2870,18 +3316,18 @@
   relatedstring = {from},
   options = 	 {related=true},
   author = 	 {Weed, A.~E.},
-  publisher = {American Mutoscope {and} Biograph Company},
-  type = 	 {35~mm; 2 min., 19 sec.},
+  publisher =    {American Mutoscope {and} Biograph Company},
+  type = 	 {35~mm film; 2:19 at 15~fps},
   annote = 	 {This film from an online archive takes a Video
-                  entry.  Note the creator of the film in the author
-                  field, and the medium w/ running length in the type
-                  field.  The related field references another (Video)
-                  entry, containing information about the online
-                  location of the MPEG version of the original 35mm
-                  film.  The related=true option means that these two
-                  entries will be presented together in both notes and
-                  bibliography, as suggested by the Manual, 14.280.
-                  The relatedstring links the two entries.}
+                  entry. Note the creator of the film in the author
+                  field, and the medium with running length in the
+                  type field. The related field references another
+                  (Video) entry, containing information about the
+                  online location of the MPEG version of the original
+                  35mm film. The related=true option means that these
+                  two entries will be presented together in both notes
+                  and bibliography, as suggested by the Manual,
+                  14.267. The relatedstring links the two entries.}
 }
 
 @Book{weresz,
@@ -2890,8 +3336,8 @@
   usere = 	 {The end of the Three Emperors' League},
   publisher = 	 {PWN},
   year = 	 1977,
-  location =  {Warsaw},
-  shorttitle = {The End of the Three Emperors' League},
+  location =     {Warsaw},
+  shorttitle =   {The End of the Three Emperors' League},
   annote = 	 {A Book in Polish, with the title given in Polish
                   (though lacking diacritics) and with a translation
                   provided for us. The translation, in the usere
@@ -2913,29 +3359,27 @@
   author = 	 {White, E.~B.},
   title = 	 {EBW to Harold Ross},
   titleaddon = 	 {memorandum},
-  keywords = {original},
+  keywords =     {original},
   crossref = 	 {white:total},
   pages = 	 273,
   origdate = 	 {1946-05-02},
   shorthand = 	 {EBWMemo},
-  shorttitle = {to Ross},
+  shorttitle =   {to Ross},
   annote = 	 {This and the next two entries demonstrate how to use
                   cross-references in Letter entries.  When more than
                   one letter is cited, the published collection of
                   letters alone will be printed in the bibliography,
                   so we use the keywords field to stop this entry from
-                  appearing there.  Since Chicago's mechanism for
+                  appearing there. Since Chicago's mechanism for
                   shortened cross-references is by default operative
                   in Letter entries using crossref or xref (as in
                   InBook, InCollection, and InProceedings entries),
                   the first long citation to any letter in the
                   collection will present the parent's full data,
                   whereas subsequent long citations will abbreviate
-                  it. Due to changes in the code implementing this,
-                  the current entry needs a crossref field rather than
-                  an xref.  Note the usual Letter form of the title
-                  and shorttitle, the letter's date in origdate, and
-                  the descriptive term "memorandum" in the titleaddon,
+                  it. Note the usual Letter form of the title and
+                  shorttitle, the letter's date in origdate, and the
+                  descriptive term "memorandum" in the titleaddon,
                   with its initial lowercase letter. I've also
                   provided a shorthand field just to give a glimpse of
                   how it looks.}
@@ -2945,18 +3389,17 @@
   author = 	 {White, E.~B.},
   title = 	 {EBW to B.~Russell},
   keywords = 	 {original},
-  xref =  {white:total},
+  crossref =     {white:total},
   pages = 	 283,
   origdate = 	 {1947-07-02},
-  shorttitle = {to Russell},
+  shorttitle =   {to Russell},
   annote = 	 {This is a spurious entry I've just made up to show
                   the cross-referencing mechanism at work in Letter
-                  entries.  The long note form of this comes after
-                  that citing white:ross:memo, so it will be
-                  abbreviated by comparison. The usual Letter title,
-                  shorttitle, and origdate are present, and the
-                  keywords field will keep it from being printed in
-                  the bibliography.}
+                  entries. The long note form of this comes after that
+                  citing white:ross:memo, so it will be abbreviated by
+                  comparison. The usual Letter title, shorttitle, and
+                  origdate are present, and the keywords field will
+                  keep it from being printed in the bibliography.}
 }
 
 @Book{white:total,
@@ -2969,36 +3412,40 @@
   annote = 	 {The parent entry of the two preceding child entries.
                   Note that it is a Book entry, and will appear in the
                   bibliography if more than one child references it,
-                  even though it isn't cited itself.  You no longer
-                  need the \isdot macro in the shortauthor field to
-                  avoid awkward repetition of the author's name in the
-                  shortened form of the cross-reference in the second
-                  child's long note.  If you were to cite this book
-                  separately, however, then the \headlesscite commands
-                  would be necessary to avoid this repetition.}
+                  even though it isn't cited itself. If you were to
+                  cite this book separately then the headlesscite
+                  commands might be useful to avoid repetition of the
+                  author's name.}
 }
 
 @InReference{wikiped:bibtex,
   title = 	 {Wikipedia},
-  lista = {BibTeX},
-  keywords = {original},
+  lista =        {BibTeX},
+  entrysubtype = {online},
   url = 	 {http://en.wikipedia.org/wiki/BibTeX},
-  urldate = 	 {2011-09-03},
-  userd = 	 {last modified},
+  urldate = 	 {2019-11-15T20:59:00},
+  userd = 	 {last edited},
   annote = 	 {\textsf{InReference} entries are designed to allow
                   you to cite particular articles in an
-                  alphabetically-arranged reference work.  The
+                  alphabetically-arranged reference work. The
                   \textsf{lista} field holds the name of the article,
                   and for printed works you can use the standard
                   \textsf{postnote} field to make a single .bib entry
                   work for references to several different articles.
                   For an online work, you must have a \textsf{urldate}
-                  field, as such sources change rather rapidly, while
-                  the \textsf{userd} field allows you to identify
-                  which sort of date is at stake.  Ordinarily, such an
-                  entry need not be printed in the bibliography, only
-                  in notes, but here it will appear in both for the
-                  sake of example.}
+                  field, as such sources change rather rapidly, and in
+                  the case of heavily contested articles it could well
+                  be useful to also to include a time stamp in the
+                  same field, as here (though this isn't necessary at
+                  all for this article). The \textsf{userd} field
+                  allows you to identify which sort of date is at
+                  stake. Online works which haven't had any sort of
+                  printed existence can, at your discretion, have
+                  titles in plain roman (like an \textsf{Online}
+                  entry). Defining an \textsf{entrysubtype} field
+                  achieves this. Ordinarily, such an entry need not be
+                  printed in the bibliography, only in notes, but here
+                  it will appear in both for the sake of example.}
 }
 
 @InBook{will:cohere,
@@ -3008,9 +3455,9 @@
   booksubtitle = {Toward Clarity and Grace},
   bookauthor = 	 {Williams, Joseph~M.},
   pages = 	 {81--95},
-  publisher = uchp,
+  publisher =    uchp,
   year = 	 1990,
-  location =  {Chicago},
+  location =     {Chicago},
   annote = 	 {A chapter in a book that has a different authorship
                   from the book as a whole. In such a case, you can
                   use an InBook entry, with the author(s) of the
@@ -3020,7 +3467,15 @@
 
 @CustomC{york:creasey,
   author = 	 {York, Jeremy},
-  title = 	 {Creasey, John}
+  title = 	 {Creasey, John},
+  annote =       {This CustomC entry provides a cross-reference from
+                  the pseudonym in the author field to the real name
+                  in the title field, allowing your readers to find
+                  the cited work under the author's real name. The
+                  entry for that work, creasey:york:death, contains a
+                  userc field which refers to this entry, ensuring
+                  that this cross-reference will be printed if the
+                  main entry itself is cited.}
 }
 
 @Collection{zukowsky:chicago,
@@ -3035,4 +3490,3 @@
                   of an author. Note extra information in publisher
                   field.}
 }
-
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 8bb142ce521..2497d4df310 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,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.63 2018/01/10 17:37:15 dfussner Exp $
-
-% Copyright (c) 2009-2018 David Fussner.  This package is
+% Copyright (c) 2009-2020 David Fussner.  This package is
 % author-maintained.
 %
 % This work may be copied, distributed and/or modified under the
@@ -13,22 +11,27 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2018/01/10 v 3.10 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2020/04/20 v 3.14 biblatex style]
 
 \RequirePackage{etoolbox}
+\RequirePackage{nameref}
+\RequirePackage{xstring}
 
 \DeclareOption{authordate}{\def\cms@style{authordate}}
 \DeclareOption{notes}{\def\cms@style{notes}}
 \DeclareOption{authordate-trad}{\def\cms@style{authordatetrad}}
-\DeclareOption{authordate15}{\def\cms@style{authordateold}}
-\DeclareOption{notes15}{\def\cms@style{notesold}}
+\DeclareOption{authordate16}{\def\cms@style{authordateold}}
+\DeclareOption{notes16}{\def\cms@style{notesold}}
+\DeclareOption{authordate-trad16}{\def\cms@style{authordatetrold}}
 \DeclareOption*{\eappto\cms@options{\CurrentOption,}}
 \let\cms@options\empty
 \ExecuteOptions{notes}%
 
 \newtoggle{cms@nomark}
+\newtoggle{cms@urlbreak}
 
 \DeclareOption{footmarkoff}{\global\toggletrue{cms@nomark}}
+\DeclareOption{cmsbreakurl}{\global\toggletrue{cms@urlbreak}}
 
 \DeclareOption{natbib}{%
   \PassOptionsToPackage{natbib}{biblatex}}
@@ -53,8 +56,10 @@
 \def\cms@authordate{%
   \RequirePackage[style=chicago-authordate]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,
-    uniquename=minfull,useeditor=true,usetranslator=true,usenamec=true,
+    pagetracker=true,autocite=inline,alldates=comp,labeldateparts=true,
+    citetracker=true,uniquename=minfull,useeditor=true,usetranslator=true,
+    usenamec=true,alltimes=12h,urltime=24h,datecirca=true,datezeros=false,
+    dateuncertain=true,timezones=true,compressyears=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
     abbreviate=false,dateabbrev=false,avdate=true}}
@@ -66,32 +71,53 @@
     citetracker=true,ibidtracker=constrict,usetranslator=true,
     usenamec=true,loccittracker=constrict,dateabbrev=false,
     maxbibnames=10,minbibnames=7,sorting=cms,sortcase=false,
-    uniquework=true}}
+    labeltitle=true,alltimes=12h,urltime=24h,timezones=true,
+    datezeros=false,datecirca=true,dateuncertain=true,compressyears=true,
+    nodates=true}}
 
 \def\cms@authordatetrad{%
   \RequirePackage[style=chicago-authordate-trad]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,
-    uniquename=minfull,useeditor=true,usetranslator=true,usenamec=true,
+    pagetracker=true,autocite=inline,alldates=comp,labeldateparts=true,
+    citetracker=true,uniquename=minfull,useeditor=true,usetranslator=true,
+    usenamec=true,alltimes=12h,urltime=24h,datecirca=true,datezeros=false,
+    dateuncertain=true,timezones=true,compressyears=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
     abbreviate=false,dateabbrev=false,avdate=true}}
 
 \def\cms@authordateold{%
-  \RequirePackage[style=chicago-authordate15]{biblatex}%
+  \RequirePackage[style=chicago-authordate16]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,
-    uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
+    pagetracker=true,autocite=inline,alldates=comp,labeldateparts=true,
+    citetracker=true,uniquename=minfull,useeditor=true,usetranslator=true,
+    usenamec=true,alltimes=12h,urltime=24h,datecirca=true,datezeros=false,
+    dateuncertain=true,timezones=true,compressyears=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
-    uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false}}
+    uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
+    abbreviate=false,dateabbrev=false,avdate=true}}
 
 \def\cms@notesold{%
-  \RequirePackage[style=chicago-notes15]{biblatex}%
+  \RequirePackage[style=chicago-notes16]{biblatex}%
   \ExecuteBibliographyOptions{%
     pagetracker=true,autocite=footnote,abbreviate=false,alldates=comp,
     citetracker=true,ibidtracker=constrict,usetranslator=true,
-    usecompiler=true,loccittracker=constrict,dateabbrev=false,
-    maxbibnames=10,minbibnames=7}}
+    usenamec=true,loccittracker=constrict,dateabbrev=false,
+    maxbibnames=10,minbibnames=7,sorting=cms,sortcase=false,
+    labeltitle=true,alltimes=12h,urltime=24h,timezones=true,
+    datezeros=false,datecirca=true,dateuncertain=true,compressyears=true,
+    nodates=true}}
+
+\def\cms@authordatetrold{%
+  \RequirePackage[style=chicago-authordate-trad16]{biblatex}%
+  \ExecuteBibliographyOptions{%
+    pagetracker=true,autocite=inline,alldates=comp,labeldateparts=true,
+    citetracker=true,uniquename=minfull,useeditor=true,usetranslator=true,
+    usenamec=true,alltimes=12h,urltime=24h,datecirca=true,datezeros=false,
+    dateuncertain=true,timezones=true,compressyears=true,
+    ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
+    uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
+    abbreviate=false,dateabbrev=false,avdate=true}}
 
 \csuse{cms@\cms@style}
 \undef\cms@authordate
@@ -99,18 +125,65 @@
 \undef\cms@authordatetrad
 \undef\cms@authordateold
 \undef\cms@notesold
+\undef\cms@authordatetrold
 \expandafter\ExecuteBibliographyOptions\expandafter{\cms@options}
 
 \setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
 \setlength{\bibhang}{2em}
 \setlength{\lositemsep}{0.25\baselineskip plus 0.25\baselineskip}
 
+\urlstyle{rm}
 \setcounter{biburllcpenalty}{5000}
 \setcounter{biburlucpenalty}{9000}
 \setcounter{biburlnumpenalty}{9000}
+\setcounter{mincomprange}{100}%
+\setcounter{mincompwidth}{10}%
 
 \renewcommand*{\bibnamedash}{\rule[.4ex]{3em}{.6pt}}
 
+\iftoggle{cms@urlbreak}
+{\renewcommand*{\biburlsetup}{%
+    \Urlmuskip\biburlbigskip
+    \mathchardef\UrlBigBreakPenalty=\value{biburlbigbreakpenalty}\relax
+    \mathchardef\UrlBreakPenalty=\value{biburlbreakpenalty}\relax
+    \def\UrlBigBreaks{\do\:}%
+    \def\UrlBreaks{%
+      \do\@\do\\\do\!\do\|\do\;\do\>\do\]\do\)\do\}%
+    \do\'\do\+\do\=\do\$\do\&\do\*\do\^\do\"}%
+  \ifnumgreater{\value{biburlnumpenalty}}{0}
+  {\def\do##1{%
+      \appto\UrlSpecials{%
+        \do##1{%
+          \mathchar`##1
+          \mskip\biburlnumskip
+          \penalty\value{biburlnumpenalty}}}}%
+    \do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9\do\0}
+  {}%
+  \ifnumgreater{\value{biburlucpenalty}}{0}
+  {\def\do##1{%
+      \appto\UrlSpecials{%
+        \do##1{%
+          \mathchar`##1
+          \mskip\biburlucskip
+          \penalty\value{biburlucpenalty}}}}%
+    \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J
+    \do\K\do\L\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T
+    \do\U\do\V\do\W\do\X\do\Y\do\Z}
+  {}%
+  \ifnumgreater{\value{biburllcpenalty}}{0}
+  {\def\do##1{%
+      \appto\UrlSpecials{%
+        \do##1{%
+          \mathchar`##1
+          \mskip\biburllcskip
+          \penalty\value{biburllcpenalty}}}}%
+    \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j
+    \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t
+    \do\u\do\v\do\w\do\x\do\y\do\z}
+  {}%
+  \let\do=\noexpand}}%
+{}
+
 \iftoggle{cms@nomark}
 {}
 {\@ifclassloaded{memoir}%
@@ -141,6 +214,7 @@
 
 \DeclareLanguageMapping{brazilian}{cms-brazilian}
 \DeclareLanguageMapping{british}{cms-british}
+\DeclareLanguageMapping{dutch}{cms-dutch}
 \DeclareLanguageMapping{german}{cms-german}
 \DeclareLanguageMapping{french}{cms-french}
 \DeclareLanguageMapping{finnish}{cms-finnish}
@@ -152,4 +226,38 @@
 
 \ifundef\bbl@loaded{\let\bbl@loaded\@empty}{}% For old versions of babel
 
+\patchcmd{\blx@comprange@check}% Audrey Boruvka's code from StackExchange
+{\blx@comprange@comp{#1}{#2}}% Moved here from cbx
+{\blx@tempcnta=#1
+  \divide\blx@tempcnta100
+  \multiply\blx@tempcnta100
+  \ifnumequal{\blx@tempcnta}{#1}
+  {\blx@range@out@value{#1\bibrangedash#2}}
+  {\blx@comprange@comp{#1}{#2}}}
+{}{}%
+
+\newrobustcmd*{\suppressbibfield}[2][]{%
+  \ifblank{#1}%
+  {\ifblank{#2}%
+    {}%
+    {\DeclareSourcemap{
+        \maps[datatype=bibtex]{
+          \map{
+            \renewcommand*{\do}[1]{
+              \step[fieldset=##1, null]}\docsvlist{#2}}}}}}%
+  {\ifblank{#2}%
+    {\DeclareSourcemap{
+        \maps[datatype=bibtex]{
+          \map{
+            \renewcommand*{\do}[1]{%
+              \pertype{##1}}\docsvlist{#1}%
+            \step[entrynull]}}}}%
+    {\DeclareSourcemap{
+        \maps[datatype=bibtex]{
+          \map{
+            \renewcommand*{\do}[1]{%
+              \pertype{##1}}\docsvlist{#1}%
+            \renewcommand*{\do}[1]{%
+              \step[fieldset=##1, null]}\docsvlist{#2}}}}}}}
+
 \endinput
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 d48dec31cf1..9919887ea20 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,19 +1,23 @@
-% $Id: chicago-authordate-trad.cbx,v 0.9.1.4 2018/01/11 09:55:09 dfussner Exp $
+% This is a biblatex citation style file, originally 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 (trad) style of the Chicago Manual of Style, 17th
+% edition.
 
-% 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 (trad) style of the Chicago Manual of Style, 16th edition.
-
-\ProvidesFile{chicago-authordate-trad.cbx}[2018/01/11 v 3.10 biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2020/04/20 v 3.14 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
 
 %%%% Trad-only Option %%%%
 
-\DeclareBibliographyOption{headline}[true]{%
-  \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
+\providetoggle{cms@headline}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{headline}[true]{%
+  \settoggle{cms@headline}{#1}%
+  \iftoggle{cms@headline}%
+  {\renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}%
+  {}}
 
 %%%% Field Formats -- Title, Citetitle, Lostitle %%%%
 
@@ -26,33 +30,33 @@ citation style]
 \DeclareFieldFormat{subtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
 \DeclareFieldFormat
-[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
 {title}{%
   \iffieldundef{title}%
   {}%
   {\MakeSentenceCase*{#1}}}
 
 \DeclareFieldFormat
-[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
 {citetitle}{\MakeSentenceCase*{#1}}
 
 \DeclareFieldFormat
-[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
 {lostitle}{\MakeSentenceCase*{#1}}
 
 \DeclareFieldFormat
-[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
 {subtitle}{%
   \iffieldundef{subtitle}%
   {}%
   {\MakeSentenceCase*{#1}}}
 
-\DeclareFieldFormat[artwork,image]{title}{%
+\DeclareFieldFormat[artwork,image,inreference]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\MakeSentenceCase*{#1}\isdot}}
 
-\DeclareFieldFormat[artwork,image]{subtitle}{%
+\DeclareFieldFormat[artwork,image,inreference]{subtitle}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\MakeSentenceCase*{#1}\isdot}}
@@ -73,6 +77,10 @@ citation style]
 
 \DeclareFieldAlias[image]{lostitle}[artwork]{title}
 
+\DeclareFieldAlias[inreference]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[inreference]{lostitle}[artwork]{title}
+
 \DeclareFieldFormat[letter]{title}{#1\isdot}
 
 \DeclareFieldFormat[letter]{citetitle}{#1\isdot}
@@ -149,12 +157,31 @@ citation style]
 
 \DeclareFieldFormat{mainsubtitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
 
+\DeclareFieldFormat[article,periodical,review,suppperiodical]{maintitle}{%
+  \mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[article,periodical,review,suppperiodical]{mainsubtitle}{%
+  \mkbibemph{#1}\isdot}
+
 \DeclareFieldFormat[audio,music,video]{title}{%
-  \iffieldundef{booktitle}%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\MakeSentenceCase*{#1}\isdot}}
 
-\DeclareFieldAlias[video]{citetitle}[video]{title}
+\DeclareFieldFormat[video]{citetitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+      and
+      not test {\iffieldundef{title}}%
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+    {\MakeSentenceCase*{#1}\isdot}}}
 
 \DeclareFieldAlias[video]{lostitle}[video]{title}
 
@@ -255,6 +282,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibemph{\MakeSentenceCase*{#1}}}
@@ -268,6 +300,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \MakeSentenceCase*{#1}}
@@ -281,6 +318,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibemph{#1}}
@@ -294,6 +336,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1\addspace\bibstring{in}}
@@ -307,10 +354,33 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1}
 
+\DeclareFieldFormat{muschapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{track}}%
+  \endgroup
+  \bibstring{track}~#1}%
+
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
 \DeclareFieldFormat{jtnoformat}{#1}
@@ -325,15 +395,15 @@ citation style]
   {\iffieldundef{issuetitle}%
     {\iffieldundef{title}%
       {\iffieldundef{booktitle}%
-        {\iffieldundef{maintitle}%
-          {\iffieldundef{journaltitle}%
+        {\iffieldundef{journaltitle}%
+          {\iffieldundef{maintitle}%
             {}%
-            {\DeclareFieldAlias{jtnoformat}{jtitle:hook}%
-              \DeclareFieldAlias{sjtnoformat}{title}%
-              \DeclareFieldAlias{journaltitle}{default}%
-              \DeclareFieldAlias{shortjournal}{series}%
-              \DeclareFieldAlias{jtsnoformat}{jtitle:hook}}}%
-          {\DeclareFieldAlias{maintitle}{title:hook}}}%
+            {\DeclareFieldAlias{maintitle}{title:hook}}}%
+          {\DeclareFieldAlias{jtnoformat}{jtitle:hook}%
+            \DeclareFieldAlias{sjtnoformat}{title}%
+            \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{jtsnoformat}{jtitle:hook}}}%
         {\DeclareFieldAlias{booktitle}{title:hook}}}%
       {\DeclareFieldAlias{tnoformat}{jtitle:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
@@ -346,7 +416,9 @@ citation style]
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%
-      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\ifentrytype{music}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
       {\DeclareFieldAlias[video]{title}{title:hook}%
         \DeclareFieldAlias[audio]{title}{title:hook}%
         \DeclareFieldAlias[music]{title}{title:hook}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.bbx
new file mode 100644
index 00000000000..9b91b51d5ec
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.bbx
@@ -0,0 +1,5 @@
+\ProvidesFile{chicago-authordate-trad16.bbx}
+
+\RequireBibliographyStyle{chicago-authordate16}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx
new file mode 100644
index 00000000000..a090b604eb8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx
@@ -0,0 +1,378 @@
+% 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 (trad) style of the Chicago Manual of Style, 16th edition.
+
+\ProvidesFile{chicago-authordate-trad16.cbx}[2020/04/20 v 3.14 biblatex
+citation style]
+
+\RequireCitationStyle{chicago-dates-common16}
+
+%%%% Trad-only Option %%%%
+
+\DeclareBibliographyOption{headline}[true]{%
+  \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
+
+%%%% Field Formats -- Title, Citetitle, Lostitle %%%%
+
+\DeclareFieldFormat{title}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat{citetitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat{subtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{citetitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{lostitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{subtitle}{%
+  \iffieldundef{subtitle}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[artwork,image]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldFormat[artwork,image]{subtitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[artwork]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{subtitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldAlias[image]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[image]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[letter]{title}{#1\isdot}
+
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[letter]{subtitle}{#1\isdot}
+
+\DeclareFieldFormat[suppbook,suppcollection]{title}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat[suppbook,suppcollection]{subtitle}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[misc]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldAlias[misc]{citetitle}[misc]{title}
+
+\DeclareFieldAlias[misc]{lostitle}[misc]{title}
+
+\DeclareFieldFormat[misc]{subtitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase{#1}}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}}
+
+\DeclareFieldFormat[review,suppperiodical]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}%
+  {#1\isdot}}
+
+\DeclareFieldAlias[review]{lostitle}[review]{title}
+
+\DeclareFieldAlias[review]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{lostitle}[review]{title}
+
+\DeclareFieldFormat[review,suppperiodical]{subtitle}{%
+  \ifcapital{\MakeCapital{#1\isdot}}%
+  {#1\isdot}}
+
+\DeclareFieldFormat{booktitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{booksubtitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{mainsubtitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[audio,music,video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[video]{citetitle}[video]{title}
+
+\DeclareFieldAlias[video]{lostitle}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[video]{title}
+
+\DeclareFieldAlias[music]{lostitle}[video]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[video]{title}
+
+\DeclareFieldAlias[audio]{lostitle}[video]{title}
+
+\DeclareFieldFormat[audio,music,video]{subtitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldFormat{issuetitle}{\MakeSentenceCase*{#1\isdot}}
+
+\DeclareFieldFormat{issuesubtitle}{\MakeSentenceCase*{#1\isdot}}
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{video+title}{%
+  \iffieldundef{title}%
+  {}%
+  {\printtext{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[subtitle]{subtitle}}}}
+
+\newbibmacro*{italtitle+stitle}{%
+  \printtext{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[subtitle]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\newbibmacro*{mag+news+title}{%
+  \printtext{%
+       \printfield{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[subtitle]{subtitle}}%
+     \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
+     \ifboolexpr{%
+       togl {cms@related}%
+       and
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
+     }%\newcunit\newblock
+
+\newbibmacro*{issuetitle}{%
+  \iffieldundef{issuetitle}%
+  {}%
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
+    {\usebibmacro{cms-in:}}% periodical entries
+    {}%
+    \printtext{%
+      \printfield{issuetitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[issuesubtitle]{issuesubtitle}}}}
+
+%%%% Related macros that can't reside in common.cbx %%%%
+
+\newbibmacro*{related:reviewof}[1]{%
+  \entrydata*{#1}{%
+    \let\newunit\newcunit% FIXME??
+    \iffieldundef{title}%
+    {}%
+    {\printtext{%
+        \printfield{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[subtitle]{subtitle}}}%
+    \newcunit%
+    \ifnameundef{author}%
+    {\newcunit%
+      \usebibmacro{byeditor+others}}%
+    {\bibstring{by}\addspace%
+      \printnames[byauthor]{author}%
+      \newcunit\usebibmacro{byeditor+others}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}}}
+
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat{jtitle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1\addspace\bibstring{in}}
+
+\DeclareFieldFormat{avchapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1}
+
+\DeclareFieldFormat{sjtnoformat}{#1}
+\DeclareFieldFormat{stnoformat}{#1}
+\DeclareFieldFormat{jtnoformat}{#1}
+\DeclareFieldFormat{jtsnoformat}{#1}
+\DeclareFieldFormat{tnoformat}{#1}
+
+\newbibmacro*{cms:titlehook}{% Needed for the full drivers in reprintfrom
+  \ifthenelse{\iffieldundef{chapter}\OR\NOT\(\ifentrytype{audio}\OR%
+    \ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+    \ifentrytype{inproceedings}\OR\ifentrytype{letter}\OR%
+    \ifentrytype{music}\OR\ifentrytype{video}\)}%
+  {\iffieldundef{issuetitle}%
+    {\iffieldundef{title}%
+      {\iffieldundef{booktitle}%
+        {\iffieldundef{maintitle}%
+          {\iffieldundef{journaltitle}%
+            {}%
+            {\DeclareFieldAlias{jtnoformat}{jtitle:hook}%
+              \DeclareFieldAlias{sjtnoformat}{title}%
+              \DeclareFieldAlias{journaltitle}{default}%
+              \DeclareFieldAlias{shortjournal}{series}%
+              \DeclareFieldAlias{jtsnoformat}{jtitle:hook}}}%
+          {\DeclareFieldAlias{maintitle}{title:hook}}}%
+        {\DeclareFieldAlias{booktitle}{title:hook}}}%
+      {\DeclareFieldAlias{tnoformat}{jtitle:hook}%
+        \DeclareFieldAlias{stnoformat}{citetitle}%
+        \DeclareFieldAlias[video]{title}{title:hook}%
+        \DeclareFieldAlias[audio]{title}{title:hook}%
+        \DeclareFieldAlias[music]{title}{title:hook}%
+        \DeclareFieldAlias{title}{title:hook}%
+        \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
+    {\DeclareFieldAlias{issuetitle}{ititle:hook}}}%
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {\iffieldundef{title}%
+      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\DeclareFieldAlias[video]{title}{title:hook}%
+        \DeclareFieldAlias[audio]{title}{title:hook}%
+        \DeclareFieldAlias[music]{title}{title:hook}}}%
+    {\DeclareFieldAlias{chapter}{chapter:hook}}}}%
+
+\endinput
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 7032fd8b019..b5e787803e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,8 @@
-% $Id: chicago-authordate.bbx,v 0.9.1.13 2018/01/11 09:25:52 dfussner Exp $
-
-% This is a biblatex style file, adapted mainly from Lehman's
-% standard.bbx and from chicago-notes.bbx.  It provides the
+% This is a biblatex style file, originally 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}[2018/01/11 v 3.10 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2020/04/20 v 3.14 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -14,7 +12,13 @@ bibliography style]
 
 \DeclareFieldFormat{shorthandwidth}{#1}
 
-\DeclareFieldFormat{shortjournalwidth}{\mkbibemph{\textbf{#1}}\isdot}
+\DeclareFieldFormat{shortserieswidth}{#1}
+
+\DeclareFieldFormat{shortjournalwidth}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\textbf{#1}\isdot}%
+  {\mkbibemph{\textbf{#1}}\isdot}}%
 
 \newlength{\lositemsep}
 
@@ -28,19 +32,6 @@ bibliography style]
   {\endlist}
   {\item}
 
-\defbibenvironment{shorthands}% biblatex < 2.9
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
 \defbibenvironment{shorthand}
   {\list
      {\printfield[shorthandwidth]{shorthand}}%
@@ -123,6 +114,15 @@ bibliography style]
   {\endlist\nopunct\vspace{-\baselineskip}}
   {\item}
 
+\defbibcheck{shorthand}{%
+  \iftoggle{cms@los}%
+  {\iffieldundef{shorthand}%
+    {\skipentry}%
+    {\ifcsdef{\strfield{shorthand}}%
+      {\skipentry}%
+      {\savefieldcs{shorthand}{\strfield{shorthand}}}}}%
+  {}}%
+
 \defbibcheck{shortjournal}{% Only one list
   \iffieldundef{shortjournal}%
   {\skipentry}%
@@ -138,20 +138,65 @@ bibliography style]
 %     {\savefield{shortjournal}{\cms@shjour}}}%
 %   {\savefield{shortjournal}{\cms@shjour}}}
 
+\defbibenvironment{shortseries}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.7\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shsernotes}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\footnotesize%
+      \setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shserendnotes}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\enotesize%
+      \setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}
+  {\item}
+
+\defbibcheck{shortseries}{% Only one list
+  \ifthenelse{\iffieldundef{shortseries}\OR%
+    \iffieldundef{series}\OR%
+    \iffieldsequal{series}{shortseries}}%
+  {\skipentry}%
+  {\ifcsdef{\strfield{shortseries}}%
+    {\skipentry}%
+    {\savefieldcs{shortseries}%
+      {\strfield{shortseries}}}}}%
+
 \AtBeginBibliography{%
   \togglefalse{cms@headlessnote}}%
 
 \AtEveryBibitem{%
-  \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
+  \global\csundef{@cmsst}}%
 
 \AtEveryLositem{%
-  \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
+  \global\csundef{@cmsst}}%
 
 \AtEveryBiblistitem{shortjournal}{%
   \global\csundef{@cmsst}%
@@ -234,7 +279,7 @@ bibliography style]
        and
        test {\ifdefvoid{#3}}%
      }%
-     {}{\revsdnamepunct}%    
+     {}{\revsdnamepunct}%
      \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
      \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
      \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}%
@@ -290,28 +335,50 @@ bibliography style]
 \newbibmacro*{justauthor}{%
   \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\let\bbx@lasthash\undefined}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}%
-      {\bibnamedash\addspace}}%
+      {\printtext{\bibnamedash}}%
+      {\printtext{\bibnamedash}%
+        \ifentrytype{customc}%
+        {\newunit}%
+        {\setunit{\addspace}}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
       {\iffieldequalstr{authortype}{anon?}%
         {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
           \savefield{fullhash}{\bbx@lasthash}}%
-        {\printnames{author}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printnames{author}%
+            \ifentrytype{customc}{}%
+            {\setunit{\addspace}\printfield{nameaddon}}\bibcloseparen%
+            \ifentrytype{customc}%
+            {\newunit\printfield{nameaddon}}%
+            {}}%
+          {\printnames{author}%
+            \ifentrytype{customc}{\newunit}{\setunit{\addspace}}%
+            \printfield{nameaddon}}%
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
   \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\usebibmacro{pickeditor}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}%
-      {\bibnamedash\addspace}}%
+      {\printtext{\bibnamedash}}%
+      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -319,8 +386,11 @@ bibliography style]
         {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
           \savefield{fullhash}{\bbx@lasthash}}%
         {\iftoggle{cms@authorparens}%
-          {\bibopenparen\printnames{author}\bibcloseparen}%
-          {\printnames{author}}%
+          {\bibopenparen\printnames{author}%
+            \setunit{\addspace}\printfield{nameaddon}\bibcloseparen}%
+          {\printnames{author}%
+            \setunit{\addspace}%
+            \printfield{nameaddon}}%
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
@@ -331,15 +401,26 @@ bibliography style]
 \newbibmacro*{moreeditor}{%
   \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
     {\usebibmacro{picktranslator}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-                 \iffirstonpage}%
-       {\bibnamedash\editordelim}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\editordelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\editordelim}}%
        {\iftoggle{cms@authorparens}%
          {\bibopenparen\printnames{editor}%
+           \setunit{\addspace}\printfield{nameaddon}%
            \bibcloseparen\editordelim}%
-         {\printnames{editor}\editordelim}%
+         {\printnames{editor}%
+           \setunit{\addspace}%
+           \printfield{nameaddon}\editordelim}%
         \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
+     \usebibmacro{editstrg}}}%
 
 \renewbibmacro*{editor}{%
   \iftoggle{cms@headlessnote}%
@@ -347,35 +428,68 @@ bibliography style]
   {\ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
     {\ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
       {\usebibmacro{picktranslator}}%
-      {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-          \iffirstonpage}%
-        {\bibnamedash\editordelim}%
+      {\ifboolexpr{%
+          test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\iffieldundef{nameaddon}%
+          {\printtext{\bibnamedash}\editordelim}%
+          {\printtext{\bibnamedash}\setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}}%
         {\iftoggle{cms@authorparens}%
           {\bibopenparen\printnames{editor}%
+            \setunit{\addspace}\printfield{nameaddon}%
             \bibcloseparen\editordelim}%
-          {\printnames{editor}\editordelim}%
+          {\printnames{editor}%
+            \setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}%
           \savefield{fullhash}{\bbx@lasthash}}%
         \usebibmacro{editstrg}}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-        \iffirstonpage}%
-      {\bibnamedash\nameadelim}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\nameadelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}}%
       {\iftoggle{cms@authorparens}%
         {\bibopenparen\printnames[sortname]{namea}%
+          \setunit{\addspace}\printfield{nameaddon}%
           \bibcloseparen\nameadelim}%
-        {\printnames[sortname]{namea}\nameadelim}%
+        {\printnames[sortname]{namea}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}%
         \savefield{fullhash}{\bbx@lasthash}}%
       \usebibmacro{parteditstrg}}}}
 
 \newbibmacro*{parteditor}{%
   \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
   {\usebibmacro{picktranslator}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
-    {\bibnamedash\nameadelim}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\nameadelim}%
+      {\printtext{\bibnamedash}\setunit{\addcomma}%
+        \printfield{nameaddon}\nameadelim}}%
     {\iftoggle{cms@authorparens}%
       {\bibopenparen\printnames[sortname]{namea}%
+        \setunit{\addspace}\printfield{nameaddon}%
         \bibcloseparen\nameadelim}%
-      {\printnames[sortname]{namea}\nameadelim}%
+      {\printnames[sortname]{namea}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim}%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{parteditstrg}}}
 
@@ -387,39 +501,72 @@ bibliography style]
 \newbibmacro*{moretranslator}{%
   \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}%
   {\usebibmacro{compiler}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
-    {\bibnamedash\addcomma\addspace}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms@authorparens}%
       {\bibopenparen\printnames[sortname]{translator}%
-        \bibcloseparen\addcomma\addspace}%
-      {\printnames[sortname]{translator}\addcomma\addspace}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{translator}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{transstrg}}}
 
 \newbibmacro*{parttranslator}{%
   \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
   {\usebibmacro{compiler}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
-    {\bibnamedash\addcomma\addspace}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms@authorparens}%
       {\bibopenparen\printnames[sortname]{nameb}%
-        \bibcloseparen\addcomma\addspace}%
-      {\printnames[sortname]{nameb}\addcomma\addspace}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{nameb}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{parttransstrg}}}
 
 \newbibmacro*{compiler}{%
   \ifthenelse{\ifnameundef{namec}\OR\NOT\ifusenamec}%
   {\let\bbx@lasthash\undefined}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
-    {\bibnamedash\addcomma\addspace}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addcomma}%
+        \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms@authorparens}%
       {\bibopenparen\printnames[sortname]{namec}%
-        \bibcloseparen\addcomma\addspace}%
-      {\printnames[sortname]{namec}\addcomma\addspace}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{namec}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{compilestrg}}}
 
@@ -439,34 +586,20 @@ bibliography style]
       \usebibmacro{shorthand:label}}%
     {\mkbibemph{\bibstring{see}}%
       \addspace%
-      \usebibmacro{author/editor}}%
-    \finentry}%
-  {\iftoggle{cms@fullshhand}%
-    {\usedriver{\frenchspacing}%
-      {\thefield{entrytype}}%
-      \finentry}%
-    {\ifnameundef{labelname}%
-      {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-          \ifentrytype{periodical}}%
-        {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-            \newcunit}}%
-        {\ifentrytype{manual}%
-          {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-          {}}}%
-      {\usebibmacro{author/editor}%
-        \setunit{\addcomma\space}}%
-      \printfield[lostitle]{title}%
-      \finentry}}}
-
-\DeclareBibliographyDriver{shorthands}{% biblatex < 2.9
-  \iftoggle{cms@los}%
-  {\ifnameundef{labelname}%
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{shorthand:label}}%
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{author/editor}}%
+      \ifboolexpr{%
+        test {\iffieldequalstr{labelnamesource}{shortauthor}}%
+        and
+        (
+        test {\ifentrytype{manual}}%
+        or
+        test {\ifentrytype{standard}}%
+        )
+      }%
+      {\printnames{\thefield{labelnamesource}}}%
+      {\ifentrytype{customc}%
+        {\clearfield{nameaddon}}%
+        {}%
+        \usebibmacro{author/editor}}}%
     \finentry}%
   {\iftoggle{cms@fullshhand}%
     {\usedriver{\frenchspacing}%
@@ -480,8 +613,19 @@ bibliography style]
         {\ifentrytype{manual}%
           {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
           {}}}%
-      {\usebibmacro{author/editor}%
-        \setunit{\addcomma\space}}%
+      {\ifboolexpr{%
+          test {\iffieldequalstr{labelnamesource}{shortauthor}}%
+          and
+          (
+          test {\ifentrytype{manual}}%
+          or
+          test {\ifentrytype{standard}}%
+          )
+        }%
+        {\printnames{\thefield{labelnamesource}}\newunit}%
+        {\ifentrytype{customc}%
+          {\usebibmacro{justauthor}\setunit{\addspace}}%
+          {\usebibmacro{author/editor}\newunit}}}%
       \printfield[lostitle]{title}%
       \finentry}}}
 
@@ -501,6 +645,9 @@ bibliography style]
     \printlist[periodplace]{location}}%
   \finentry}%
 
+\DeclareBibliographyDriver{shortseries}{%
+  \printfield{series}\finentry}
+
 \DeclareStyleSourcemap{
   \maps[datatype=bibtex]{
     \map{
@@ -509,9 +656,11 @@ bibliography style]
       \step[fieldset=shortjournal, origfieldval]
     }
     \map{
-      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldsource=pubstate,
+      match=\regexp{forthcoming|inpreparation|submitted|inpress}, final]
       \step[fieldset=year, origfieldval, final]
-      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      \step[fieldsource=year,
+      match=\regexp{(forthcoming|inpreparation|submitted|inpress)},
       replace=\regexp{\\bibstring\{$1\}}]%$
       \step[fieldset=pubstate, null]
     }
@@ -582,7 +731,78 @@ bibliography style]
       match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
       final]
       \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
-    }    
+    }
+    \map{
+      \pertype{standard}
+      \step[notfield=author, final]
+      \step[fieldsource=organization, final]
+      \step[fieldsource=organization, match=\regexp{(.*)}]
+      \step[fieldset=shortauthor, fieldvalue=\regexp{{$1}}]%$
+    }
+    \map{
+      \pertype{manual}
+      \step[notfield=author, final]
+      \step[notfield=editor, final]
+      \step[fieldsource=organization, final]
+      \step[fieldsource=organization, match=\regexp{(.*)}]
+      \step[fieldset=shortauthor, fieldvalue=\regexp{{$1}}]%$
+    }
+    \map[overwrite]{
+      \pertype{review}
+      \pertype{online}
+      \pertype{suppperiodical}
+      \step[fieldsource=relatedtype, match=\regexp{commenton}, final]
+      \step[fieldsource=options, final]
+      \step[fieldsource=options, notmatch=\regexp{skipbib|cmsdate}, final]
+      \step[fieldset=options, fieldvalue={,skipbib,cmsdate=full},
+      append]
+      \step[notfield=verbc, final]
+      \step[fieldsource=entrykey]
+      \step[fieldset=verbc, origfieldval]
+    }
+    \map{
+      \pertype{review}
+      \pertype{online}
+      \pertype{suppperiodical}
+      \step[fieldsource=relatedtype, match=\regexp{commenton}, final]
+      \step[notfield=options, final]
+      \step[fieldset=options, fieldvalue={skipbib,cmsdate=full}]
+      \step[fieldsource=entrykey]
+      \step[fieldset=verbc, origfieldval]
+    }
+    \map{
+      \pertype{review}
+      \pertype{online}
+      \pertype{suppperiodical}
+      \step[fieldsource=relatedtype, match=\regexp{commenton}, final]
+      \step[fieldsource=related, match=\regexp{(.*)}]
+      \step[entrynew=$1-customc, entrynewtype=customc]%$
+      \step[fieldset=options, fieldvalue={skipbib,authortitle},
+      entrytarget=$1-customc]%$
+      \step[fieldset=pubstate, fieldvalue=cms-generated,
+      entrytarget=$1-customc]%$
+      \step[fieldsource=relatedtype]
+      \step[fieldsource=relatedstring]
+      \step[fieldset=title, origfieldval, entrytarget=$1-customc]%$
+    }
+    \map{
+      \pertype{video}
+      \step[fieldsource=entrysubtype, match=tvepisode, final]
+      \step[fieldsource=title, final]
+      \step[fieldsource=booktitle, final]
+      \step[fieldset=sorttitle, origfieldval]
+    }
+    \map[overwrite]{% Backward compatibility kludges
+      \step[fieldsource=year,
+      match=\regexp{^\[(.+)\](.*)},
+      replace=\regexp{\[$1\]\\midsentence$2}]
+      \step[fieldsource=year,
+      match=\regexp{^\\bibopenbracket\s*(.+)\\bibclosebracket(.*)},
+      replace=\regexp{\[$1\]\\midsentence$2}]
+      \step[fieldsource=year,
+      match=\regexp{^\\mkbibbrackets\{(.+)\}(.*)},
+      replace=\regexp{\[$1\]\\midsentence$2}]
+    }
   }
 }%
 
@@ -590,8 +810,6 @@ bibliography style]
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{mag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
@@ -607,10 +825,12 @@ bibliography style]
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock% 17th ed. clarifies punctuation
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{mag+news+date}%
+  \newunit\newblock
+  \printfield{type}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
   \newunit\newblock
@@ -639,8 +859,6 @@ bibliography style]
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef{\bbx@lasthash}{\usebibmacro{mag+news+title}\newunit}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -657,10 +875,12 @@ bibliography style]
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock% 17th ed.
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{journal+issue+year+pages}%
+  \iftoggle{cms@switchdates}%
+  {\usebibmacro{journal+issue+year+pages}{orig}}%
+  {\usebibmacro{journal+issue+year+pages}{}}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
@@ -690,26 +910,23 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
-  \usebibmacro{cmsbibsortdate}%
+  \usebibmacro{cmscitesortdate}% 17th ed. ??
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
-  \newcunit\newblock
-  \usebibmacro{date}%
+  \newunit\newblock
+  \usebibmacro{artwork+dates}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-  \printfield{howpublished}%
   \newunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -717,6 +934,10 @@ bibliography style]
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
   \newunit\newblock
+  \printfield{howpublished}%
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
   \printfield{addendum}%
@@ -737,8 +958,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifboolexpr{%
     test {\ifundef{\bbx@lasthash}}%
@@ -758,7 +977,11 @@ bibliography style]
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \newcunit%\setunit{\addperiod\addspace}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}% 17th ed.
+  \iffieldundef{eventyear}%
+  {\newcunit}%
+  {\newunit}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
@@ -767,7 +990,7 @@ bibliography style]
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
-  \newunit% unit, not cunit?
+  \usebibmacro{editorpunct}%\newunit% unit, not cunit?
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
@@ -834,8 +1057,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -845,7 +1066,9 @@ bibliography style]
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
     {}%
-    {\usebibmacro{edition}}}%
+    {\usebibmacro{edition}}%
+    \setunit*{\addcomma\addspace}%
+    \usebibmacro{version}}%
   {}%
   \newunit\newblock% 16th ed.
   \usebibmacro{byauthor}%
@@ -867,6 +1090,10 @@ bibliography style]
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
+  \newcunit
+  \iffieldundef{version}%
+  {}%
+  {\printfield{version}}
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \usebibmacro{editorpunct}%
@@ -888,6 +1115,8 @@ bibliography style]
   \newcunit\newblock
   \printlist[][-\value{listtotal}]{lista}%
   \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
   \printfield{addendum}%
@@ -948,8 +1177,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1059,8 +1286,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1096,8 +1321,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1193,37 +1416,104 @@ bibliography style]
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{justauthor}%
+  \iffieldundef{nameaddon}%
+  {\newunit}%
+  {\setunit{\addspace}}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{dataset}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock%
+  \printtext[parens]{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newunit% 16th ed.
+    \usebibmacro{byauthor}%
+    \newunit\newblock
+    \usebibmacro{byeditor+others}%
+    \setunit{\addspace}\newblock%
+    \ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{number}\AND\iffieldundef{type}}%
+    {}%
+    {\printtext[parens]{%
+        \printfield{howpublished}%
+        \newcunit
+        \printfield{type}%
+        \setunit{\addspace}%
+        \printfield{number}}}%
+    \newunit\newblock
+    \printfield{version}%
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{institution+organization}%
+    \setunit*{\addcomma\addspace}\newblock
+    \printlist{location}%
+    \setunit{\addsemicolon\addspace}%
+    \printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{date}%
+  \clearfield{urlyear}\clearfield{urlmonth}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
-  \usebibmacro{cmsbibsortdate}%
+  \usebibmacro{cmscitesortdate}%
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
-  \setunit*{\addcomma\addspace}% 16th ed. added * (?)
-  \usebibmacro{date}%
+  \newunit\newblock% 16th ed. added * (?)
+  \usebibmacro{artwork+dates}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-  \printfield{howpublished}%
   \newunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1231,6 +1521,10 @@ bibliography style]
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
   \newunit\newblock
+  \printfield{howpublished}%
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
   \printfield{addendum}%
@@ -1251,8 +1545,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1354,8 +1646,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1457,8 +1747,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -1798,8 +2086,6 @@ bibliography style]
 \DeclareBibliographyDriver{legal}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newcunit\newblock
   \usebibmacro{clegis+news+title}%
   \setunit{\addspace}%
@@ -1865,8 +2151,6 @@ bibliography style]
   \iffieldequalstr{entrysubtype}{uk}% FIXME?
   {\usebibmacro{bibindex}%
     \usebibmacro{author/editor}%
-    \setunit{\addspace}%
-    \printfield{nameaddon}%
     \newcunit\newblock
     \usebibmacro{clegis+news+title}%
     \setunit{\addspace}%
@@ -1930,8 +2214,6 @@ bibliography style]
   {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
     {\usebibmacro{bibindex}%
       \usebibmacro{author/editor}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}%
       \newcunit\newblock
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
@@ -1988,8 +2270,6 @@ bibliography style]
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
       \usebibmacro{author/editor}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}%
       \newcunit\newblock
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
@@ -2063,8 +2343,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
@@ -2168,8 +2446,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -2213,8 +2489,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \iffieldundef{entrysubtype}%
   {\ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}}%
@@ -2231,7 +2505,9 @@ bibliography style]
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
     \newcunit\newblock%
-    \usebibmacro{unpubl+letter+date}}%
+    \usebibmacro{unpubl+letter+date}%
+    \newcunit
+    \printlist{origlocation}}% 17th ed.
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
@@ -2246,7 +2522,10 @@ bibliography style]
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
-  \usebibmacro{institution+organization}%
+  \iffieldundef{entrysubtype}%
+  {\printfield{venue}\setunit*{\addcomma\addspace}}%
+  {}%
+  \usebibmacro{misc+institution+organization}%
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
   \iffieldundef{entrysubtype}%
@@ -2274,8 +2553,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifboolexpr{%
     test {\ifundef{\bbx@lasthash}}%
@@ -2296,9 +2573,16 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\usebibmacro{byeditor+others}\newunit\newblock}{}%
   \usebibmacro{music+eventdate}%\printeventdate
   \newunit\newblock
-  \usebibmacro{chapinscore}%
+  \printfield{note}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \usebibmacro{chap+as+track}%inscore% 17th ed.
+  \usebibmacro{music+bookauthor}% Ditto.
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
   {\newunit}% Fix customc?
@@ -2306,9 +2590,9 @@ bibliography style]
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit% unit, not cunit?
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {}{\usebibmacro{byeditor+others}}%
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}%
   {}%
@@ -2338,14 +2622,14 @@ bibliography style]
   \newunit\newblock
   \printfield{version}%
   \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \usebibmacro{music+origdate}% Changed for 17th ed.
   \newunit\newblock
   \printlist{publisher}%
   \setunit*{\addcomma\addspace}\newblock
-  \printfield{series}%
-  \setunit{\addspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifboolexpr{test {\iflistundef{publisher}} and test {\iffieldundef{series}}}%
+  {\newunit}%
+  {\setunit{\addspace}}%
   \printfield{number}%
   \newcunit\newblock
   \usebibmacro{date}%
@@ -2388,26 +2672,79 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \ifundef\bbx@lasthash%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{commenton}}%
+    }%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{titleaddon}}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}}%
+      {\usebibmacro{italtitle+stitle}}}%
+    {\usebibmacro{italtitle+stitle}}}%
+  {}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \ifundef\bbx@lasthash%
+  {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{titleaddon}}%
+    {}%
+    {\ifboolexpr{%
+        togl {cms@related}%
+        and
+        test {\iffieldequalstr{relatedtype}{commenton}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}}%
+      {}}}%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{commenton}}%
+    }%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{titleaddon}}%
+      {}%
+      {\usebibmacro{italtitle+stitle}%
+        \newcunit\newblock
+        \usebibmacro{date}%
+        \usebibmacro{time+stamp}%
+        \iftoggle{cms@switchdates}%
+        {\clearfield{orighour}\clearfield{origyear}\clearfield{origmonth}%
+          \clearfield{origday}\clearfield{origseason}}%
+        {\clearfield{hour}\clearfield{year}\clearfield{month}%
+          \clearfield{day}\clearfield{season}}%
+        \newunit\newblock}%
+      \usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\usebibmacro{italtitle+stitle}}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
   \usebibmacro{bibreprint}%
   \printlist{organization}% 16th ed.
   \newunit\newblock
   \printfield{note}%
-  \newunit\newblock
+  \newcunit\newblock% 17th ed. comma
   \usebibmacro{date}%
+  \usebibmacro{time+stamp}% 17th ed.
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
   \newunit\newblock
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
   {}%
-  {\printurldate}% Date fix
+  {\printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}% Date fix
   \newunit\newblock
   \iftoggle{cms@doionly}%
   {\iffieldundef{doi}%
@@ -2422,11 +2759,13 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2438,10 +2777,10 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{author+holder}% + holder?
   \newunit\newblock
-  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \ifundef\bbx@lasthash{\usebibmacro{patenttitle+stitle}}{}%
   \usebibmacro{cmscitesortdate}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \ifundef\bbx@lasthash{}{\usebibmacro{patenttitle+stitle}}%
   \setunit{\addperiod\addspace}%
   \printfield{note}%
   \setunit{\addperiod\addspace}%
@@ -2490,25 +2829,82 @@ bibliography style]
   {}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{performance}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}%
+  {\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
 \DeclareBibliographyDriver{periodical}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifboolexpr{%
     test {\ifundef{\bbx@lasthash}}%
     and
     not togl {cms@origpublished}%
   }%
-  {\printtext[title]{% magazine subtype
-    \printfield[tnoformat]{title}%
-    \setunit{\subtitlepunct}%
-    \printfield[stnoformat]{subtitle}}%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \clearlist{location}%
+  \clearfield{shorttitle}%
   \clearfield{title}%
   \clearfield{subtitle}%
   \newunit\newblock}{}%
@@ -2548,21 +2944,29 @@ bibliography style]
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifboolexpr{%
     test {\ifundef{\bbx@lasthash}}%
     and
     not togl {cms@origpublished}%
   }%
-  {\printtext[title]{% magazine subtype
-    \printfield[tnoformat]{title}%
-    \setunit{\subtitlepunct}%
-    \printfield[stnoformat]{subtitle}}%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \clearlist{location}%
+  \clearfield{shorttitle}%
   \clearfield{title}%
   \clearfield{subtitle}%
   \newunit\newblock}{}%
@@ -2579,7 +2983,9 @@ bibliography style]
   \usebibmacro{bibreprint}%
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{periodical+issue+year+pages}%
+  \iftoggle{cms@switchdates}%
+  {\usebibmacro{periodical+issue+year+pages}{orig}}%
+  {\usebibmacro{periodical+issue+year+pages}{}}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
@@ -2605,8 +3011,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -2755,8 +3159,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -2767,8 +3169,10 @@ bibliography style]
   \newunit\newblock
   \printfield{type}%
   \newcunit
-  \printfield{series}%
-  \setunit{\addnbspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifthenelse{\iffieldundef{type}\AND\iffieldundef{series}}%
+  {\newunit}%
+  {\setunit{\addnbspace}}%
   \printfield{number}%
   \newunit
   \printfield{note}%
@@ -2801,14 +3205,16 @@ bibliography style]
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+author}}%
   {\usebibmacro{author/editor}}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef{\bbx@lasthash}%
   {\ifboolexpr{%
       togl {cms@related}%
       and
+      (
       test {\iffieldequalstr{relatedtype}{reviewof}}%
+      or
+      test {\iffieldequalstr{relatedtype}{commenton}}%
+      )
     }%
     {\usebibmacro{related:init}%
       \usebibmacro{related}}%
@@ -2824,7 +3230,11 @@ bibliography style]
   {\ifboolexpr{%
       togl {cms@related}%
       and
+      (
       test {\iffieldequalstr{relatedtype}{reviewof}}%
+      or
+      test {\iffieldequalstr{relatedtype}{commenton}}%
+      )
     }%
     {\usebibmacro{related:init}%
       \usebibmacro{related}}%
@@ -2835,6 +3245,8 @@ bibliography style]
   \printfield{titleaddon}%
   \newcunit\newblock
   \usebibmacro{music+eventdate}% 16th ed.
+  \newcunit\newblock
+  \printeventtime%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
   \newunit\newblock%
@@ -2846,14 +3258,18 @@ bibliography style]
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock% 17th ed.
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}}%
-  {\usebibmacro{journal+issue+year+pages}}%
+    \newunit\newblock
+    \printfield{type}%
+    \newcunit\newblock
+    \usebibmacro{chap+pag}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{journal+issue+year+pages}{orig}}%
+    {\usebibmacro{journal+issue+year+pages}{}}}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
@@ -2871,6 +3287,96 @@ bibliography style]
     togl {cms@related}%
     and
     not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{standard}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \ifnameundef{author}%
+  {\iflistundef{organization}%
+    {\let\bbx@lasthash\undefined}%
+    {\ifboolexpr{%
+        test {\iflistequals{organization}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}}}%
+      {\iftoggle{cms@authorparens}%
+        {\bibopenparen\printlist{organization}\bibcloseparen}%
+        {\printlist{organization}}%
+        \savelist{organization}{\bbx@lasthash}}}}%
+  {\usebibmacro{justauthor}}%
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}{\usebibmacro{italtitle+stitle}}{}%
+  \ifthenelse{\iffieldundef{userd}\AND\iffieldundef{howpublished}}%
+  {\usebibmacro{cmsbibsortdate}}%
+  {\usebibmacro{cmscitesortdate}}% Like Patent entries (?)
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}{}%
+  {\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \usebibmacro{edition}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{series+or+shortser}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock%
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+  \newunit\newblock%
+  \usebibmacro{bibreprint}%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\iflistundef{organization}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}%
+      \printlist{organization}%
+      \setunit*{\addcomma\addspace}}}%
+  {\setunit*{\addcolon\addspace}%
+    \printlist{publisher}%
+    \setunit*{\addcomma\addspace}}%
+  \usebibmacro{date}
+  \setunit{\addsemicolon\addspace}%
+  \printfield{howpublished}%
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
   }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
@@ -2883,8 +3389,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{%
   \usebibmacro{inforaft}%
@@ -2958,8 +3462,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -2993,8 +3495,6 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
@@ -3042,35 +3542,40 @@ bibliography style]
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{%
-  \usebibmacro{video+title}% Simplifies trad style
-  \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\setunit{\ctitleaddonpunct}}%
-  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}%\usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock}{}%
+    \usebibmacro{video+tv+title}%
+    \newunit\newblock}{}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx@lasthash{}{%
-  \usebibmacro{video+title}% Simplifies trad style
-  \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\setunit{\ctitleaddonpunct}}%
-  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}%\usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}}%
-  \setunit{\addperiod\addspace}% 16th ed.
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
+    \usebibmacro{video+tv+title}}%
+  \ifboolexpr{%
+    test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+    and
+    (
+    not test {\iffieldundef{title}}%
+    and
+    not test {\iffieldundef{booktitle}}%
+    )
+  }%
+  {\usebibmacro{video+title}%
+    \iffieldundef{booktitle}%
+    {\setunit{\ctitleaddonpunct}}%
+    {\setunit{\ptitleaddonpunct}}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}\newblock%
+    \usebibmacro{language+transtitle}%
+    \usebibmacro{byauthor}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{part+editor+translator}}
+  {\setunit{\addperiod\addspace}% 16th ed.
+    \usebibmacro{byauthor}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{part+editor+translator}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{chapinscore}%
+    \usebibmacro{btitle+bstitle}}%
   \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
@@ -3109,12 +3614,15 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
   \usebibmacro{music+eventdate}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{usera}%
   \newunit\newblock
   \usebibmacro{origpubl+loc+year}% 16th ed.
   \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
+  \usebibmacro{bibreprint}% 17th ed.
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \printfield{type}%
@@ -3152,7 +3660,14 @@ bibliography style]
     )
     }%
   {}%
-  {\printurldate}% Date fix
+  {\printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}% Date fix
   \iffieldundef{addendum}%
   {\newunit\newblock}%
   {\newcunit\newblock}%
@@ -3192,18 +3707,30 @@ bibliography style]
     or
     not togl {cms@los}%
   }%
-  {\togglefalse{cms@authorparens}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
+  {\togglefalse{cms@authorparens}%
+    \global\csundef{cms@shauthor}}%
+  {\ifboolexpr{%
+      ((
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      or
+      test {\iffieldequals{shorthand}{\cms@shauthor}}%
+      )
+      and
+      togl {cms@namedash}%
+      )
+      and
+      not test {\iffirstonpage}%
+    }%
     {\togglefalse{cms@authorparens}}%
     {\toggletrue{cms@authorparens}%
+      \savefield{shorthand}{\cms@shauthor}%
       \printfield{shorthand}\addspace}}}
 
 \newbibmacro*{shorthand:label}{% Test this
   \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
     \ifentrytype{periodical}}% Simplifies .bib creation
     {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\ifentrytype{manual}%
+    {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
       {\printtext[bibhyperref]{\printlist{organization}}}%
       {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
 
@@ -3213,6 +3740,8 @@ bibliography style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -3225,17 +3754,646 @@ bibliography style]
     {\usebibmacro{origfirst+labelyear+extrayear}}%
     {\usebibmacro{standard+labelyear+extrayear}}}}
 
+\protected\def\cmsunspecified#1#2{%
+  \ifboolexpr{%
+    test {\iffieldundef{#2dateunspecified}}%
+    or
+    togl {cms@alwaysrange}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{#2endyear}}%
+      or
+      test {\iffieldequalstr{#2dateera}{bce}}%
+      or
+      not togl {cms@compyears}%
+      or
+      not test {\iffieldnum{#2year}}%
+      or
+      not test {\iffieldnum{#2endyear}}%
+      or
+      not test {\if@cms@onlyyears{#2}}%
+    }%
+    {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2year}}%
+    {\cmscompcenturies{#2}%
+      \ifboolexpr{%
+        (
+        test {\if@cms@bracket}%
+        and
+        not test {\if@cms@endbracket}
+        )
+        or
+        (
+        not test {\if@cms@bracket}%
+        and
+        test {\if@cms@endbracket}%
+        )
+        or
+        (
+        test {\if@cms@endcirca}%
+        and
+        not test {\if@cms@circa}%
+        )
+        or
+        not test {\ifnumequal{\cms@tempcnta}{\cms@tempcntb}}%
+      }%
+      {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+      {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}}}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{#2dateunspecified}{yearindecade}}%
+      and
+      test {\ifbibstring{decade}}%
+      and
+      not togl {cms@decaderange}%
+    }%
+    {\cmsmkdecade{#1}{#2}}%
+    {\ifboolexpr{%
+        test {\iffieldequalstr{#2dateunspecified}{yearincentury}}%
+        and
+        test {\ifbibstring{century}}%
+        and
+        not togl {cms@centuryrange}%
+      }%
+      {\cmsmkcentury{#2}}%
+      {\iftoggle{cms@compyears}%
+        {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+          \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}}}}}%
+
+\protected\def\cmscompressyears#1{%
+  \def\cms@tempa{\thefield{#1year}--\thefield{#1endyear}}%
+  \edef\cms@tempb{\mkcomprange{\csuse{cms@tempa}}}%
+  \cms@tempb}%
+
+\newcount\cms@tempcnta
+\newcount\cms@tempcntb
+
+\def\cmscompcenturies#1{%
+  \cms@tempcnta=\thefield{#1year}%
+  \divide\cms@tempcnta100
+  \cms@tempcntb=\thefield{#1endyear}%
+  \divide\cms@tempcntb100}
+
+\protected\def\cmsformatextra{%
+  \ifboolexpr{%
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {\usebibmacro{cmsextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  {\ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}}
+
+\protected\def\cmsformatendextra{%
+  \ifboolexpr{%
+    test {\if@cms@endbracket}%
+    and
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {\usebibmacro{cmsextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  {\ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}}
+
+\newbibmacro*{cmsextradate}{% For use with some date specs
+  \iffieldundef{extradate}%
+  {}%
+  {\setunit*{}%
+    \printfield{extradate}\clearfield{extradate}}}
+
+\newbibmacro*{cmsparensextradate}{% For use with other date specs
+  \iffieldundef{extradate}%
+  {}%
+  {\setunit*{}%
+    \mkbibparens{\printfield{extradate}}\clearfield{extradate}}}
+
+\protected\def\cmsdateeraprintpre#1{% AD/BC order depends on language
+  \ifdefstring\blx@dateera{astronomical}%
+  {\iffieldnum{#1}%
+    {\begingroup%
+      \let\blx@tempa\@empty%
+      \blx@ifstrendswith{#1}{endyear}%
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+        \def\blx@tempa{end}}%
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifnumless{0-\thefield{#1}}{0}%
+        {\printtext{\csuse{bibdateera\blx@tempa prefix}}}%
+        {}}%
+      {}%
+      \endgroup}%
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      test {\if@cms@adfirst}%
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}{}{\global\toggletrue{cms@bc}}}%
+        {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+          {\ifdefstring\blx@tempa{end}%
+            {\iftoggle{cms@bc}%
+              {\printtext{%
+                  \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+                \global\togglefalse{cms@bc}}%
+              {}}%
+            {\printtext{%
+                \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+              \global\togglefalse{cms@bc}}}%
+          {}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\protected\def\cmsdateeraprint#1{% AD/BC order depends on language
+  \ifboolexpr{%
+    test {\ifdefstring\blx@dateera{christian}}%
+    and
+    test {\if@cms@adfirst}%
+  }%
+  {\iffieldnum{#1}
+    {\begingroup
+      \let\blx@tempa\@empty
+      \blx@ifstrendswith{#1}{endyear}
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype
+        \def\blx@tempa{end}}
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifdefstring\blx@tempa{end}%
+        {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+          \printtext{\printdelim{dateeradelim}\midsentence%
+            \bibsstring{\blx@dateera@bce}}%
+          \global\booltrue{cms:extraparens}\relax%
+          \fi}%
+        {\csuse{if\blx@datetype enddateera}{bce}%
+          {}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}%
+            \global\booltrue{cms:extraparens}\relax%
+            \fi}}}%
+      {}%
+      \endgroup}
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{secular}}%
+      or
+      (
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      not test {\if@cms@adfirst}%
+      )
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}%
+            \global\booltrue{cms:extraparens}\relax%
+            \fi}%
+          {\csuse{if\blx@datetype enddateera}{bce}%
+            {}%
+            {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+              \printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@bce}}%
+              \global\booltrue{cms:extraparens}\relax%
+              \fi}}}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+            {\printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@ce}}%
+              \global\booltrue{cms:extraparens}}%
+            {}}%
+          {\csuse{if\blx@datetype enddateera}{ce}%
+            {}%
+            {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+              {\printtext{\printdelim{dateeradelim}\midsentence%
+                  \bibsstring{\blx@dateera@ce}}%
+                \global\booltrue{cms:extraparens}}%
+              {}}}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\newrobustcmd*{\cms@datebrackets}{%
+  \iftoggle{cms@nodatebrackets}%
+  {\global\boolfalse{cms:bracket}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@yearbrackets}{%
+  \iftoggle{cms@noyearbrackets}%
+  {\global\boolfalse{cms:bracket}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@mkbibrangetrunc}[2]{% DATE FIX
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2day}}%
+          {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+            {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+              \clearfield{#2endyear}}% Clear up inheritance problem ???
+            {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkbibrangefull}[2]{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+        \ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkyearrangeextra}[3][]{%
+  \global\boolfalse{cms:extraparens}%
+  \begingroup
+  \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}%
+  \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}%
+  \blx@metadateinfo{#3}%
+  \iffieldundef{#3year}
+  {\blx@nounit}%
+  {\printtext{%
+      \if@cms@bracket%
+      {\cms@yearbrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \ifdateyearsequal{#3}{#3end}%
+      {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3endyear}%
+        \clearfield{#3endyear}}%
+      {\ifblank{#1}%
+        {\cmsunspecified{#2}{#3}}%
+        {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {\ifthenelse{\iffieldundef{#3endyear}\OR%
+              \iffieldequalstr{#3endyear}{}}%
+            {\global\booltrue{cms:extraparens}}%
+            {}%
+            \bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#3endyear}
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}%
+        \cmsformatextra}%\usebibmacro{cmsextradate}%
+      {\iffieldequalstr{#3endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \cmsformatextra%\usebibmacro{cmsextradate}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@yearbrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \csuse{mkbibdate#2}{#3endyear}{}{}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#3endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#3endyear}}}%
+          {\if@cms@enduncertain%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}%
+            \cmsdateeraprint{#3endyear}}%
+          \cmsformatendextra}}}}%
+  \endgroup}%
+
+\def\if@cms@adfirst{%
+  \ifboolexpr{%
+    test {\ifdefstring\blx@languagename{american}}%
+    or
+    test {\ifdefstring\blx@languagename{british}}%
+    or
+    test {\ifdefstring\blx@languagename{canadian}}%
+    or
+    test {\ifdefstring\blx@languagename{english}}%
+    or
+    test {\ifdefstring\blx@languagename{UKenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{USenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{australian}}%
+    or
+    test {\ifdefstring\blx@languagename{newzealand}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@bracket{%
+  \ifboolexpr{%
+    (
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endbracket{%
+  \ifboolexpr{%
+    (
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@circa{%
+  \ifboolexpr{%
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@uncertain{%
+  \ifboolexpr{%
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endcirca{%
+  \ifboolexpr{%
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@enduncertain{%
+  \ifboolexpr{%
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@onlyyears#1{%
+  \ifboolexpr{%
+    test {\iffieldundef{#1month}}%
+    and
+    test {\iffieldundef{#1endmonth}}%
+    and
+    test {\iffieldundef{#1day}}%
+    and
+    test {\iffieldundef{#1endday}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
 \newbibmacro*{standard+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
     \iffieldequalstr{labelyear}{nodate}}% or new declaration ???
     {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
-        test {\ifentrytype{inreference}}%
-        or
-        test {\ifentrytype{reference}}%
-        or
-        test {\ifentrytype{mvreference}}%
+        test {\ifentrytype{dataset}}%
         or
         not togl {cms@nodates}}%
       {}%
@@ -3243,86 +4401,24 @@ bibliography style]
     {\iffieldundef{year}%
       {\iffieldundef{eventyear}%
         {\iffieldundef{origyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {\clearfield{urlyear}}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}%
-                \clearfield{urlyear}}%
-              {\iffieldundef{urlmonth}%
-                {\clearfield{urlyear}}%
-                {\iffieldsequal{urlyear}{urlendyear}%
-                  {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{origendyear}%
-            {\clearfield{origyear}}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{origendyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}%
-                \clearfield{origyear}}%
-              {\iffieldundef{origmonth}%
-                {\clearfield{origyear}}%
-                {\iffieldsequal{origyear}{origendyear}%
-                  {\clearfield{origyear}\clearfield{origendyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{eventendyear}%
-          {\clearfield{eventyear}}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}%
-              \clearfield{eventyear}}%
-            {\iffieldundef{eventmonth}%
-              {\clearfield{eventyear}}%
-              {\iffieldsequal{eventyear}{eventendyear}%
-                {\clearfield{eventyear}\clearfield{eventendyear}}%
-                {}}%
-              \usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{endyear}% DATE FIX
-        {\clearfield{year}}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }%
-          {\mbox{\bibdatedash}%
-            \clearfield{year}}%
-          {\iffieldundef{month}%
-            {\clearfield{year}}%
-            {\iffieldsequal{year}{endyear}%
-              {\clearfield{year}\clearfield{endyear}}%
+              {\bibstring{nodate}}%
               {}}%
-            \usebibmacro{cms@test@labelend}}}}}}%
+            {\printurldateextra%
+              \usebibmacro{clear+datefield}{url}}}%
+          {\printorigdateextra%
+            \usebibmacro{clear+datefield}{orig}}}%
+        {\printeventdateextra%
+          \usebibmacro{clear+datefield}{event}}}%
+      {\printdateextra%
+        \usebibmacro{clear+datefield}{}}}}%
 
 \newbibmacro*{origfirst+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -3330,11 +4426,7 @@ bibliography style]
     {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
-        test {\ifentrytype{inreference}}%
-        or
-        test {\ifentrytype{reference}}%
-        or
-        test {\ifentrytype{mvreference}}%
+        test {\ifentrytype{dataset}}%
         or
         not togl {cms@nodates}}%
       {}%
@@ -3342,86 +4434,24 @@ bibliography style]
     {\iffieldundef{origyear}%
       {\iffieldundef{year}%
         {\iffieldundef{eventyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {\clearfield{urlyear}}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}%
-                \clearfield{urlyear}}%
-              {\iffieldundef{urlmonth}%
-                {\clearfield{urlyear}}%
-                {\iffieldsequal{urlyear}{urlendyear}%
-                  {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{eventendyear}%
-            {\clearfield{eventyear}}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{eventendyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}%
-                \clearfield{eventyear}}%
-              {\iffieldundef{eventmonth}%
-                {\clearfield{eventyear}}%
-                {\iffieldsequal{eventyear}{eventendyear}%
-                  {\clearfield{eventyear}\clearfield{eventendyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{endyear}%
-          {\clearfield{year}}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{endyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}%
-              \clearfield{year}}%
-            {\iffieldundef{month}%
-              {\clearfield{year}}%
-              {\iffieldsequal{year}{endyear}%
-                {\clearfield{year}\clearfield{endyear}}%
-                {}}%
-              \usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{origendyear}% DATE FIX
-        {\clearfield{origyear}}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{origendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }%
-          {\mbox{\bibdatedash}%
-            \clearfield{origyear}}%
-          {\iffieldundef{origmonth}%
-            {\clearfield{origyear}}%
-            {\iffieldsequal{origyear}{origendyear}%
-              {\clearfield{origyear}\clearfield{origendyear}}%
+              {\bibstring{nodate}}%
               {}}%
-            \usebibmacro{cms@test@labelend}}}}}}%
+            {\printurldateextra%
+              \usebibmacro{clear+datefield}{url}}}%
+          {\printeventdateextra%
+            \usebibmacro{clear+datefield}{event}}}%
+        {\printdateextra%
+          \usebibmacro{clear+datefield}{}}}%
+      {\printorigdateextra%
+        \usebibmacro{clear+datefield}{orig}}}}%
 
 \newbibmacro*{av+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -3429,11 +4459,7 @@ bibliography style]
     {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
-        test {\ifentrytype{inreference}}%
-        or
-        test {\ifentrytype{reference}}%
-        or
-        test {\ifentrytype{mvreference}}%
+        test {\ifentrytype{dataset}}%
         or
         not togl {cms@nodates}}%
       {}%
@@ -3441,106 +4467,77 @@ bibliography style]
     {\iffieldundef{eventyear}%
       {\iffieldundef{origyear}%
         {\iffieldundef{year}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {\clearfield{urlyear}}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}%
-                \clearfield{urlyear}}%
-              {\iffieldundef{urlmonth}%
-                {\clearfield{urlyear}}%
-                {\iffieldsequal{urlyear}{urlendyear}%
-                  {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{endyear}%
-            {\clearfield{year}}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{endyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}%
-                \clearfield{year}}%
-              {\iffieldundef{month}%
-                {\clearfield{year}}%
-                {\iffieldsequal{year}{endyear}%
-                  {\clearfield{year}\clearfield{endyear}}%
-                  {}}%
-                \usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{origendyear}%
-          {\clearfield{origyear}}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{origendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}%
-              \clearfield{origyear}}%
-            {\iffieldundef{origmonth}%
-              {\clearfield{origyear}}%
-              {\iffieldsequal{origyear}{origendyear}%
-                {\clearfield{origyear}\clearfield{origendyear}}%
-                {}}%
-              \usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{eventendyear}% DATE FIX
-        {\clearfield{eventyear}}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{eventendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }%
-          {\mbox{\bibdatedash}%
-            \clearfield{eventyear}}%
-          {\iffieldundef{eventmonth}%
-            {\clearfield{eventyear}}%
-            {\iffieldsequal{eventyear}{eventendyear}%
-              {\clearfield{eventyear}\clearfield{eventendyear}}%
+              {\bibstring{nodate}}%
               {}}%
-            \usebibmacro{cms@test@labelend}}}}}}%
+            {\printurldateextra%
+              \usebibmacro{clear+datefield}{url}}}%
+          {\printdateextra%
+            \usebibmacro{clear+datefield}{}}}%
+        {\printorigdateextra%
+          \usebibmacro{clear+datefield}{orig}}}%
+      {\printeventdateextra%
+        \usebibmacro{clear+datefield}{event}}}}%
 
-\newbibmacro*{origyear+endyear}{%
-  \printfield{origyear}%
-  \ifthenelse{\iffieldundef{origendyear}\OR%
-    \iffieldsequal{origyear}{origendyear}}% Same fix as in .lbx
-  {}%
-  {\iffieldequalstr{origendyear}{}%
-    {\mbox{\bibdatedash}}%
-    {\bibdatedash\csuse{mkbibdatelong}{origendyear}{}{}}}}% ???
-
-% \printfield{origendyear}}}} Peculiar bug with this after \bibnamedash
+\newbibmacro{artwork+dates}{% 17th ed.
+  \iftoggle{cms@ordate}%
+  {\IfBeginWith{\thefield{labeldatesource}}{orig}%
+    {\iftoggle{cms@switchdates}%
+      {\printdate\newunit\printorigdate}%
+      {\ifthenelse{\iffieldundef{origmonth}\AND\iffieldundef{origseason}}%
+        {\iffieldundef{year}{}{\printdate}}%
+        {\printorigdate%
+          \iffieldundef{year}%
+          {}%
+          {\newunit\printdate}}}}%
+    {\IfBeginWith{\thefield{labeldatesource}}{event}%
+      {}%
+      {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}%
+        {}{\printdate}}}}%
+  {\ifboolexpr{%
+      togl {cms@origlabel}%
+      or
+      togl {cms@bothlabelold}%
+      or
+      togl {cms@bothlabelnew}%
+    }%
+    {\iftoggle{cms@switchdates}%
+      {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}%
+        {\printorigdate}%
+        {\printdate\newunit\printorigdate}}%
+      {\ifthenelse{\iffieldundef{origmonth}\AND\iffieldundef{origseason}}%
+        {\printdate}%
+        {\printorigdate\newunit\printdate}}}%
+    {\iftoggle{cms@switchdates}%
+      {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}%
+        {\printorigdate}%
+        {\printdate\newunit\printorigdate}}%
+      {\iffieldundef{origyear}%
+        {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}%
+          {}%
+          {\printdate}}%
+        {\printorigdate%
+          \iffieldundef{year}%
+          {}%
+          {\newunit\printdate}}}}}}
 
-\newbibmacro*{year+endyear}{%
-  \printfield{year}%
-  \ifthenelse{\iffieldundef{endyear}\OR%
-    \iffieldsequal{year}{endyear}}% Same fix as in .lbx
-  {}%
-  {\iffieldequalstr{endyear}{}%
-    {\mbox{\bibdatedash}}%
-    {\bibdatedash\printfield{endyear}}}}
+\newbibmacro*{clear+datefield}[1]{%
+  \iffieldundef{#1day}%
+  {\iffieldundef{#1endyear}%
+    {\clearfield{#1year}}%
+    {\ifthenelse{\iffieldundef{#1month}\AND\iffieldundef{#1season}}%
+      {\clearfield{#1year}}%
+      {\ifdateyearsequal{#1}{#1end}%
+        {\clearfield{#1year}\clearfield{#1endyear}}%
+        {}}}}%
+  {}}
 
 \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
   \ifboolexpr{%
@@ -3572,10 +4569,10 @@ bibliography style]
     {\usebibmacro{bothyear+oldstyle}}%
     {\iftoggle{cms@bothlabelold}%
       {\usebibmacro{bothyear+oldstyle}}%
-      {\usebibmacro{labelyear+extrayear}}}}%
-  \ifcsdef{@cms@tempdate}%
-  {\toggletrue{\@cms@tempdate}}%
-  {}}%
+      {\usebibmacro{labelyear+extrayear}}}}}%
+  % \ifcsdef{@cms@tempdate}%
+  % {\toggletrue{\@cms@tempdate}}%
+  % {}}%
 
 \newbibmacro*{origyear+labelyear}{%
   \ifboolexpr{ (
@@ -3583,6 +4580,8 @@ bibliography style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -3600,8 +4599,9 @@ bibliography style]
         \usebibmacro{standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}%
         {\usebibmacro{origfirst+labelyear+extrayear}}%
-        {\usebibmacro{origyear+endyear}%
-          \clearfield{origyear}}}}}}%
+        {\clearfield{extradate}%
+          \printorigdateextra%\usebibmacro{origyear+endyear}%
+          \usebibmacro{clear+datefield}{orig}}}}}}%
 
 \newbibmacro*{bothyear+oldstyle}{%
   \ifboolexpr{ (
@@ -3609,6 +4609,8 @@ bibliography style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -3622,9 +4624,11 @@ bibliography style]
         \bibopenparen%
         \usebibmacro{labelyear+extrayear}%
         \bibcloseparen%
-        \setunit{\addspace}\usebibmacro{origyear+endyear}}%
-      \clearfield{year}%
-      \clearfield{origyear}}%
+        \setunit{\addspace}%
+        \clearfield{extrayear}%
+        \printorigdateextra}% \usebibmacro{origyear+endyear}
+      \usebibmacro{clear+datefield}{}%
+      \usebibmacro{clear+datefield}{orig}}%
     {\iffieldundef{origyear}%
       {\iftoggle{cms@ordate}%
         {}%
@@ -3638,18 +4642,23 @@ bibliography style]
               \usebibmacro{origfirst+labelyear+extrayear}%
               \bibcloseparen%
               \setunit*{\addspace}%
-              \usebibmacro{year+endyear}}}}%
-        {\printtext{%
-            \bibopenparen%
-            \usebibmacro{origyear+endyear}%
-            \bibcloseparen%
-            \clearfield{extradate}\setunit*{\addspace}%
-            \usebibmacro{standard+labelyear+extrayear}}}%
-        \clearfield{origyear}%
-        \clearfield{year}}}}}%
+              \clearfield{extradate}%
+              \printdateextra}}}% \usebibmacro{year+endyear}
+        {\iffieldundef{year}%
+          {\usebibmacro{origfirst+labelyear+extrayear}}%
+          {\printtext{%
+              \bibopenparen%
+              \clearfield{extradate}%
+              \printorigdateextra%
+              % \usebibmacro{origyear+endyear}%
+              \bibcloseparen%
+              \setunit*{\addspace}%
+              \usebibmacro{standard+labelyear+extrayear}}}}%
+        \usebibmacro{clear+datefield}{orig}%
+        \usebibmacro{clear+datefield}{}}}}}%
 
 \newbibmacro*{pubstate}{%
-  \iftoggle{cms@reprint}%
+  \iffieldequalstr{pubstate}{reprint}%
   {\iftoggle{cms@switchdates}%
     {\iffieldundef{year}% Fix for consistency???
       {}%
@@ -3661,22 +4670,28 @@ bibliography style]
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
           \printorigdate}}}}% Need \addperiod & \nopunct ??
-  {\printfield{pubstate}}}%
+  {}}% 17th ed.
 
 \newbibmacro*{choosepubstring}{%
   \ifthenelse{\ifentrytype{video}\OR%
     \ifentrytype{music}}%
   {\bibstring{origreleaseyear}}%
-  {\bibstring{origpubyear}}}%
+  {\bibstring{origpubyearalt}}}%
 
 \newbibmacro*{bibreprint}{%
-  \iftoggle{cms@reprint}%
-  {\iffieldundef{origyear}%
-    {\bibstring{reprint}\newcunit}% 16th ed.
-    {\iftoggle{cms@switchdates}%
-      {\bibstring{reprint}\newcunit}% 16th ed.
-      {}}}%
-  {}}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\ifentrytype{video}%
+    {}%
+    {\iffieldundef{origyear}%
+      {\bibstring{reprint}\reprintpunct}% 16th ed. \newcunit
+      {\iftoggle{cms@switchdates}%
+        {\bibstring{reprint}\reprintpunct}% 16th ed. \newcunit
+        {}}}}%
+  {\iffieldundef{pubstate}%
+    {}%
+    {\iffieldbibstring{pubstate}%
+      {\biblstring{\thefield{pubstate}}\reprintpunct}% \newcunit
+      {\printfield[prenote]{pubstate}\reprintpunct}}}}% \newcunit
 
 \newbibmacro*{volume+pages}{% Volume fix (modified)
   \ifboolexpr{%
@@ -3872,46 +4887,48 @@ bibliography style]
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}%
 
-\newbibmacro*{cjournal+ser+vol+num}{% Moved to bbx
+\newbibmacro*{cjournal+ser+vol+num}[1]{% Moved to bbx
   \usebibmacro{journal+sub}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
   \iffieldundef{series}%
-    {}%
-    {\newcunit
-      \printfield[jourser]{series}%
-      \newcunit}%\setunit*{\addspace}?
-  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {}%
+  {\newcunit
+    \printfield[jourser]{series}%
+    \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{#1year}\AND\iffieldundef{#1month}\AND%
+    \iffieldundef{issue}\AND\iffieldundef{#1season}}%
   {\iffieldundef{volume}%
     {\newcunit%
       \printfield[journum]{number}%
       \clearfield{number}%
-      \setunit{\addcomma\addspace}}%
+      \printunit{\addcomma\addspace}}%
     {\printfield[jourvol]{volume}%
       \setunit{\addcomma\addspace}}}%
   {\printfield[jourvol]{volume}%
     \newcunit%
     \printfield[journum]{number}%
     \clearfield{number}%
-    \setunit{\addcomma\addspace}}% need * here?
-  \printfield{eid}%
-  \newunit}%
+    \setunit{\addcomma\addspace}}}% eid moved for 17th ed.
+  % \printfield{eid}%
+  % \newunit}%
 
-\newbibmacro*{journal+issue+year+pages}{%
+\newbibmacro*{journal+issue+year+pages}[1]{%
   \ifboolexpr{%
     not togl {cms@numbermonth}%
     or
     test {\ifcsstring{blx@dateformat@date}{year}}%
     }%
-    {\clearfield{month}}%
+    {\clearfield{#1month}}%
     {}%
-  \usebibmacro{cjournal+ser+vol+num}%
+  \usebibmacro{cjournal+ser+vol+num}{#1}%
   \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
-    \AND\iffieldundef{number}\AND\iffieldundef{year}}% Test year for
-  {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT% related entries??
-      \iffieldundef{volume}}% Removed kludge for French colon spacing?
+  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{#1month}%
+    \AND\iffieldundef{number}\AND\iffieldundef{#1year}\AND%
+    \iffieldundef{#1season}}% Test year for related entries??
+  {\ifthenelse{\iffieldundef{bookpagination}\AND%
+      \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}%
     {\setunit{\postvolpunct}}%
     {\setunit{\addcolon\addspace}}}% This may not be universally correct.
   {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
@@ -3922,22 +4939,23 @@ bibliography style]
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
     \setunit{\addcolon\addspace}}%
-  \printfield{pages}}%
+  \usebibmacro{eid+or+pages}}%
 
-\newbibmacro*{periodical+issue+year+pages}{%
+\newbibmacro*{periodical+issue+year+pages}[1]{%
   \ifboolexpr{%
     not togl {cms@numbermonth}%
     or
     test {\ifcsstring{blx@dateformat@date}{year}}%
   }%
-  {\clearfield{month}}%
+  {\clearfield{#1month}}%
   {}%
-  \usebibmacro{cperiodical+ser+vol+num}%
+  \usebibmacro{cperiodical+ser+vol+num}{#1}%
   \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
-    \AND\iffieldundef{number}\AND\iffieldundef{year}}% See prev. macro
-  {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
-      \iffieldundef{volume}}% Removed kludge for French ???
+  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{#1month}%
+    \AND\iffieldundef{number}\AND\iffieldundef{#1year}\AND%
+    \iffieldundef{#1season}}% See prev. macro
+  {\ifthenelse{\iffieldundef{bookpagination}\AND%
+      \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}%
     {\setunit{\postvolpunct}}%
     {\setunit{\addcolon\addspace}}}%
   {\printtext[parens]{%
@@ -3948,7 +4966,12 @@ bibliography style]
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
     \setunit{\addcolon\addspace}}%
-  \printfield{pages}}%
+  \usebibmacro{eid+or+pages}}%
+
+\newbibmacro*{eid+or+pages}{%
+  \iffieldundef{eid}%
+  {\printfield{pages}}%
+  {\printfield{eid}}}
 
 \newbibmacro*{bycompiler}{%
   \ifnameundef{namec}%
@@ -3959,7 +4982,7 @@ bibliography style]
 \renewbibmacro*{byeditor}{%
   \ifnameundef{editor}%
     {}%
-    {\usebibmacro{cbytypestrg}{editor}{editor}%
+    {\usebibmacro{bytypestrg}{editor}{editor}%
      \setunit{\addspace}%
      \printnames[byeditor]{editor}%
      \usebibmacro{editorpunct}}%
@@ -3968,19 +4991,19 @@ bibliography style]
 \renewbibmacro*{byeditorx}{%
   \ifnameundef{editora}%
     {}%
-    {\usebibmacro{cbytypestrg}{editora}{editor}%
+    {\usebibmacro{bytypestrg}{editora}{editor}%
      \setunit{\addspace}%
      \printnames[byeditora]{editora}%
      \usebibmacro{editorpunct}}%
   \ifnameundef{editorb}%
     {}%
-    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+    {\usebibmacro{bytypestrg}{editorb}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorb]{editorb}%
      \usebibmacro{editorpunct}}%
   \ifnameundef{editorc}%
     {}%
-    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+    {\usebibmacro{bytypestrg}{editorc}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorc]{editorc}%
      \usebibmacro{editorpunct}}}
@@ -4115,6 +5138,9 @@ bibliography style]
 \newbibmacro*{begrelatedloop}{}
 \newbibmacro*{endrelatedloop}{}
 
+\newcommand*{\begrelateddelimmaintitle}{\newunitpunct\par\nobreak}%
+\newcommand*{\begrelateddelimmaintitlenc}{\newunitpunct\par\nobreak}%
+
 \def\ifrelatedloop{%
   \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}%
     or test {\xifinlistcs{\strfield{clonesourcekey}}{bbx:relatedloop}} }}%
@@ -4122,12 +5148,15 @@ bibliography style]
 \newbibmacro*{related}{%
   \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }%
     {}%
-    {\usebibmacro{begrelated}%
+    {\ifcsundef{begrelateddelim\strfield{relatedtype}}%
+       {\printunit{\begrelateddelim}}%
+       {\printunit{\csuse{begrelateddelim\strfield{relatedtype}}}}%
+     \usebibmacro{begrelated}%
      \def\bbx@tempa{}%
      \setcounter{bbx:relatedtotal}{0}%
      \def\do##1{%
        \entrydata{##1}{%
-         \ifrelatedloop
+         \ifrelatedloop%
            {}%
            {\stepcounter{bbx:relatedtotal}%
             \gappto{\bbx@tempa}{##1,}}}}%
@@ -4142,7 +5171,13 @@ bibliography style]
         \def\do{%
           \stepcounter{bbx:relatedcount}%
           \ifnumgreater{\value{bbx:relatedcount}}{1}%
-            {\printtext{\relateddelim}}%
+            {\ifcsundef{relateddelim\strfield{relatedtype}}%
+              {\printunit{\relateddelim}}%
+              {\expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter\printunit
+                \expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter{%
+                  \csuse{relateddelim\strfield{relatedtype}}}}}%
             {}}%
         \ifbibmacroundef{related:\strfield{relatedtype}}%
           {\appto{\do}{\usebibmacro{related:default}}}%
@@ -4176,4 +5211,270 @@ bibliography style]
        {}%
      \usebibmacro{endrelated}}}%
 
+\NewBibliographyString{%
+   afterwordto,%
+   broadcast,%
+   by,%
+   bychoreographer,%
+   bycompileraf,%
+   bycompileran,%
+   bycompileranaf,%
+   bycompileranfo,%
+   bycompileranin,%
+   bycompilerco,%
+   bycompilercoaf,%
+   bycompilercofo,%
+   bycompilercoin,%
+   bycompilerfo,%
+   bycompilerin,%
+   byconductor,%
+   bydirector,%
+   byeditoralt,%
+   byeditorcp,%
+   byeditorcpaf,%
+   byeditorcpan,%
+   byeditorcpanaf,%
+   byeditorcpanfo,%
+   byeditorcpanin,%
+   byeditorcpco,%
+   byeditorcpcoaf,%
+   byeditorcpcofo,%
+   byeditorcpcoin,%
+   byeditorcpfo,%
+   byeditorcpin,%
+   byeditortrcp,%
+   byeditortrcpaf,%
+   byeditortrcpan,%
+   byeditortrcpanaf,%
+   byeditortrcpanfo,%
+   byeditortrcpanin,%
+   byeditortrcpco,%
+   byeditortrcpcoaf,%
+   byeditortrcpcofo,%
+   byeditortrcpcoin,%
+   byeditortrcpfo,%
+   byeditortrcpin,%
+   bynone,%
+   byproducer,%
+   bytranslatorcp,%
+   bytranslatorcpaf,%
+   bytranslatorcpan,%
+   bytranslatorcpanaf,%
+   bytranslatorcpanfo,%
+   bytranslatorcpanin,%
+   bytranslatorcpco,%
+   bytranslatorcpcoaf,%
+   bytranslatorcpcofo,%
+   bytranslatorcpcoin,%
+   bytranslatorcpfo,%
+   bytranslatorcpin,%
+   canadasection,%
+   canadasections,%
+   cbyannotator,%
+   cbyauthor,%
+   cbychoreographer,%
+   cbycollaborator,%
+   cbycommentator,%
+   cbycompiler,%
+   cbycompileraf,%
+   cbycompileran,%
+   cbycompileranaf,%
+   cbycompileranfo,%
+   cbycompileranin,%
+   cbycompilerco,%
+   cbycompilercoaf,%
+   cbycompilercofo,%
+   cbycompilercoin,%
+   cbycompilerfo,%
+   cbycompilerin,%
+   cbyconductor,%
+   cbycontinuator,%
+   cbydirector,%
+   cbyeditor,%
+   cbyeditoraf,%
+   cbyeditoralt,%
+   cbyeditoran,%
+   cbyeditoranaf,%
+   cbyeditoranfo,%
+   cbyeditoranin,%
+   cbyeditorco,%
+   cbyeditorcoaf,%
+   cbyeditorcofo,%
+   cbyeditorcoin,%
+   cbyeditorcp,%
+   cbyeditorcpaf,%
+   cbyeditorcpan,%
+   cbyeditorcpanaf,%
+   cbyeditorcpanfo,%
+   cbyeditorcpanin,%
+   cbyeditorcpco,%
+   cbyeditorcpcoaf,%
+   cbyeditorcpcofo,%
+   cbyeditorcpcoin,%
+   cbyeditorcpfo,%
+   cbyeditorcpin,%
+   cbyeditorfo,%
+   cbyeditorin,%
+   cbyeditortr,%
+   cbyeditortraf,%
+   cbyeditortran,%
+   cbyeditortranaf,%
+   cbyeditortranfo,%
+   cbyeditortranin,%
+   cbyeditortrco,%
+   cbyeditortrcoaf,%
+   cbyeditortrcofo,%
+   cbyeditortrcoin,%
+   cbyeditortrcp,%
+   cbyeditortrcpaf,%
+   cbyeditortrcpan,%
+   cbyeditortrcpanaf,%
+   cbyeditortrcpanfo,%
+   cbyeditortrcpanin,%
+   cbyeditortrcpco,%
+   cbyeditortrcpcoaf,%
+   cbyeditortrcpcofo,%
+   cbyeditortrcpcoin,%
+   cbyeditortrcpfo,%
+   cbyeditortrcpin,%
+   cbyeditortrfo,%
+   cbyeditortrin,%
+   cbyfounder,%
+   cbynone,%
+   cbyorganizer,%
+   cbyproducer,%
+   cbyredactor,%
+   cbytranslator,%
+   cbytranslatoraf,%
+   cbytranslatoran,%
+   cbytranslatoranaf,%
+   cbytranslatoranfo,%
+   cbytranslatoranin,%
+   cbytranslatorco,%
+   cbytranslatorcoaf,%
+   cbytranslatorcofo,%
+   cbytranslatorcoin,%
+   cbytranslatorcp,%
+   cbytranslatorcpaf,%
+   cbytranslatorcpan,%
+   cbytranslatorcpanaf,%
+   cbytranslatorcpanfo,%
+   cbytranslatorcpanin,%
+   cbytranslatorcpco,%
+   cbytranslatorcpcoaf,%
+   cbytranslatorcpcofo,%
+   cbytranslatorcpcoin,%
+   cbytranslatorcpfo,%
+   cbytranslatorcpin,%
+   cbytranslatorfo,%
+   cbytranslatorin,%
+   century,%
+   cfromamerican,%
+   cfrombrazilian,%
+   cfrombulgarian,%
+   cfromcatalan,%
+   cfromcroatian,%
+   cfromczech,%
+   cfromdanish,%
+   cfromdutch,%
+   cfromenglish,%
+   cfromestonian,%
+   cfromfinnish,%
+   cfromfrench,%
+   cfromgalician,%
+   cfromgerman,%
+   cfromgreek,%
+   cfromitalian,%
+   cfromjapanese,%
+   cfromlatin,%
+   cfromnorwegian,%
+   cfrompolish,%
+   cfromportuguese,%
+   cfromrussian,%
+   cfromslovak,%
+   cfromslovene,%
+   cfromspanish,%
+   cfromswedish,%
+   cfromukrainian,%
+   choreographer,%
+   choreographers,%
+   commenton,%
+   conductor,%
+   conductors,%
+   decade,%
+   director,%
+   directors,%
+   discrecorded,%
+   edamerican,%
+   edbrazilian,%
+   edbulgarian,%
+   edcatalan,%
+   edcroatian,%
+   edczech,%
+   eddanish,%
+   eddutch,%
+   edenglish,%
+   edestonian,%
+   edfinnish,%
+   edfrench,%
+   edgalician,%
+   edgerman,%
+   edgreek,%
+   editalian,%
+   editorcompiler,%
+   editorcompilers,%
+   editortranscompiler,%
+   editortranscompilers,%
+   editortranslator,%
+   editortranslators,%
+   edjapanese,%
+   edlatin,%
+   ednorwegian,%
+   edpolish,%
+   edportuguese,%
+   edrussian,%
+   edslovak,%
+   edslovene,%
+   edspanish,%
+   edswedish,%
+   edukrainian,%
+   forewordto,%
+   hereinafter,%
+   inlang,%
+   introductionto,%
+   none,%
+   nones,%
+   note,%
+   numbers,%
+   of,%
+   on,%
+   origedition,%
+   origpub,%
+   origpublin,%
+   origpubyear,%
+   origpubyearalt,%
+   origreleaseyear,%
+   origshownyear,%
+   partvolume,%
+   patentfiled,%
+   patentissued,%
+   preface,%
+   printed,%
+   producer,%
+   producers,%
+   pseudonym,%
+   review,%
+   revisededition,%
+   selfpublished,%
+   songrecorded,%
+   subsection,%
+   subsections,%
+   subverbis,%
+   subverbo,%
+   supranote,%
+   track,%
+   transcompiler,%
+   transcompilers%
+ }%
+
 \endinput
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 f0abe6ed187..1e37ea0ecce 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,11 +1,9 @@
-% $Id: chicago-authordate.cbx,v 0.9.1.4 2018/01/11 09:29:25 dfussner Exp $
+% This is a biblatex citation style file, originally 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, 17th edition.
 
-% 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}[2018/01/11 v 3.10 biblatex
+\ProvidesFile{chicago-authordate.cbx}[2020/04/20 v 3.14 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
@@ -39,7 +37,7 @@ citation style]
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[artwork,image]{title}{%
+\DeclareFieldFormat[artwork,image,inreference]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
@@ -52,11 +50,15 @@ citation style]
 
 \DeclareFieldAlias[image]{lostitle}[artwork]{title}
 
-\DeclareFieldFormat[letter,patent]{title}{#1\isdot}
+\DeclareFieldAlias[inreference]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[inreference]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[letter]{title}{#1\isdot}
 
-\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
 
-\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
 
 \DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
 
@@ -114,11 +116,24 @@ citation style]
 \DeclareFieldFormat{mainsubtitle}{\mkbibemph{#1}}
 
 \DeclareFieldFormat[audio,music,video]{title}{%
-  \iffieldundef{booktitle}%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldAlias[video]{citetitle}[video]{title}
+\DeclareFieldFormat[video]{citetitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+      and
+      not test {\iffieldundef{title}}%
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\mkbibemph{#1}\isdot}%
+    {\mkbibquote{#1\isdot}}}}
 
 \DeclareFieldAlias[video]{lostitle}[video]{title}
 
@@ -212,6 +227,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibemph{#1}}
@@ -225,6 +245,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibquote{#1}}
@@ -238,6 +263,11 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1\addspace\bibstring{in}}
@@ -251,10 +281,33 @@ citation style]
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1}
 
+\DeclareFieldFormat{muschapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{track}}%
+  \endgroup
+  \bibstring{track}~#1}%
+
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
@@ -271,15 +324,15 @@ citation style]
   {\iffieldundef{issuetitle}%
     {\iffieldundef{title}%
       {\iffieldundef{booktitle}%
-        {\iffieldundef{maintitle}%
-          {\iffieldundef{journaltitle}%
+        {\iffieldundef{journaltitle}% Switch order for 17th ed.
+          {\iffieldundef{maintitle}%
             {}%
-            {\DeclareFieldAlias{jtnoformat}{title:hook}%
-              \DeclareFieldAlias{sjtnoformat}{title}%
-              \DeclareFieldAlias{journaltitle}{default}%
-              \DeclareFieldAlias{shortjournal}{series}%
-              \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
-          {\DeclareFieldAlias{maintitle}{title:hook}}}%
+            {\DeclareFieldAlias{maintitle}{title:hook}}}%
+          {\DeclareFieldAlias{jtnoformat}{title:hook}%
+            \DeclareFieldAlias{sjtnoformat}{title}%
+            \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
         {\DeclareFieldAlias{booktitle}{title:hook}}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
@@ -295,7 +348,9 @@ citation style]
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%
-      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\ifentrytype{music}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
         \DeclareFieldAlias[video]{title}{default}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx
new file mode 100644
index 00000000000..e0bde354e9e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx
@@ -0,0 +1,4935 @@
+% 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-authordate16.bbx}[2020/04/20 v 3.14 biblatex
+bibliography style]
+
+%%%% Initialize and format bibliography and los %%%%
+
+\providetoggle{cms@citejtabb}% Here for Sourcemap declaration
+\providetoggle{cms@bibjtabb}%
+
+\DeclareFieldFormat{shorthandwidth}{#1}
+
+\DeclareFieldFormat{shortjournalwidth}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\textbf{#1}\isdot}%
+  {\mkbibemph{\textbf{#1}}\isdot}}%
+
+\newlength{\lositemsep}
+
+\defbibenvironment{bibliography}% New for 0.9a
+  {\list
+     {}
+     {\setlength{\leftmargin}{\bibhang}%
+      \setlength{\itemindent}{-\leftmargin}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shorthand}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{losnotes}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\footnotesize%
+      \setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{losendnotes}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\enotesize%
+      \setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}% Kludges for endnotes
+  {\item}
+
+\defbibenvironment{shortjournal}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.7\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{sjnotes}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\footnotesize%
+      \setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{sjendnotes}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\enotesize%
+      \setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}
+  {\item}
+
+\defbibcheck{shorthand}{%
+  \iftoggle{cms@los}%
+  {\iffieldundef{shorthand}%
+    {\skipentry}%
+    {\ifcsdef{\strfield{shorthand}}%
+      {\skipentry}%
+      {\savefieldcs{shorthand}{\strfield{shorthand}}}}}%
+  {}}%
+
+\defbibcheck{shortjournal}{% Only one list
+  \iffieldundef{shortjournal}%
+  {\skipentry}%
+  {\ifcsdef{\strfield{shortjournal}=\strfield{journaltitle}}%
+    {\skipentry}%
+    {\savefieldcs{shortjournal}%
+      {\strfield{shortjournal}=\strfield{journaltitle}}}}}%
+
+% \defbibcheck{shortjournal}{% Multiple lists
+%   \ifcsdef{cms@shjour}%
+%   {\iffieldequals{shortjournal}{\cms@shjour}%
+%     {\skipentry}%
+%     {\savefield{shortjournal}{\cms@shjour}}}%
+%   {\savefield{shortjournal}{\cms@shjour}}}
+
+\AtBeginBibliography{%
+  \togglefalse{cms@headlessnote}}%
+
+\AtEveryBibitem{%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}}%
+
+\AtEveryLositem{%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}}%
+
+\AtEveryBiblistitem{shortjournal}{%
+  \global\csundef{@cmsst}%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\clearlist{location}}%
+  {}}%
+
+\InitializeBibliographyStyle{%
+  \let\bbx@lasthash\undefined}%
+
+%%%% Bibliography-specific bibstrings %%%%
+
+%% Now in *.lbx %%
+
+%%%% Author, Editor, Translator, and Compiler  Macros %%%%
+
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+  {\usebibmacro{name:delim}{#3#1}%
+    \usebibmacro{name:hook}{#3#1}%
+    \ifblank{#3}{}{%
+      \ifcapital
+      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+      {\mkbibnameprefix{#3}\isdot}%
+      \ifpunctmark{'}{}{\addhighpenspace}}%
+    \mkbibnamelast{#1}\isdot
+    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
+  {\usebibmacro{name:delim}{#1}%
+    \usebibmacro{name:hook}{#1}%
+    \mkbibnamelast{#1}\isdot%
+    \ifblank{#2#3#4}{}{\addcomma}%
+    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
+\renewbibmacro*{name:first-last}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifpunctmark{'}%
+    {}%
+    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+  \mkbibnamelast{#1}\isdot
+  \ifblank{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
+        \ifboolexpr{%
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+        }%
+        {\addcomma}%
+        {}}}%
+    {\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}%
+     \ifdefvoid{#3}{}{%
+       \ifcapital
+         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+         {\mkbibnameprefix{#3}\isdot}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+     \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
+    {\usebibmacro{name:delim}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot
+     \ifboolexpr{%
+       test {\ifdefvoid{#2}}%
+       and
+       test {\ifdefvoid{#3}}%
+     }%
+     {}{\revsdnamepunct}%    
+     \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+     \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+     \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}%
+
+\renewbibmacro*{name:given-family}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
+  \ifdefvoid{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifprefchar
+      {}%
+      {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
+  \mkbibnamefamily{#1}\isdot
+  \ifdefvoid{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+      {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot%
+        \ifboolexpr{% Test needed?
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+        }%
+        {\revsdnamepunct}%
+        {}}}%
+    {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
+
+\renewbibmacro*{author/editor}{%
+  \ifboolexpr{%
+    test {\ifuseauthor}%
+    or
+    togl {cms@headlessnote}%
+  }%
+  {\usebibmacro{author}}%
+  {\ifusenamea%
+    {\usebibmacro{pickeditor}}%
+    {\ifuseeditor%
+      {\usebibmacro{moreeditor}}%
+      {\ifusenameb%
+        {\usebibmacro{picktranslator}}%
+        {\ifusetranslator%
+          {\usebibmacro{moretranslator}}%
+          {\ifusenamec%
+            {\usebibmacro{compiler}}%
+            {\let\bbx@lasthash\undefined}}}}}}}%
+
+\renewbibmacro*{author}{%
+  \iftoggle{cms@headlessnote}%
+  {\usebibmacro{justauthor}}%
+  {\usebibmacro{moreauthor}}}
+
+\newbibmacro*{justauthor}{%
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\let\bbx@lasthash\undefined}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}}%
+      {\printtext{\bibnamedash}%
+        \ifentrytype{customc}%
+        {\newunit}%
+        {\setunit{\addspace}}\printfield{nameaddon}}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{author}\bibrightbracket%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printnames{author}%
+            \ifentrytype{customc}{}%
+            {\setunit{\addspace}\printfield{nameaddon}}\bibcloseparen%
+            \ifentrytype{customc}%
+            {\newunit\printfield{nameaddon}}%
+            {}}%
+          {\printnames{author}%
+            \ifentrytype{customc}{\newunit}{\setunit{\addspace}}%
+            \printfield{nameaddon}}%
+          \savefield{fullhash}{\bbx@lasthash}}}}}}
+
+\newbibmacro*{moreauthor}{%
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\usebibmacro{pickeditor}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}}%
+      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{author}\bibrightbracket%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printnames{author}%
+            \setunit{\addspace}\printfield{nameaddon}\bibcloseparen}%
+          {\printnames{author}%
+            \setunit{\addspace}%
+            \printfield{nameaddon}}%
+          \savefield{fullhash}{\bbx@lasthash}}}}}}
+
+\newbibmacro*{pickeditor}{%
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+  {\usebibmacro{moreeditor}}%
+  {\usebibmacro{parteditor}}}
+
+\newbibmacro*{moreeditor}{%
+  \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+    {\usebibmacro{picktranslator}}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\editordelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\editordelim}}%
+       {\iftoggle{cms@authorparens}%
+         {\bibopenparen\printnames{editor}%
+           \setunit{\addspace}\printfield{nameaddon}%
+           \bibcloseparen\editordelim}%
+         {\printnames{editor}%
+           \setunit{\addspace}%
+           \printfield{nameaddon}\editordelim}%
+        \savefield{fullhash}{\bbx@lasthash}}%
+     \usebibmacro{editstrg}}}%
+
+\renewbibmacro*{editor}{%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+    {\ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+      {\usebibmacro{picktranslator}}%
+      {\ifboolexpr{%
+          test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\iffieldundef{nameaddon}%
+          {\printtext{\bibnamedash}\editordelim}%
+          {\printtext{\bibnamedash}\setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printnames{editor}%
+            \setunit{\addspace}\printfield{nameaddon}%
+            \bibcloseparen\editordelim}%
+          {\printnames{editor}%
+            \setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        \usebibmacro{editstrg}}}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\nameadelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}}%
+      {\iftoggle{cms@authorparens}%
+        {\bibopenparen\printnames[sortname]{namea}%
+          \setunit{\addspace}\printfield{nameaddon}%
+          \bibcloseparen\nameadelim}%
+        {\printnames[sortname]{namea}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      \usebibmacro{parteditstrg}}}}
+
+\newbibmacro*{parteditor}{%
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+  {\usebibmacro{picktranslator}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\nameadelim}%
+      {\printtext{\bibnamedash}\setunit{\addcomma}%
+        \printfield{nameaddon}\nameadelim}}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{namea}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\nameadelim}%
+      {\printnames[sortname]{namea}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parteditstrg}}}
+
+\newbibmacro*{picktranslator}{%
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
+  {\usebibmacro{moretranslator}}%
+  {\usebibmacro{parttranslator}}}
+
+\newbibmacro*{moretranslator}{%
+  \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}%
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{translator}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{translator}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{transstrg}}}
+
+\newbibmacro*{parttranslator}{%
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{nameb}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{nameb}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parttransstrg}}}
+
+\newbibmacro*{compiler}{%
+  \ifthenelse{\ifnameundef{namec}\OR\NOT\ifusenamec}%
+  {\let\bbx@lasthash\undefined}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addcomma}%
+        \printfield{nameaddon}\newcunit}}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{namec}%
+        \setunit{\addspace}\printfield{nameaddon}%
+        \bibcloseparen\newcunit}%
+      {\printnames[sortname]{namec}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{compilestrg}}}
+
+\renewcommand*{\revsdnamedelim}{\addcomma}
+
+\DeclareNameAlias{author}{sortname}% Needed in 0.9
+\DeclareNameAlias{editor}{sortname}
+\DeclareNameAlias{translator}{sortname}
+
+%%%% Drivers for Bibliography entries and Shorthands %%%%
+
+\DeclareBibliographyDriver{shorthand}{%
+  \iftoggle{cms@los}%
+  {\ifnameundef{labelname}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      \usebibmacro{shorthand:label}}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      \ifboolexpr{%
+        test {\iffieldequalstr{labelnamesource}{shortauthor}}%
+        and
+        test {\ifentrytype{manual}}%
+      }%
+      {\printnames{\thefield{labelnamesource}}}%
+      {\ifentrytype{customc}%
+        {\clearfield{nameaddon}}%
+        {}%
+        \usebibmacro{author/editor}}}%
+    \finentry}%
+  {\iftoggle{cms@fullshhand}%
+    {\usedriver{\frenchspacing}%
+      {\thefield{entrytype}}%
+      \finentry}%
+    {\ifnameundef{labelname}%
+      {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+          \ifentrytype{periodical}}%
+        {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+            \newcunit}}%
+        {\ifentrytype{manual}%
+          {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+          {}}}%
+      {\ifboolexpr{%
+          test {\iffieldequalstr{labelnamesource}{shortauthor}}%
+          and
+          test {\ifentrytype{manual}}%
+        }%
+        {\printnames{\thefield{labelnamesource}}\newunit}%
+        {\ifentrytype{customc}%
+          {\usebibmacro{justauthor}\setunit{\addspace}}%
+          {\usebibmacro{author/editor}\newunit}}}%
+      \printfield[lostitle]{title}%
+      \finentry}}}
+
+\DeclareBibliographyDriver{shortjournal}{%
+  \iffieldundef{journaltitle}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\printtext[journaltitle]{%
+      \printfield[jtnoformat]{journaltitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sjtnoformat]{journalsubtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  \finentry}%
+
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=shorttitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map{
+      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldset=year, origfieldval, final]
+      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      replace=\regexp{\\bibstring\{$1\}}]%$
+      \step[fieldset=pubstate, null]
+    }
+    \map{
+      \pertype{article}
+      \pertype{periodical}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=entrysubtype, match={newspaper},
+      replace={magazine}]
+    }
+    \map{
+      \pertype{jurisdiction}
+      \pertype{legal}
+      \pertype{legislation}
+      \step[fieldsource=journaltitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{[^\\adddot][a-z]}, final]
+      \step[fieldset=shortjournal, fieldvalue=\addnbspace, append]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=title, match=\regexp{Const}, final]
+      \step[fieldset=entrysubtype, fieldvalue=constitution]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=entrysubtype, match=\regexp{canada}, final]
+      \step[fieldsource=bookpagination, match={section},
+      replace={canadasection}]
+      \step[fieldsource=pagination, match={section},
+      replace={canadasection}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=subtitle, final]
+      \step[fieldsource=title,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=title, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=booksubtitle, final]
+      \step[fieldsource=booktitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=booktitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=issuesubtitle, final]
+      \step[fieldsource=issuetitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=issuetitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=journalsubtitle, final]
+      \step[fieldsource=journaltitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=journaltitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=mainsubtitle, final]
+      \step[fieldsource=maintitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=year, match=\regexp{^\\mkbibbrackets\{(.+)\}(.*)$},%$
+      replace=\regexp{[$1]$2}]% Kludge for backward compat.
+    }
+  }
+}%
+
+\DeclareBibliographyDriver{article}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{mag+news+author}%
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \usebibmacro{mag+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{bibreprint}%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock% 17th ed. clarifies punctuation
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{mag+news+date}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+  {\usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}{\usebibmacro{mag+news+title}\newunit}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}{}{\usebibmacro{mag+news+title}}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{bibreprint}%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock% 17th ed.
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
+  \usebibmacro{journal+issue+year+pages}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{artwork}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not test {\iffieldundef{title}}%
+  }%
+  {\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    or
+    test {\iffieldundef{title}}%
+  }%
+  {}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit%\setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}% Reversed with bibreprint 16th ed. (?)
+  \newunit\newblock
+  \usebibmacro{bibreprint}%\printorigdate%
+  \usebibmacro{publ+loc+year}%
+  \newunit
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \printfield{ismn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
+  \printfield{chapter}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newcunit\newblock
+  \printlist[][-\value{listtotal}]{lista}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{bookinbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{howpubl+loc+year}%
+  \newunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{justauthor}%
+  \iffieldundef{nameaddon}%
+  {\newunit}%
+  {\setunit{\addspace}}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{image}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \setunit*{\addcomma\addspace}% 16th ed. added * (?)
+  \usebibmacro{date}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }%
+  {\setunit{\addperiod\addspace}%
+  \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }%
+  {\setunit{\addperiod\addspace}% Moved here.
+  \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }%
+  {\setunit{\addperiod\addspace}%
+    \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{inreference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{reference+title}%{italtitle+stitle}
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}% need asterisk?
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newcunit\newblock
+  \printlist[][-\value{listtotal}]{lista}%
+  \newcunit\newblock% \setunit{\addspace}% 16th ed.
+  \ifnameundef{author}%
+  {}%
+  {\printtext{% 16th ed.
+      \bibstring{by}%
+      \addspace%
+      \printnames[byauthor]{author}}}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{jurisdiction}{%
+  \iffieldequalstr{entrysubtype}{square}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext[brackets]{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \iffieldundef{issue}%
+    {\printfield[jurisdictionser]{series}}%
+    {\setunit{\addspace}%
+      \printfield{issue}}% Better ideas?
+    \usebibmacro{juridpostnote}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\addspace}%
+    \usebibmacro{cms:shorthandintro}%
+    \setunit{\addspace}\newblock
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@related}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{round}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit*{\addspace}%
+      \printfield[jourvol]{volume}%
+      \setunit{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \setunit{\addspace}%
+      \printlist{origpublisher}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printlist{origlocation}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+        \printlist{location}%
+        \setunit*{\addspace}%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{legal}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newcunit\newblock
+  \usebibmacro{clegis+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield[juridnum]{number}%
+  \newcunit%
+  \iffieldundef{year}%
+  {}%
+  {\printtext{%
+    \begingroup% Better ideas?
+    \let\abx@bibmonth\blx@imc@bibsstring%
+    \usebibmacro{date}\endgroup}}%
+  \newcunit%\setunit*{\addspace}%
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}%
+  {}%
+  {\printtext[shortjournal]{%
+    \printfield[jtsnoformat]{shortjournal}}}%
+  \setunit{\addspace}%
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \newcunit%
+  \printfield{part}%
+  \newcunit%
+  \printfield{chapter}%
+  \usebibmacro{juridpostnote}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addspace}%
+  \printlist{location}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
+  \setunit{\addspace}\newblock%
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legislation}{%
+  \iffieldequalstr{entrysubtype}{uk}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{author/editor}%
+    \newcunit\newblock
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \newcunit%\setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit*{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \setunit{\addspace}%
+    \printfield{series}%
+    \setunit{\addspace}%
+    \printfield{issue}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}%
+    \usebibmacro{juridpostnote}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\addspace}%
+    \usebibmacro{cms:shorthandintro}%
+    \setunit{\addspace}\newblock%
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@related}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \setunit{\addspace}%
+      \printfield[hansardser]{series}%
+      \setunit{\addspace}%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addspace}% FIXME?
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \newcunit%
+      \printfield{series}%
+      \setunit{\addspace}%
+      \printfield{issue}%
+      \newcunit%
+      \printfield{part}%
+      \newcunit%
+      \printfield{chapter}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iffieldundef{usera}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+          \printlist{location}%
+          \setunit*{\addspace}%
+          \printfield{usera}%
+          \setunit*{\addspace}%
+          \begingroup% Better ideas?
+          \let\abx@bibmonth\blx@imc@bibsstring%
+          \usebibmacro{date}\endgroup}}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{letter}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \printtext[title]{%
+    \printfield[noformat]{title}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{letter+date}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%\bibsentence
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }%
+  {\usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\newunit}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\newunit}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author+org}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \usebibmacro{edition}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock%
+  \usebibmacro{bibreprint}%
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \iffieldundef{entrysubtype}%
+  {\ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}}%
+  {}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \iffieldundef{entrysubtype}%
+  {\ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}}%
+  {\printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newcunit\newblock%
+    \usebibmacro{unpubl+letter+date}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \iffieldundef{entrysubtype}%
+  {\newcunit\newblock%
+    \usebibmacro{date}}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not test {\iffieldundef{title}}%
+  }%
+  {\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    or
+    test {\iffieldundef{title}}%
+  }%
+  {}{\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}%\printeventdate
+  \newunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\newunit}% Fix customc?
+  {\newcunit}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \newunit\newblock
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{pubstate}% 16th ed -- origdate instead, as above?
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printlist{organization}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
+  {}%
+  {\printurldate}% Date fix
+  \newunit\newblock
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
+  \newunit\newblock%
+  \usebibmacro{eprint}%
+  \newunit\newblock
+  \printfield{url}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author+holder}% + holder?
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmscitesortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \setunit{\addperiod\addspace}%
+  \printfield{note}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{bibreprint}%
+  \printfield{type}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}%
+    {}%
+    {\setunit*{\addspace}%
+     \printtext[parens]{%
+       \printlist[][-\value{listtotal}]{location}}}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \iftoggle{cms@switchdates}%
+  {\bibstring{patentfiled}%
+    \setunit{\addspace}%
+    \printdate%
+    \setunit{\addcomma\addspace}%
+    \bibstring{and}%
+    \addspace\bibstring{patentissued}\addspace%
+    \printorigdate}%
+  {\iffieldundef{origyear}%
+    {\iffieldundef{year}%
+      {}%
+      {\bibstring{patentfiled}\setunit{\addspace}%
+        \printdate}}%
+    {\bibstring{patentfiled}\setunit{\addspace}%
+      \printorigdate%\usebibmacro{date}%
+      \setunit{\finalandcomma\addspace\bibstring{and}%
+        \addspace\bibstring{patentissued}\addspace}%
+      \usebibmacro{date}}}%
+  \newcunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \iftoggle{cms@related}%
+  {\newunit%
+    \usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \clearlist{location}%
+  \clearfield{shorttitle}%
+  \clearfield{title}%
+  \clearfield{subtitle}%
+  \newunit\newblock}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{periodical+date+issue}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \clearlist{location}%
+  \clearfield{shorttitle}%
+  \clearfield{title}%
+  \clearfield{subtitle}%
+  \newunit\newblock}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
+  \usebibmacro{periodical+issue+year+pages}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{bibprexref}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{bibpostxref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{reference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{reference+title}%{italtitle+stitle}
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}% need asterisk?
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit
+  \printfield{series}%
+  \setunit{\addnbspace}%
+  \printfield{number}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{inst+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{review}{%
+  \usebibmacro{bibindex}%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{mag+news+author}}%
+  {\usebibmacro{author/editor}}%
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}%
+      \newunit}}%
+  {}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef{\bbx@lasthash}%
+  {}%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \newcunit\newblock
+  \usebibmacro{music+eventdate}% 16th ed.
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{bibreprint}%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{mag+news+date}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}}%
+  {\usebibmacro{journal+issue+year+pages}}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{suppbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{%
+  \usebibmacro{inforaft}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{bybookauthor}%
+  \clearname{bookauthor}%
+  \newunit\newblock}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{%
+  \usebibmacro{inforaft}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{italtitle+stitle}}%
+  \newunit
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \newcunit%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{suppcollection}{suppbook}
+
+\DeclareBibliographyAlias{suppperiodical}{review}
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \printfield{note}%
+  \setunit{\addperiod\addspace}\newblock%
+  \usebibmacro{bibreprint}%
+  \usebibmacro{type+inst+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
+  \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{byeditor+others}% Fix bug ???
+  \newunit\newblock
+  \usebibmacro{bibreprint}%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \printfield{eventtitle}%
+  \setunit*{\ctitleaddonpunct}\newblock%
+  \printfield{eventtitleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
+  \printlist{location}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iffieldundef{eventmonth}%
+  {\usebibmacro{date}}%
+  {\printeventdate}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{shorthand:author}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{%
+  \usebibmacro{video+title}% Simplifies trad style
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}{}%
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \ifundef\bbx@lasthash{}{%
+  \usebibmacro{video+title}% Simplifies trad style
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}% 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
+%%%% Other Formatting Macros %%%%
+
+\newbibmacro*{bib+doi+url}{% 16th ed.
+  \ifboolexpr{%
+    not togl {cms@url}%
+    or
+    (
+    test {\iffieldundef{urlyear}}%
+    and
+    test {\iffieldundef{urlmonth}}%
+    )
+    }%
+  {}%
+  {\printurldate}% Date fix
+  \iffieldundef{addendum}%
+  {\newunit\newblock}%
+  {\newcunit\newblock}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \setunit*{\addperiod\addspace}\newblock%
+      \clearfield{url}}}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
+    {\printfield{doi}%
+      \setunit*{\addperiod\addspace}\newblock}%
+    {}}%
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
+  {\usebibmacro{eprint}%
+    \setunit*{\addperiod\addspace}\newblock}%
+  {}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
+  {\printfield{url}}%
+  {}}%
+
+\newbibmacro*{shorthand:author}{%
+  \ifboolexpr{%
+    test {\iffieldundef{shorthand}}%
+    or
+    not togl {cms@los}%
+  }%
+  {\togglefalse{cms@authorparens}%
+    \global\csundef{cms@shauthor}}%
+  {\ifboolexpr{%
+      ((
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      or
+      test {\iffieldequals{shorthand}{\cms@shauthor}}%
+      )
+      and
+      togl {cms@namedash}%
+      )
+      and
+      not test {\iffirstonpage}%
+    }%
+    {\togglefalse{cms@authorparens}}%
+    {\toggletrue{cms@authorparens}%
+      \savefield{shorthand}{\cms@shauthor}%
+      \printfield{shorthand}\addspace}}}
+
+\newbibmacro*{shorthand:label}{% Test this
+  \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+    \ifentrytype{periodical}}% Simplifies .bib creation
+    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
+    {\ifentrytype{manual}%
+      {\printtext[bibhyperref]{\printlist{organization}}}%
+      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
+
+\newbibmacro*{labelyear+extrayear}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{av+labelyear+extrayear}}%
+  {\iftoggle{cms@ordate}%
+    {\usebibmacro{origfirst+labelyear+extrayear}}%
+    {\usebibmacro{standard+labelyear+extrayear}}}}
+
+\protected\def\cmsunspecified#1#2{%
+  \ifboolexpr{%
+    test {\iffieldundef{#2dateunspecified}}%
+    or
+    togl {cms@alwaysrange}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{#2endyear}}%
+      or
+      test {\iffieldequalstr{#2dateera}{bce}}%
+      or
+      not togl {cms@compyears}%
+      or
+      not test {\iffieldnum{#2year}}%
+      or
+      not test {\iffieldnum{#2endyear}}%
+      or
+      not test {\if@cms@onlyyears{#2}}%
+    }%
+    {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2year}}%
+    {\cmscompcenturies{#2}%
+      \ifboolexpr{%
+        (
+        test {\if@cms@bracket}%
+        and
+        not test {\if@cms@endbracket}
+        )
+        or
+        (
+        not test {\if@cms@bracket}%
+        and
+        test {\if@cms@endbracket}%
+        )
+        or
+        (
+        test {\if@cms@endcirca}%
+        and
+        not test {\if@cms@circa}%
+        )
+        or
+        not test {\ifnumequal{\cms@tempcnta}{\cms@tempcntb}}%
+      }%
+      {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+      {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}}}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{#2dateunspecified}{yearindecade}}%
+      and
+      test {\ifbibstring{decade}}%
+      and
+      not togl {cms@decaderange}%
+    }%
+    {\cmsmkdecade{#1}{#2}}%
+    {\ifboolexpr{%
+        test {\iffieldequalstr{#2dateunspecified}{yearincentury}}%
+        and
+        test {\ifbibstring{century}}%
+        and
+        not togl {cms@centuryrange}%
+      }%
+      {\cmsmkcentury{#2}}%
+      {\iftoggle{cms@compyears}%
+        {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+          \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}}}}}%
+
+\protected\def\cmscompressyears#1{%
+  \def\cms@tempa{\thefield{#1year}--\thefield{#1endyear}}%
+  \edef\cms@tempb{\mkcomprange{\csuse{cms@tempa}}}%
+  \cms@tempb}%
+
+\newcount\cms@tempcnta
+\newcount\cms@tempcntb
+
+\def\cmscompcenturies#1{%
+  \cms@tempcnta=\thefield{#1year}%
+  \divide\cms@tempcnta100
+  \cms@tempcntb=\thefield{#1endyear}%
+  \divide\cms@tempcntb100}
+
+\protected\def\cmsformatextra{%
+  \ifboolexpr{%
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {\usebibmacro{cmsextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  {\ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}}
+
+\protected\def\cmsformatendextra{%
+  \ifboolexpr{%
+    test {\if@cms@endbracket}%
+    and
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {\usebibmacro{cmsextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  {\ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}}
+
+\newbibmacro*{cmsextradate}{% For use with some date specs
+  \iffieldundef{extradate}%
+  {}%
+  {\setunit*{}%
+    \printfield{extradate}\clearfield{extradate}}}
+
+\newbibmacro*{cmsparensextradate}{% For use with other date specs
+  \iffieldundef{extradate}%
+  {}%
+  {\setunit*{}%
+    \mkbibparens{\printfield{extradate}}\clearfield{extradate}}}
+
+\protected\def\cmsdateeraprintpre#1{% AD/BC order depends on language
+  \ifdefstring\blx@dateera{astronomical}%
+  {\iffieldnum{#1}%
+    {\begingroup%
+      \let\blx@tempa\@empty%
+      \blx@ifstrendswith{#1}{endyear}%
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+        \def\blx@tempa{end}}%
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifnumless{0-\thefield{#1}}{0}%
+        {\printtext{\csuse{bibdateera\blx@tempa prefix}}}%
+        {}}%
+      {}%
+      \endgroup}%
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      test {\if@cms@adfirst}%
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}{}{\global\toggletrue{cms@bc}}}%
+        {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+          {\ifdefstring\blx@tempa{end}%
+            {\iftoggle{cms@bc}%
+              {\printtext{%
+                  \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+                \global\togglefalse{cms@bc}}%
+              {}}%
+            {\printtext{%
+                \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+              \global\togglefalse{cms@bc}}}%
+          {}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\protected\def\cmsdateeraprint#1{% AD/BC order depends on language
+  \ifboolexpr{%
+    test {\ifdefstring\blx@dateera{christian}}%
+    and
+    test {\if@cms@adfirst}%
+  }%
+  {\iffieldnum{#1}
+    {\begingroup
+      \let\blx@tempa\@empty
+      \blx@ifstrendswith{#1}{endyear}
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype
+        \def\blx@tempa{end}}
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifdefstring\blx@tempa{end}%
+        {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+          \printtext{\printdelim{dateeradelim}\midsentence%
+            \bibsstring{\blx@dateera@bce}}%
+          \global\booltrue{cms:extraparens}\relax%
+          \fi}%
+        {\csuse{if\blx@datetype enddateera}{bce}%
+          {}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}%
+            \global\booltrue{cms:extraparens}\relax%
+            \fi}}}%
+      {}%
+      \endgroup}
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{secular}}%
+      or
+      (
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      not test {\if@cms@adfirst}%
+      )
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}%
+            \global\booltrue{cms:extraparens}\relax%
+            \fi}%
+          {\csuse{if\blx@datetype enddateera}{bce}%
+            {}%
+            {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+              \printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@bce}}%
+              \global\booltrue{cms:extraparens}\relax%
+              \fi}}}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+            {\printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@ce}}%
+              \global\booltrue{cms:extraparens}}%
+            {}}%
+          {\csuse{if\blx@datetype enddateera}{ce}%
+            {}%
+            {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+              {\printtext{\printdelim{dateeradelim}\midsentence%
+                  \bibsstring{\blx@dateera@ce}}%
+                \global\booltrue{cms:extraparens}}%
+              {}}}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\newrobustcmd*{\cms@datebrackets}{%
+  \iftoggle{cms@nodatebrackets}%
+  {\global\boolfalse{cms:bracket}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@yearbrackets}{%
+  \iftoggle{cms@noyearbrackets}%
+  {\global\boolfalse{cms:bracket}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@mkbibrangetrunc}[2]{% DATE FIX
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2day}}%
+          {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+            {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+              \clearfield{#2endyear}}% Clear up inheritance problem ???
+            {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkbibrangefull}[2]{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+        \ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkyearrangeextra}[3][]{%
+  \global\boolfalse{cms:extraparens}%
+  \begingroup
+  \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}%
+  \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}%
+  \blx@metadateinfo{#3}%
+  \iffieldundef{#3year}
+  {\blx@nounit}%
+  {\printtext{%
+      \if@cms@bracket%
+      {\cms@yearbrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \ifdateyearsequal{#3}{#3end}%
+      {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3endyear}%
+        \clearfield{#3endyear}}%
+      {\ifblank{#1}%
+        {\cmsunspecified{#2}{#3}}%
+        {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {\ifthenelse{\iffieldundef{#3endyear}\OR%
+              \iffieldequalstr{#3endyear}{}}%
+            {\global\booltrue{cms:extraparens}}%
+            {}%
+            \bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#3endyear}
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}%
+        \cmsformatextra}%\usebibmacro{cmsextradate}%
+      {\iffieldequalstr{#3endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \cmsformatextra%\usebibmacro{cmsextradate}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@yearbrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \csuse{mkbibdate#2}{#3endyear}{}{}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#3endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#3endyear}}}%
+          {\if@cms@enduncertain%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}%
+            \cmsdateeraprint{#3endyear}}%
+          \cmsformatendextra}}}}%
+  \endgroup}%
+
+\def\if@cms@adfirst{%
+  \ifboolexpr{%
+    test {\ifdefstring\blx@languagename{american}}%
+    or
+    test {\ifdefstring\blx@languagename{british}}%
+    or
+    test {\ifdefstring\blx@languagename{canadian}}%
+    or
+    test {\ifdefstring\blx@languagename{english}}%
+    or
+    test {\ifdefstring\blx@languagename{UKenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{USenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{australian}}%
+    or
+    test {\ifdefstring\blx@languagename{newzealand}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@bracket{%
+  \ifboolexpr{%
+    (
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endbracket{%
+  \ifboolexpr{%
+    (
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@circa{%
+  \ifboolexpr{%
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@uncertain{%
+  \ifboolexpr{%
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endcirca{%
+  \ifboolexpr{%
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@enduncertain{%
+  \ifboolexpr{%
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@onlyyears#1{%
+  \ifboolexpr{%
+    test {\iffieldundef{#1month}}%
+    and
+    test {\iffieldundef{#1endmonth}}%
+    and
+    test {\iffieldundef{#1day}}%
+    and
+    test {\iffieldundef{#1endday}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\newbibmacro*{standard+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}% or new declaration ???
+    {\ifboolexpr{%
+        test {\ifentrytype{misc}}%
+        or
+        test {\ifentrytype{inreference}}%
+        or
+        test {\ifentrytype{reference}}%
+        or
+        test {\ifentrytype{mvreference}}%
+        or
+        not togl {cms@nodates}}%
+      {}%
+      {\bibstring{nodate}}}%
+    {\iffieldundef{year}%
+      {\iffieldundef{eventyear}%
+        {\iffieldundef{origyear}%
+          {\printurldateextra%
+            \usebibmacro{clear+datefield}{url}}%
+          {\printorigdateextra%
+            \usebibmacro{clear+datefield}{orig}}}%
+        {\printeventdateextra%
+          \usebibmacro{clear+datefield}{event}}}%
+      {\printdateextra%
+        \usebibmacro{clear+datefield}{}}}}%
+
+\newbibmacro*{origfirst+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+    {\ifboolexpr{%
+        test {\ifentrytype{misc}}%
+        or
+        test {\ifentrytype{inreference}}%
+        or
+        test {\ifentrytype{reference}}%
+        or
+        test {\ifentrytype{mvreference}}%
+        or
+        not togl {cms@nodates}}%
+      {}%
+      {\bibstring{nodate}}}%
+    {\iffieldundef{origyear}%
+      {\iffieldundef{year}%
+        {\iffieldundef{eventyear}%
+          {\printurldateextra%
+            \usebibmacro{clear+datefield}{url}}%
+          {\printeventdateextra%
+            \usebibmacro{clear+datefield}{event}}}%
+        {\printdateextra%
+          \usebibmacro{clear+datefield}{}}}%
+      {\printorigdateextra%
+        \usebibmacro{clear+datefield}{orig}}}}%
+
+\newbibmacro*{av+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+    {\ifboolexpr{%
+        test {\ifentrytype{misc}}%
+        or
+        test {\ifentrytype{inreference}}%
+        or
+        test {\ifentrytype{reference}}%
+        or
+        test {\ifentrytype{mvreference}}%
+        or
+        not togl {cms@nodates}}%
+      {}%
+      {\bibstring{nodate}}}%
+    {\iffieldundef{eventyear}%
+      {\iffieldundef{origyear}%
+        {\iffieldundef{year}%
+          {\printurldateextra%
+            \usebibmacro{clear+datefield}{url}}%
+          {\printdateextra%
+            \usebibmacro{clear+datefield}{}}}%
+        {\printorigdateextra%
+          \usebibmacro{clear+datefield}{orig}}}%
+      {\printeventdateextra%
+        \usebibmacro{clear+datefield}{event}}}}%
+
+\newbibmacro*{clear+datefield}[1]{%
+  \iffieldundef{#1endyear}%
+  {\clearfield{#1year}}%
+  {\ifthenelse{\iffieldundef{#1month}\AND\iffieldundef{#1season}}%
+    {\clearfield{#1year}}%
+    {\ifdateyearsequal{#1}{#1end}%
+      {\clearfield{#1year}\clearfield{#1endyear}}%
+      {}}}}%
+
+\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    not test {\iffieldint{origyear}}%
+  }%
+  {\usebibmacro{cmsbibyear}}%
+  {\iffieldint{year}%
+    {\ifboolexpr{% Needed for date ranges - video type, esp.
+        test {\iffieldundef{endyear}}%
+        or
+        not test {\iffieldnum{endyear}}%
+      }%
+      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsbibyear}}%
+        {\usebibmacro{cmsbibyear}}}%
+      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsbibyear}}%
+        {\usebibmacro{cmsbibyear}}}}%
+    {\usebibmacro{cmsbibyear}}}}%
+
+\newbibmacro*{cmsbibyear}{%
+  \iftoggle{cms@origlabel}%
+  {\usebibmacro{origyear+labelyear}}%
+  {\iftoggle{cms@bothlabelnew}%
+    {\usebibmacro{bothyear+oldstyle}}%
+    {\iftoggle{cms@bothlabelold}%
+      {\usebibmacro{bothyear+oldstyle}}%
+      {\usebibmacro{labelyear+extrayear}}}}}%
+
+\newbibmacro*{origyear+labelyear}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{labelyear+extrayear}}%
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}% ???
+        {}%
+        {\clearfield{extradate}}%
+        \usebibmacro{standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{origfirst+labelyear+extrayear}}%
+        {\clearfield{extradate}%
+          \printorigdateextra%\usebibmacro{origyear+endyear}%
+          \usebibmacro{clear+datefield}{orig}}}}}}%
+
+\newbibmacro*{bothyear+oldstyle}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{av+labelyear+extrayear}}% \clearfield local to \printtext
+  {\iftoggle{cms@switchdates}%
+    {\printtext{%
+        \bibopenparen%
+        \usebibmacro{labelyear+extrayear}%
+        \bibcloseparen%
+        \setunit{\addspace}%
+        \clearfield{extrayear}%
+        \printorigdateextra}% \usebibmacro{origyear+endyear}
+      \usebibmacro{clear+datefield}{}%
+      \usebibmacro{clear+datefield}{orig}}%
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extradate}}%
+        \usebibmacro{standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% ???
+        {\iffieldundef{year}%
+          {\usebibmacro{origfirst+labelyear+extrayear}}%
+          {\printtext{%
+              \bibopenparen%
+              \usebibmacro{origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit*{\addspace}%
+              \clearfield{extradate}%
+              \printdateextra}}}% \usebibmacro{year+endyear}
+        {\iffieldundef{year}%
+          {\usebibmacro{origfirst+labelyear+extrayear}}%
+          {\printtext{%
+              \bibopenparen%
+              \clearfield{extradate}%
+              \printorigdateextra%
+              % \usebibmacro{origyear+endyear}%
+              \bibcloseparen%
+              \setunit*{\addspace}%
+              \usebibmacro{standard+labelyear+extrayear}}}}%
+        \usebibmacro{clear+datefield}{orig}%
+        \usebibmacro{clear+datefield}{}}}}}%
+
+\newbibmacro*{pubstate}{%
+  \iftoggle{cms@reprint}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{year}% Fix for consistency???
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printdate}}}% Need \addperiod & \nopunct ??
+    {\iffieldundef{origyear}%
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printorigdate}}}}% Need \addperiod & \nopunct ??
+  {\printfield{pubstate}}}%
+
+\newbibmacro*{choosepubstring}{%
+  \ifthenelse{\ifentrytype{video}\OR%
+    \ifentrytype{music}}%
+  {\bibstring{origreleaseyear}}%
+  {\bibstring{origpubyear}}}%
+
+\newbibmacro*{bibreprint}{%
+  \iftoggle{cms@reprint}%
+  {\iffieldundef{origyear}%
+    {\bibstring{reprint}\newcunit}% 16th ed.
+    {\iftoggle{cms@switchdates}%
+      {\bibstring{reprint}\newcunit}% 16th ed.
+      {}}}%
+  {}}%
+
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+  \ifboolexpr{%
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}%
+    {\iffieldundef{part}%
+      {\iffieldundef{pages}%
+        {\printfield{volume}}% Still print this w/o part or pages???
+        {\ifthenelse{\iffieldnums{pages}%
+            \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+          {\printfield[default]{volume}%
+            \postvolpunct%
+            \printfield{pages}}%
+          {\printfield{volume}%
+            \addcomma\addspace%
+            \printfield{pages}}}}%
+      {\printfield{volume}%
+        \printfield{part}%
+        \newcunit%
+        \printfield{pages}}}}%
+  {\ifboolexpr{%
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {\printfield{pages}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}}}%
+
+\newbibmacro*{bibprexref}{% For back references
+  \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}%
+
+\newbibmacro*{bibpostxref}{% Volume fix
+  \iffieldundef{chapter}%
+  {\iffieldundef{pages}%
+    {\iffieldundef{volume}%
+      {\iffieldundef{part}%
+        {}%
+        {\newcunit\printfield{part}}}%
+      {\ifboolexpr{%
+          test {\ifcsdef{cbx@incollvol}}%
+          and
+          test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        }%
+        {\iffieldundef{part}%
+          {}%
+          {\ifboolexpr{%
+              test {\ifcsdef{cbx@incollpart}}%
+              and
+              test {\iffieldequalcs{part}{cbx@incollpart}}%
+            }%
+            {}%
+            {\newcunit\printfield{part}}}}%
+        {\iffieldundef{part}%
+          {\newcunit\printfield{volume}}%
+          {\newcunit\printfield{volume}\printfield{part}}}}}%
+    {\iffieldundef{volume}%
+      {\iffieldundef{part}%
+        {\newcunit\printfield{pages}}%
+        {\newcunit\printfield{part}\newcunit\printfield{pages}}}%
+      {\ifboolexpr{%
+          test {\ifcsdef{cbx@incollvol}}%
+          and
+          test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        }%
+        {\iffieldundef{part}%
+          {\newcunit\printfield{pages}}%
+          {\ifboolexpr{%
+              test {\ifcsdef{cbx@incollpart}}%
+              and
+              test {\iffieldequalcs{part}{cbx@incollpart}}%
+            }%
+            {\newcunit\printfield{pages}}%
+            {\newcunit\printfield{part}\newcunit\printfield{pages}}}}%
+        {\iffieldundef{part}%
+          {\ifthenelse{\iffieldnums{pages}%
+              \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+            {\newcunit\printfield[default]{volume}%
+              \postvolpunct%
+              \printfield{pages}}%
+            {\newcunit\printfield{volume}%
+              \addcomma\addspace%
+              \printfield{pages}}}%
+          {\newcunit\printfield{volume}%
+            \printfield{part}%
+            \newcunit%
+            \printfield{pages}}}}}}%
+  {\newcunit\printfield{chapter}}%
+  \iftoggle{cms@xrefurl}%
+  {\newunit%
+    \usebibmacro{bib+doi+url}}%
+  {}%
+  \ifcsdef{cbx@incollpgref}% Here we print and clear the child's
+  {\restorelist{pageref}{\cbx@incollpgref}% backrefs
+    \newunit%
+    \usebibmacro{pageref}%
+    \global\let\cbx@incollpgref\undefined}%
+  {}}%
+
+\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
+  \iffieldundef{maintitle}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\printfield{volumes}}%
+    {\printfield{volume}%
+      \printfield{part}}}%
+  {\ifboolexpr{%
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {}%
+    {\printfield{volumes}}}}
+
+\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% Test ???
+    {\iffieldundef{title}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}% Volume-less treatment?
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}%
+
+\newbibmacro*{btitle+bstitle}{% InIn fix from N&B
+  \iffieldundef{booktitle}%
+  {}%
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {}%
+    {\usebibmacro{cms-in:}}%
+    \printtext{%
+      \printfield{booktitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[booksubtitle]{booksubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{booktitleaddon}%
+    \setunit*{\addcomma\addspace}}}%
+
+\newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+    \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}%
+    {\usebibmacro{cms-in:}% Volume-less treatment?
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}%
+
+\newbibmacro*{cjournal+ser+vol+num}{% Moved to bbx
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}%
+  {}%
+  {\newcunit
+    \printfield[jourser]{series}%
+    \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+    \iffieldundef{issue}\AND\iffieldundef{season}}%
+  {\iffieldundef{volume}%
+    {\newcunit%
+      \printfield[journum]{number}%
+      \clearfield{number}%
+      \printunit{\addcomma\addspace}}%
+    {\printfield[jourvol]{volume}%
+      \setunit{\addcomma\addspace}}}%
+  {\printfield[jourvol]{volume}%
+    \newcunit%
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}% need * here?
+  \printfield{eid}%
+  \newunit}%
+
+\newbibmacro*{journal+issue+year+pages}{%
+  \ifboolexpr{%
+    not togl {cms@numbermonth}%
+    or
+    test {\ifcsstring{blx@dateformat@date}{year}}%
+    }%
+    {\clearfield{month}}%
+    {}%
+  \usebibmacro{cjournal+ser+vol+num}%
+  \setunit{\addspace}%
+  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
+    \AND\iffieldundef{number}\AND\iffieldundef{year}\AND%
+    \iffieldundef{season}}% Test year for related entries??
+  {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT\iffieldundef{volume}}%
+    {\setunit{\postvolpunct}}%
+    {\setunit{\addcolon\addspace}}}% This may not be universally correct.
+  {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
+      \iffieldundef{issue}%
+      {\usebibmacro{date}%
+        \printfield{number}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}%
+    \setunit{\addcolon\addspace}}%
+  \printfield{pages}}%
+
+\newbibmacro*{periodical+issue+year+pages}{%
+  \ifboolexpr{%
+    not togl {cms@numbermonth}%
+    or
+    test {\ifcsstring{blx@dateformat@date}{year}}%
+  }%
+  {\clearfield{month}}%
+  {}%
+  \usebibmacro{cperiodical+ser+vol+num}%
+  \setunit{\addspace}%
+  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
+    \AND\iffieldundef{number}\AND\iffieldundef{year}\AND%
+    \iffieldundef{season}}% See prev. macro
+  {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT\iffieldundef{volume}}%
+    {\setunit{\postvolpunct}}%
+    {\setunit{\addcolon\addspace}}}%
+  {\printtext[parens]{%
+      \iffieldundef{issue}%
+      {\usebibmacro{date}%
+        \printfield{number}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}%
+    \setunit{\addcolon\addspace}}%
+  \printfield{pages}}%
+
+\newbibmacro*{bycompiler}{%
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{bycompiler}\addspace
+     \printnames[bycompiler]{namec}}}
+
+\renewbibmacro*{byeditor}{%
+  \ifnameundef{editor}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{byeditorx}}%
+
+\renewbibmacro*{byeditorx}{%
+  \ifnameundef{editora}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \usebibmacro{editorpunct}}%
+  \ifnameundef{editorb}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \usebibmacro{editorpunct}}%
+  \ifnameundef{editorc}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \usebibmacro{editorpunct}}}
+
+\renewbibmacro*{byeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND
+    \(\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}\)}%
+    {\def\@tempa{byeditor}%
+     \ifnamesequal{editor}{translator}%
+       {\edef\@tempa{\@tempa tr}%
+        \clearname{translator}}%
+       {}%
+       \ifnamesequal{editor}{namec}%
+       {\edef\@tempa{\@tempa cp}%
+         \clearname{namec}}%
+       {}%
+     \ifnamesequal{editor}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{editor}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{editor}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{editor}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{editor}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \clearname{editor}%
+     \usebibmacro{editorpunct}%
+     \usebibmacro{byeditorx}}%
+   {\usebibmacro{byeditor}}%
+  \usebibmacro{bytranslator+others}}%
+
+\renewbibmacro*{bytranslator+others}{%
+  \ifnameundef{translator}%
+    {}%
+    {\def\@tempa{bytranslator}%
+      \ifnamesequal{translator}{namec}%
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}%
+      {}%
+     \ifnamesequal{translator}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{translator}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{bycompiler+others}}%
+
+\newbibmacro*{bycompiler+others}{%
+  \ifnameundef{namec}%
+    {}%
+    {\def\@tempa{bycompiler}%
+     \ifnamesequal{namec}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{namec}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{byothers}}%
+
+\newbibmacro*{byothers}{% Changed for 0.9
+  \usebibmacro{cbytranslator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{bycompiler}%
+  \usebibmacro{editorpunct}%
+%  \usebibmacro{byredactor}%
+%  \usebibmacro{editorpunct}%
+  \usebibmacro{withcommentator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withannotator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withintroduction}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withforeword}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withafterword}}%
+
+%%%% Related functionality from standard.bbx %%%%
+
+\newcounter{bbx:relatedcount}
+\newcounter{bbx:relatedtotal}
+
+\newbibmacro*{related:init}{%
+  \csundef{bbx:relatedloop}}
+
+\newbibmacro*{begrelated}{\ifcsdef{bbx@lasthash}%
+  {\let\cms@related@hash\bbx@lasthash}{}}%
+\newbibmacro*{endrelated}{\ifcsdef{cms@related@hash}%
+  {\global\let\bbx@lasthash\cms@related@hash%
+    \let\cms@related@hash\undefined}{}}%
+\newbibmacro*{begrelatedloop}{}
+\newbibmacro*{endrelatedloop}{}
+
+\newcommand*{\begrelateddelimmaintitle}{\newunitpunct\par\nobreak}%
+\newcommand*{\begrelateddelimmaintitlenc}{\newunitpunct\par\nobreak}%
+
+\def\ifrelatedloop{%
+  \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}%
+    or test {\xifinlistcs{\strfield{clonesourcekey}}{bbx:relatedloop}} }}%
+
+\newbibmacro*{related}{%
+  \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }%
+    {}%
+    {\ifcsundef{begrelateddelim\strfield{relatedtype}}%
+       {\printunit{\begrelateddelim}}%
+       {\printunit{\csuse{begrelateddelim\strfield{relatedtype}}}}%
+     \usebibmacro{begrelated}%
+     \def\bbx@tempa{}%
+     \setcounter{bbx:relatedtotal}{0}%
+     \def\do##1{%
+       \entrydata{##1}{%
+         \ifrelatedloop%
+           {}%
+           {\stepcounter{bbx:relatedtotal}%
+            \gappto{\bbx@tempa}{##1,}}}}%
+     \docsvfield{related}%
+     \restorefield{related}{\bbx@tempa}%
+     \ifnumgreater{\value{bbx:relatedtotal}}{0}%
+       {\listcsxadd{bbx:relatedloop}{\strfield{entrykey}}%
+        \iffieldundef{clonesourcekey}%
+          {}%
+          {\listcsxadd{bbx:relatedloop}{\strfield{clonesourcekey}}}%
+        \setcounter{bbx:relatedcount}{0}%
+        \def\do{%
+          \stepcounter{bbx:relatedcount}%
+          \ifnumgreater{\value{bbx:relatedcount}}{1}%
+            {\ifcsundef{relateddelim\strfield{relatedtype}}%
+              {\printunit{\relateddelim}}%
+              {\expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter\printunit
+                \expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter{%
+                  \csuse{relateddelim\strfield{relatedtype}}}}}%
+            {}}%
+        \ifbibmacroundef{related:\strfield{relatedtype}}%
+          {\appto{\do}{\usebibmacro{related:default}}}%
+          {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
+        \iffieldformatundef{related:\strfield{relatedtype}}%
+          {\def\bbx@tempa{related}}%
+          {\def\bbx@tempa{related:\strfield{relatedtype}}}%
+        \iffieldformatundef{relatedstring:\strfield{relatedtype}}%
+          {\def\bbx@tempb{relatedstring:default}}%
+          {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
+        \printtext[\bbx@tempa]{%
+          \usebibmacro{begrelatedloop}%
+          \iffieldundef{relatedstring}%
+            {\ifboolexpr{%
+               test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}%
+               and
+               test {\ifbibxstring{\thefield{relatedtype}s}}%
+             }%
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+               {\iffieldbibstring{relatedtype}%
+                  {\printtext[\bbx@tempb]{%
+                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                  {}}}%
+            {\iffieldbibstring{relatedstring}%
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+               {\printfield[\bbx@tempb]{relatedstring}}}%
+          \docsvfield{related}%
+          \usebibmacro{endrelatedloop}}}%
+       {}%
+     \usebibmacro{endrelated}}}%
+
+\NewBibliographyString{%
+   afterwordto,%
+   broadcast,%
+   by,%
+   bychoreographer,%
+   bycompileraf,%
+   bycompileran,%
+   bycompileranaf,%
+   bycompileranfo,%
+   bycompileranin,%
+   bycompilerco,%
+   bycompilercoaf,%
+   bycompilercofo,%
+   bycompilercoin,%
+   bycompilerfo,%
+   bycompilerin,%
+   byconductor,%
+   bydirector,%
+   byeditoralt,%
+   byeditorcp,%
+   byeditorcpaf,%
+   byeditorcpan,%
+   byeditorcpanaf,%
+   byeditorcpanfo,%
+   byeditorcpanin,%
+   byeditorcpco,%
+   byeditorcpcoaf,%
+   byeditorcpcofo,%
+   byeditorcpcoin,%
+   byeditorcpfo,%
+   byeditorcpin,%
+   byeditortrcp,%
+   byeditortrcpaf,%
+   byeditortrcpan,%
+   byeditortrcpanaf,%
+   byeditortrcpanfo,%
+   byeditortrcpanin,%
+   byeditortrcpco,%
+   byeditortrcpcoaf,%
+   byeditortrcpcofo,%
+   byeditortrcpcoin,%
+   byeditortrcpfo,%
+   byeditortrcpin,%
+   bynone,%
+   byproducer,%
+   bytranslatorcp,%
+   bytranslatorcpaf,%
+   bytranslatorcpan,%
+   bytranslatorcpanaf,%
+   bytranslatorcpanfo,%
+   bytranslatorcpanin,%
+   bytranslatorcpco,%
+   bytranslatorcpcoaf,%
+   bytranslatorcpcofo,%
+   bytranslatorcpcoin,%
+   bytranslatorcpfo,%
+   bytranslatorcpin,%
+   canadasection,%
+   canadasections,%
+   cbyannotator,%
+   cbyauthor,%
+   cbychoreographer,%
+   cbycollaborator,%
+   cbycommentator,%
+   cbycompiler,%
+   cbycompileraf,%
+   cbycompileran,%
+   cbycompileranaf,%
+   cbycompileranfo,%
+   cbycompileranin,%
+   cbycompilerco,%
+   cbycompilercoaf,%
+   cbycompilercofo,%
+   cbycompilercoin,%
+   cbycompilerfo,%
+   cbycompilerin,%
+   cbyconductor,%
+   cbycontinuator,%
+   cbydirector,%
+   cbyeditor,%
+   cbyeditoraf,%
+   cbyeditoralt,%
+   cbyeditoran,%
+   cbyeditoranaf,%
+   cbyeditoranfo,%
+   cbyeditoranin,%
+   cbyeditorco,%
+   cbyeditorcoaf,%
+   cbyeditorcofo,%
+   cbyeditorcoin,%
+   cbyeditorcp,%
+   cbyeditorcpaf,%
+   cbyeditorcpan,%
+   cbyeditorcpanaf,%
+   cbyeditorcpanfo,%
+   cbyeditorcpanin,%
+   cbyeditorcpco,%
+   cbyeditorcpcoaf,%
+   cbyeditorcpcofo,%
+   cbyeditorcpcoin,%
+   cbyeditorcpfo,%
+   cbyeditorcpin,%
+   cbyeditorfo,%
+   cbyeditorin,%
+   cbyeditortr,%
+   cbyeditortraf,%
+   cbyeditortran,%
+   cbyeditortranaf,%
+   cbyeditortranfo,%
+   cbyeditortranin,%
+   cbyeditortrco,%
+   cbyeditortrcoaf,%
+   cbyeditortrcofo,%
+   cbyeditortrcoin,%
+   cbyeditortrcp,%
+   cbyeditortrcpaf,%
+   cbyeditortrcpan,%
+   cbyeditortrcpanaf,%
+   cbyeditortrcpanfo,%
+   cbyeditortrcpanin,%
+   cbyeditortrcpco,%
+   cbyeditortrcpcoaf,%
+   cbyeditortrcpcofo,%
+   cbyeditortrcpcoin,%
+   cbyeditortrcpfo,%
+   cbyeditortrcpin,%
+   cbyeditortrfo,%
+   cbyeditortrin,%
+   cbyfounder,%
+   cbynone,%
+   cbyorganizer,%
+   cbyproducer,%
+   cbyredactor,%
+   cbytranslator,%
+   cbytranslatoraf,%
+   cbytranslatoran,%
+   cbytranslatoranaf,%
+   cbytranslatoranfo,%
+   cbytranslatoranin,%
+   cbytranslatorco,%
+   cbytranslatorcoaf,%
+   cbytranslatorcofo,%
+   cbytranslatorcoin,%
+   cbytranslatorcp,%
+   cbytranslatorcpaf,%
+   cbytranslatorcpan,%
+   cbytranslatorcpanaf,%
+   cbytranslatorcpanfo,%
+   cbytranslatorcpanin,%
+   cbytranslatorcpco,%
+   cbytranslatorcpcoaf,%
+   cbytranslatorcpcofo,%
+   cbytranslatorcpcoin,%
+   cbytranslatorcpfo,%
+   cbytranslatorcpin,%
+   cbytranslatorfo,%
+   cbytranslatorin,%
+   century,%
+   cfromamerican,%
+   cfrombrazilian,%
+   cfrombulgarian,%
+   cfromcatalan,%
+   cfromcroatian,%
+   cfromczech,%
+   cfromdanish,%
+   cfromdutch,%
+   cfromenglish,%
+   cfromestonian,%
+   cfromfinnish,%
+   cfromfrench,%
+   cfromgalician,%
+   cfromgerman,%
+   cfromgreek,%
+   cfromitalian,%
+   cfromjapanese,%
+   cfromlatin,%
+   cfromnorwegian,%
+   cfrompolish,%
+   cfromportuguese,%
+   cfromrussian,%
+   cfromslovak,%
+   cfromslovene,%
+   cfromspanish,%
+   cfromswedish,%
+   cfromukrainian,%
+   choreographer,%
+   choreographers,%
+   commenton,%
+   conductor,%
+   conductors,%
+   decade,%
+   director,%
+   directors,%
+   discrecorded,%
+   edamerican,%
+   edbrazilian,%
+   edbulgarian,%
+   edcatalan,%
+   edcroatian,%
+   edczech,%
+   eddanish,%
+   eddutch,%
+   edenglish,%
+   edestonian,%
+   edfinnish,%
+   edfrench,%
+   edgalician,%
+   edgerman,%
+   edgreek,%
+   editalian,%
+   editorcompiler,%
+   editorcompilers,%
+   editortranscompiler,%
+   editortranscompilers,%
+   editortranslator,%
+   editortranslators,%
+   edjapanese,%
+   edlatin,%
+   ednorwegian,%
+   edpolish,%
+   edportuguese,%
+   edrussian,%
+   edslovak,%
+   edslovene,%
+   edspanish,%
+   edswedish,%
+   edukrainian,%
+   forewordto,%
+   hereinafter,%
+   inlang,%
+   introductionto,%
+   none,%
+   nones,%
+   note,%
+   numbers,%
+   of,%
+   on,%
+   origedition,%
+   origpub,%
+   origpublin,%
+   origpubyear,%
+   origpubyearalt,%
+   origreleaseyear,%
+   origshownyear,%
+   partvolume,%
+   patentfiled,%
+   patentissued,%
+   preface,%
+   printed,%
+   producer,%
+   producers,%
+   pseudonym,%
+   review,%
+   revisededition,%
+   selfpublished,%
+   songrecorded,%
+   subsection,%
+   subsections,%
+   subverbis,%
+   subverbo,%
+   supranote,%
+   track,%
+   transcompiler,%
+   transcompilers%
+ }%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx
new file mode 100644
index 00000000000..725a201aec6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx
@@ -0,0 +1,324 @@
+% 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-authordate16.cbx}[2020/04/20 v 3.14 biblatex
+citation style]
+
+\RequireCitationStyle{chicago-dates-common16}
+
+%%%% Field Formats -- Title, Citetitle, Lostitle %%%%
+
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{citetitle}{%
+  \iffieldundef{title}%
+  {#1\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{lostitle}{%
+  \iffieldundef{title}%
+  {#1\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[artwork,image]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldAlias[artwork]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
+
+\DeclareFieldAlias[image]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[image]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[letter,patent]{title}{#1\isdot}
+
+\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{#1}\isdot}
+
+\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[misc]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldAlias[misc]{citetitle}[misc]{title}
+
+\DeclareFieldAlias[misc]{lostitle}[misc]{title}
+
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[review,suppperiodical]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}%
+  {#1\isdot}}
+
+\DeclareFieldAlias[review]{lostitle}[review]{title}
+
+\DeclareFieldAlias[review]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{lostitle}[review]{title}
+
+\DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
+
+\DeclareFieldFormat{maintitle}{\mkbibemph{#1}}
+
+\DeclareFieldFormat{booksubtitle}{\mkbibemph{#1}}
+
+\DeclareFieldFormat{mainsubtitle}{\mkbibemph{#1}}
+
+\DeclareFieldFormat[audio,music,video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldAlias[video]{citetitle}[video]{title}
+
+\DeclareFieldAlias[video]{lostitle}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[music]{title}
+
+\DeclareFieldAlias[music]{lostitle}[music]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[audio]{title}
+
+\DeclareFieldAlias[audio]{lostitle}[audio]{title}
+
+\DeclareFieldFormat{issuetitle}{\mkbibquote{#1\isdot}}
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{video+title}{% Simplifies trad style.
+  \iffieldundef{title}%
+  {}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}}}
+
+\newbibmacro*{italtitle+stitle}{%
+  \printtext[title]{%
+    \printfield[tnoformat]{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[stnoformat]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\newbibmacro*{mag+news+title}{%
+  \printtext[title]{%
+       \printfield[noformat]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[noformat]{subtitle}}%
+     \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
+     \ifboolexpr{%
+       togl {cms@related}%
+       and
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
+     }%\newcunit\newblock
+
+\newbibmacro*{issuetitle}{%
+  \iffieldundef{issuetitle}%
+  {}%
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
+    {\usebibmacro{cms-in:}}% periodical entries
+    {}%
+    \printtext[issuetitle]{%
+      \printfield[itnoformat]{issuetitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sitnoformat]{issuesubtitle}}}}
+
+%%%% Related macros that can't reside in common.cbx %%%%
+
+\newbibmacro*{related:reviewof}[1]{%
+  \entrydata*{#1}{%
+    \let\newunit\newcunit% FIXME??
+    \iffieldundef{title}%
+    {}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
+    \newcunit%
+    \ifnameundef{author}%
+    {\newcunit%
+      \usebibmacro{byeditor+others}}%
+    {\bibstring{by}\addspace%
+      \printnames[byauthor]{author}%
+      \newcunit\usebibmacro{byeditor+others}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}}}
+
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibquote{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1\addspace\bibstring{in}}
+
+\DeclareFieldFormat{avchapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1}
+
+\DeclareFieldFormat{sitnoformat}{#1}
+\DeclareFieldFormat{sjtnoformat}{#1}
+\DeclareFieldFormat{stnoformat}{#1}
+\DeclareFieldFormat{itnoformat}{#1}
+\DeclareFieldFormat{jtnoformat}{#1}
+\DeclareFieldFormat{jtsnoformat}{#1}
+\DeclareFieldFormat{tnoformat}{#1}
+
+\newbibmacro*{cms:titlehook}{% Needed for the full drivers in reprintfrom
+  \ifthenelse{\iffieldundef{chapter}\OR\NOT\(\ifentrytype{audio}\OR%
+    \ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+    \ifentrytype{inproceedings}\OR\ifentrytype{letter}\OR%
+    \ifentrytype{music}\OR\ifentrytype{video}\)}%
+  {\iffieldundef{issuetitle}%
+    {\iffieldundef{title}%
+      {\iffieldundef{booktitle}%
+        {\iffieldundef{maintitle}%
+          {\iffieldundef{journaltitle}%
+            {}%
+            {\DeclareFieldAlias{jtnoformat}{title:hook}%
+              \DeclareFieldAlias{sjtnoformat}{title}%
+              \DeclareFieldAlias{journaltitle}{default}%
+              \DeclareFieldAlias{shortjournal}{series}%
+              \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
+          {\DeclareFieldAlias{maintitle}{title:hook}}}%
+        {\DeclareFieldAlias{booktitle}{title:hook}}}%
+      {\DeclareFieldAlias{tnoformat}{title:hook}%
+        \DeclareFieldAlias{stnoformat}{citetitle}%
+        \DeclareFieldAlias[video]{title}{default}%
+        \DeclareFieldAlias[audio]{title}{default}%
+        \DeclareFieldAlias[music]{title}{default}%
+        \DeclareFieldAlias{title}{default}%
+        \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
+    {\iffieldundef{issuesubtitle}%
+      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+        \DeclareFieldAlias{issuetitle}{default}}%
+      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {\iffieldundef{title}%
+      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\DeclareFieldAlias{tnoformat}{title:hook}%
+        \DeclareFieldAlias{stnoformat}{citetitle}%
+        \DeclareFieldAlias[video]{title}{default}%
+        \DeclareFieldAlias[audio]{title}{default}%
+        \DeclareFieldAlias[music]{title}{default}}}%
+    {\DeclareFieldAlias{chapter}{chapter:hook}}}}%
+
+\endinput
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 6b8e1a41737..902b41fa645 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,17 +1,18 @@
-% $Id: chicago-dates-common.cbx,v 0.10.1.15 2018/01/11 09:49:53 dfussner Exp $
+% This is a biblatex citation style file, originally adapted from
+% Lehman's authoryear-comp.cbx.  It is heavily modified, and contains
+% the common code for providing inline citations (and a reference
+% list) for the two author-date styles of the Chicago Manual of Style,
+% 17th edition.
 
-% 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)
-% for the two author-date styles of the Chicago Manual of Style, 16th
-% edition.
-
-\ProvidesFile{chicago-dates-common.cbx}[2018/01/11 v 3.10 biblatex
+\ProvidesFile{chicago-dates-common.cbx}[2020/04/20 v 3.14 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
 \newbool{cbx:parens}
+\newbool{cms:bracket}
+\newbool{cms:extraparens}
+\newbool{cms:comma}
 
 \providecommand*{\mkibid}[1]{#1}
 
@@ -20,35 +21,43 @@ citation style]
 \providetoggle{cms@bothlabelold}
 \providetoggle{cms@bothlabelnew}
 \providetoggle{cms@fulldate}
-\providetoggle{cms@reprint}
 \providetoggle{cms@switchdates}
 \providetoggle{cms@los}
-%\providetoggle{cms@oneyear}
 \providetoggle{cms@avdate}
 \providetoggle{cms@ordate}
 \providetoggle{cms@nodates}
+\providetoggle{cms@bc}% Attempt to provide correct dateera handling
+\providetoggle{cms@alwaysrange}% Turns off decade and century handling
+\providetoggle{cms@decaderange}% Only turns off decade handling
+\providetoggle{cms@centuryrange}% Only turns off century handling
+\providetoggle{cms@nodatebrackets}% For brackets in uncertain & circa
+\providetoggle{cms@noyearbrackets}%
 \providetoggle{cms@authorparens}
-\providetoggle{cms@datedash}
 \providetoggle{cms@modpostnote}
 \providetoggle{cms@ukord}
 \providetoggle{cms@fullnote}% For the legal entry types
 \providetoggle{cms@shortnote}% Ditto
 
 \providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@urltime}% 17th ed.
 \providetoggle{cms@doi}
 \providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
+\providetoggle{cms@shser}
 \providetoggle{cms@addendum}
 \providetoggle{cms@hidevolumes}% Modify Volume fix
 \providetoggle{cms@comprange}
+\providetoggle{cms@compyears}
 
 \providetoggle{cms@jrcomma}% Comma after Jr./Sr.
 
+\providetoggle{cms@strict}
 \providetoggle{cms@headlessnote}% Keep
 \providetoggle{cms@noibid}% Keep
+\providetoggle{cms@namedash}
 \providetoggle{cms@usecompiler}% Keep
 \providetoggle{cms@origpublished}% Keep
 \providetoggle{cms@annotation}% Keep
@@ -58,6 +67,7 @@ citation style]
 \providetoggle{cms@noneshort}% Ditto
 \providetoggle{cms@legalnotes}% Ditto
 \providetoggle{cms@supranotes}% Ditto
+\providetoggle{cms@running@text}% For Jurisdiction entries
 \providetoggle{cms@vol}%
 \providetoggle{cms@crossref}%
 \providetoggle{cms@bookcrossref}
@@ -66,15 +76,13 @@ citation style]
 \providetoggle{cms@xrefurl}
 \providetoggle{cms@related}
 \providetoggle{cms@linkit}
+\providetoggle{cms@authortitle}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
   {}%
   {\nocite{\thefield{userc}}}%
-  \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
+  \global\csundef{@cmsst}}%
 
 \protected\def\cms@warning@noline#1{%
   \begingroup
@@ -82,27 +90,26 @@ citation style]
   \PackageWarningNoLine{biblatex-chicago}{#1}%
   \endgroup}%
 
-\DeclareBibliographyOption{avdate}[true]{%
+\DeclareBibliographyOption[string]{avdate}[true]{%
   \ifcsdef{cms@opt@avdate@#1}%
   {\csuse{cms@opt@avdate@#1}}%
   {\blx@err@invopt{avdate=#1}{}}}%
 \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{eventdate}%
-        \field{origdate} \field{date} \field{year} \field{urldate}}}%
-    {\DeclareLabelyear[music,review,suppperiodical,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}}%
-  {\DeclareLabelyear[music,review,suppperiodical,video]%
-    {eventyear,origyear,year,urlyear}}%
-  \toggletrue{cms@avdate}}%
+  \DeclareLabeldate[music,review,standard,suppperiodical,video]% 17th ed.
+  {\field{eventdate} \field{origdate} \field{date} \field{year}%
+    \field{urldate} \literal{nodate}}%
+    \toggletrue{cms@avdate}}%
 \def\cms@opt@avdate@false{%
   \togglefalse{cms@avdate}}%
 
-\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
+\DeclareBibliographyOption[string]{cmsdate}[off]{% Implement origyear as
   \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
   {\csuse{cms@global@cmsdate@#1}}%
-  {\blx@err@invopt{cmsdate=#1}{}}}%
+  {\csuse{cms@global@cmsdate@off}\cms@warning@noline%
+    {'cmsdate=#1' isn't a valid option.\MessageBreak
+      The default - 'off' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
 \def\cms@global@cmsdate@on{%
   \toggletrue{cms@origlabel}%
   \ExecuteBibliographyOptions{cmsorigdate=true}}%
@@ -118,40 +125,28 @@ citation style]
 \def\cms@global@cmsdate@full{}%
 \def\cms@global@cmsdate@off{}%
 
-\DeclareBibliographyOption{cmsorigdate}[true]{% ??? Also need new macros
-  \ifcsdef{cms@opt@origdate@#1}% for printing dates.  Worth it ???
+\DeclareBibliographyOption[string]{cmsorigdate}[true]{% ? Also need new macros
+  \ifcsdef{cms@opt@origdate@#1}% for printing dates.  Worth it ?
   {\csuse{cms@opt@origdate@#1}}%
   {\blx@err@invopt{cmsorigdate=#1}{}}}%
 \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{origdate} \field{date} \field{year}%
-        \field{eventdate} \field{urldate}}%
-      \DeclareLabeldate[patent]{\field{date} \field{year}%
-        \field{eventdate} \field{origdate} \field{urldate}}}%
-    {\DeclareLabelyear{\field{origyear} \field{year}%
-        \field{eventyear} \field{urlyear}}%
-      \DeclareLabelyear[patent]{\field{year} \field{eventyear}%
-        \field{origyear} \field{urlyear}}}}%
-  {\DeclareLabelyear{origyear,year,eventyear,urlyear}%
-    \DeclareLabelyear[patent]{year,eventyear,origyear,urlyear}}%
+  \DeclareLabeldate{\field{origdate} \field{origyear} \field{date}%
+    \field{year} \field{eventdate} \field{urldate}%
+    \literal{nodate}}%
+  \DeclareLabeldate[patent]{\field{date} \field{year}%
+    \field{eventdate} \field{origdate} \field{origyear}%
+    \field{urldate}}%
   \global\toggletrue{cms@ordate}}%
 \def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
 
-\DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
+\DeclareEntryOption[string]{cmsdate}[off]{% Trying to implement origyear as
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
-  {\iftoggle{cms@origlabel}%
-    {\togglefalse{cms@origlabel}%
-      \def\@cms@tempdate{cms@origlabel}}%
-    {\iftoggle{cms@bothlabelnew}%
-      {\togglefalse{cms@bothlabelnew}%
-        \def\@cms@tempdate{cms@bothlabelnew}}%
-      {\iftoggle{cms@bothlabelold}%
-        {\togglefalse{cms@bothlabelold}%
-          \def\@cms@tempdate{cms@bothlabelold}}%
-        {}}}%
-    \csuse{cms@opt@cmsdate@#1}}%
-  {\blx@err@invopt{cmsdate=#1}{}}}%
+  {\csuse{cms@opt@cmsdate@#1}}%
+  {\csuse{cms@opt@cmsdate@off}\cms@warning@noline%
+    {'cmsdate=#1' isn't a valid option.\MessageBreak
+      The default - 'off' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
 \def\cms@opt@cmsdate@on{%
   \toggletrue{cms@origlabel}}%
 \def\cms@opt@cmsdate@new{%
@@ -164,38 +159,44 @@ citation style]
   \toggletrue{cms@fulldate}}%
 \def\cms@opt@cmsdate@off{}%
 
-\DeclareBibliographyOption[boolean]{genallnames}[true]{%
-  \settoggle{cms@genallnames}{#1}}%
+\DeclareBiblatexOption{global,entry}[boolean]{alwaysrange}[true]{%
+  \settoggle{cms@alwaysrange}{#1}}%
 
-\DeclareEntryOption[boolean]{genallnames}[true]{%
-  \settoggle{cms@genallnames}{#1}}%
+\DeclareBiblatexOption{global,entry}[boolean]{decaderange}[true]{%
+  \settoggle{cms@decaderange}{#1}}%
 
-\DeclareBibliographyOption[boolean]{hypertitle}[true]{%
-  \settoggle{cms@linkit}{#1}}%
+\DeclareBiblatexOption{global,entry}[boolean]{centuryrange}[true]{%
+  \settoggle{cms@centuryrange}{#1}}%
 
-\DeclareEntryOption[boolean]{hypertitle}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodatebrackets}[true]{%
+  \settoggle{cms@nodatebrackets}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{noyearbrackets}[true]{%
+  \settoggle{cms@noyearbrackets}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{hypertitle}[true]{%
   \settoggle{cms@linkit}{#1}}%
 
 \DeclareBibliographyOption[boolean]{annotation}[true]{%
   \global\settoggle{cms@annotation}{#1}}%
 
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
+  \settoggle{cms@namedash}{#1}}
+
 \DeclareBibliographyOption[boolean]{short}[true]{%
   \global\settoggle{cms@allshort}{#1}}
 
-\DeclareBibliographyOption[boolean]{noneshort}[true]{%
-  \global\settoggle{cms@noneshort}{#1}}
-
-\DeclareEntryOption[boolean]{noneshort}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{noneshort}[true]{%
   \settoggle{cms@noneshort}{#1}}
 
 \DeclareBibliographyOption[boolean]{legalnotes}[true]{%
   \global\settoggle{cms@legalnotes}{#1}}
 
-\DeclareBibliographyOption[boolean]{supranotes}[true]{%
-  \global\settoggle{cms@supranotes}{#1}}
-
-\DeclareEntryOption[boolean]{supranotes}[true]{%
-  \global\settoggle{cms@supranotes}{#1}}
+\DeclareBiblatexOption{global,entry}[boolean]{supranotes}[true]{%
+  \settoggle{cms@supranotes}{#1}}
 
 \DeclareBibliographyOption[boolean]{cmslos}[true]{%
   \global\settoggle{cms@los}{#1}}%
@@ -203,18 +204,13 @@ citation style]
 \DeclareBibliographyOption[boolean]{noibid}[true]{%
   \global\settoggle{cms@noibid}{#1}}%
 
-\DeclareBibliographyOption{compresspages}[true]{%
-  \ifcsdef{cms@opt@crange@#1}%
-  {\csuse{cms@opt@crange@#1}}%
-  {\blx@err@invopt{compresspages=#1}{}}}%
-\def\cms@opt@crange@true{%
-  \global\toggletrue{cms@comprange}%
-  \setcounter{mincomprange}{100}%
-  \setcounter{mincompwidth}{10}%
-}%
-\def\cms@opt@crange@false{}%
+\DeclareBibliographyOption[boolean]{compresspages}[true]{%
+  \global\settoggle{cms@comprange}{#1}}%
+
+\DeclareBibliographyOption[boolean]{compressyears}[true]{%
+  \global\settoggle{cms@compyears}{#1}}%
 
-\DeclareBibliographyOption{postnotepunct}[true]{%
+\DeclareBibliographyOption[string]{postnotepunct}[true]{%
   \ifcsdef{cms@opt@ppunct@#1}%
   {\csuse{cms@opt@ppunct@#1}}%
   {\blx@err@invopt{postnotepunct=#1}{}}}%
@@ -222,25 +218,19 @@ citation style]
   \global\toggletrue{cms@modpostnote}}%
 \def\cms@opt@ppunct@false{}%
 
-\DeclareBibliographyOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}%
+\DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
+  \settoggle{blx@usenamec}{#1}}%
 
-\DeclareBibliographyOption{nodates}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{nodates}[true]{%
   \settoggle{cms@nodates}{#1}}%
 
-\DeclareEntryOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}%
-
-\DeclareBibliographyOption{juniorcomma}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{juniorcomma}[true]{%
   \settoggle{cms@jrcomma}{#1}}%
 
-\DeclareEntryOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}%
-
-\DeclareBibliographyOption{shorthandfull}[true]{%
+\DeclareBibliographyOption[boolean]{shorthandfull}[true]{%
   \settoggle{cms@fullshhand}{#1}}%
 
-\DeclareBibliographyOption{longcrossref}[false]{%
+\DeclareBiblatexOption{global,entry}[string]{longcrossref}[false]{%
   \ifcsdef{cms@opt@lxref@#1}%
   {\csuse{cms@opt@lxref@#1}}%
   {\blx@err@invopt{longcrossref=#1}{}}}%
@@ -256,12 +246,7 @@ citation style]
 \def\cms@opt@lxref@bib{%
   \toggletrue{cms@crossref}}%
 
-\DeclareEntryOption{longcrossref}[false]{%
-  \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}%
-  {\blx@err@invopt{longcrossref=#1}{}}}%
-
-\DeclareBibliographyOption{booklongxref}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{booklongxref}[true]{%
   \ifcsdef{cms@opt@bklxref@#1}%
   {\csuse{cms@opt@bklxref@#1}}%
   {\blx@err@invopt{booklongxref=#1}{}}}%
@@ -274,18 +259,10 @@ citation style]
 \def\cms@opt@bklxref@bib{%
   \toggletrue{cms@bookcrossref}}%
 
-\DeclareEntryOption{booklongxref}[true]{%
-  \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}%
-  {\blx@err@invopt{booklongxref=#1}{}}}%
-
-\DeclareBibliographyOption[boolean]{xrefurl}[true]{%
-  \settoggle{cms@xrefurl}{#1}}%
-
-\DeclareEntryOption[boolean]{xrefurl}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{xrefurl}[true]{%
   \settoggle{cms@xrefurl}{#1}}%
 
-\DeclareBibliographyOption[string]{journalabbrev}[false]{%
+\DeclareBiblatexOption{global,entry}[string]{journalabbrev}[false]{%
   \ifcsdef{cms@opt@jtabb@#1}%
   {\csuse{cms@opt@jtabb@#1}}%
   {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
@@ -306,19 +283,10 @@ citation style]
   \togglefalse{cms@citejtabb}%
   \toggletrue{cms@bibjtabb}}%
 
-\DeclareEntryOption[string]{journalabbrev}[false]{%
-  \ifcsdef{cms@opt@jtabb@#1}%
-  {\csuse{cms@opt@jtabb@#1}}%
-  {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
-    {'journalabbrev=#1' isn't a valid option.\MessageBreak
-      The default - 'false' - has been set.\MessageBreak
-      Please see biblatex-chicago.pdf for valid\MessageBreak
-      option keys}}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{seriesabbrev}[true]{%
+  \settoggle{cms@shser}{#1}}
 
-\DeclareBibliographyOption[boolean]{related}[true]{%
-  \settoggle{cms@related}{#1}}%
-
-\DeclareEntryOption[boolean]{related}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{related}[true]{%
   \settoggle{cms@related}{#1}}%
 
 \DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
@@ -326,7 +294,7 @@ citation style]
 
 % Controlling punctuation before titleaddon fields %
 
-\DeclareBibliographyOption[string]{ptitleaddon}[period]{%
+\DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
   \ifcsdef{cms@opt@ptao@#1}%
     {\csuse{cms@opt@ptao@#1}}%
     {\csuse{cms@opt@ptao@period}\cms@warning@noline%
@@ -347,16 +315,7 @@ citation style]
 \def\cms@opt@ptao@period{%
   \def\ptitleaddonpunct{\addperiod\addspace}}%
 
-\DeclareEntryOption[string]{ptitleaddon}[period]{%
-  \ifcsdef{cms@opt@ptao@#1}%
-    {\csuse{cms@opt@ptao@#1}}%
-    {\csuse{cms@opt@ptao@period}\cms@warning@noline%
-      {'ptitleaddon=#1' is not a valid option.\MessageBreak
-        The default - 'period' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
-\DeclareBibliographyOption[string]{ctitleaddon}[comma]{%
+\DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
   \ifcsdef{cms@opt@ctao@#1}%
     {\csuse{cms@opt@ctao@#1}}%
     {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
@@ -377,22 +336,16 @@ citation style]
 \def\cms@opt@ctao@period{%
   \def\ctitleaddonpunct{\addperiod\addspace}}%
 
-\DeclareEntryOption[string]{ctitleaddon}[comma]{%
-  \ifcsdef{cms@opt@ctao@#1}%
-    {\csuse{cms@opt@ctao@#1}}%
-    {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
-      {'ctitleaddon=#1' is not a valid option.\MessageBreak
-        The default - 'comma' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
 % The field-exclusion options %
 
-\DeclareBibliographyOption{isbn}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlstamp}[true]{%
+  \settoggle{cms@urltime}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}%
-\DeclareBibliographyOption{url}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{url}[true]{%
   \settoggle{cms@url}{#1}}%
-\DeclareBibliographyOption{doi}[true]{%
+\DeclareBiblatexOption{global,type,entry}[string]{doi}[true]{%
   \ifcsdef{cms@opt@doi@#1}%
   {\csuse{cms@opt@doi@#1}}%
   {\blx@err@invopt{doi=#1}{}}}%
@@ -402,63 +355,45 @@ citation style]
   \togglefalse{cms@doi}}%
 \def\cms@opt@doi@only{%
   \toggletrue{cms@doionly}}%
-\DeclareBibliographyOption{eprint}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}%
-\DeclareBibliographyOption{numbermonth}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{numbermonth}[true]{%
   \settoggle{cms@numbermonth}{#1}}%
-\DeclareBibliographyOption{bookpages}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookpages}[true]{%
   \settoggle{cms@bookpages}{#1}}%
-\DeclareBibliographyOption{includeall}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{includeall}[true]{%
   \settoggle{cms@isbn}{#1}%
   \settoggle{cms@url}{#1}%
+  \settoggle{cms@urltime}{#1}% 17th ed.
   \settoggle{cms@doi}{#1}%
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
   \settoggle{cms@bookpages}{#1}}%
-\DeclareBibliographyOption{hidevolumes}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{hidevolumes}[true]{%
   \settoggle{cms@hidevolumes}{#1}}%
 
-\DeclareEntryOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}%
-\DeclareEntryOption{doi}[true]{%
-  \ifcsdef{cms@opt@doi@#1}%
-  {\iftoggle{cms@doi}%
-    {\togglefalse{cms@doi}%
-      \iftoggle{cms@doionly}%
-      {\togglefalse{cms@doionly}}% !!
-      {}}%
-    {\toggletrue{cms@doi}}% !!
-    \csuse{cms@opt@doi@#1}}%
-  {\blx@err@invopt{doi=#1}{}}}%
-\DeclareEntryOption{url}[true]{%
-  \settoggle{cms@url}{#1}}%
-\DeclareEntryOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}%
-\DeclareEntryOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}%
-\DeclareEntryOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}%
-\DeclareEntryOption{hidevolumes}[true]{%
-  \settoggle{cms@hidevolumes}{#1}}%
+\DeclareBiblatexOption{type,entry}[boolean]{authortitle}[true]{%
+  \settoggle{cms@authortitle}{#1}}%
 
 \ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
-  ctitleaddon,ptitleaddon,journalabbrev=notes,legalnotes,supranotes}%
+  ctitleaddon,ptitleaddon,journalabbrev=notes,legalnotes,supranotes,%
+  dashed}%
 
-\@ifpackagelater{biblatex}{2016/09/01}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldateparts=true}}%
-{\@ifpackagelater{biblatex}{2013/03/30}
-  {\ExecuteBibliographyOptions{labeldate=true}}
-  {\ExecuteBibliographyOptions{labelyear=true}}}%
+\ExecuteBibliographyOptions[standard]{useeditor=false,usenamec=false}%
+\ExecuteBibliographyOptions[dataset]{authortitle=true}%
 
 \iftoggle{cms@legalnotes}%
 {\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
 {}%
 
-\@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}}}%
+\AtEndPreamble{%       Automatic sorting by shorthand when it appears
+  \iftoggle{cms@los}%  at the head of the entry.
+  {\DeclareSourcemap{
+      \maps[datatype=bibtex]{
+        \map{
+          \step[fieldsource=shorthand, final]
+          \step[fieldset=sortname, origfieldval]}}}}%
+  {}}
 
 \DeclareLabeltitle[legislation]{%
   \field{shorttitle}%
@@ -520,6 +455,9 @@ citation style]
   \noinherit{urlyear}
   \noinherit{urlmonth}
   \noinherit{urlday}
+  \noinherit{urlseason}
+  \noinherit{urlhour}
+  \noinherit{urlminute}
   \noinherit{doi}
   \noinherit{eprint}
   \noinherit{eprinttype}
@@ -530,18 +468,32 @@ citation style]
   \noinherit{year}
   \noinherit{month}
   \noinherit{day}
+  \noinherit{season}
   \noinherit{endyear}
   \noinherit{endmonth}
   \noinherit{endday}
+  \noinherit{endseason}
   \noinherit{origyear}
   \noinherit{origmonth}
   \noinherit{origday}
+  \noinherit{origseason}
   \noinherit{origendyear}
   \noinherit{origendmonth}
-  \noinherit{origendday}}
+  \noinherit{origendday}
+  \noinherit{origendseason}}
 
 % More authordate options %
 
+\DeclareExtradate{%
+  \scope{
+    \field{labelyear}
+    \field{year}
+  }
+  \scope{
+    \field{verbc}
+  }
+}
+
 \DeclareSortingTemplate{cms}{% Updated to >3.7 format
   \sort{
     \field{presort}
@@ -573,46 +525,63 @@ citation style]
     \field{title}
   }
   \sort{
+    \field{endyear}
+    \field{eventendyear}
+    \field{origendyear}
+  }
+  \sort{
     \field[padside=left,padwidth=4,padchar=0]{volume}
     \literal{0000}
   }
 }
 
+\DeclareSortExclusion{misc,online}{organization}
+\DeclareSortExclusion{inreference,mvreference,reference}{%
+  author,editor,namea,nameb,namec,translator}
+
 \DeclareSortingTemplate{shortjournal}{%
   \sort{
     \field{shortjournal}
   }
 }
 
-\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
-{\DeclareLabelname{\field{shortauthor} \field{author}%
-    \field{shorteditor} \field{namea} \field{editor}%
-    \field{nameb} \field{translator} \field{namec}}}%
-{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
-    editor,nameb,translator,namec}}%
+\DeclareSortingTemplate{shortseries}{%
+  \sort{
+    \field{shortseries}
+  }
+}
+
+\DeclareLabelname{\field{shortauthor} \field{author}%
+  \field{shorteditor} \field{namea} \field{editor}%
+  \field{nameb} \field{translator} \field{namec}}%
 
-\DeclareEntryOption{switchdates}[true]{%
+\DeclareEntryOption[boolean]{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}%
 
-\DeclareBibliographyOption{strict}[true]{%
-  \let\splitfootnoterule\footnoterule
-  \renewcommand\footnoterule{}%
-  \advance\skip\footins 4\p@\@plus2\p@\relax
-  \gdef\split@prev{0}%
-  \let\pagefootnoterule\footnoterule
-  % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
-  \def\footnoterule{\relax
-    \ifnum\split@prev=\z@
-    \pagefootnoterule
-    \else
-    \splitfootnoterule
-    \fi
-    \xdef\split@prev{\the\insertpenalties}%
-  }}%
+\DeclareBibliographyOption[boolean]{strict}[true]{%
+  \settoggle{cms@strict}{#1}%
+  \iftoggle{cms@strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split@prev{0}%
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split@prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split@prev{\the\insertpenalties}%
+    }}%
+  {}}%
 
 \protected\def\blx@newcunit{%
-  \global\let\blx@unitpunct\newcunitpunct
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}%
+  {}%
+  {\global\let\blx@unitpunct\newcunitpunct
+    \global\toggletrue{blx@unit}}}%
 
 \appto\blx@blxinit{%
   \let\newcunit\blx@newcunit}%
@@ -660,14 +629,18 @@ citation style]
 \newbibmacro*{cite}{%
   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
   {\usebibmacro{cite:ibid}}%
-  {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
+  {\ifboolexpr{%
+      togl {cms@authortitle}%
+      or
+      test {\iffieldequalstr{entrysubtype}{classical}}%
+    }% Similar to notes+bib
     {\iffieldundef{shorthand}%
       {\ifthenelse{\ifnameundef{labelname}\OR
           \ifentrytype{inreference}\OR
           \ifentrytype{reference}\OR
           \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
-          \setunit{\cms@testspace}%
+          \setunit{\cms@testspace}% Is this right?
           \usebibmacro{cite:reinit}}%
         {\iffieldequals{fullhash}{\cbx@lasthash}%
           {\iffieldundef{postnote}%
@@ -677,10 +650,12 @@ citation style]
           {\iffieldequals{fullhash}{\cbx@lastyear}%
             {}%
             {\usebibmacro{cmsbracketname}% For names in []
-              \ifentrytype{customc}%
-              {\newcunit}%
-              {\setunit{\cms@testspace}}}%
-            \usebibmacro{cite:label}%
+              \ifthenelse{\ifentrytype{misc}\AND%
+                \iffieldequalstr{entrysubtype}{classical}}%
+              {\cms@testspace}{\newcunit}}% Wrong?
+            \ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
+            {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+            {\usebibmacro{cite:label}}%
             \iffieldundef{postnote}%
             {\savefield{fullhash}{\cbx@lasthash}}%
             {\savefield{fullhash}{\cbx@lastyear}}}}}%
@@ -691,7 +666,7 @@ citation style]
           \ifentrytype{reference}\OR
           \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
-          \setunit{\cms@testspace}%
+          \setunit{\nameyeardelim}%cms@testspace%
           \usebibmacro{cmscitesortdate}%
           \usebibmacro{cite:reinit}}%
         {\iffieldequals{fullhash}{\cbx@lasthash}%
@@ -712,15 +687,19 @@ citation style]
 
 \newbibmacro*{cmsbracketname}{%
   \iffieldequalstr{authortype}{anon}%
-  {\bibleftbracket\printnames{labelname}%
-    \bibrightbracket}%
+  {\printtext{\bibleftbracket\printnames{labelname}%
+      \bibrightbracket}}%
   {\iffieldequalstr{authortype}{anon?}%
-    {\bibleftbracket\printnames{labelname}?%
-      \bibrightbracket}%
+    {\printtext{\bibleftbracket\printnames{labelname}?%
+        \bibrightbracket}}%
     {\printnames{labelname}}}}%
 
 \newbibmacro*{citeyear}{%
-  \iffieldequalstr{entrysubtype}{classical}%
+  \ifboolexpr{%
+    togl {cms@authortitle}%
+    or
+    test {\iffieldequalstr{entrysubtype}{classical}}%
+  }%
   {\iffieldundef{shorthand}%
     {\usebibmacro{citeyear:noshort}}%
     {\iftoggle{cms@los}%
@@ -734,7 +713,11 @@ citation style]
   \setunit{\multicitedelim}}%
 
 \newbibmacro*{citeyear:noshort}{%
-  \iffieldequalstr{entrysubtype}{classical}% Altered for CMS
+  \ifboolexpr{%
+    togl {cms@authortitle}%
+    or
+    test {\iffieldequalstr{entrysubtype}{classical}}%
+  }% Altered for CMS
   {\iffieldequals{fullhash}{\cbx@lasthash}%
     {\iffieldundef{postnote}%
       {\setunit{\compcitedelim}}%
@@ -765,11 +748,19 @@ citation style]
     {\iffieldequals{fullhash}{\cbx@lastyear}%
       {\setunit{\multicitedelim}%
         \global\undef\cbx@lastyear}%
-      {\iffieldequalstr{entrysubtype}{classical}%
+      {\ifboolexpr{%
+          togl {cms@authortitle}%
+          or
+          test {\iffieldequalstr{entrysubtype}{classical}}%
+        }%
         {\setunit{\multicitedelim}}%
         {\setunit{\compcitedelim}}}}%
     {\setunit{\multicitedelim}}%
-    \iffieldequalstr{entrysubtype}{classical}%
+    \ifboolexpr{%
+      togl {cms@authortitle}%
+      or
+      test {\iffieldequalstr{entrysubtype}{classical}}%
+    }%
     {\usebibmacro{cite:label}}%
     {\usebibmacro{cmscitesortdate}}}%
   {\iffieldundef{shorthand}%
@@ -777,14 +768,28 @@ citation style]
         \ifentrytype{inreference}\OR
         \ifentrytype{reference}\OR
         \ifentrytype{mvreference}}%
-      {\iffieldequalstr{entrysubtype}{classical}%
-        {\setunit{%
-            \global\booltrue{cbx:parens}%
-            \cms@testspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cite:label}}%
+      {\ifboolexpr{%
+          togl {cms@authortitle}%
+          or
+          test {\iffieldequalstr{entrysubtype}{classical}}%
+        }%
+        {\ifentrytype{customc}%
+          {\setunit{%
+              \global\booltrue{cbx:parens}%
+              \multicitedelim}%\bibopenparen%
+            \ifnumequal{\value{citecount}}{1}%
+            {\usebibmacro{prenote}\clearfield{prenote}}%
+            {}%
+            \savefield{postnote}{\cms@tempz}\clearfield{postnote}%
+            \usebibmacro{cite:label}%
+            \restorefield{postnote}{\cms@tempz}}%
+          {\setunit{%
+              \global\booltrue{cbx:parens}%
+              \cms@testspace\bibopenparen}%
+            \ifnumequal{\value{citecount}}{1}%
+            {\usebibmacro{prenote}}%
+            {}%
+            \usebibmacro{cite:label}}}%
         {\usebibmacro{cite:label}%
           \ifboolexpr{%
             togl {cms@gencite}%
@@ -822,8 +827,14 @@ citation style]
         \ifnumequal{\value{citecount}}{1}%
         {\usebibmacro{prenote}}%
         {}%
-        \iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}%
+        \ifboolexpr{%
+          togl {cms@authortitle}%
+          or
+          test {\iffieldequalstr{entrysubtype}{classical}}%
+        }%
+        {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
+          {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+          {\usebibmacro{cite:label}}}%
         {\usebibmacro{cmscitesortdate}}%
         \savefield{fullhash}{\cbx@lasthash}}}%
     {\printfield{shorthand}%
@@ -844,8 +855,14 @@ citation style]
       \ifnumequal{\value{citecount}}{1}%
       {\usebibmacro{prenote}}%
       {}%
-      \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}%
+      \ifboolexpr{%
+        togl {cms@authortitle}%
+        or
+        test {\iffieldequalstr{entrysubtype}{classical}}%
+      }%
+      {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
+        {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+        {\usebibmacro{cite:label}}}%
       {\usebibmacro{cmscitesortdate}}%
       \savefield{fullhash}{\cbx@lasthash}}%
     \stepcounter{textcitecount}}% Added ???
@@ -862,11 +879,19 @@ citation style]
       {\iffieldequals{fullhash}{\cbx@lastyear}%
         {\setunit{\multicitedelim}%
           \global\undef\cbx@lastyear}%
-        {\iffieldequalstr{entrysubtype}{classical}%
+        {\ifboolexpr{%
+            togl {cms@authortitle}%
+            or
+            test {\iffieldequalstr{entrysubtype}{classical}}%
+          }%
           {\setunit{\multicitedelim}}%
           {\setunit{\compcitedelim}}}}%
       {\setunit{\multicitedelim}}%
-      \iffieldequalstr{entrysubtype}{classical}%
+      \ifboolexpr{%
+        togl {cms@authortitle}%
+        or
+        test {\iffieldequalstr{entrysubtype}{classical}}%
+      }%
       {\usebibmacro{cite:label}}%
       {\usebibmacro{cmscitesortdate}}}%
     {\iffieldundef{postnote}%
@@ -882,14 +907,28 @@ citation style]
       \ifentrytype{reference}\OR
       \ifentrytype{mvreference}}%
     {\iffieldundef{shorthand}%
-      {\iffieldequalstr{entrysubtype}{classical}%
-        {\setunit{%
-            \global\booltrue{cbx:parens}%
-            \cms@testspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cite:label}}%
+      {\ifboolexpr{%
+          togl {cms@authortitle}%
+          or
+          test {\iffieldequalstr{entrysubtype}{classical}}%
+        }%
+        {\ifentrytype{customc}%
+          {\setunit{%
+              \global\booltrue{cbx:parens}%
+              \multicitedelim}%\bibopenparen%
+            \ifnumequal{\value{citecount}}{1}%
+            {\usebibmacro{prenote}\clearfield{prenote}}%
+            {}%
+            \savefield{postnote}{\cms@tempz}\clearfield{postnote}%
+            \usebibmacro{cite:label}%
+            \restorefield{postnote}{\cms@tempz}}%
+          {\setunit{%
+              \global\booltrue{cbx:parens}%
+              \cms@testspace\bibopenparen}%
+            \ifnumequal{\value{citecount}}{1}%
+            {\usebibmacro{prenote}}%
+            {}%
+            \usebibmacro{cite:label}}}%
         {\usebibmacro{cite:label}%
           \ifboolexpr{%
             togl {cms@gencite}%
@@ -930,8 +969,14 @@ citation style]
       {\usebibmacro{prenote}}%
       {}%
       \iffieldundef{shorthand}%
-      {\iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}%
+      {\ifboolexpr{%
+          togl {cms@authortitle}%
+          or
+          test {\iffieldequalstr{entrysubtype}{classical}}%
+        }%
+        {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
+          {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+          {\usebibmacro{cite:label}}}%
         {\usebibmacro{cmscitesortdate}}}%
       {\printtext[bibhyperref]{%
           \printfield{shorthand}}}%
@@ -983,8 +1028,10 @@ citation style]
         \usebibmacro{cite:label}}}%
     {\printfield{shorthand}%
       \printtext[cmshyper]{%
-        \setunit{\cms@testspace}% FIXME
-        \usebibmacro{cite:label}}%
+        \setunit{\addcomma\addspace}% FIXME: wrong in 16th _and_ 17th eds?
+        \ifthenelse{\ifentrytype{standard}\OR\ifentrytype{manual}}%
+        {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+        {\usebibmacro{cite:label}}}%
       \savefield{fullhash}{\cbx@lasthash}}}%
   {\printtext[bibhyperref]{\printfield{shorthand}}%
     \usebibmacro{cite:reinit}}}%
@@ -1010,9 +1057,30 @@ citation style]
       }%
       {\printtext[cmshyper]{\printfield[shortjournal]{shortjournal}}}%
       {\printtext[cmshyper]{\printfield[journaltitle]{journaltitle}}}}%
-    {\ifentrytype{manual}%
+    {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
       {\printtext[cmshyper]{\printlist{organization}}}%
-      {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}}}%
+      {\ifboolexpr{%
+          test {\ifentrytype{video}}%
+          and
+          test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+          and
+          not test {\iffieldundef{title}}%
+          and
+          not test {\iffieldundef{booktitle}}%
+        }%
+        {\iffieldundef{shorttitle}%
+          {\printtext[cmshyper]{%
+                \printfield{booktitle}%
+                \setunit{\subtitlepunct}%
+                \printfield[booksubtitle]{booksubtitle}}% (?)
+              \setunit{\ctitleaddonpunct}%
+              \printfield{booktitleaddon}%
+              \iffieldundef{booktitleaddon}{}{\addcomma\addspace}}%
+          {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}%
+            \setunit{\ctitleaddonpunct}%
+            \printfield{booktitleaddon}%
+            \iffieldundef{booktitleaddon}{}{\addcomma\addspace}}}%
+        {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}}}}%
   {\printtext[cmshyper]{\printfield{label}}}}%
 
 \newbibmacro*{cite:labelyear+extrayear}{%
@@ -1021,6 +1089,8 @@ citation style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -1039,76 +1109,30 @@ citation style]
   {\ifboolexpr{%
       test {\ifentrytype{misc}}%
       or
-      test {\ifentrytype{inreference}}%
-      or
-      test {\ifentrytype{reference}}%
-      or
-      test {\ifentrytype{mvreference}}%
+      test {\ifentrytype{dataset}}%
       or
       not togl {cms@nodates}%
     }%
     {}%
-    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
       \iffieldundef{year}%
       {\iffieldundef{eventyear}%
         {\iffieldundef{origyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{origendyear}%
-            {}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{origendyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{eventendyear}%
-          {}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}}%
-            {\usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{endyear}% DATE FIX
-        {}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }%
-          {\mbox{\bibdatedash}}%
-          {\usebibmacro{cms@test@labelend}}}}}}}%
+              {\bibstring{nodate}}%
+              {}}%
+            {\printurldateextra}}%
+          {\printorigdateextra}}%
+        {\printeventdateextra}}%
+      {\printdateextra}}}}%
 
 \newbibmacro*{cite:origfirst+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1116,76 +1140,30 @@ citation style]
   {\ifboolexpr{%
       test {\ifentrytype{misc}}%
       or
-      test {\ifentrytype{inreference}}%
-      or
-      test {\ifentrytype{reference}}%
-      or
-      test {\ifentrytype{mvreference}}%
+      test {\ifentrytype{dataset}}%
       or
       not togl {cms@nodates}%
     }%
     {}%
-    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
       \iffieldundef{origyear}%
       {\iffieldundef{year}%
         {\iffieldundef{eventyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{eventendyear}%
-            {}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{eventendyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{endyear}%
-          {}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{endyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}}%
-            {\usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{origendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{origendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }%
-          {\mbox{\bibdatedash}}%
-          {\usebibmacro{cms@test@labelend}}}}}}}%
+              {\bibstring{nodate}}%
+              {}}%
+            {\printurldateextra}}%
+          {\printeventdateextra}}%
+        {\printdateextra}}%
+      {\printorigdateextra}}}}%
 
 \newbibmacro*{cite:av+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1193,84 +1171,30 @@ citation style]
   {\ifboolexpr{%
       test {\ifentrytype{misc}}%
       or
-      test {\ifentrytype{inreference}}%
-      or
-      test {\ifentrytype{reference}}%
-      or
-      test {\ifentrytype{mvreference}}%
+      test {\ifentrytype{dataset}}%
       or
       not togl {cms@nodates}%
     }%
     {}%
-    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
       \iffieldundef{eventyear}%
       {\iffieldundef{origyear}%
         {\iffieldundef{year}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{urlendyear}%
-            {}%
+          {\iffieldundef{userd}%
             {\ifboolexpr{%
-                test {\iffieldequalstr{urlendyear}{}}%
+                togl {cms@nodates}%
                 and
-                not togl {cms@datedash}%
-              }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extradate}%
-            {}%
-            {\setunit*{}%
-              \printfield{extradate}}%
-            \iffieldundef{endyear}%
-            {}%
-            {\ifboolexpr{%
-                test {\iffieldequalstr{endyear}{}}%
+                not test {\ifentrytype{misc}}%
                 and
-                not togl {cms@datedash}%
+                not test {\ifentrytype{dataset}}%
               }%
-              {\mbox{\bibdatedash}}%
-              {\usebibmacro{cms@test@labelend}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extradate}%
-          {}%
-          {\setunit*{}%
-            \printfield{extradate}}%
-          \iffieldundef{origendyear}%
-          {}%
-          {\ifboolexpr{%
-              test {\iffieldequalstr{origendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }%
-            {\mbox{\bibdatedash}}%
-            {\usebibmacro{cms@test@labelend}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extradate}%
-        {}%
-        {\setunit*{}%
-          \printfield{extradate}}%
-        \iffieldundef{eventendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{%
-            test {\iffieldequalstr{eventendyear}{}}%
-            and
-            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}}}}%
+              {\bibstring{nodate}}%
+              {}}%
+            {\printurldateextra}}%
+          {\printdateextra}}%
+        {\printorigdateextra}}%
+      {\printeventdateextra}}}}%
 
 \newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
   \ifboolexpr{%
@@ -1305,11 +1229,15 @@ citation style]
       {\iftoggle{cms@bothlabelold}%
         {\usebibmacro{cite:bothyear+oldstyle}}%
         {\iftoggle{cms@fulldate}%
-          {\newcunit\printtext[bibhyperref]{\printdate}}% Consistency(?)
-          {\usebibmacro{cite:labelyear+extrayear}}}}}}%
-  \ifcsdef{@cms@tempdate}%
-  {\toggletrue{\@cms@tempdate}}%
-  {}}%
+          {\printtext[cmsyearhyper]{%
+              \csuse{print\strfield{labeldatesource}date}%
+              \iffieldundef{\strfield{labeldatesource}hour}%
+              {}% Consistency(?)
+              {\newcunit\csuse{print\strfield{labeldatesource}time}}}}%
+          {\usebibmacro{cite:labelyear+extrayear}}}}}}}%
+  % \ifcsdef{@cms@tempdate}%
+  % {\toggletrue{\@cms@tempdate}}%
+  % {}%
 
 \newbibmacro*{cite:origyear+labelyear}{%
   \ifboolexpr{ (
@@ -1317,6 +1245,8 @@ citation style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -1334,8 +1264,9 @@ citation style]
         \usebibmacro{cite:standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}%
         {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-        {\printtext[bibhyperref]{%
-            \usebibmacro{origyear+endyear}}}}}}}%
+        {\clearfield{extradate}%
+          \printtext[cmsyearhyper]{%
+            \printorigdateextra}}}}}}% \usebibmacro{origyear+endyear}
 
 \newbibmacro*{cite:bothyear+oldstyle}{%
   \ifboolexpr{ (
@@ -1343,6 +1274,8 @@ citation style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{standard}}%
+    or
     test {\ifentrytype{suppperiodical}}%
     or
     test {\ifentrytype{video}}%
@@ -1352,11 +1285,13 @@ citation style]
   }%
   {\usebibmacro{cite:av+labelyear+extrayear}}%
   {\iftoggle{cms@switchdates}%
-    {\printtext[bibhyperref]{%
+    {\printtext[cmsyearhyper]{%
         \bibopenparen%
         \usebibmacro{cite:labelyear+extrayear}%
         \bibcloseparen%
-        \addspace\usebibmacro{origyear+endyear}}}%
+        \clearfield{extradate}%
+        \addspace%
+        \printorigdateextra}}% \usebibmacro{origyear+endyear}
     {\iffieldundef{origyear}% ???
       {\iftoggle{cms@ordate}%
         {}%
@@ -1365,18 +1300,23 @@ citation style]
       {\iftoggle{cms@ordate}% Added test for year field ???
         {\iffieldundef{year}%
           {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-          {\printtext[bibhyperref]{%
+          {\printtext[cmsyearhyper]{%
               \bibopenparen%
               \usebibmacro{cite:origfirst+labelyear+extrayear}%
               \bibcloseparen%
               \setunit{\addspace}%\addspace% ???
-              \usebibmacro{year+endyear}}}}%
-        {\printtext[bibhyperref]{%
-            \bibopenparen%
-            \usebibmacro{origyear+endyear}%
-            \bibcloseparen%
-            \clearfield{extradate}\addspace%
-            \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}%
+              \clearfield{extradate}%
+              \printdateextra}}}%\usebibmacro{year+endyear}
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[cmsyearhyper]{%
+              \bibopenparen%
+              \clearfield{extradate}%
+              \printorigdateextra%
+              % \usebibmacro{origyear+endyear}%
+              \bibcloseparen%
+              \addspace%
+              \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}}%
 
 \newbibmacro*{cite:save}{%
   \savefield{entrykey}{\cbx@lastkey}}%
@@ -1443,8 +1383,36 @@ citation style]
   {}%
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand{\cmshypercite}% Intended for CustomC comments
+  {\usebibmacro{cite:init}%
+    \togglefalse{blx@skipbib}%
+    \togglefalse{cms@authortitle}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \usebibmacro{cite}}
+  {}%\multicitedelim
+  {}%\usebibmacro{postnote} Stops double printing
+
+\DeclareCiteCommand{\atcite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@authortitle}%
+    \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\atpcite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@authortitle}%
+    \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
 %%% Commands, macros and formats for the Legal entry types %%%
-  
+
 \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}%\bibsentence
   {\usebibmacro{citeindex}%
@@ -1478,6 +1446,15 @@ citation style]
   {\multicitedelim}
   {}
 
+\DeclareCiteCommand{\runcite}% 17th ed.
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@running@text}%
+    \usebibmacro{cite}%
+    \togglefalse{cms@running@text}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
 \newbibmacro*{cite:full}{%
   \iftoggle{cms@noneshort}%
   {\ifboolexpr{%
@@ -1678,6 +1655,8 @@ citation style]
   \ifboolexpr{%
     test {\iffootnote}%
     and
+    togl {cms@supranotes}%
+    and
     (
     test {\ifentrytype{legal}}%
     or
@@ -1767,7 +1746,7 @@ citation style]
   \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
     \iffieldundef{titleaddon}}%
   {}%
-  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  {\printtext[title]{%
       \printfield[noformat]{title}%
       \setunit{\subtitlepunct}%
       \printfield[noformat]{subtitle}}%
@@ -1861,8 +1840,15 @@ citation style]
     togl {cms@url}%
     and
     not test {\iffieldundef{urlyear}}%
+  }%
+  {\printurldate%
+    \ifboolexpr{% 17th ed.
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
     }%
-  {\printurldate}% Date fix
+    {\newcunit\printurltime}%
+    {}}% Date fix
   {}%
   \newcunit\newblock
   \iftoggle{cms@doionly}%
@@ -1929,7 +1915,11 @@ citation style]
       {\printtext{at}\addspace #1}}}}%
 
 \DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\mkcomprange[\mkjuridprefix]{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -1937,7 +1927,12 @@ citation style]
     {\mkjuridprefix{#1}}%
     {\mkpageprefix[pagination]{#1}}}}%
 
-\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+\DeclareFieldFormat[jurisdiction]{title}{%
+  \iftoggle{cms@running@text}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{title}{#1\isdot}
 
 \DeclareFieldFormat[legislation]{title}{%
   \iffieldequalstr{entrysubtype}{hearing}%
@@ -2008,7 +2003,41 @@ citation style]
   {c\adddotspace #1}%
   {\bibsstring{chapter}~#1}}%
 
-%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% 
+\DeclareFieldFormat[music]{chapter}{\bibstring{track}~#1}
+
+\newbibmacro*{patenttitle+stitle}{% Unify Patent entries across 2 AD styles
+  \printtext{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[subtitle]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\DeclareFieldFormat[patent]{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[patent]{citetitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat[patent]{lostitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat[patent]{subtitle}{%
+  \iffieldundef{subtitle}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[dataset]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldAlias[dataset]{citetitle}[dataset]{title}
+
+\DeclareFieldAlias[dataset]{lostitle}[dataset]{title}
+
+%%% Textcite commands taken verbatim from authoryear-comp.cbx %%%
 
 \DeclareCiteCommand{\cbx@textcite}
   {\usebibmacro{cite:init}}
@@ -2216,7 +2245,7 @@ citation style]
 
 \DeclareListFormat{periodplace}{\mkbibparens{#1}}
 
-\DeclareListFormat{lista}{% 
+\DeclareListFormat{lista}{%
   \ifthenelse{\value{listtotal}<2}%
   {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
   {\ifthenelse{\value{listcount}=1}%
@@ -2229,19 +2258,12 @@ citation style]
 
 \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
 
-\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
-{\patchcmd{\blx@comprange@check}%
-  {\blx@comprange@comp{#1}{#2}}%
-  {\blx@tempcnta=#1%
-    \divide\blx@tempcnta100%
-    \multiply\blx@tempcnta100%
-    \ifnumequal{\blx@tempcnta}{#1}%
-    {\blx@range@out@value{#1\bibrangedash#2}}%
-    {\blx@comprange@comp{#1}{#2}}}%
-  {}{}}{}%
-
 \DeclareFieldFormat{postnote}{% Changed for page compression option
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\mkcomprange{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -2250,7 +2272,11 @@ citation style]
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat[inreference]{postnote}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -2259,7 +2285,11 @@ citation style]
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat{pages}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{bookpagination}%
     {\mkcomprange{#1}\isdot}%
     {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
@@ -2269,13 +2299,6 @@ citation style]
 
 \DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
 
-% \DeclareFieldFormat{edlang}{%
-%   \ifbibstring{#1}%
-%   {\bibstring{#1}}%
-%   {\ifbibstring{ed#1}%
-%     {\bibstring{ed#1}}%
-%     {\ifcapital{\MakeCapital{#1}}{#1}}}}
-
 \DeclareListFormat{edlang}{% Required for feminine forms in some
   \usebibmacro{list:delim}{% languages
     \ifbibstring{#1}%
@@ -2298,13 +2321,21 @@ citation style]
   {#1}}
 
 \DeclareFieldFormat[customc]{citetitle}{%
-  \ifnameundef{author}%
-  {#1}%
-  {\iffieldundef{nameaddon}%
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      #1}%
-    {\printfield{nameaddon}\addspace #1}}}
+  \iffieldequalstr{pubstate}{cms-generated}% Comments 17th ed.
+  {\ifbibstring{#1}%
+    {\bibstring{#1}}%
+    {#1}%
+    \StrGobbleRight{\strfield{entrykey}}{8}[\cms@aa]%
+    \addspace\cmshypercite{\cms@aa}}%
+  {\ifnameundef{author}%
+    {#1}%
+    {\iffieldundef{nameaddon}%
+      {\mkbibemph{\bibstring{see}}%
+        \addspace%
+        #1}%
+      {\printfield{nameaddon}\addspace #1}}}}
+
+\DeclareFieldAlias[customc]{lostitle}[customc]{title}
 
 \DeclareFieldFormat{shortjournal}{\mkbibemph{#1}\isdot}
 
@@ -2312,8 +2343,6 @@ citation style]
 
 %%%% Other Field Formats %%%%
 
-\DeclareNumChars*{:}%
-
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
 
 \DeclareFieldFormat{note}{%
@@ -2328,18 +2357,21 @@ citation style]
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
 
-\DeclareFieldFormat[artwork,image]{type}{%
+\DeclareFieldFormat[artwork,image,online,article,review,suppperiodical,book]
+{type}{%
   \ifcapital%
   {\MakeCapital{#1}}%
   {#1}}
 
+\DeclareFieldFormat[video]{usera}{%
+  \bibstring{on}\addspace #1}
+
+\DeclareFieldFormat{version}{\bibsstring{version}\addspace #1}%
+
 \DeclareFieldFormat{url}{\url{#1}}
 
 \DeclareFieldFormat{doi}{%
-  \textrm{doi}\addcolon
-  \ifhyperref
-    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}%
-    {\nolinkurl{#1}}}
+  \url{https://doi.org/#1}}
 
 \DeclareFieldFormat[music]{date}{% Generalize userd ???
   \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
@@ -2356,6 +2388,37 @@ citation style]
   {#1}%
   {\printfield{userd}\addspace #1}}
 
+\DeclareFieldFormat[artwork,image]{date}{%
+  \iffieldundef{origyear}%
+  {#1}%
+  {\iftoggle{cms@switchdates}%
+    {#1}%
+    {\iffieldundef{userd}%
+      {\bibstring{printed}\addspace #1}%
+      {\printfield{userd}\addspace #1}}}}
+
+\DeclareFieldFormat[artwork,image]{origdate}{%
+  \iffieldundef{year}%
+  {#1}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{userd}%
+      {\bibstring{printed}\addspace #1}%
+      {\printfield{userd}\addspace #1}}%
+    {#1}}}
+
+\DeclareFieldFormat[artwork,image]{urldate}{%
+  \ifboolexpr{%
+    test {\iffieldundef{userd}}%
+    or
+    (
+    not test {\iffieldundef{year}}%
+    and
+    not test {\iffieldundef{origyear}}%
+    )
+  }%
+  {\bibstring{urlseen}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
 \DeclareFieldFormat{date}{% Generalize userd ???
   \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
   {#1}%
@@ -2378,7 +2441,7 @@ citation style]
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \iftoggle{cms@reprint}% Date fix
+  \iffieldequalstr{pubstate}{reprint}% Date fix
   {#1}%
   {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
     {\bibstring{discrecorded}\space #1}%
@@ -2398,7 +2461,12 @@ citation style]
 
 \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
 
-\DeclareFieldFormat[review,suppperiodical]{nameaddon}{#1\bibsentence}% 16th ed.
+\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{#1\bibsentence}%
+
+\DeclareFieldFormat[misc]{nameaddon}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibbrackets{#1\bibsentence}}%
+  {#1\bibsentence}}
 
 \DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
   \ifbibstring{#1}%
@@ -2442,6 +2510,10 @@ citation style]
   {\addnbspace #1}%
   {\addcomma\addspace #1}}
 
+\DeclareFieldFormat{series}{#1\isdot}
+
+\DeclareFieldFormat{shortseries}{#1\isdot}
+
 \DeclareFieldFormat{addendum}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
@@ -2461,8 +2533,11 @@ citation style]
 
 \DeclareFieldFormat{cmshyper}{% Control the number of elements hyperlinked.
   \ifboolexpr{%
-    (
+    ((
     not test {\iffieldequalstr{entrysubtype}{classical}}%
+    and
+    not togl {cms@authortitle}%
+    )
     or
     togl {blx@skipbib}%
     )
@@ -2472,6 +2547,11 @@ citation style]
   {#1}%
   {\bibhyperref{#1}}}%
 
+\DeclareFieldFormat{cmsyearhyper}{% Only link when in ref list
+  \iftoggle{blx@skipbib}
+  {#1}%
+  {\bibhyperref{#1}}}%
+
 %%%% Related field formats from biblatex.def %%%%
 
 \DeclareFieldFormat{related:origpubas}{#1}% This and next remove parens
@@ -2526,24 +2606,125 @@ citation style]
   \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
 
 \renewcommand*{\nameyeardelim}{%
-  \ifthenelse{\iffieldundef{labelyear}\OR%
-    \iffieldequalstr{labelyear}{nodate}}%
-  {\addcomma\addspace}%
-  {\iffieldundef{origyear}% Is this test correct?
-    {\iffieldundef{year}%
-      {\cms@testspace}% FIXME -- automatic n.d. ??? labeldate test?
-      {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
-          \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
-        \iffieldnums{year}% This one works.
+  \ifboolexpr{%
+    (
+    togl {cms@bothlabelnew}%
+    or
+    togl {cms@bothlabelold}%
+    )
+    and
+    (
+    not test {\iffieldundef{year}}%
+    and
+    not test {\iffieldundef{origyear}}%
+    )
+  }%
+  {\cms@testspace}%
+  {\cms@pre@punct%
+    \ifboolexpr{%
+      test {\iffieldundef{labelyear}}%
+      or
+      (
+      test {\iffieldundef{userd}}%
+      and
+      test {\iffieldequalstr{labeldatesource}{url}}%
+      )
+      or
+      test {\iffieldequalstr{labelyear}{nodate}}%
+      or
+      togl {cms@fulldate}%
+      or
+      bool {cms:comma}%
+    }%
+    {\addcomma\addspace}%
+    {\iffieldundef{origyear}%
+      {\iffieldundef{year}%
         {\cms@testspace}%
-        {\addcomma\addspace}}}% 16th ed. wants comma before n.d. (!)
-    {\cms@testspace}}}
+        {\ifboolexpr{%
+            test {\iffieldnums{year}}%
+            or
+            test {\iffieldstart{year}{[}}%] For backward compatibility
+          }%
+          {\cms@testspace}%
+          {\addcomma\addspace}}}%
+      {\cms@testspace}}\global\boolfalse{cms:comma}}}
 
-\newcommand{\classicpunct}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \ifentrytype{letter}}%
-  {\setunit*{\addspace}}%
-  {\setunit*{\addcomma\addspace}}}
+\newrobustcmd*{\cms@citepunct@helper}[1]{%
+  \begingroup
+  \blx@metadateinfo{#1}%
+  \ifboolexpr{%
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {}%
+  {\if@cms@circa%
+    {\global\booltrue{cms:comma}}%
+    {\if@cms@adfirst%
+      {\iffieldnum{#1year}%
+        {\ifboolexpr{%
+            test {\ifdefstring\blx@dateera{christian}}%
+            and
+            not test {\iffieldequalstr{#1dateera}{bce}}%
+            and
+            test {\ifnumless{\thefield{#1year}}\blx@dateeraauto}%
+          }%
+          {\global\booltrue{cms:comma}}%
+          {}}%
+        {}}%
+      {\ifboolexpr{%
+          test {\ifdefstring\blx@languagename{french}}%
+          or
+          test {\ifdefstring\blx@languagename{dutch}}%
+        }%
+        {\ifboolexpr{%
+            not test {\iffieldequalstr{#1dateunspecified}{yearindecade}}%
+            or
+            togl {cms@alwaysrange}%
+            or
+            togl {cms@decaderange}%
+          }%
+          {}%
+          {\global\booltrue{cms:comma}}}%
+        {\ifboolexpr{%
+            test {\ifdefstring\blx@languagename{brazilian}}%
+            or
+            test {\ifdefstring\blx@languagename{brazil}}%
+          }%
+          {\ifboolexpr{%
+              test {\iffieldundef{#1dateunspecified}}%
+              or
+              togl {cms@alwaysrange}%
+            }%
+            {}%
+            {\ifboolexpr{%
+                (
+                test {\iffieldequalstr{#1dateunspecified}{yearindecade}}%
+                and
+                not togl {cms@decaderange}%
+                )
+                or
+                (
+                test {\iffieldequalstr{#1dateunspecified}{yearincentury}}%
+                and
+                not togl {cms@centuryrange}%
+                )
+              }%
+              {\global\booltrue{cms:comma}}%
+              {}}}%
+          {}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@pre@punct}{%
+  \iftoggle{cms@origlabel}%
+  {\cms@citepunct@helper{orig}}%
+  {\ifdefstring\abx@field@labeldatesource{year}%
+    {\cms@citepunct@helper{}}%
+    {\ifdefstring\abx@field@labeldatesource{origyear}%
+      {\cms@citepunct@helper{orig}}%
+      {\ifdefstring\abx@field@labeldatesource{nodate}%
+        {}%
+        {\cms@citepunct@helper{\abx@field@labeldatesource}}}}}}
 
 \renewcommand*{\subtitlepunct}{% Follows CMS16 spec.
   \ifboolexpr{%
@@ -2556,15 +2737,17 @@ citation style]
     \global\csundef{@cmsst}}%
 }
 
-\newcommand{\postvolpunct}{\addcolon}%
+\newcommand*{\reprintpunct}{%
+  \ifthenelse{\ifentrytype{artwork}\OR\ifentrytype{image}}%
+  {}%
+  {\ifentrytype{dataset}%
+    {\setunit{\addspace}}%
+    {\printunit{\addcomma\addspace}}}}
 
-\newcommand{\parttrans}{%
-  {\bibstring{bytranslator}\space}}%
+\newcommand*{\postvolpunct}{\addcolon}%
 
-% \newcommand{\partedit}{%
-%   \iftoggle{cms@postposit}% Kludge to make it work in French.
-%   {\bibstring{byeditoralt}\addspace}%
-%   {\bibstring{byeditor}\addspace}}%
+\newcommand*{\parttrans}{%
+  {\bibstring{bytranslator}\space}}%
 
 \protected\def\partedit#1{%
   \ifcat\noexpand~\noexpand#1%
@@ -2597,24 +2780,24 @@ citation style]
   \cms@tempa%
 }%
 
-\newcommand{\part@edit@i}{\bibstring{byeditor}\addspace}%
+\newcommand*{\part@edit@i}{\bibstring{byeditor}\addspace}%
 
-\newcommand{\partcomp}{%
+\newcommand*{\partcomp}{%
   {\bibstring{bycompiler}\space}}%
 
-\newcommand{\parteditandcomp}{%
+\newcommand*{\parteditandcomp}{%
   {\bibstring{byeditorcp}\space}}%
 
-\newcommand{\parttransandcomp}{%
+\newcommand*{\parttransandcomp}{%
   {\bibstring{bytranslatorcp}\space}}%
 
-\newcommand{\partedittransandcomp}{%
+\newcommand*{\partedittransandcomp}{%
   {\bibstring{byeditortrcp}\space}}%
 
-\newcommand{\parteditandtrans}{%
+\newcommand*{\parteditandtrans}{%
   {\bibstring{byeditortr}\space}}%
 
-\newcommand{\reprint}{\bibstring{reprint}}%
+\newcommand*{\reprint}{\bibstring{reprint}}%
 
 \newcommand*{\multipubsdelim}{\addnbspace/\addspace}
 
@@ -2653,11 +2836,11 @@ citation style]
       {}%
       {\cms@testspace}}%
     {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
-      {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
+      {\DeclareNumChars*{abcdeABCDE:}%
         \iffieldpages{postnote}%
         {\cms@testspace}%
         {\addcomma\addspace}}%
-      {\addcomma\addspace}}}}
+      {\addcomma\addspace}\DeclareNumChars{.}}}}
 
 \newcommand*{\postnotewrapper}{%
   \iftoggle{cms@modpostnote}%
@@ -2689,13 +2872,16 @@ citation style]
 
 \newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
   \iffieldequalstr{editortype}{none}%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
 
 \newcommand*{\nameadelim}{% Otherwise you get an inaccurate comma.
   \iffieldequalstr{nameatype}{none}%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\DeclareDelimFormat{dateeradelim}{\addnbspace}%
+\DeclareDelimFormat{dateaddelim}{\addnbspace}%
 
 \DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
   \begingroup% final {by}.
@@ -2710,7 +2896,7 @@ citation style]
   {\ifboolexpr{%
       test {\ifnumless{\value{listcount}}{\value{liststop}}}%
       or
-      test \ifmoreitems%
+      test {\ifmoreitems}%
      }%
      {\bibstring{from#1}}%
      {\bibstring{cfrom#1}}}%
@@ -2724,7 +2910,7 @@ citation style]
   \ifboolexpr{%
     test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
     and
-    test \ifmoreitems%
+    test {\ifmoreitems}%
   }%
     {\ifnumgreater{\value{liststop}}{1}%
        {\finalandcomma}%
@@ -2805,6 +2991,14 @@ citation style]
       {\bibstring{by}\addspace\printnames[default]{bookauthor}%
      \newcunit\newblock}}}
 
+\newbibmacro*{music+bookauthor}{%
+  \ifnameundef{bookauthor}%
+    {}%
+    {\ifnamesequal{author}{bookauthor}%
+      {}%
+      {\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
 \newbibmacro*{editorpunct}{%
   \ifthenelse{\(\iffieldundef{booktitle}\AND%
     \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
@@ -2819,6 +3013,10 @@ citation style]
   \printfield{edition}%
     \clearfield{edition}}%
 
+\newbibmacro*{version}{%
+  \printfield{version}%
+  \clearfield{version}}%
+
 \newbibmacro*{inforaft}{%
   \ifnameundef{introduction}%
   {\ifnameundef{afterword}%
@@ -2838,12 +3036,42 @@ citation style]
      \andmoredelim\bibstring{andmore}\bibrightbracket}%
     {}}
 
+\newbibmacro*{video+tv+title}{% For 17th ed.
+  \ifboolexpr{%
+    test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+    and
+    (
+    not test {\iffieldundef{title}}%
+    and
+    not test {\iffieldundef{booktitle}}%
+    )
+  }%
+  {\printtext{%
+      \printfield{booktitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[booksubtitle]{booksubtitle}}%
+    \setunit{\ptitleaddonpunct}%
+    \printfield{booktitleaddon}%
+  \ifundef\bbx@lasthash{}{\newcunit}}%
+  {\usebibmacro{video+title}% Simplifies trad style
+    \iffieldundef{booktitle}% Comma after italics, period after quotes
+    {\setunit{\ctitleaddonpunct}}%
+    {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
+    \printfield{titleaddon}%\usebibmacro{title+stitle}%
+    \setunit{\addspace}\newblock%\bibsentence
+    \usebibmacro{language+transtitle}}}
+
 \newbibmacro*{reference+title}{%
-  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
-    {\usebibmacro{italtitle+stitle}%
-      \savefield{title}{\bbx@lasthash}}}
+  \ifboolexpr{%
+    test {\iffieldequals{title}{\bbx@lasthash}}%
+    and
+    not test {\iffirstonpage}%
+    and
+    togl {cms@namedash}%
+  }%
+  {\printtext{\bibnamedash}}%
+  {\usebibmacro{italtitle+stitle}%
+    \savefield{title}{\bbx@lasthash}}}
 
 \newbibmacro*{mag+news+author}{%
   \ifboolexpr{%
@@ -2855,28 +3083,26 @@ citation style]
     and
     not togl {cms@origpublished}%
   }%
-  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
+  {\ifboolexpr{%
+      test {\iffieldequals{journaltitle}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\printtext{\bibnamedash}}%
     {\usebibmacro{journal+sub}%
       \setunit*{\addspace}%
       \printlist[periodplace]{location}%
       \savefield{journaltitle}{\bbx@lasthash}}}%
   {\usebibmacro{author}}}
 
-\newbibmacro*{cmag+news+author}{%
-  \ifnameundef{author}%
-  {\usebibmacro{journal+sub}%
-    \setunit*{\addspace}%
-    \printlist[periodplace]{location}}%
-  {\usebibmacro{author}}}
-
 \newbibmacro*{type+inst+year}{%
   \printfield{type}%
   \newcunit
   \printlist{institution}%
   \setunit*{\addcomma\space}%
-  \printfield{year}}
+  \printdate}% Was printfield{year}?
 
 \newbibmacro*{institution+organization}{%
   \iflistundef{organization}%
@@ -2887,6 +3113,31 @@ citation style]
     \newcunit%
     \printlist{institution}}}
 
+\newbibmacro*{misc+institution+organization}{% 17th ed.
+  \iffieldundef{number}%
+  {\iflistundef{organization}%
+    {\iflistundef{institution}%
+      {}%
+      {\printlist{institution}}}%
+    {\printlist{organization}%
+      \newcunit%
+      \printlist{institution}}}%
+  {\iflistundef{organization}%
+    {\iflistundef{institution}%
+      {\newcunit\printfield{number}}%
+      {\newcunit\printfield{number}%
+        \newunit%
+        \printlist{institution}}}%
+    {\iflistundef{institution}%
+      {\newcunit\printfield{number}%
+        \newunit%
+        \printlist{organization}}%
+      {\printlist{organization}%
+        \newcunit%
+        \printfield{number}%
+        \newcunit%
+        \printlist{institution}}}}}
+
 \newbibmacro*{author+org}{%
   \ifnameundef{author}%
   {\ifnameundef{editor}%
@@ -2896,8 +3147,10 @@ citation style]
           test {\iflistequals{organization}{\bbx@lasthash}}%
           and
           not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
         }%
-        {\bibnamedash\addperiod\addspace}%
+        {\printtext{\bibnamedash}}%
         {\iftoggle{cms@authorparens}%
           {\bibopenparen\printlist{organization}\bibcloseparen}%
           {\printlist{organization}}%
@@ -2905,10 +3158,19 @@ citation style]
     {\usebibmacro{editor}}}%
   {\usebibmacro{author/editor}}}
 
-\newbibmacro*{cbytypestrg}[2]{%
+\renewbibmacro*{bytypestrg}[2]{% From biblatex.def
   \iffieldundef{#1type}%
     {\bibstring{by#2}}%
-    {\bibstring{by\thefield{#1type}}}}
+    {\ifbibxstring{by\thefield{#1type}}%
+      {\bibstring{by\thefield{#1type}}}%
+      {\printtext[note]{\thefield{#1type}}}}}%
+
+\newbibmacro*{cbytypestrg}[2]{%
+  \iffieldundef{#1type}%
+    {\bibstring{cby#2}}%
+    {\ifbibxstring{cby\thefield{#1type}}%
+      {\bibstring{cby\thefield{#1type}}}%
+      {\printtext[note]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbyeditor}{%
   \ifnameundef{editor}%
@@ -3121,45 +3383,52 @@ citation style]
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
   {\ifboolexpr{%
-      test {\ifentrytype{music}}%
+      not test {\iffieldundef{eventyear}}%
       and
       not test {\iffieldundef{booktitle}}%
       and
+      test {\ifentrytype{audio}}%
+      and
       not togl {cms@origpublished}%
     }%
-    {\bibstring{on}\setunit{\addspace}}%
+    {\bibstring{in}\setunit{\addspace}}%
     {}}%
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
     {\addspace\bibstring{of}\setunit{\addspace}}}}%
 
-\newbibmacro*{music+ser+num}{%
-  \iffieldundef{series}%
-  {\iffieldundef{number}%
-    {}%
-    {\printfield{number}}}%
-  {\printfield{series}%
-    \setunit{\addspace}%
-    \printfield{number}}}%
-
-\newbibmacro*{music+publisher}{%
-  \iffieldundef{howpublished}%
-  {\iffieldundef{pubstate}%
+\newbibmacro*{chap+as+track}{%
+  \iffieldundef{chapter}%
+  {\ifboolexpr{%
+      not test {\iffieldundef{booktitle}}%
+      and
+      not togl {cms@origpublished}%
+    }%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\printfield{chapter}\clearfield{chapter}%
+    \iffieldundef{booktitle}%
     {}%
-    {\printfield{pubstate}}}%
-  {\printfield{howpublished}}}%
+    {\addspace\bibstring{on}\setunit{\addspace}}}}%
 
 \newbibmacro*{music+origdate}{%
-  \iftoggle{cms@reprint}% 16th ed.
+  \iffieldequalstr{pubstate}{reprint}% 17th ed.
   {}%
   {\iftoggle{cms@switchdates}% Date fix
-    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+        \iffieldundef{season}}%
       {}%
       {\usebibmacro{cmsorigdate}}}%
-    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+        \iffieldundef{origseason}}%
       {}%
-      {\usebibmacro{cmsorigdate}}}}}%
+      {\usebibmacro{cmsorigdate}}}%
+    \iffieldundef{pubstate}%
+    {}%
+    {\iffieldbibstring{pubstate}%
+      {\newunit\biblstring{\thefield{pubstate}}}%
+      {\newunit\printfield[prenote]{pubstate}}}}}%
 
 \newbibmacro*{music+eventdate}{% Date fix
   \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
@@ -3167,10 +3436,17 @@ citation style]
   {\printeventdate}}
 
 \newbibmacro*{ser+num}{%
-  \printfield{series}%
+  \usebibmacro{series+or+shortser}%
   \printfield[sernum]{number}%
   \newunit}
 
+\newbibmacro*{series+or+shortser}{%
+  \iffieldundef{shortseries}%
+  {\printfield{series}}%
+  {\iftoggle{cms@shser}%
+    {\printfield{shortseries}}%
+    {\printfield{series}}}}
+
 \newbibmacro*{language+transtitle}{%
   \iffieldundef{usere}%
   {\printlist[][-\value{listtotal}]{language}}%
@@ -3191,10 +3467,7 @@ citation style]
   \iflistundef{origpublisher}%
   {\setunit*{\addcomma\addspace}}%
   {\setunit*{\addcolon\addspace}}%
-  \printlist{origpublisher}%
-%  \setunit*{\addcomma\addspace}%
-%  \usebibmacro{cmsorigdate}%
-}%
+  \printlist{origpublisher}}%
 
 \newbibmacro*{howpubl+loc+year}{%
   \printlist{location}%
@@ -3216,8 +3489,8 @@ citation style]
   \usebibmacro{date}%
 }%
 
-\newbibmacro*{originally+published+as}{% Punctuation fix now in 
-  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+\newbibmacro*{originally+published+as}{% Punctuation fix now in
+  \iffieldundef{userf}%                  \origfullcite for 0.8e.
   {\iffieldundef{reprinttitle}%
     {}%
     {\usebibmacro{begrelated}%
@@ -3270,25 +3543,29 @@ citation style]
   {\printlist{origlocation}%
     \newcunit\newblock}%
   \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
     {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
     {}%
-    {\cms@datelong}}}
+    {\cms@datelong{orig}}}}
 
 \newbibmacro*{unpubl+letter+date}{% For the Misc type.
-  \iflistundef{origlocation}%
+  \iffieldundef{venue}%
   {}%
-  {\printlist{origlocation}%
+  {\printfield{venue}%
     \newcunit\newblock}%
   \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
     {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
     {\printdate}% For interviews and other dated non-letters
-    {\cms@datelong}}}
+    {\cms@datelong{orig}}}}
 
 \newbibmacro*{cmsbookdate}{%
   \ifthenelse{\iffieldundef{year}\AND\iffieldundef{origyear}}%
@@ -3304,44 +3581,54 @@ citation style]
 \renewbibmacro*{date}{% Adding the test solved some issues in 0.9 with
   \iftoggle{cms@switchdates}%
   {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}%
-    \AND\iffieldundef{origday}}%
+    \AND\iffieldundef{origday}\AND\iffieldundef{origseason}}%
     {}%
     {\printorigdate}}%
   {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}%
-    \AND\iffieldundef{day}}%  punctuation in some entry types (Misc).  The 
-    {}%                   whole \printdate thing may need further work. 
+    \AND\iffieldundef{day}\AND\iffieldundef{season}}% Punctuation in some
+    {}%  entry types (Misc).  The whole \printdate thing may need further work.
     {\printdate}}}
 
-\newcommand*{\cms@datelong}{% Modified for 0.9
-  \iffieldundef{origmonth}%
-  {\printfield{origyear}}%
-  {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
-    \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-    \printfield{origyear}}}%
-
-\newcommand*{\cms@datelongalt}{% Modified for 0.9
-  \iffieldundef{month}%
-  {\printfield{year}}%
-  {\printfield[letterday]{day}\setunit*{\nobreakspace}%
-    \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-    \printfield{year}}}%
-
-\newcommand*{\letterdatelong}{% Modified for 0.9
-  \iftoggle{cms@switchdates}% This one for users
-  {\iffieldundef{year}% Previous two for internal use
+\newbibmacro*{time+stamp}{% 17th ed.
+  \iftoggle{cms@switchdates}%
+  {\iffieldundef{orighour}%
     {}%
-    {\iffieldundef{month}%
-      {\printfield{year}}%
-      {\printfield[letterday]{day}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-        \printfield{year}}}}%
-  {\iffieldundef{origyear}%
+    {\newcunit\printorigtime}}%
+  {\iffieldundef{hour}%
     {}%
-    {\iffieldundef{origmonth}%
-      {\printfield{origyear}}%
-      {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-        \printfield{origyear}}}}}%
+    {\newcunit\printtime}}}
+
+\newcommand*{\cms@datelong}[1]{% Modified for 17th ed.
+  \begingroup
+  \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}}}%
+    {\cmsdateeraprintpre{##1}\stripzeros{\thefield{##1}}}}%
+  \cms@mkbibrangetrunc{long}{#1}%
+  \endgroup}%
+
+\newrobustcmd*{\letterdatelong}{% For users: 17th ed.
+  \ifboolexpr{%
+    test {\ifdefstring{\blx@languagename}{american}}%
+    or
+    test {\ifdefstring{\blx@languagename}{english}}% i.e., no babel
+  }%
+  {\iftoggle{cms@switchdates}%
+    {\cms@datelong{}}%
+    {\cms@datelong{orig}}}%
+  {\iftoggle{cms@switchdates}%
+    {\printdate}%
+    {\printorigdate}}}%
 
 \newbibmacro*{journal+sub}{%
   \iffieldundef{journaltitle}%
@@ -3383,17 +3670,29 @@ citation style]
     and
     not togl {cms@origpublished}%
   }%
-  {\usebibmacro{date+issue}}%
+  {\usebibmacro{date+issue}{a}}%
   {\usebibmacro{mag+date+issue}}}
 
-\newbibmacro*{date+issue}{%
+\newbibmacro*{date+issue}[1]{%
+  \iffieldundef{maintitle}%
+  {\ifblank{#1}{\newcunit\newblock}{\newunit\newblock}}%
+  {\printtext{%
+      \printfield{maintitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[mainsubtitle]{mainsubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{maintitleaddon}%
+    \newcunit\newblock}%
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \setunit*{\addcomma\addspace}\newblock%
   \iffieldundef{issue}%
   {\iffieldundef{number}%
-    {\usebibmacro{date}}%
+    {\usebibmacro{date}%
+      \usebibmacro{time+stamp}}% 17th ed.
     {\iftoggle{cms@numbermonth}%
       {\usebibmacro{date}}%
       {\usebibmacro{cmsyear}}%
-      \setunit*{\addcomma\addspace}% Starred version for when the 
+      \setunit*{\addcomma\addspace}% Starred version for when the
       \printfield[journum]{number}}}% month isn't printed because of
   {\printfield{issue}% the toggle.
     \setunit{\addspace}%
@@ -3403,22 +3702,20 @@ citation style]
   \usebibmacro{journal+sub}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
-  \newcunit\newblock
-  \printfield{usera}% For network ID and possible section of newspaper.
-  \newcunit\newblock
-  \usebibmacro{date+issue}}
+  \newunit\newblock
+  \usebibmacro{date+issue}{}}
 
 \newbibmacro*{cmsyear}{%
   \iftoggle{cms@switchdates}%
-  {\printfield{origyear}}%
-  {\printfield{year}}}
+  {\clearfield{extradate}\printorigdateextra}% \printfield{origyear}
+  {\clearfield{extradate}\printdateextra}}% \printfield{year}
 
 \newbibmacro*{cmsorigdate}{% New for 0.9
   \iftoggle{cms@switchdates}%
   {\printdate}%
   {\printorigdate}}
 
-\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
+\newbibmacro*{cperiodical+ser+vol+num}[1]{% For periodical entries,
   \ifboolexpr{% article subtype
     togl {cms@citejtabb}%
     and
@@ -3449,16 +3746,20 @@ citation style]
   {\newcunit
     \printfield[jourser]{series}%
     \newcunit}%\setunit*{\addspace}?
-  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
-  {\printfield[jourvol]{volume}%
-    \setunit{\addcomma\addspace}}%
+  \ifthenelse{\iffieldundef{#1year}\AND\iffieldundef{#1month}\AND%
+    \iffieldundef{issue}\AND\iffieldundef{#1season}}% New, more accurate
+  {\iffieldundef{volume}% test, also in article
+    {\newcunit%
+      \printfield[journum]{number}%
+      \clearfield{number}%
+      \setunit{\addcomma\addspace}}%
+    {\printfield[jourvol]{volume}%
+      \setunit{\addcomma\addspace}}}%
   {\printfield[jourvol]{volume}%
-    \setunit{\addcomma\addspace}% need * here?
+    \newcunit%
     \printfield[journum]{number}%
     \clearfield{number}%
-    \setunit{\addcomma\addspace}}%
-  \printfield{eid}%
-  \newunit}
+    \setunit{\addcomma\addspace}}}% Moved eid for 17th ed.
 
 \newbibmacro*{periodical+date+issue}{% For periodical type &
   \ifboolexpr{% magazine subtype
@@ -3485,10 +3786,8 @@ citation style]
         \printfield[stnoformat]{subtitle}}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
-  \newcunit\newblock
-  \printfield{usera}% For network ID and possible section of newspaper.
-  \newcunit\newblock
-  \usebibmacro{date+issue}}
+  \newunit\newblock
+  \usebibmacro{date+issue}{}}
 
 \renewbibmacro*{postnote}{%
   \iffieldundef{postnote}%
@@ -3581,9 +3880,11 @@ citation style]
           {\bibstring{editortranslator}%
             \clearname{translator}}%
           {\bibstring{editor}}}}}}%
-  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
-    {\bibstring{\thefield{editortype}s}}%
-    {\bibstring{\thefield{editortype}}}}%
+  {\ifbibxstring{\thefield{editortype}}%
+    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+      {\bibstring{\thefield{editortype}s}}%
+      {\bibstring{\thefield{editortype}}}}%
+    {\printtext[note]{\thefield{editortype}}}}%
   \clearname{editor}}
 
 \newbibmacro*{parteditstrg}{%
@@ -3614,13 +3915,15 @@ citation style]
           {\bibstring{editortranslator}%
             \clearname{nameb}}%
           {\bibstring{editor}}}}}}%
-  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
-    {\bibstring{\thefield{nameatype}s}}%
-    {\bibstring{\thefield{nameatype}}}}%
+  {\ifbibxstring{\thefield{nameatype}}%
+    {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+      {\bibstring{\thefield{nameatype}s}}%
+      {\bibstring{\thefield{nameatype}}}}%
+    {\printtext[note]{\thefield{nameatype}}}}%
   \clearname{namea}}
 
 \newbibmacro*{clearpublin}{%
-  \clearname{author}%
+  \clearname{author}\clearfield{shorthand}%
   \ifthenelse{\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
     \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}}%
   {}%
@@ -3633,17 +3936,22 @@ citation style]
     \ifentrytype{collection}\OR\ifentrytype{reference}\OR%
     \ifentrytype{suppbook}\OR\ifentrytype{suppcollection}\)\OR%
     \(\(\ifentrytype{audio}\OR\ifentrytype{music}\OR%
-    \ifentrytype{video}\)\AND\iffieldundef{booktitle}\)}%
+    \ifentrytype{video}\)\AND\(\iffieldundef{booktitle}\AND%
+    \iffieldundef{entrysubtype}\)\)}%
   {}%
   {\clearfield{title}%
     \clearfield{subtitle}%
     \clearfield{titleaddon}%
     \clearfield{usere}%
-    \clearlist{language}}%
+    \clearlist{language}%
+    \ifentrytype{music}%
+    {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
+      \clearfield{eventmonth}}%
+    {}}%
   \ifentrytype{letter}%
   {\iftoggle{cms@switchdates}%
-    {\clearfield{year}\clearfield{month}}%
-    {\clearfield{origyear}\clearfield{origmonth}}%
+    {\clearfield{year}\clearfield{month}\clearfield{season}}%
+    {\clearfield{origyear}\clearfield{origmonth}\clearfield{origseason}}%
     \clearfield{origlocation}}%
   {}%
   \clearfield{reprinttitle}%
@@ -3713,6 +4021,9 @@ citation style]
       \renewbibmacro*{pageref}{}}%
     {\thefield{entrytype}}}}
 
+\letbibmacro*{related:maintitlenc}{related:multivolume}% From N & B
+\letbibmacro*{related:maintitle}{related:multivolume}%
+
 \renewbibmacro*{related:multivolume}[1]{%
   \entrydata*{#1}{%
     \usebibmacro{at+every+item}%
@@ -3757,6 +4068,11 @@ citation style]
       \newcunit}%
     \usebibmacro{date}}}%
 
+\newbibmacro*{related:commenton}[1]{% 17th ed.
+  \togglefalse{cms@fulldate}% Let cloned entry set it
+  \entrydata*{#1}{%
+    \cmshypercite{\strfield{clonesourcekey}}}}
+
 \providetoggle{cms@otherlang}
 
 \apptocmd\blx@opt@autolang@other%
@@ -3787,9 +4103,6 @@ citation style]
     {\thefield{entrytype}}}}
 
 \newbibmacro*{at+every+item}{%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
   \ifboolexpr{% AD requires this here because cmsbibsortdate=null
     test {\iffieldundef{origyear}}%
     or
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
new file mode 100644
index 00000000000..808388e32cf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
@@ -0,0 +1,3748 @@
+% 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)
+% for the two author-date styles of the Chicago Manual of Style, 16th
+% edition.
+
+\ProvidesFile{chicago-dates-common16.cbx}[2020/04/20 v 3.14 biblatex
+citation style]
+
+%%%% Biblatex initialization + Chicago options + Toggles %%%%
+
+\newbool{cbx:parens}
+\newbool{cms:bracket}
+\newbool{cms:extraparens}
+\newbool{cms:comma}
+
+\providecommand*{\mkibid}[1]{#1}
+
+\providetoggle{cms@inlineibid}
+\providetoggle{cms@origlabel}
+\providetoggle{cms@bothlabelold}
+\providetoggle{cms@bothlabelnew}
+\providetoggle{cms@fulldate}
+\providetoggle{cms@reprint}
+\providetoggle{cms@switchdates}
+\providetoggle{cms@los}
+\providetoggle{cms@avdate}
+\providetoggle{cms@ordate}
+\providetoggle{cms@nodates}
+\providetoggle{cms@bc}% Attempt to provide correct dateera handling
+\providetoggle{cms@alwaysrange}% Turns off decade and century handling
+\providetoggle{cms@decaderange}% Only turns off decade handling
+\providetoggle{cms@centuryrange}% Only turns off century handling
+\providetoggle{cms@nodatebrackets}% For brackets in uncertain & circa
+\providetoggle{cms@noyearbrackets}%
+\providetoggle{cms@authorparens}
+\providetoggle{cms@datedash}
+\providetoggle{cms@modpostnote}
+\providetoggle{cms@ukord}
+\providetoggle{cms@fullnote}% For the legal entry types
+\providetoggle{cms@shortnote}% Ditto
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@urltime}% 17th ed.
+\providetoggle{cms@doi}
+\providetoggle{cms@doionly}
+\providetoggle{cms@eprint}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+\providetoggle{cms@addendum}
+\providetoggle{cms@hidevolumes}% Modify Volume fix
+\providetoggle{cms@comprange}
+\providetoggle{cms@compyears}
+
+\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
+
+\providetoggle{cms@strict}
+\providetoggle{cms@headlessnote}% Keep
+\providetoggle{cms@noibid}% Keep
+\providetoggle{cms@namedash}
+\providetoggle{cms@usecompiler}% Keep
+\providetoggle{cms@origpublished}% Keep
+\providetoggle{cms@annotation}% Keep
+\providetoggle{cms@postposit}% Keep
+\providetoggle{cms@fullshhand}%
+\providetoggle{cms@allshort}% For legal types
+\providetoggle{cms@noneshort}% Ditto
+\providetoggle{cms@legalnotes}% Ditto
+\providetoggle{cms@supranotes}% Ditto
+\providetoggle{cms@vol}%
+\providetoggle{cms@crossref}%
+\providetoggle{cms@bookcrossref}
+\providetoggle{cms@gencite}
+\providetoggle{cms@genallnames}
+\providetoggle{cms@xrefurl}
+\providetoggle{cms@related}
+\providetoggle{cms@linkit}
+
+\AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}}%
+
+\protected\def\cms@warning@noline#1{%
+  \begingroup
+  \blx@safe@actives
+  \PackageWarningNoLine{biblatex-chicago}{#1}%
+  \endgroup}%
+
+\DeclareBibliographyOption[string]{avdate}[true]{%
+  \ifcsdef{cms@opt@avdate@#1}%
+  {\csuse{cms@opt@avdate@#1}}%
+  {\blx@err@invopt{avdate=#1}{}}}%
+\def\cms@opt@avdate@true{%
+  \DeclareLabeldate[music,review,standard,suppperiodical,video]% 17th ed.
+  {\field{eventdate} \field{origdate} \field{date} \field{year}%
+    \field{urldate} \literal{nodate}}%
+    \toggletrue{cms@avdate}}%
+\def\cms@opt@avdate@false{%
+  \togglefalse{cms@avdate}}%
+
+\DeclareBibliographyOption[string]{cmsdate}[off]{% Implement origyear as
+  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@global@cmsdate@#1}}%
+  {\csuse{cms@global@cmsdate@off}\cms@warning@noline%
+    {'cmsdate=#1' isn't a valid option.\MessageBreak
+      The default - 'off' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms@global@cmsdate@on{%
+  \toggletrue{cms@origlabel}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}%
+\def\cms@global@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}%
+\def\cms@global@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}%
+\def\cms@global@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}%
+\def\cms@global@cmsdate@full{}%
+\def\cms@global@cmsdate@off{}%
+
+\DeclareBibliographyOption[string]{cmsorigdate}[true]{% ? Also need new macros
+  \ifcsdef{cms@opt@origdate@#1}% for printing dates.  Worth it ?
+  {\csuse{cms@opt@origdate@#1}}%
+  {\blx@err@invopt{cmsorigdate=#1}{}}}%
+\def\cms@opt@origdate@true{%
+  \DeclareLabeldate{\field{origdate} \field{origyear} \field{date}%
+    \field{year} \field{eventdate} \field{urldate}%
+    \literal{nodate}}%
+  \DeclareLabeldate[patent]{\field{date} \field{year}%
+    \field{eventdate} \field{origdate} \field{origyear}%
+    \field{urldate}}%
+  \global\toggletrue{cms@ordate}}%
+\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
+
+\DeclareEntryOption[string]{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@opt@cmsdate@#1}}%
+  {\csuse{cms@opt@cmsdate@off}\cms@warning@noline%
+    {'cmsdate=#1' isn't a valid option.\MessageBreak
+      The default - 'off' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms@opt@cmsdate@on{%
+  \toggletrue{cms@origlabel}}%
+\def\cms@opt@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}}%
+\def\cms@opt@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}}%
+\def\cms@opt@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}}%
+\def\cms@opt@cmsdate@full{%
+  \toggletrue{cms@fulldate}}%
+\def\cms@opt@cmsdate@off{}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{alwaysrange}[true]{%
+  \settoggle{cms@alwaysrange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{decaderange}[true]{%
+  \settoggle{cms@decaderange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{centuryrange}[true]{%
+  \settoggle{cms@centuryrange}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodatebrackets}[true]{%
+  \settoggle{cms@nodatebrackets}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{noyearbrackets}[true]{%
+  \settoggle{cms@noyearbrackets}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{hypertitle}[true]{%
+  \settoggle{cms@linkit}{#1}}%
+
+\DeclareBibliographyOption[boolean]{annotation}[true]{%
+  \global\settoggle{cms@annotation}{#1}}%
+
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
+  \settoggle{cms@namedash}{#1}}
+
+\DeclareBibliographyOption[boolean]{short}[true]{%
+  \global\settoggle{cms@allshort}{#1}}
+
+\DeclareBiblatexOption{global,entry}[boolean]{noneshort}[true]{%
+  \settoggle{cms@noneshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{legalnotes}[true]{%
+  \global\settoggle{cms@legalnotes}{#1}}
+
+\DeclareBiblatexOption{global,entry}[boolean]{supranotes}[true]{%
+  \settoggle{cms@supranotes}{#1}}
+
+\DeclareBibliographyOption[boolean]{cmslos}[true]{%
+  \global\settoggle{cms@los}{#1}}%
+
+\DeclareBibliographyOption[boolean]{noibid}[true]{%
+  \global\settoggle{cms@noibid}{#1}}%
+
+\DeclareBibliographyOption[boolean]{compresspages}[true]{%
+  \global\settoggle{cms@comprange}{#1}}%
+
+\DeclareBibliographyOption[boolean]{compressyears}[true]{%
+  \global\settoggle{cms@compyears}{#1}}%
+
+\DeclareBibliographyOption[string]{postnotepunct}[true]{%
+  \ifcsdef{cms@opt@ppunct@#1}%
+  {\csuse{cms@opt@ppunct@#1}}%
+  {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+  \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
+  \settoggle{blx@usenamec}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}%
+
+\DeclareBibliographyOption[boolean]{shorthandfull}[true]{%
+  \settoggle{cms@fullshhand}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[string]{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}%
+  {\blx@err@invopt{longcrossref=#1}{}}}%
+\def\cms@opt@lxref@none{%
+  \togglefalse{cms@crossref}%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@lxref@true{%
+  \toggletrue{cms@crossref}}%
+\def\cms@opt@lxref@false{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@notes{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@bib{%
+  \toggletrue{cms@crossref}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}%
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+\def\cms@opt@bklxref@true{%
+  \toggletrue{cms@bookcrossref}}%
+\def\cms@opt@bklxref@false{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@notes{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@bib{%
+  \toggletrue{cms@bookcrossref}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{xrefurl}[true]{%
+  \settoggle{cms@xrefurl}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[string]{journalabbrev}[false]{%
+  \ifcsdef{cms@opt@jtabb@#1}%
+  {\csuse{cms@opt@jtabb@#1}}%
+  {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
+    {'journalabbrev=#1' isn't a valid option.\MessageBreak
+      The default - 'false' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms@opt@jtabb@true{%
+  \toggletrue{cms@citejtabb}%
+  \toggletrue{cms@bibjtabb}}%
+\def\cms@opt@jtabb@false{%
+  \togglefalse{cms@citejtabb}%
+  \togglefalse{cms@bibjtabb}}%
+\def\cms@opt@jtabb@notes{%
+  \toggletrue{cms@citejtabb}%
+  \togglefalse{cms@bibjtabb}}%
+\def\cms@opt@jtabb@bib{%
+  \togglefalse{cms@citejtabb}%
+  \toggletrue{cms@bibjtabb}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{related}[true]{%
+  \settoggle{cms@related}{#1}}%
+
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+  \settoggle{cms@ukord}{#1}}%
+
+% Controlling punctuation before titleaddon fields %
+
+\DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
+  \ifcsdef{cms@opt@ptao@#1}%
+    {\csuse{cms@opt@ptao@#1}}%
+    {\csuse{cms@opt@ptao@period}\cms@warning@noline%
+      {'ptitleaddon=#1' is not a valid option.\MessageBreak
+        The default - 'period' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@ptao@none{%
+  \let\ptitleaddonpunct\@empty}%
+\def\cms@opt@ptao@comma{%
+  \def\ptitleaddonpunct{\addcomma\addspace}}%
+\def\cms@opt@ptao@colon{%
+  \def\ptitleaddonpunct{\addcolon\addspace}}%
+\def\cms@opt@ptao@space{%
+  \def\ptitleaddonpunct{\addspace}}%
+\def\cms@opt@ptao@semicolon{%
+  \def\ptitleaddonpunct{\addsemicolon\addspace}}%
+\def\cms@opt@ptao@period{%
+  \def\ptitleaddonpunct{\addperiod\addspace}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
+  \ifcsdef{cms@opt@ctao@#1}%
+    {\csuse{cms@opt@ctao@#1}}%
+    {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
+      {'ctitleaddon=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@ctao@none{%
+  \let\ctitleaddonpunct\@empty}%
+\def\cms@opt@ctao@comma{%
+  \def\ctitleaddonpunct{\addcomma\addspace}}%
+\def\cms@opt@ctao@colon{%
+  \def\ctitleaddonpunct{\addcolon\addspace}}%
+\def\cms@opt@ctao@space{%
+  \def\ctitleaddonpunct{\addspace}}%
+\def\cms@opt@ctao@semicolon{%
+  \def\ctitleaddonpunct{\addsemicolon\addspace}}%
+\def\cms@opt@ctao@period{%
+  \def\ctitleaddonpunct{\addperiod\addspace}}%
+
+% The field-exclusion options %
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlstamp}[true]{%
+  \settoggle{cms@urltime}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{url}[true]{%
+  \settoggle{cms@url}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[string]{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}%
+  {\blx@err@invopt{doi=#1}{}}}%
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}%
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}%
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@urltime}{#1}% 17th ed.
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@eprint}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}%
+
+\DeclareEntryOption[boolean]{authortitle}[true]{%
+  \settoggle{cms@authortitle}{#1}}%
+
+\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
+  ctitleaddon,ptitleaddon,journalabbrev=notes,legalnotes,supranotes,%
+  dashed}%
+
+\iftoggle{cms@legalnotes}%
+{\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
+{}%
+
+\AtEndPreamble{%       Automatic sorting by shorthand when it appears
+  \iftoggle{cms@los}%  at the head of the entry.
+  {\DeclareSourcemap{
+      \maps[datatype=bibtex]{
+        \map{
+          \step[fieldsource=shorthand]
+          \step[fieldset=sortname, origfieldval]}}}}%
+  {}}
+
+\DeclareLabeltitle[legislation]{%
+  \field{shorttitle}%
+  \field{titleaddon}%
+  \field{title}}%
+
+\DeclareDataInheritance{collection}{suppcollection}{%
+  \inherit{title}{title}
+  \inherit{subtitle}{subtitle}
+  \inherit{titleaddon}{titleaddon}}
+
+\DeclareDataInheritance{mvbook}{incollection}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book}{incollection}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book,collection}{letter}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{mvbook,mvcollection}{letter}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{*}{*}{%
+  \noinherit{namea}
+  \noinherit{nameb}
+  \noinherit{sortyear}
+  \noinherit{sortname}
+  \noinherit{sorttitle}
+  \noinherit{sorttitle}
+  \noinherit{urlyear}
+  \noinherit{urlmonth}
+  \noinherit{urlday}
+  \noinherit{urlseason}
+  \noinherit{urlhour}
+  \noinherit{urlminute}
+  \noinherit{doi}
+  \noinherit{eprint}
+  \noinherit{eprinttype}
+  \noinherit{url}}
+
+\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
+{*}{% ???
+  \noinherit{year}
+  \noinherit{month}
+  \noinherit{day}
+  \noinherit{season}
+  \noinherit{endyear}
+  \noinherit{endmonth}
+  \noinherit{endday}
+  \noinherit{endseason}
+  \noinherit{origyear}
+  \noinherit{origmonth}
+  \noinherit{origday}
+  \noinherit{origseason}
+  \noinherit{origendyear}
+  \noinherit{origendmonth}
+  \noinherit{origendday}
+  \noinherit{origendseason}}
+
+% More authordate options %
+
+\DeclareSortingTemplate{cms}{% Updated to >3.7 format
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{author}
+    \field{namea}
+    \field{editor}
+    \field{nameb}
+    \field{translator}
+    \field{namec}
+    \field{sorttitle}
+    \field{journaltitle}
+    \field{organization}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{labelyear}
+    \field{year}
+    \field{origyear}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{endyear}
+    \field{eventendyear}
+    \field{origendyear}
+  }
+  \sort{
+    \field[padside=left,padwidth=4,padchar=0]{volume}
+    \literal{0000}
+  }
+}
+
+\DeclareSortExclusion{misc,online}{organization}
+\DeclareSortExclusion{inreference,mvreference,reference}{%
+  author,editor,namea,nameb,namec,translator}
+
+\DeclareSortingTemplate{shortjournal}{%
+  \sort{
+    \field{shortjournal}
+  }
+}
+
+\DeclareLabelname{\field{shortauthor} \field{author}%
+  \field{shorteditor} \field{namea} \field{editor}%
+  \field{nameb} \field{translator} \field{namec}}%
+
+\DeclareEntryOption[boolean]{switchdates}[true]{%
+  \settoggle{cms@switchdates}{#1}}%
+
+\DeclareBibliographyOption[boolean]{strict}[true]{%
+  \settoggle{cms@strict}{#1}%
+  \iftoggle{cms@strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split@prev{0}%
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split@prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split@prev{\the\insertpenalties}%
+    }}%
+  {}}%
+
+\protected\def\blx@newcunit{%
+  \iftoggle{blx@keepunit}%
+  {}%
+  {\global\let\blx@unitpunct\newcunitpunct
+    \global\toggletrue{blx@unit}}}%
+
+\appto\blx@blxinit{%
+  \let\newcunit\blx@newcunit}%
+
+\newcommand*{\newcunitpunct}{\addcomma\space}
+
+\def\mkbibcurdinal#1{%
+  \@tempcnta0#1 \the\@tempcnta}%
+
+\@ifpackagelater{biblatex}{2011/01/04}%
+{}%
+{\PackageError{biblatex}%
+  {Outdated 'biblatex' package}%
+  {The Chicago style requires biblatex v1.1 or later.\MessageBreak
+    You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+    This is a fatal error. I'm aborting now.}%
+  \endinput}%
+
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+  \DeclarePunctuationPairs{comma}{*!?}}
+
+%%%% Macros from authoryear-comp.cbx, revised for CMS %%%%
+
+\newbibmacro*{cite:init}{%
+  \ifnumless{\value{multicitecount}}{2}%
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash%
+     \global\undef\cbx@lastyear}%
+    {\iffieldundef{prenote}%
+       {}%
+       {\global\undef\cbx@lasthash%
+	\global\undef\cbx@lastyear}}}%
+
+\newbibmacro*{cite:reinit}{%
+  \global\undef\cbx@lasthash%
+  \global\undef\cbx@lastyear}%
+
+\newbibmacro*{backref+check}{%
+  \ifbibliography%
+  {\backtrackerfalse}%
+  {}}
+
+\newbibmacro*{cite}{%
+  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+  {\usebibmacro{cite:ibid}}%
+  {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\cms@testspace}%
+          \usebibmacro{cite:reinit}}%
+        {\iffieldequals{fullhash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\multicitedelim}}%
+            {}%
+            \usebibmacro{cite:label}}%
+          {\iffieldequals{fullhash}{\cbx@lastyear}%
+            {}%
+            {\usebibmacro{cmsbracketname}% For names in []
+              \ifentrytype{customc}%
+              {\newcunit}%
+              {\setunit{\cms@testspace}}}%
+            \usebibmacro{cite:label}%
+            \iffieldundef{postnote}%
+            {\savefield{fullhash}{\cbx@lasthash}}%
+            {\savefield{fullhash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand+title}}}%
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\nameyeardelim}%
+          \usebibmacro{cmscitesortdate}%
+          \usebibmacro{cite:reinit}}%
+        {\iffieldequals{fullhash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\compcitedelim}}%
+            {}%
+            \usebibmacro{cmscitesortdate}}%
+          {\iffieldequals{fullhash}{\cbx@lastyear}% Is this right?
+            {}%
+            {\usebibmacro{cmsbracketname}%
+              \setunit{\nameyeardelim}}%
+            \usebibmacro{cmscitesortdate}%
+            \iffieldundef{postnote}%
+            {\savefield{fullhash}{\cbx@lasthash}}%
+            {\savefield{fullhash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}% ???
+
+\newbibmacro*{cmsbracketname}{%
+  \iffieldequalstr{authortype}{anon}%
+  {\printtext{\bibleftbracket\printnames{labelname}%
+      \bibrightbracket}}%
+  {\iffieldequalstr{authortype}{anon?}%
+    {\printtext{\bibleftbracket\printnames{labelname}?%
+        \bibrightbracket}}%
+    {\printnames{labelname}}}}%
+
+\newbibmacro*{citeyear}{%
+  \iffieldequalstr{entrysubtype}{classical}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand+title}}}}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}%
+
+\newbibmacro*{citeyear:noshort}{%
+  \iffieldequalstr{entrysubtype}{classical}% Altered for CMS
+  {\iffieldequals{fullhash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cite:label}}%
+    {\usebibmacro{cite:label}%
+      \iffieldundef{postnote}%
+      {\savefield{fullhash}{\cbx@lasthash}}%
+      {}}}%
+  {\iffieldequals{fullhash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cmscitesortdate}}%
+    {\usebibmacro{cmscitesortdate}%
+      \iffieldundef{postnote}%
+      {\savefield{fullhash}{\cbx@lasthash}}%
+      {}}}}%
+
+\newbibmacro*{textcite}{%
+  \iftoggle{cms@los}%
+  {\usebibmacro{textcite:authshort}}%
+  {\usebibmacro{textcite:citeshort}}}%
+
+\newbibmacro*{textcite:authshort}{%
+  \iffieldequals{fullhash}{\cbx@lasthash}%
+  {\iffieldundef{postnote}%
+    {\iffieldequals{fullhash}{\cbx@lastyear}%
+      {\setunit{\multicitedelim}%
+        \global\undef\cbx@lastyear}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{\multicitedelim}}%
+        {\setunit{\compcitedelim}}}}%
+    {\setunit{\multicitedelim}}%
+    \iffieldequalstr{entrysubtype}{classical}%
+    {\usebibmacro{cite:label}}%
+    {\usebibmacro{cmscitesortdate}}}%
+  {\iffieldundef{shorthand}%
+    {\ifthenelse{\ifnameundef{labelname}\OR
+        \ifentrytype{inreference}\OR
+        \ifentrytype{reference}\OR
+        \ifentrytype{mvreference}}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \cms@testspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+          \usebibmacro{cite:label}}%
+        {\usebibmacro{cite:label}%
+          \ifboolexpr{%
+            togl {cms@gencite}%
+            and
+            (
+            test {\iffinalcitedelim}%
+            or
+            togl {cms@genallnames}%
+            )
+          }%
+          {\thegen}%
+          {}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \cms@testspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+          \usebibmacro{cmscitesortdate}}}%
+      {\printnames{labelname}%
+        \ifboolexpr{%
+          togl {cms@gencite}%
+          and
+          (
+          test {\iffinalcitedelim}%
+          or
+          togl {cms@genallnames}%
+          )
+        }%
+        {\thegen}%
+        {}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \cms@testspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}%
+        {\usebibmacro{prenote}}%
+        {}%
+        \iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}%
+        {\usebibmacro{cmscitesortdate}}%
+        \savefield{fullhash}{\cbx@lasthash}}}%
+    {\printfield{shorthand}%
+      \ifboolexpr{%
+        togl {cms@gencite}%
+        and
+        (
+        test {\iffinalcitedelim}%
+        or
+        togl {cms@genallnames}%
+        )
+      }%
+      {\thegen}%
+      {}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \cms@testspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}%
+      {\usebibmacro{prenote}}%
+      {}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}%
+      {\usebibmacro{cmscitesortdate}}%
+      \savefield{fullhash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
+  \setunit{%
+    \ifbool{cbx:parens}%
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    {}%
+    \textcitedelim}}% Not \multicitedelim ???
+
+\newbibmacro*{textcite:citeshort}{%
+  \iffieldequals{fullhash}{\cbx@lasthash}%
+  {\iffieldundef{shorthand}%
+    {\iffieldundef{postnote}%
+      {\iffieldequals{fullhash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\iffieldequalstr{entrysubtype}{classical}%
+          {\setunit{\multicitedelim}}%
+          {\setunit{\compcitedelim}}}}%
+      {\setunit{\multicitedelim}}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}%
+      {\usebibmacro{cmscitesortdate}}}%
+    {\iffieldundef{postnote}%
+      {\iffieldequals{fullhash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\setunit{\compcitedelim}}}%
+      {\setunit{\multicitedelim}}%
+      \printtext[bibhyperref]{%
+        \printfield{shorthand}}}}%
+  {\ifthenelse{\ifnameundef{labelname}\OR
+      \ifentrytype{inreference}\OR
+      \ifentrytype{reference}\OR
+      \ifentrytype{mvreference}}%
+    {\iffieldundef{shorthand}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \cms@testspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+          \usebibmacro{cite:label}}%
+        {\usebibmacro{cite:label}%
+          \ifboolexpr{%
+            togl {cms@gencite}%
+            and
+            (
+            test {\iffinalcitedelim}%
+            or
+            togl {cms@genallnames}%
+            )
+          }%
+          {\thegen}%
+          {}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \cms@testspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+          \usebibmacro{cmscitesortdate}}}%
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}}%
+    {\printnames{labelname}%
+      \ifboolexpr{%
+        togl {cms@gencite}%
+        and
+        (
+        test {\iffinalcitedelim}%
+        or
+        togl {cms@genallnames}%
+        )
+      }%
+      {\thegen}%
+      {}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \cms@testspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}%
+      {\usebibmacro{prenote}}%
+      {}%
+      \iffieldundef{shorthand}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}%
+        {\usebibmacro{cmscitesortdate}}}%
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}%
+      \savefield{fullhash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
+  \setunit{%
+    \ifbool{cbx:parens}%
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    {}%
+    \textcitedelim}}% Not \multicitedelim ???
+
+\newbibmacro*{textcite:postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\savefield{fullhash}{\cbx@lastyear}%
+    \setunit{\postnotewrapper}%delim}%
+    \printfield{postnote}}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
+  {\setunit{}%
+    \printtext{%
+      \ifbool{cbx:parens}%
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
+      {}}}%
+  {\setunit{%
+      \ifbool{cbx:parens}%
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
+      {}%
+      \textcitedelim}}}% Not \multicitedelim ???
+
+\newbibmacro*{cite:shorthand}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{fullhash}{\cbx@lasthash}%
+    {\printtext[cmshyper]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cmscitesortdate}}}%
+    {\printfield{shorthand}%
+      \printtext[cmshyper]{%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cmscitesortdate}}%
+      \savefield{fullhash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}%
+
+\newbibmacro*{cite:shorthand+title}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{fullhash}{\cbx@lasthash}%
+    {\printtext[cmshyper]{%
+        \setunit{\multicitedelim}%
+        \usebibmacro{cite:label}}}%
+    {\printfield{shorthand}%
+      \printtext[cmshyper]{%
+        \setunit{\addcomma\addspace}% FIXME: wrong in 16th _and_ 17th eds?
+        \ifentrytype{manual}%
+        {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}%
+        {\usebibmacro{cite:label}}}%
+      \savefield{fullhash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}%
+
+\newbibmacro*{cite:label}{% Test this
+  \iffieldundef{label}%
+  {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+      \ifentrytype{periodical}}% Simplifies .bib creation
+    {\ifboolexpr{%
+        not test {\iffieldundef{shortjournal}}%
+        and
+        ((
+        test {\ifcitation}%
+        and
+        togl {cms@citejtabb}%
+        )
+        or
+        (
+        test {\ifbibliography}%
+        and
+        togl {cms@bibjtabb}%
+        ))
+      }%
+      {\printtext[cmshyper]{\printfield[shortjournal]{shortjournal}}}%
+      {\printtext[cmshyper]{\printfield[journaltitle]{journaltitle}}}}%
+    {\ifentrytype{manual}%
+      {\printtext[cmshyper]{\printlist{organization}}}%
+      {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}}}%
+  {\printtext[cmshyper]{\printfield{label}}}}%
+
+\newbibmacro*{cite:labelyear+extrayear}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@ordate}%
+    {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+    {\usebibmacro{cite:standard+labelyear+extrayear}}}}%
+
+\newbibmacro*{cite:standard+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+  {\ifboolexpr{%
+      test {\ifentrytype{misc}}%
+      or
+      test {\ifentrytype{inreference}}%
+      or
+      test {\ifentrytype{reference}}%
+      or
+      test {\ifentrytype{mvreference}}%
+      or
+      not togl {cms@nodates}%
+    }%
+    {}%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
+      \iffieldundef{year}%
+      {\iffieldundef{eventyear}%
+        {\iffieldundef{origyear}%
+          {\printurldateextra}%
+          {\printorigdateextra}}%
+        {\printeventdateextra}}%
+      {\printdateextra}}}}%
+
+\newbibmacro*{cite:origfirst+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+  {\ifboolexpr{%
+      test {\ifentrytype{misc}}%
+      or
+      test {\ifentrytype{inreference}}%
+      or
+      test {\ifentrytype{reference}}%
+      or
+      test {\ifentrytype{mvreference}}%
+      or
+      not togl {cms@nodates}%
+    }%
+    {}%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
+      \iffieldundef{origyear}%
+      {\iffieldundef{year}%
+        {\iffieldundef{eventyear}%
+          {\printurldateextra}%
+          {\printeventdateextra}}%
+        {\printdateextra}}%
+      {\printorigdateextra}}}}%
+
+\newbibmacro*{cite:av+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+  {\ifboolexpr{%
+      test {\ifentrytype{misc}}%
+      or
+      test {\ifentrytype{inreference}}%
+      or
+      test {\ifentrytype{reference}}%
+      or
+      test {\ifentrytype{mvreference}}%
+      or
+      not togl {cms@nodates}%
+    }%
+    {}%
+    {\printtext[cmsyearhyper]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[cmsyearhyper]{%
+      \iffieldundef{eventyear}%
+      {\iffieldundef{origyear}%
+        {\iffieldundef{year}%
+          {\printurldateextra}%
+          {\printdateextra}}%
+        {\printorigdateextra}}%
+      {\printeventdateextra}}}}%
+
+\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    not test {\iffieldint{origyear}}%
+  }%
+  {\usebibmacro{cmsciteyear}}%
+  {\iffieldint{year}%
+    {\ifboolexpr{% Needed for date ranges
+        test {\iffieldundef{endyear}}%
+        or
+        not test {\iffieldnum{endyear}}%
+      }%
+      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}%
+      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}}%
+    {\usebibmacro{cmsciteyear}}}}%
+
+\newbibmacro*{cmsciteyear}{%
+  \ifentrytype{patent}% Fix for double year w/cmsdate
+  {\usebibmacro{cite:standard+labelyear+extrayear}}
+  {\iftoggle{cms@origlabel}%
+    {\usebibmacro{cite:origyear+labelyear}}%
+    {\iftoggle{cms@bothlabelnew}%
+      {\usebibmacro{cite:bothyear+oldstyle}}%
+      {\iftoggle{cms@bothlabelold}%
+        {\usebibmacro{cite:bothyear+oldstyle}}%
+        {\iftoggle{cms@fulldate}%
+          {\printtext[cmsyearhyper]{%
+              \csuse{print\strfield{labeldatesource}date}%
+              \iffieldundef{\strfield{labeldatesource}hour}%
+              {}% Consistency(?)
+              {\newcunit\csuse{print\strfield{labeldatesource}time}}}}%
+          {\usebibmacro{cite:labelyear+extrayear}}}}}}}%
+  % \ifcsdef{@cms@tempdate}%
+  % {\toggletrue{\@cms@tempdate}}%
+  % {}%
+
+\newbibmacro*{cite:origyear+labelyear}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}% ???
+        {}%
+        {\clearfield{extradate}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+        {\clearfield{extradate}%
+          \printtext[cmsyearhyper]{%
+            \printorigdateextra}}}}}}% \usebibmacro{origyear+endyear}
+
+\newbibmacro*{cite:bothyear+oldstyle}{%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }%
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\printtext[cmsyearhyper]{%
+        \bibopenparen%
+        \usebibmacro{cite:labelyear+extrayear}%
+        \bibcloseparen%
+        \clearfield{extradate}%
+        \addspace%
+        \printorigdateextra}}% \usebibmacro{origyear+endyear}
+    {\iffieldundef{origyear}% ???
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extradate}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% Added test for year field ???
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[cmsyearhyper]{%
+              \bibopenparen%
+              \usebibmacro{cite:origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit{\addspace}%\addspace% ???
+              \clearfield{extradate}%
+              \printdateextra}}}%\usebibmacro{year+endyear}
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[cmsyearhyper]{%
+              \bibopenparen%
+              \clearfield{extradate}%
+              \printorigdateextra%
+              % \usebibmacro{origyear+endyear}%
+              \bibcloseparen%
+              \addspace%
+              \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}}%
+
+\newbibmacro*{cite:save}{%
+  \savefield{entrykey}{\cbx@lastkey}}%
+
+\newbibmacro*{cite:ibid}{%
+  \iftoggle{cms@noibid}%
+  {\blx@ibidreset%
+    \usebibmacro{cite}}%
+  {\ifthenelse{\iffieldundef{prenote}\AND%
+      \iffieldundef{postnote}}%
+    {\blx@ibidreset%
+      \usebibmacro{cite}%
+      \PackageWarning{biblatex-chicago}%
+      {Empty Ibidem citation}}%
+    {\toggletrue{cms@inlineibid}}}}%
+
+%%%% Citation Commands, internal and external %%%%
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}%
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%
+  {\usebibmacro{postnote}}
+
+%%% Commands, macros and formats for the Legal entry types %%%
+  
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\parenfullcite}[\mkbibparens]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\newbibmacro*{cite:full}{%
+  \iftoggle{cms@noneshort}%
+  {\ifboolexpr{%
+      test {\ifciteibid}%
+      and
+      not test {\iffirstonpage}%
+      and
+      not togl {cms@noibid}%
+    }%
+    {\togglefalse{cms@fullnote}%
+      \toggletrue{cms@shortnote}%
+      \usebibmacro{legal:ibid}}%
+    {\usebibmacro{cite:driver}}}%
+  {\ifboolexpr{%
+      test {\ifciteseen}%
+      or
+      togl {cms@allshort}%
+    }%
+    {\togglefalse{cms@fullnote}%
+      \toggletrue{cms@shortnote}%
+      \ifboolexpr{%
+        test {\ifciteibid}%
+        and
+        not test {\iffirstonpage}%
+        and
+        not togl {cms@noibid}%
+      }%
+      {\usebibmacro{legal:ibid}}%
+      {\usebibmacro{cite:short}}}%
+    {\usebibmacro{cite:driver}}}}
+
+\newbibmacro*{cite:driver}{%
+  \printtext[bibhypertarget]{%
+    \usedriver
+      {\DeclareNameAlias{sortname}{default}\frenchspacing}%
+      {\thefield{entrytype}}}}%
+
+\newbibmacro*{cite:short}{%
+  \iffieldundef{shorthand}%
+  {\ifentrytype{jurisdiction}%
+    {\usebibmacro{cite:short:jurisdiction}}%
+    {\ifentrytype{legal}%
+      {\usebibmacro{cite:short:legal}}%
+      {\ifentrytype{legislation}%
+        {\usebibmacro{cite:short:legislation}}%
+        {\usebibmacro{cite}}}}}
+  {\usebibmacro{cite:shorthand:legal}}}%
+
+\newbibmacro*{cite:short:jurisdiction}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \iffieldundef{issue}%
+  {\printfield[jurisdictionser]{series}}%
+  {\setunit{\addspace}%
+    \printfield{issue}}% Better ideas?
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legal}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \printfield[legalser]{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legislation}{%
+  \iffieldequalstr{entrysubtype}{constitution}%
+  {\usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}}%
+  {\iffieldequalstr{labeltitlesource}{shorttitle}%
+    {\ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}%
+    {\ifboolexpr{%
+        test {\iffieldundef{shortjournal}}%
+        or
+        (
+        not test {\iffieldundef{volume}}%
+        and
+        not test {\iffieldint{volume}}%
+        )
+      }%
+      {\ifboolexpr{%
+          test {\iffieldundef{entrysubtype}}%
+          and
+          not test {\iflistundef{location}}
+        }%
+        {\printlist{location}%
+          \setunit{\addspace}}%
+        {}%
+        \ifboolexpr{%
+          togl {cms@allshort}%
+          or
+          test {\ifbibliography}%
+        }%
+        {\printtext[bibhyperref]{%
+            \printfield[citetitle]{labeltitle}}}%
+        {\printtext[cmshyperlink]{%
+            \printfield[citetitle]{labeltitle}}}%
+        \setunit{\addspace}%
+        \printfield[juridnum]{number}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}}%
+      {\printfield{note}%
+        \newcunit%
+        \printfield[jourvol]{volume}%
+        \setunit*{\addnbspace}%
+        \iffieldundef{shortjournal}% Test eliminates spurious comma
+        {}%
+        {\printtext[shortjournal]{%
+            \printfield[jtsnoformat]{shortjournal}}}%
+        \printfield[legislationser]{series}%
+        \setunit{\addspace}%
+        \printfield{issue}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}%
+      }}}%
+  \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:shorthand:legal}{%
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield{shorthand}}}%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    togl {cms@supranotes}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+      \newcunit}}% ??
+  {\newcunit}% ??
+  \iffieldundef{postnote}%
+  {\global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}%
+  {\usebibmacro{semel:postnote}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
+\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
+  \iffieldundef{shorthand}%
+  {}%
+  {\iffieldundef{shorthandintro}%
+    {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+        \ifentrytype{legislation}}%
+      {\printtext[brackets]{%
+        \bibstring{hereinafter}\addspace%
+        \printfield{shorthand}}}%
+      {\printtext[parens]{%
+        \bibstring{citedas}\addspace%
+        \printfield{shorthand}}}}%
+    {%\addspace%\setunit{\addspace}% Ditto
+      \printfield{shorthandintro}}}}
+
+\newbibmacro*{footcite:save}{%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
+    \label{cbx@\the\value{instcount}}}%
+  {}}%
+
+\newbibmacro*{legal:ibid}{%
+  \ifboolexpr{%
+    togl {cms@noibid}%
+    or
+    test {\ifbibliography}% Needed for inheritshorthand option
+  }%
+  {\global\toggletrue{cms@shortnote}%
+    \global\togglefalse{cms@fullnote}%
+    \usebibmacro{cite:short}%
+    \usebibmacro{cite:save}}%
+  {\printtext[bibhyperlink]{%
+      \bibsstring[\mkbibemph]{ibidem}}%\bibstring[\mkibid]{ibidem}
+    \ifboolexpr{%
+      test {\ifloccit}%
+      or
+      (
+      test {\ifciteibid}%
+      and
+      test {\iffieldequalcs{postnote}{cms@pnsaved}}%
+      and
+      not test {\ifdefvoid{\blx@loccittracker}}% Package option=false
+      )
+    }%
+    {\global\toggletrue{cms@loccit}}%
+    {}}\usebibmacro{postnote}}% FIXME?
+
+\newbibmacro*{clegis+news+title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
+    \iffieldundef{titleaddon}}%
+  {}%
+  {\printtext[title]{%
+      \printfield[noformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+  }}%\newcunit\newblock}
+
+\newbibmacro*{cpart+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}%
+    {\bibstring{cbytranslator}\addspace%
+      \printnames[bytranslator]{nameb}}}%
+  {\ifthenelse{\iffieldundef{nameatype}\OR%
+      \iffieldequalstr{nameatype}{editor}}%
+    {\ifnamesequal{namea}{nameb}%
+      {\bibstring{cbyeditortr}\addspace%
+        \printnames[byeditor]{namea}}%
+      {\bibstring{cbyeditor}\addspace% Need this \space here?
+        \printnames[byeditor]{namea}%
+        \ifnameundef{nameb}%
+        {}%
+        {\newcunit%
+          \bibstring{cbytranslator}\addspace%
+          \printnames[bytranslator]{nameb}}}}%
+    {\usebibmacro{cbytypestrg}{namea}{editor}%
+      \setunit{\addspace}%
+      \printnames[byeditor]{namea}%
+      \ifnameundef{nameb}%
+      {}%
+      {\newunit%
+        \bibstring{cbytranslator}\addspace%
+        \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{juridpostnote}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{shortjournal}%
+      {\setunit{\addcomma\addspace}}%
+      {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+        {\setunit{\addspace}}%
+        {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+      \printfield{pages}%
+      \iffieldundef{postnote}%
+      {}%
+      {\ifthenelse{\ifentrytype{legislation}\OR\ifentrytype{legal}}%
+        {\newcunit}%
+        {\setunit*{\addcomma\addspace}}%
+        \usebibmacro{semel:postnote}}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\iffieldundef{shortjournal}%
+          {\setunit{\addcomma\addspace}}%
+          {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+            {\setunit{\addspace}}%
+            {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+          \printfield{pages}}}%
+      {\iffieldundef{shortjournal}%
+        {\setunit{\addcomma\addspace}}%
+        {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+          {\setunit{\addspace}}%
+          {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+        \usebibmacro{semel:postnote}}}% See below for alternate test here
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
+\newbibmacro*{semel:postnote}{% Fix to print postnote only once
+  \printfield{postnote}% Old form broke \ifloccit
+  \global\let\cms@pnsaved\abx@field@postnote%
+  \global\let\abx@field@postnote\undefined%
+  \AtNextCitekey{\ifciteibid{}{\global\let\cms@pnsaved\undefined}}}%
+
+\newbibmacro*{cite+doi+url}{% 16th ed.
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{urlyear}}%
+    }%
+  {\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{eprint}}%
+  }%
+  {\usebibmacro{eprint}}%
+  {}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
+  {\printfield{url}}%
+  {}}%
+
+\DeclareListFormat[jurisdiction]{location}{%
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{list:delim}{#1}%
+    #1\isdot%
+    \usebibmacro{list:andothers}}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\mkbibparens{#1}\addspace}%
+    {\mkbibparens{#1\isdot}}}}%
+
+\DeclareListFormat[jurisdiction]{origlocation}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {#1\isdot\addcomma\addspace}%
+  {#1\isdot}}
+
+\DeclareListFormat[jurisdiction]{origpublisher}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {\mkbibparens{#1}\addspace}%
+  {\mkbibparens{#1\isdot}}}
+
+\newrobustcmd*{\mkjuridprefix}[1]{%
+  \ifboolexpr{% FIXME: Is this always right?
+    test {\iftoggle{cms@fullnote}}%
+    and
+    test {\ifentrytype{jurisdiction}}%
+    }%
+  {\iffieldundef{issue}%
+    {#1}%
+    {\printtext{at}\addspace *#1}}%
+  {\iffieldundef{issue}%
+    {\printtext{at}\addspace #1}% FIXME: Make it a bibstring?
+    {\ifentrytype{jurisdiction}%
+      {\printtext{at}\addspace *#1}%
+      {\printtext{at}\addspace #1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\mkcomprange[\mkjuridprefix]{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\mkjuridprefix{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{title}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[jurisdiction,legal]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{journaltitle}{%
+  \iffieldundef{shortjournal}%
+  {#1\isdot}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{shortjournal}{#1\isdot}
+
+\DeclareFieldFormat{jurisdictionser}{%
+  \ifinteger{#1}%
+  {\mkjuridordinal{#1}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
+
+\DeclareFieldFormat{legislationser}{%
+  \iffieldequalstr{entrysubtype}{hansard}%
+  {\ifinteger{#1}%
+    {\addspace\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+    {\ifbibstring{#1}%
+      {\addspace\mkbibparens{\bibstring{#1}}}%
+      {\addspace\mkbibparens{#1}}}}%
+  {\iffieldequalstr{entrysubtype}{uk}%
+    {\addspace #1\isdot}%
+    {\addcomma\addspace #1\isdot}}}%
+
+\DeclareFieldFormat{legalser}{\addspace #1\isdot}%
+
+\DeclareFieldFormat{hansardser}{%
+  \ifinteger{#1}%
+  {\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+  {\ifbibstring{#1}{\mkbibparens{\bibstring{#1}}}{\mkbibparens{#1}}}}%
+
+\DeclareFieldFormat{juridnum}{\bibcpstring{number}\addspace #1}%
+
+\DeclareFieldFormat{jourvol}{#1}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
+  \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
+
+\DeclareFieldFormat[legal,legislation]{part}{%
+  \ifnumerals{#1}%
+  {\bibsstring{part}~#1}%
+  {#1\isdot}}%
+
+\DeclareFieldFormat[legal,legislation]{chapter}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
+    \iffieldequalstr{entrysubtype}{hansard}}%
+  {c\adddotspace #1}%
+  {\bibsstring{chapter}~#1}}%
+
+%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% 
+
+\DeclareCiteCommand{\cbx@textcite}
+  {\usebibmacro{cite:init}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}}
+  {}%
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+  {\gdef\cbx@savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
+     {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}%
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{fullhash}{\cbx@lasthash}%
+     {}%
+     {\stepcounter{textcitetotal}%
+      \savefield{fullhash}{\cbx@lasthash}}}
+  {}%
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
+%%% The \gentextcite commands - \textcite in the genitive case %%%
+
+\DeclareCiteCommand{\cms@gentextcite@i}
+  {\usebibmacro{cite:init}%
+    \toggletrue{cms@gencite}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}}
+  {}%
+  {\usebibmacro{textcite:postnote}%
+    \togglefalse{cms@gencite}}%
+
+\DeclareCiteCommand{\cms@gentextcite}[\cbx@textcite@init\cms@gentextcite@i]
+  {\gdef\cbx@savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
+     {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}%
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{fullhash}{\cbx@lasthash}%
+     {}%
+     {\stepcounter{textcitetotal}%
+      \savefield{fullhash}{\cbx@lasthash}}}
+  {}%
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\DeclareMultiCiteCommand{\cms@gentextcite@is}{\cms@gentextcite@i}{}
+\DeclareMultiCiteCommand{\cms@gentextcites}[\cbx@textcites@init\cms@gentextcite@is]{\cms@gentextcite}{}
+
+\newrobustcmd*{\gentextcite}[1][]{%
+  \@ifnextchar[%]
+  {\gencite@i[#1]}%
+  {\gencite@i[][#1]}}%
+
+\def\gencite@i[#1][#2]{%
+  \@ifnextchar[%]
+  {\gencite@ii[#1][#2]}%
+  {\gencite@ii[][#1][#2]}}%
+
+\def\gencite@ii[#1][#2][#3]#4{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \gencite@iii[#2][#3]{#4}}%
+
+\def\gencite@iii#1{\cms@gentextcite#1}
+
+\newrobustcmd*{\gentextcites}[1][]{%
+  \@ifnextchar(%)
+  {\gencites@iv[#1]}%
+  {\@ifnextchar[%]
+    {\gencites@i[#1]}%
+    {\gencites@i[][#1]}}}%
+
+\def\gencites@i[#1][#2]{%
+  \@ifnextchar[%]
+  {\gencites@ii[#1][#2]}%
+  {\gencites@ii[][#1][#2]}}%
+
+\def\gencites@ii[#1][#2][#3]#4{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \gencites@iii[#2][#3]{#4}}%
+
+\def\gencites@iii#1{\cms@gentextcites#1}%
+
+\def\gencites@iv[#1]#2{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \cms@gentextcites#2}%
+
+\newrobustcmd*{\Gentextcite}{\bibsentence\gentextcite}
+\newrobustcmd*{\Gentextcites}{\bibsentence\gentextcites}
+
+%%% End code for \gentextcite %%%
+
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
+   {\footcitetext}{\setunit{\multicitedelim}}
+
+\DeclareCiteCommand{\bibxrefcite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?)
+  {\usebibmacro{xref-in:}%
+    \blx@ibidreset% For authordate style
+    \usebibmacro{cite}}
+  {}%
+  {}%
+
+\DeclareCiteCommand{\origfullcite}
+  {\usebibmacro{backref+check}%
+    \nopunct\unspace%
+    \savebibmacro{cmsbibsortdate}%
+    \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@headlessnote}\frenchspacing}%
+    {\thefield{entrytype}}%
+    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
+  {\usebibmacro{backref+check}%
+    \nopunct%\unspace%
+    \ifboolexpr{%
+      togl {cms@otherlang}%
+      and
+      not test {\iffieldundef{langid}}%
+    }%
+    {\addspace}{\unspace}%
+    \savebibmacro{cmsbibsortdate}%
+    \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}\usebibmacro{cms:titlehook}%
+      \toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@origpublished}\frenchspacing}%
+    {\thefield{entrytype}}%
+    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+%%%% List Formats %%%%
+
+\DeclareListFormat{language}{%
+  \ifthenelse{\value{listcount}=1}%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
+    \ifbibstring{#1}%
+    {\bibstring{#1}}%
+    {\ifbibstring{lang#1}%
+      {\bibstring{lang#1}}%
+      {#1}}%
+    \ifthenelse{\value{listtotal}=1}%
+    {\bibrightbracket}%
+    {}}%
+  {\ifthenelse{\value{listcount}=\value{listtotal}}%
+    {\multilangdelim%
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
+        {#1}}%
+      \bibrightbracket}%
+    {\multilangdelim%
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
+        {#1}}}}%
+  \usebibmacro{langlist:andothers}}%
+
+\DeclareListFormat{publisher}{%
+  \ifthenelse{\value{listtotal}<2}%
+  {#1\isdot}%
+  {\ifthenelse{\value{listcount}=1}%
+    {#1}%
+    {\multipubsdelim #1\isdot}}}%
+
+\DeclareListFormat{periodplace}{\mkbibparens{#1}}
+
+\DeclareListFormat{lista}{% 
+  \ifthenelse{\value{listtotal}<2}%
+  {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
+  {\ifthenelse{\value{listcount}=1}%
+    {\bibsstring{subverbis}\addspace\mkbibquote{#1\isdot}\addcomma}%
+    {\ifthenelse{\value{listcount}<\value{listtotal}}%
+      {\addspace\mkbibquote{#1\isdot}\addcomma}%
+      {\addspace\mkbibquote{#1\isdot}}}}}
+
+%%%% Field Formats -- Mostly non-title %%%%
+
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\mkcomprange{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {#1}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat[inreference]{postnote}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat{pages}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{bookpagination}%
+    {\mkcomprange{#1}\isdot}%
+    {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+  {\iffieldundef{bookpagination}%
+    {#1\isdot}%
+    {\mkpageprefix[bookpagination]{#1}}}}%
+
+\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
+
+\DeclareListFormat{edlang}{% Required for feminine forms in some
+  \usebibmacro{list:delim}{% languages
+    \ifbibstring{#1}%
+    {\bibxstring{#1}}%
+    {\ifbibstring{ed#1}%
+      {\bibxstring{ed#1}}%
+      {\ifcapital{\MakeCapital{#1}}{#1}}}}%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifbibstring{ed#1}%
+    {\bibstring{ed#1}}%
+    {\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \usebibmacro{list:andothers}}
+
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
+
+\DeclareFieldFormat[customc]{citetitle}{%
+  \ifnameundef{author}%
+  {#1}%
+  {\iffieldundef{nameaddon}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      #1}%
+    {\printfield{nameaddon}\addspace #1}}}
+
+\DeclareFieldFormat{shortjournal}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{shorttitle}{\mkbibemph{#1}\isdot}
+
+%%%% Other Field Formats %%%%
+
+\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
+
+\DeclareFieldFormat{note}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}%
+
+\DeclareFieldFormat
+[audio,manual,music,patent,report,suppbook,suppcollection,thesis,video]
+{type}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifcapital%
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat[artwork,image]{type}{%
+  \ifcapital%
+  {\MakeCapital{#1}}%
+  {#1}}
+
+\DeclareFieldFormat{url}{\url{#1}}
+
+\DeclareFieldFormat{doi}{%
+  \textrm{doi}\addcolon
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}%
+    {\nolinkurl{#1}}}
+
+\DeclareFieldFormat[music]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}%
+  \OR\NOT\iffieldundef{urlmonth}\OR\NOT\iffieldundef{eventmonth}%
+  \OR\NOT\iffieldundef{origmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+    \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{urlmonth}%
+    \OR\NOT\iffieldundef{eventmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{urldate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+    \OR\NOT\iffieldundef{origyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{discrecorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{songrecorded}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{broadcast}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
+\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+
+\DeclareFieldFormat[review,suppperiodical]{nameaddon}{#1\bibsentence}% 16th ed.
+
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}%
+
+\DeclareFieldFormat{edition}{% New in 0.8
+  \ifinteger{#1}%
+  {\mkbibordedition{#1}~\bibstring{edition}}%
+  {\ifcapital
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
+
+\DeclareFieldFormat{titleaddon}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+
+\DeclareFieldAlias{booktitleaddon}{titleaddon}
+
+\DeclareFieldAlias{maintitleaddon}{titleaddon}
+
+\DeclareFieldFormat{jourser}{%
+  \ifinteger{#1}%
+  {\mkbibordseries{#1}%
+    \addnbspace%
+    \bibstring{jourser}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
+
+\DeclareFieldFormat{journum}{% Revised for 0.9.5
+  \ifboolexpr{%
+    test {\ifnumerals{#1}}%
+    and
+    not test {\ifnumeral{#1}}%
+  }%
+  {\bibstring{numbers}\addspace #1}%
+  {\bibstring{number}\addspace #1}}
+
+\DeclareFieldFormat{sernum}{%
+  \ifnumeral{#1}%
+  {\addnbspace #1}%
+  {\addcomma\addspace #1}}
+
+\DeclareFieldFormat{addendum}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+% This works better here than in the entrytail macro -- userf use is
+% no longer a problem, though the page breaking still isn't ideal.
+
+\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+
+\DeclareFieldFormat{part}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldAlias[review]{volume}[article]{volume}
+
+\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
+
+\DeclareFieldFormat{cmshyper}{% Control the number of elements hyperlinked.
+  \ifboolexpr{%
+    (
+    not test {\iffieldequalstr{entrysubtype}{classical}}%
+    or
+    togl {blx@skipbib}%
+    )
+    and
+    not togl {cms@linkit}%
+  }%
+  {#1}%
+  {\bibhyperref{#1}}}%
+
+\DeclareFieldFormat{cmsyearhyper}{% Only link when in ref list
+  \iftoggle{blx@skipbib}
+  {#1}%
+  {\bibhyperref{#1}}}%
+
+%%%% Related field formats from biblatex.def %%%%
+
+\DeclareFieldFormat{related:origpubas}{#1}% This and next remove parens
+
+\DeclareFieldFormat{related:origpubin}{#1}
+
+\DeclareFieldFormat{relatedstring:default}{% For notes + bib
+  \ifboolexpr{%
+    test {\iffieldundef{relatedstring}}%
+    or
+    test {\iffieldbibstring{relatedstring}}%
+  }%
+  {#1}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}%
+  \ifentrytype{jurisdiction}%
+  {\newcunit}%
+  {\printunit{\relatedpunct}}}%
+
+\DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
+  \ifboolexpr{%
+    test {\iffieldundef{relatedstring}}%
+    or
+    test {\iffieldbibstring{relatedstring}}%
+  }%
+  {#1}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}%
+  \addspace}%
+
+%%%% Commands, for users and internal %%%%
+
+\newcommand*{\cbytypeeditor}{% Needed?
+  \iffieldundef{editortype}%
+    {\bibstring{cbytypeeditor}}%
+    {\bibstring{cbytype\thefield{editortype}}}}
+
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+
+\newcommand*{\cms@testspace}{% FIXME
+  \ifboolexpr{%
+    test {\ifnumequal{\spacefactor}{\blx@sf@dot}}%
+    and
+    not test {\ifbibliography}%
+  }%
+  {\addnbspace}%
+  {\addspace}}%
+
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
+\renewcommand*{\nameyeardelim}{%
+  \ifboolexpr{%
+    (
+    togl {cms@bothlabelnew}%
+    or
+    togl {cms@bothlabelold}%
+    )
+    and
+    (
+    not test {\iffieldundef{year}}%
+    and
+    not test {\iffieldundef{origyear}}%
+    )
+  }%
+  {\cms@testspace}%
+  {\cms@pre@punct%
+    \ifboolexpr{%
+      test {\iffieldundef{labelyear}}%
+      or
+      test {\iffieldequalstr{labelyear}{nodate}}%
+      or
+      togl {cms@fulldate}%
+      or
+      bool {cms:comma}%
+    }%
+    {\addcomma\addspace}%
+    {\iffieldundef{origyear}%
+      {\iffieldundef{year}%
+        {\cms@testspace}%
+        {\ifboolexpr{%
+            test {\iffieldnums{year}}%
+            or
+            test {\iffieldstart{year}{[}}%] For backward compatibility
+          }%
+          {\cms@testspace}%
+          {\addcomma\addspace}}}%
+      {\cms@testspace}}\global\boolfalse{cms:comma}}}
+
+\newrobustcmd*{\cms@citepunct@helper}[1]{%
+  \begingroup
+  \blx@metadateinfo{#1}%
+  \ifboolexpr{%
+    test {\if@cms@bracket}%
+    and
+    not togl {cms@noyearbrackets}%
+  }%
+  {}%
+  {\if@cms@circa%
+    {\global\booltrue{cms:comma}}%
+    {\if@cms@adfirst%
+      {\iffieldnum{#1year}%
+        {\ifboolexpr{%
+            test {\ifdefstring\blx@dateera{christian}}%
+            and
+            not test {\iffieldequalstr{#1dateera}{bce}}%
+            and
+            test {\ifnumless{\thefield{#1year}}\blx@dateeraauto}%
+          }%
+          {\global\booltrue{cms:comma}}%
+          {}}%
+        {}}%
+      {\ifboolexpr{%
+          test {\ifdefstring\blx@languagename{french}}%
+          or
+          test {\ifdefstring\blx@languagename{dutch}}%
+        }%
+        {\ifboolexpr{%
+            not test {\iffieldequalstr{#1dateunspecified}{yearindecade}}%
+            or
+            togl {cms@alwaysrange}%
+            or
+            togl {cms@decaderange}%
+          }%
+          {}%
+          {\global\booltrue{cms:comma}}}%
+        {\ifboolexpr{%
+            test {\ifdefstring\blx@languagename{brazilian}}%
+            or
+            test {\ifdefstring\blx@languagename{brazil}}%
+          }%
+          {\ifboolexpr{%
+              test {\iffieldundef{#1dateunspecified}}%
+              or
+              togl {cms@alwaysrange}%
+            }%
+            {}%
+            {\ifboolexpr{%
+                (
+                test {\iffieldequalstr{#1dateunspecified}{yearindecade}}%
+                and
+                not togl {cms@decaderange}%
+                )
+                or
+                (
+                test {\iffieldequalstr{#1dateunspecified}{yearincentury}}%
+                and
+                not togl {cms@centuryrange}%
+                )
+              }%
+              {\global\booltrue{cms:comma}}%
+              {}}}%
+          {}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@pre@punct}{%
+  \iftoggle{cms@origlabel}%
+  {\cms@citepunct@helper{orig}}%
+  {\ifdefstring\abx@field@labeldatesource{year}%
+    {\cms@citepunct@helper{}}%
+    {\ifdefstring\abx@field@labeldatesource{origyear}%
+      {\cms@citepunct@helper{orig}}%
+      {\ifdefstring\abx@field@labeldatesource{nodate}%
+        {}%
+        {\cms@citepunct@helper{\abx@field@labeldatesource}}}}}}
+
+\renewcommand*{\subtitlepunct}{% Follows CMS16 spec.
+  \ifboolexpr{%
+    test {\ifterm}%
+    and
+    not test {\ifcsdef{@cmsst}}%
+  }%
+  {\addspace}%
+  {\addcolon\addspace%
+    \global\csundef{@cmsst}}%
+}
+
+\newcommand{\postvolpunct}{\addcolon}%
+
+\newcommand*{\parttrans}{%
+  {\bibstring{bytranslator}\space}}%
+
+\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}}%
+
+\newcommand*{\parteditandcomp}{%
+  {\bibstring{byeditorcp}\space}}%
+
+\newcommand*{\parttransandcomp}{%
+  {\bibstring{bytranslatorcp}\space}}%
+
+\newcommand*{\partedittransandcomp}{%
+  {\bibstring{byeditortrcp}\space}}%
+
+\newcommand*{\parteditandtrans}{%
+  {\bibstring{byeditortr}\space}}%
+
+\newcommand*{\reprint}{\bibstring{reprint}}%
+
+\newcommand*{\multipubsdelim}{\addnbspace/\addspace}
+
+\newcommand*{\multilocsdelim}{%
+  \ifthenelse{\value{listcount}<\value{liststop}}%
+    {\ifthenelse{\numexpr\value{listcount}+1<\value{liststop}}%
+       {\addcomma\addspace}%
+       {\ifthenelse{\value{liststop}>2}%
+         {\addcomma\addspace\bibstring{and}\addspace}%
+         {\addspace\bibstring{and}\addspace}}}%
+       {}}%
+
+\newcommand*{\multilangdelim}{%
+  \ifthenelse{\value{listtotal}<3}%
+  {\addspace\bibstring{and}\addspace}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\addcomma\addspace}%
+    {\addcomma\addspace\bibstring{and}\addspace}}}
+
+\renewcommand*{\postnotedelim}{% Cf. N&B style
+  \ifboolexpr{%
+    test {\ifciteibid}%
+    and
+    (
+    test {\ifentrytype{jurisdiction}}%
+    or
+    test {\ifentrytype{legal}}%
+    or
+    test {\ifentrytype{legislation}}%
+    )
+  }%
+  {\addspace}%
+  {\iftoggle{cms@inlineibid}%
+    {\togglefalse{cms@inlineibid}%
+      \iffieldundef{prenote}% Bug fix
+      {}%
+      {\cms@testspace}}%
+    {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
+      {\DeclareNumChars*{abcdeABCDE:}%
+        \iffieldpages{postnote}%
+        {\cms@testspace}%
+        {\addcomma\addspace}}%
+      {\addcomma\addspace}\DeclareNumChars{.}}}}
+
+\newcommand*{\postnotewrapper}{%
+  \iftoggle{cms@modpostnote}%
+  {\ifboolexpr{%
+      test {\iffieldstart{postnote}{,}}%
+      or
+      test {\iffieldstart{postnote}{\bibrangessep}}%
+    }%
+    {\addcomma}% w/ or w/o \addspace?
+    {\ifboolexpr{%
+        test {\iffieldstart{postnote}{;}}%
+        or
+        test {\iffieldstart{postnote}{:}}%
+        or
+        test {\iffieldstart{postnote}{.}}%
+      }%
+      {}{\postnotedelim}}}%
+  {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+  \begingroup%                     comp.text.tex
+  \edef\@tempa{%
+    \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+  \@tempa\@nil{\endgroup\ifblank{##1}}%
+  \savefield*{#1}{\@tempa}%
+  \expandafter\iffieldstart@i\detokenize
+  \expandafter\expandafter\expandafter{%
+    \expandafter\@tempa\detokenize{#2}}\@nil}
+
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{editortype}{none}%
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\newcommand*{\nameadelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{nameatype}{none}%
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\DeclareDelimFormat{dateeradelim}{\addnbspace}%
+\DeclareDelimFormat{dateaddelim}{\addnbspace}%
+
+\DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
+  \begingroup% final {by}.
+  \blx@bibstringnormal%
+  \usebibmacro{list:delim}{%
+    \ifbibstring{from#1}%
+      {\bibxlstring{cfrom#1}}%
+      {\ifbibstring{clang#1}%
+         {\bibxlstring{lang#1}}%
+         {#1}}}%
+  \ifbibstring{cfrom#1}%
+  {\ifboolexpr{%
+      test {\ifnumless{\value{listcount}}{\value{liststop}}}%
+      or
+      test {\ifmoreitems}%
+     }%
+     {\bibstring{from#1}}%
+     {\bibstring{cfrom#1}}}%
+    {\ifbibstring{lang#1}%
+       {\biblstring{lang#1}}%
+       {#1}}%
+ \usebibmacro{list:andotherlangs}%
+ \endgroup}
+
+\newbibmacro*{list:andotherlangs}{% Final {by} after {andmore}
+  \ifboolexpr{%
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+    and
+    test {\ifmoreitems}%
+  }%
+    {\ifnumgreater{\value{liststop}}{1}%
+       {\finalandcomma}%
+       {}%
+     \printdelim{andmoredelim}\bibstring{andmore}\addspace\bibstring{by}}%
+    {}}
+
+\newcommand*{\lbx@cfromlang}{% Because the cbytranslator string can't
+  \iffieldundef{userf}% have {by} in it unless there's an origlanguage.
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[cfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@fromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@lfromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@sfromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[sfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
+  \ifbibliography
+    {\usebibmacro{entrytail}}%
+    {}%
+  \finentry}
+
+\newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
+  \newunit\newblock
+  \iftoggle{cms@annotation}%
+    {\usebibmacro{annotation}%
+     \newunit\newblock}%
+    {}}%
+
+\newbibmacro*{author+holder}{%
+  \ifnameundef{author}%
+    {\let\bbx@lasthash\undefined}%
+    {\usebibmacro{author/editor}%
+     \ifthenelse{\ifnameundef{holder}\OR
+                 \ifnamesequal{author}{holder}}%
+       {}%
+       {\setunit{\addspace}%
+        \printtext[parens]{\printnames{holder}}}}}
+
+\renewbibmacro*{byauthor}{%
+  \ifthenelse{\ifuseauthor\OR
+              \ifnameundef{author}}%
+    {}%
+    {\bibstring{by}\addspace%
+     \printnames[byauthor]{author}}}
+
+\newbibmacro*{byauthorpunct}{%
+  \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
+  {\addperiod\addspace}%
+  {\newcunit}}
+
+\renewbibmacro*{bybookauthor}{%
+  \ifnameundef{bookauthor}%
+    {}%
+    {\ifnamesequal{author}{bookauthor}%
+      {}%
+      {\bibstring{by}\addspace\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
+\newbibmacro*{editorpunct}{%
+  \ifthenelse{\(\iffieldundef{booktitle}\AND%
+    \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
+    \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
+    \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
+  {\ifentrytype{video}%
+    {\newcunit\newblock}%
+    {\newunit\newblock}}%
+  {\newcunit\newblock}}
+
+\newbibmacro*{edition}{%
+  \printfield{edition}%
+    \clearfield{edition}}%
+
+\newbibmacro*{inforaft}{%
+  \ifnameundef{introduction}%
+  {\ifnameundef{afterword}%
+    {\ifnameundef{foreword}%
+      {\printfield{type}}%
+      {\bibstring{forewordto}%
+        \clearname{foreword}}}%
+    {\bibstring{afterwordto}%
+      \clearname{afterword}}}%
+  {\bibstring{introductionto}%
+    \clearname{introduction}}}
+
+\newbibmacro*{langlist:andothers}{%
+  \ifthenelse{\value{listcount}=\value{liststop}\AND
+              \ifmoreitems}%
+    {\ifnum\value{liststop}>1 \finalandcomma\fi
+     \andmoredelim\bibstring{andmore}\bibrightbracket}%
+    {}}
+
+\newbibmacro*{reference+title}{%
+  \ifboolexpr{%
+    test {\iffieldequals{title}{\bbx@lasthash}}%
+    and
+    not test {\iffirstonpage}%
+    and
+    togl {cms@namedash}%
+  }%
+  {\printtext{\bibnamedash}}%
+  {\usebibmacro{italtitle+stitle}%
+    \savefield{title}{\bbx@lasthash}}}
+
+\newbibmacro*{mag+news+author}{%
+  \ifboolexpr{%
+    (
+    test {\ifnameundef{author}}%
+    or
+    not test {\ifuseauthor}%
+    )
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldequals{journaltitle}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\printtext{\bibnamedash}}%
+    {\usebibmacro{journal+sub}%
+      \setunit*{\addspace}%
+      \printlist[periodplace]{location}%
+      \savefield{journaltitle}{\bbx@lasthash}}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{cmag+news+author}{%
+  \ifnameundef{author}%
+  {\usebibmacro{journal+sub}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{type+inst+year}{%
+  \printfield{type}%
+  \newcunit
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \printdate}% Was printfield{year}?
+
+\newbibmacro*{institution+organization}{%
+  \iflistundef{organization}%
+  {\iflistundef{institution}%
+    {}%
+    {\printlist{institution}}}%
+  {\printlist{organization}%
+    \newcunit%
+    \printlist{institution}}}
+
+\newbibmacro*{author+org}{%
+  \ifnameundef{author}%
+  {\ifnameundef{editor}%
+    {\iflistundef{organization}%
+      {\let\bbx@lasthash\undefined}%
+      {\ifboolexpr{%
+          test {\iflistequals{organization}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\printtext{\bibnamedash}}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printlist{organization}\bibcloseparen}%
+          {\printlist{organization}}%
+          \savelist{organization}{\bbx@lasthash}}}}%
+    {\usebibmacro{editor}}}%
+  {\usebibmacro{author/editor}}}
+
+\newbibmacro*{cbytypestrg}[2]{%
+  \iffieldundef{#1type}%
+    {\bibstring{by#2}}%
+    {\bibstring{by\thefield{#1type}}}}
+
+\newbibmacro*{cbyeditor}{%
+  \ifnameundef{editor}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \newcunit}%
+  \usebibmacro{cbyeditorx}}
+
+\newbibmacro*{cbyeditorx}{%
+  \ifnameundef{editora}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \newcunit}%
+  \ifnameundef{editorb}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \newcunit}%
+  \ifnameundef{editorc}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \newcunit}}
+
+\newbibmacro*{cbytranslator}{%
+  \ifnameundef{translator}%
+  {}%
+  {\bibstring{bytranslator}%
+    \addspace
+    \printnames[bytranslator]{translator}}}
+
+\newbibmacro*{cbycompiler}{%
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{cbycompiler}\addspace%
+     \printnames[bycompiler]{namec}}}
+
+\newbibmacro*{cbyredactor}{%
+  \ifnameundef{redactor}%
+    {}%
+    {\bibstring{cbyredactor}\addspace%
+     \printnames[byredactor]{redactor}}}
+
+\newbibmacro*{cwithcommentator}{%
+  \ifnameundef{commentator}%
+    {}%
+    {\bibstring{withcommentator}\addspace%
+     \printnames[withcommentator]{commentator}}}
+
+\newbibmacro*{cwithannotator}{%
+  \ifnameundef{annotator}%
+    {}%
+    {\bibstring{withannotator}\addspace%
+     \printnames[withannotator]{annotator}}}
+
+\newbibmacro*{cwithintroduction}{%
+  \ifnameundef{introduction}%
+    {}%
+    {\bibstring{withintroduction}\addspace%
+     \printnames[withintroduction]{introduction}}}
+
+\newbibmacro*{cwithforeword}{%
+  \ifnameundef{foreword}%
+    {}%
+    {\bibstring{withforeword}\addspace%
+     \printnames[withforeword]{foreword}}}
+
+\newbibmacro*{cwithafterword}{%
+  \ifnameundef{afterword}%
+    {}%
+    {\bibstring{withafterword}\addspace%
+     \printnames[withafterword]{afterword}}}
+
+\newbibmacro*{cbyeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND
+    \(\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}\)}%
+  {\def\@tempa{cbyeditor}%
+    \ifnamesequal{editor}{translator}%
+    {\edef\@tempa{\@tempa tr}%
+      \clearname{translator}}%
+    {}%
+    \ifnamesequal{editor}{namec}%
+    {\edef\@tempa{\@tempa cp}%
+      \clearname{namec}}%
+    {}%
+    \ifnamesequal{editor}{commentator}%
+    {\edef\@tempa{\@tempa co}%
+      \clearname{commentator}}%
+    {\ifnamesequal{editor}{annotator}%
+      {\edef\@tempa{\@tempa an}%
+        \clearname{annotator}}%
+      {}}%
+    \ifnamesequal{editor}{introduction}%
+    {\edef\@tempa{\@tempa in}%
+      \clearname{introduction}}%
+    {\ifnamesequal{editor}{foreword}%
+      {\edef\@tempa{\@tempa fo}%
+        \clearname{foreword}}%
+      {\ifnamesequal{editor}{afterword}%
+        {\edef\@tempa{\@tempa af}%
+          \clearname{afterword}}%
+        {}}}%
+    \bibstring{\@tempa}\space%
+    \printnames[byeditor]{editor}%
+    \clearname{editor}%
+    \newcunit%
+    \usebibmacro{cbyeditorx}}%
+  {\usebibmacro{cbyeditor}}%
+  \usebibmacro{cbytranslator+others}}
+
+\newbibmacro*{cbytranslator+others}{%
+  \ifnameundef{translator}%
+    {}%
+    {\def\@tempa{cbytranslator}%
+      \ifnamesequal{translator}{namec}%
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}%
+      {}%
+     \ifnamesequal{translator}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{translator}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\space%
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \newcunit}%
+  \usebibmacro{cbycompiler+others}}
+
+\newbibmacro*{cbycompiler+others}{%
+  \ifnameundef{namec}%
+    {}%
+    {\def\@tempa{cbycompiler}%
+     \ifnamesequal{namec}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{namec}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\space%
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \newcunit}%
+  \usebibmacro{cbyothers}}
+
+\newbibmacro*{cbyothers}{%
+  \usebibmacro{cbytranslator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbycompiler}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbyredactor}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithcommentator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithannotator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithintroduction}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithforeword}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithafterword}}
+
+\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
+  \iftoggle{cms@origpublished}%
+  {}%
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{xref-in:}{%
+  \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}%
+  \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
+  \bibstring{in}\setunit{\addspace}}% Changed for related:reprintfrom
+
+\newbibmacro*{chapincoll}{%
+  \iffieldundef{chapter}%
+  {}%
+  {\printfield{chapter}\addspace%
+    \clearfield{chapter}}}%
+
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {\ifboolexpr{%
+      test {\ifentrytype{music}}%
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not togl {cms@origpublished}%
+    }%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\printfield{chapter}\clearfield{chapter}%
+    \iffieldundef{booktitle}%
+    {}%
+    {\addspace\bibstring{of}\setunit{\addspace}}}}%
+
+\newbibmacro*{music+ser+num}{%
+  \iffieldundef{series}%
+  {\iffieldundef{number}%
+    {}%
+    {\printfield{number}}}%
+  {\printfield{series}%
+    \setunit{\addspace}%
+    \printfield{number}}}%
+
+\newbibmacro*{music+publisher}{%
+  \iffieldundef{howpublished}%
+  {\iffieldundef{pubstate}%
+    {}%
+    {\printfield{pubstate}}}%
+  {\printfield{howpublished}}}%
+
+\newbibmacro*{music+origdate}{%
+  \iftoggle{cms@reprint}% 16th ed.
+  {}%
+  {\iftoggle{cms@switchdates}% Date fix
+    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+        \iffieldundef{season}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}%
+    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+        \iffieldundef{origseason}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}}}%
+
+\newbibmacro*{music+eventdate}{% Date fix
+  \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
+  {}%
+  {\printeventdate}}
+
+\newbibmacro*{ser+num}{%
+  \printfield{series}%
+  \printfield[sernum]{number}%
+  \newunit}
+
+\newbibmacro*{language+transtitle}{%
+  \iffieldundef{usere}%
+  {\printlist[][-\value{listtotal}]{language}}%
+  {\printfield{usere}}}
+
+\newbibmacro*{publ+loc+year}{%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}% For the author-date style.  Tricky.
+}%
+
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+  \printlist{origlocation}%
+  \iflistundef{origpublisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{origpublisher}}%
+
+\newbibmacro*{howpubl+loc+year}{%
+  \printlist{location}%
+  \iffieldundef{howpublished}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{inst+loc+year}{%
+  \printlist{location}%
+  \iflistundef{institution}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{originally+published+as}{% Punctuation fix now in 
+  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+  {\iffieldundef{reprinttitle}%
+    {}%
+    {\usebibmacro{begrelated}%
+      \bibstring{reprintfrom}% ?
+      \origpublcite{\thefield{reprinttitle}}%
+      \usebibmacro{endrelated}%
+      \newunit}}%
+  {\usebibmacro{begrelated}%
+    \iflistundef{origlanguage}%
+    {\bibstring{origpub}%
+      \origfullcite{\thefield{userf}}%
+      \usebibmacro{endrelated}%
+      \newunit}%
+    {\iftoggle{cms@postposit}%
+      {\bibstring{origedition}%
+        \setunit{\addspace}%
+        \printlist[edlang]{origlanguage}%
+        \addcolon%
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
+        \newunit}%
+      {\printlist[edlang]{origlanguage}%
+        \setunit{\addspace}%
+        \bibstring{origedition}%
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
+        \newunit}}}}
+
+\newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
+  \printlist{location}%
+  \iflistundef{organization}%
+  {\iflistundef{publisher}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{organization}%
+  \setunit*{\addcomma\space}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}}
+
+\newbibmacro*{year+in+parens}{%
+  \iffieldundef{volume}%
+  {noformat}%
+  {parens}}
+
+\newbibmacro*{letter+date}{% New for 0.9
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
+    {}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
+    {}%
+    {\cms@datelong{orig}}}}
+
+\newbibmacro*{unpubl+letter+date}{% For the Misc type.
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
+    {}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
+    {\printdate}% For interviews and other dated non-letters
+    {\cms@datelong{orig}}}}
+
+\newbibmacro*{cmsbookdate}{%
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{origyear}}%
+  {\newunit}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{origyear}%
+      {\newunit}%
+      {\newcunit\printorigdate}}%
+    {\iffieldundef{year}%
+      {\newunit}%
+      {\newcunit\printdate}}}}
+
+\renewbibmacro*{date}{% Adding the test solved some issues in 0.9 with
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}%
+    \AND\iffieldundef{origday}\AND\iffieldundef{origseason}}%
+    {}%
+    {\printorigdate}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}%
+    \AND\iffieldundef{day}\AND\iffieldundef{season}}% Punctuation in some
+    {}%  entry types (Misc).  The whole \printdate thing may need further work.
+    {\printdate}}}
+
+\newbibmacro*{time+stamp}{% 17th ed.
+  \iftoggle{cms@switchdates}%
+  {\iffieldundef{orighour}%
+    {}%
+    {\newcunit\printorigtime}}%
+  {\iffieldundef{hour}%
+    {}%
+    {\newcunit\printtime}}}
+
+\newcommand*{\cms@datelong}[1]{% Modified for 17th ed.
+  \begingroup
+  \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}}}%
+    {\cmsdateeraprintpre{##1}\stripzeros{\thefield{##1}}}}%
+  \cms@mkbibrangetrunc{long}{#1}%
+  \endgroup}%
+
+\newrobustcmd*{\letterdatelong}{% For users: 17th ed.
+  \ifboolexpr{%
+    test {\ifdefstring{\blx@languagename}{american}}%
+    or
+    test {\ifdefstring{\blx@languagename}{english}}% i.e., no babel
+  }%
+  {\iftoggle{cms@switchdates}%
+    {\cms@datelong{}}%
+    {\cms@datelong{orig}}}%
+  {\iftoggle{cms@switchdates}%
+    {\printdate}%
+    {\printorigdate}}}%
+
+\newbibmacro*{journal+sub}{%
+  \iffieldundef{journaltitle}%
+    {}%
+    {\ifboolexpr{%
+        not test {\iffieldundef{shortjournal}}%
+        and
+        ((
+        test {\ifcitation}%
+        and
+        togl {cms@citejtabb}%
+        )
+        or
+        (
+        test {\ifbibliography}%
+        and
+        togl {cms@bibjtabb}%
+        ))
+      }%
+      {\clearlist{location}\printtext[shortjournal]{%
+          \printfield[jtsnoformat]{shortjournal}}}%
+      {\printtext[journaltitle]{%
+          \printfield[jtnoformat]{journaltitle}%
+          \setunit{\subtitlepunct}%
+          \printfield[sjtnoformat]{journalsubtitle}}}}}%
+
+\newbibmacro*{chap+pag}{%
+  \printfield{chapter}%
+  \setunit*{\addcomma\space}%
+  \printfield{pages}}
+
+\newbibmacro*{mag+news+date}{%
+  \ifboolexpr{%
+    (
+    test {\ifnameundef{author}}%
+    or
+    not test {\ifuseauthor}%
+    )
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\usebibmacro{date+issue}}%
+  {\usebibmacro{mag+date+issue}}}
+
+\newbibmacro*{date+issue}{%
+  \iffieldundef{issue}%
+  {\iffieldundef{number}%
+    {\usebibmacro{date}}%
+    {\iftoggle{cms@numbermonth}%
+      {\usebibmacro{date}}%
+      {\usebibmacro{cmsyear}}%
+      \setunit*{\addcomma\addspace}% Starred version for when the 
+      \printfield[journum]{number}}}% month isn't printed because of
+  {\printfield{issue}% the toggle.
+    \setunit{\addspace}%
+    \usebibmacro{cmsyear}}}
+
+\newbibmacro*{mag+date+issue}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\clearfield{extradate}\printorigdateextra}% \printfield{origyear}
+  {\clearfield{extradate}\printdateextra}}% \printfield{year}
+
+\newbibmacro*{cmsorigdate}{% New for 0.9
+  \iftoggle{cms@switchdates}%
+  {\printdate}%
+  {\printorigdate}}
+
+\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
+  \ifboolexpr{% article subtype
+    togl {cms@citejtabb}%
+    and
+    test {\ifcitation}%
+    and
+    not test {\iffieldundef{shorttitle}}%
+  }%
+  {\clearlist{location}\printtext[shorttitle]{%
+      \printfield[tnoformat]{shorttitle}}}%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}%
+  {}%
+  {\newcunit
+    \printfield[jourser]{series}%
+    \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+    \iffieldundef{issue}\AND\iffieldundef{season}}% New, more accurate
+  {\iffieldundef{volume}% test, also in article
+    {\newcunit%
+      \printfield[journum]{number}%
+      \clearfield{number}%
+      \setunit{\addcomma\addspace}}%
+    {\printfield[jourvol]{volume}%
+      \setunit{\addcomma\addspace}}}%
+  {\printfield[jourvol]{volume}%
+    \setunit{\addcomma\addspace}% need * here?
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}%
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{periodical+date+issue}{% For periodical type &
+  \ifboolexpr{% magazine subtype
+    togl {cms@citejtabb}%
+    and
+    test {\ifcitation}%
+    and
+    not test {\iffieldundef{shorttitle}}%
+  }%
+  {\clearlist{location}\printtext[shorttitle]{%
+      \printfield[tnoformat]{shorttitle}}}%
+  {\ifboolexpr{%
+      togl {cms@bibjtabb}%
+      and
+      test {\ifbibliography}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\clearlist{location}\printtext[shorttitle]{%
+        \printfield[tnoformat]{shorttitle}}}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\renewbibmacro*{postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\setunit{\postnotewrapper}%delim}%
+  \printfield{postnote}}}
+
+\newbibmacro*{part+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}%
+    {\bibstring{bytranslator}\space%
+      \printnames[bytranslator]{nameb}}}%
+  {\ifthenelse{\iffieldundef{nameatype}\OR%
+      \iffieldequalstr{nameatype}{editor}}%
+    {\ifnamesequal{namea}{nameb}%
+      {\bibstring{byeditortr}\space%
+        \printnames[byeditor]{namea}}%
+      {\bibstring{byeditor}\space%
+        \printnames[byeditor]{namea}%
+        \ifnameundef{nameb}%
+        {}%
+        {\newunit
+          \bibstring{bytranslator}\space%
+          \printnames[bytranslator]{nameb}}}}%
+    {\usebibmacro{bytypestrg}{namea}{editor}%
+      \setunit{\addspace}%
+      \printnames[byeditor]{namea}%
+      \ifnameundef{nameb}%
+      {}%
+      {\newunit%
+        \bibstring{bytranslator}\addspace%
+        \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{compilestrg}{%
+  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}%
+  {\bibstring{compilers}}%
+  {\bibstring{compiler}}%
+  \clearname{namec}}
+
+\newbibmacro*{transstrg}{%
+  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}%
+    \clearname{translator}}
+
+\newbibmacro*{parttransstrg}{%
+  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}%
+    \clearname{nameb}}
+
+\newbibmacro*{editstrg}{% Test added for 0.9
+  \ifthenelse{\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}%
+      {\bibstring{editortranscompilers}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslators}%
+            \clearname{translator}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}%
+      {\bibstring{editortranscompiler}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslator}%
+            \clearname{translator}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+    {\bibstring{\thefield{editortype}s}}%
+    {\bibstring{\thefield{editortype}}}}%
+  \clearname{editor}}
+
+\newbibmacro*{parteditstrg}{%
+  \ifthenelse{\iffieldundef{nameatype}\OR%
+    \iffieldequalstr{nameatype}{editor}}%
+  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}%
+      {\bibstring{editortranscompilers}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslators}%
+            \clearname{nameb}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}%
+      {\bibstring{editortranscompiler}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslator}%
+            \clearname{nameb}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+    {\bibstring{\thefield{nameatype}s}}%
+    {\bibstring{\thefield{nameatype}}}}%
+  \clearname{namea}}
+
+\newbibmacro*{clearpublin}{%
+  \clearname{author}\clearfield{shorthand}%
+  \ifthenelse{\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}}%
+  {}%
+  {\clearname{namea}%
+    \clearname{nameb}}%
+  \clearfield{nameaddon}%
+  \ifthenelse{\(\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
+    \ifentrytype{mvreference}\OR\ifentrytype{proceedings}\OR%
+    \ifentrytype{collection}\OR\ifentrytype{reference}\OR%
+    \ifentrytype{suppbook}\OR\ifentrytype{suppcollection}\)\OR%
+    \(\(\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+    \ifentrytype{video}\)\AND\iffieldundef{booktitle}\)}%
+  {}%
+  {\clearfield{title}%
+    \clearfield{subtitle}%
+    \clearfield{titleaddon}%
+    \clearfield{usere}%
+    \clearlist{language}%
+    \ifentrytype{music}%
+    {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
+      \clearfield{eventmonth}}%
+    {}}%
+  \ifentrytype{letter}%
+  {\iftoggle{cms@switchdates}%
+    {\clearfield{year}\clearfield{month}\clearfield{season}}%
+    {\clearfield{origyear}\clearfield{origmonth}\clearfield{origseason}}%
+    \clearfield{origlocation}}%
+  {}%
+  \clearfield{reprinttitle}%
+}
+
+%%%% Related macros from biblatex.def %%%%
+
+\renewbibmacro*{related:origpubas}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \usebibmacro{cite:origfull}}}%
+
+\renewbibmacro*{related:reprintfrom}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \nopunct% ???
+    \usebibmacro{cite:origpubl}}}%
+
+\renewbibmacro*{related:origpubin}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \usebibmacro{cmsyear}%
+    \ifboolexpr{%
+      test {\iflistsequal{publisher}{savedpublisher}}%
+      or
+      test {\iflistundef{publisher}}%
+    }%
+      {}%
+      {\setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+       \printlist{publisher}%
+       \setunit{\addcomma\space}%
+       \iflistsequal{location}{savedlocation}%
+         {}%
+         {\printlist{location}}}}}
+
+\renewbibmacro*{related:bytranslator}[1]{%
+  \entrydata{#1}{%
+    \usebibmacro{at+every+item}%
+    \renewbibmacro*{name:hook}[1]{%
+      \ifnumequal{\value{listcount}}{1}%
+        {\begingroup
+         \mkrelatedstring%
+         \lbx@initnamehook{#1}%
+         \endgroup}%
+        {}}%
+    \printnames[bytranslator]{translator}%
+    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}%
+    \clearname{translator}%
+    \usebibmacro{cite:origfull}}}%
+
+\renewbibmacro*{related:default}[1]{%
+  \entrydata*{#1}{%
+    \usedriver
+    {\ifnameundef{savedauthor}%
+      {\ifnameundef{savededitor}%
+        {}%
+        {\ifnamesequal{editor}{savededitor}%
+          {\clearname{editor}}%
+          {}}}%
+      {\ifnamesequal{author}{savedauthor}%
+        {\clearname{author}}%
+        {}}%
+      \usebibmacro{at+every+item}%
+      \renewbibmacro*{cmsbibsortdate}{}%
+      \renewbibmacro*{related:init}{}%
+      \DeclareNameAlias{sortname}{default}%
+      \renewbibmacro*{pageref}{}}%
+    {\thefield{entrytype}}}}
+
+\letbibmacro*{related:maintitlenc}{related:multivolume}% From N & B
+\letbibmacro*{related:maintitle}{related:multivolume}%
+
+\renewbibmacro*{related:multivolume}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {}%
+    {\printtext{%
+        \printfield{volume}%
+        \printfield{part}}%
+      \setunit{\addcolon\space}}%
+    \usebibmacro{italtitle+stitle}%
+    \ifboolexpr{%
+      test {\ifnamesequal{author}{savedauthor}}%
+      or
+      test {\ifnameundef{author}}%
+    }%
+    {}%
+    {\usebibmacro{bytypestrg}{author}{author}%
+      \setunit{\addspace}%
+      \printnames[byauthor]{author}%
+      \newcunit\newblock}%
+    \ifboolexpr{%
+      test {\ifnamesequal{namea}{savednamea}}%
+      or
+      test {\ifnameundef{namea}}%
+    }%
+    {\ifboolexpr{%
+        test {\ifnamesequal{editor}{savededitor}}%
+        or
+        test {\ifnameundef{editor}}%
+      }%
+      {\ifboolexpr{%
+          test {\ifnamesequal{nameb}{savednameb}}%
+          or
+          test {\ifnameundef{nameb}}%
+        }%
+        {}%
+        {\bibstring{bytranslator}\addspace%
+          \printnames[bytranslator]{nameb}\newcunit}}%
+      {\usebibmacro{byeditor+others}%
+        \newcunit\newblock}}%
+    {\usebibmacro{part+editor+translator}%
+      \newcunit}%
+    \usebibmacro{date}}}%
+
+\providetoggle{cms@otherlang}
+
+\apptocmd\blx@opt@autolang@other%
+{\toggletrue{cms@otherlang}}%
+{\blx@info@noline{Patching 'autolang=other' option}}%
+{\PackageWarningNoLine{biblatex-chicago}%
+  {Upgrading biblatex to >v2.7a recommended,\MessageBreak
+    especially if you are using the "related"\MessageBreak
+    functionality}}
+
+\newbibmacro*{cite:origfull}{%
+  \printtext[cmshypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \clearname{author}\clearfield{userf}\clearfield{shorthand}%
+      \toggletrue{cms@headlessnote}\frenchspacing%
+      \renewbibmacro*{cmsbibsortdate}{}}%
+    {\thefield{entrytype}}}}
+
+\newbibmacro*{cite:origpubl}{%
+  \printtext[cmshypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}\clearfield{shorthand}%
+      \toggletrue{cms@headlessnote}\toggletrue{cms@origpublished}%
+      \frenchspacing\renewbibmacro*{cmsbibsortdate}{}%
+      \usebibmacro{cms:titlehook}}%
+    {\thefield{entrytype}}}}
+
+\newbibmacro*{at+every+item}{%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}%
+  \ifboolexpr{% AD requires this here because cmsbibsortdate=null
+    test {\iffieldundef{origyear}}%
+    or
+    test {\iffieldundef{year}}%
+    or
+    not test {\iffieldint{year}}%
+    or
+    togl {cms@switchdates}%
+  }%
+  {}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
+
+\endinput
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 b132de4700c..e14d9114aaf 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,8 @@
-% $Id: chicago-notes.bbx,v 0.10.1.14 2018/01/11 09:17:35 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.
+% This is a biblatex style file, originally adapted mainly from
+% Lehman's standard.bbx.  It provides the bibliography formatting for
+% the Chicago notes + bibliography style.
 
-
-\ProvidesFile{chicago-notes.bbx}[2018/01/11 v 3.10 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2020/04/20 v 3.14 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -13,6 +11,8 @@
 
 \DeclareFieldFormat{shorthandwidth}{#1}
 
+\DeclareFieldFormat{shortserieswidth}{#1}
+
 \DeclareFieldFormat{shortjournalwidth}{%
   \ifthenelse{\ifentrytype{jurisdiction}\OR%
     \ifentrytype{legal}\OR\ifentrytype{legislation}}%
@@ -33,7 +33,7 @@
 
 \defbibenvironment{shorthand}%
   {\list
-    {\printfield[shorthandwidth]{shorthand}}%
+    {\cmsshhyper{\printfield[shorthandwidth]{shorthand}}}%
     {\setlength{\labelwidth}{\shorthandwidth}%
       \setlength{\leftmargin}{\labelwidth}%
       \setlength{\labelsep}{\biblabelsep}%
@@ -44,22 +44,9 @@
   {\endlist}
   {\item}
 
-\defbibenvironment{shorthands}% For biblatex < 2.9
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
 \defbibenvironment{losnotes}
   {\list
-     {\printfield[shorthandwidth]{shorthand}}%
+     {\cmsshhyper{\printfield[shorthandwidth]{shorthand}}}%
      {\footnotesize%
       \setlength{\labelwidth}{\shorthandwidth}%
       \setlength{\leftmargin}{\labelwidth}%
@@ -73,7 +60,7 @@
 
 \defbibenvironment{losendnotes}
   {\list
-     {\printfield[shorthandwidth]{shorthand}}%
+     {\cmsshhyper{\printfield[shorthandwidth]{shorthand}}}%
      {\enotesize%
       \setlength{\labelwidth}{\shorthandwidth}%
       \setlength{\leftmargin}{\labelwidth}%
@@ -144,6 +131,57 @@
 %     {\savefield{shortjournal}{\cms@shjour}}}%
 %   {\savefield{shortjournal}{\cms@shjour}}}
 
+\defbibenvironment{shortseries}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.7\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shsernotes}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\footnotesize%
+      \setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shserendnotes}%
+  {\list
+    {\printfield[shortserieswidth]{shortseries}}%
+    {\enotesize%
+      \setlength{\labelwidth}{\shortserieswidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}
+  {\item}
+
+\defbibcheck{shortseries}{% Only one list
+  \ifthenelse{\iffieldundef{shortseries}\OR%
+    \iffieldundef{series}\OR%
+    \iffieldsequal{series}{shortseries}}%
+  {\skipentry}%
+  {\ifcsdef{\strfield{shortseries}}%
+    {\skipentry}%
+    {\savefieldcs{shortseries}%
+      {\strfield{shortseries}}}}}%
+
 \AtBeginBibliography{%
   \togglefalse{cms@headlessnote}%
   \togglefalse{cms@shortnote}%
@@ -153,9 +191,7 @@
 
 \AtEveryBibitem{%
   \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
+  \togglefalse{cms@postvol}% MT fix
   \ifboolexpr{%
     test {\iffieldundef{origyear}}%
     or
@@ -182,9 +218,6 @@
 
 \AtEveryLositem{%
   \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
   \ifboolexpr{%
     test {\iffieldundef{origyear}}%
     or
@@ -220,8 +253,10 @@
   \let\bbx@lasthash\undefined}
 
 %%%% Bibliography-specific bibstrings %%%%
-
-%% Now in *.lbx %%
+% \NewBibliographyString{note,preface,subsection,subsections,selfpublished,%
+%   commenton,printed,track,choreographer,choreographers,cbychoreographer,%
+%   bychoreographer}%
+%% Now below %%
 
 %%%% Author, Editor, Translator, and Compiler  Macros %%%%
 
@@ -346,11 +381,19 @@
 \newbibmacro*{justauthor}{%
   \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}%
-      {\bibnamedash\addspace}}%
+      {\printtext{\bibnamedash}}%\addperiod\addspace
+      {\printtext{\bibnamedash}%
+        \ifentrytype{customc}%
+        {\newunit}%
+        {\setunit{\addspace}}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -358,16 +401,25 @@
         {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
           \savefield{fullhash}{\bbx@lasthash}}%
         {\printnames{author}%
+          \ifentrytype{customc}%
+          {\ifbibliography{\newunit}{\newcunit}}%
+          {\setunit{\addspace}}%
+          \printfield{nameaddon}%
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
   \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\usebibmacro{pickeditor}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}%
-      {\bibnamedash\addspace}}%
+      {\printtext{\bibnamedash}}%\addperiod\addspace
+      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -375,6 +427,8 @@
         {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
           \savefield{fullhash}{\bbx@lasthash}}%
         {\printnames{author}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}%
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
@@ -384,13 +438,23 @@
 
 \newbibmacro*{moreeditor}{%
   \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
-    {\usebibmacro{picktranslator}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-                 \iffirstonpage}%
-       {\bibnamedash\editordelim}%
-       {\printnames{editor}\editordelim%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
+  {\usebibmacro{picktranslator}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\editordelim}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\editordelim}}%
+    {\printnames{editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\editordelim%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{editstrg}}}
 
 \renewbibmacro*{editor}{%
   \iftoggle{cms@headlessnote}%
@@ -398,28 +462,58 @@
   {\ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
     {\ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
       {\usebibmacro{picktranslator}}%
-      {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-          \iffirstonpage}%
-        {\bibnamedash\editordelim}%
-        {\printnames{editor}\editordelim%
+      {\ifboolexpr{%
+          test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\iffieldundef{nameaddon}%
+          {\printtext{\bibnamedash}\editordelim}%
+          {\printtext{\bibnamedash}\setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}}%
+        {\printnames{editor}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}\editordelim%
           \savefield{fullhash}{\bbx@lasthash}}%
         \usebibmacro{editstrg}}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-        \iffirstonpage}%
-      {\bibnamedash\nameadelim}%
-      {\printnames[sortname]{namea}\nameadelim%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\nameadelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}}%
+      {\printnames[sortname]{namea}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim%
         \savefield{fullhash}{\bbx@lasthash}}%
       \usebibmacro{parteditstrg}}}}%
 
 \newbibmacro*{parteditor}{%
   \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
-    {\usebibmacro{picktranslator}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-                 \iffirstonpage}%
-       {\bibnamedash\nameadelim}%
-       {\printnames[sortname]{namea}\nameadelim%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parteditstrg}}}
+  {\usebibmacro{picktranslator}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\nameadelim}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim}}%
+    {\printnames[sortname]{namea}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\nameadelim%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parteditstrg}}}
 
 \newbibmacro*{picktranslator}{%
   \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
@@ -428,31 +522,61 @@
 
 \newbibmacro*{moretranslator}{%
   \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}%
-    {\usebibmacro{compiler}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-                 \iffirstonpage}%
-       {\bibnamedash\addcomma\addspace}%
-       {\printnames[sortname]{translator}\addcomma\addspace%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{transstrg}}}
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{translator}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{transstrg}}}
 
 \newbibmacro*{parttranslator}{%
   \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
-    {\usebibmacro{compiler}}%
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-                 \iffirstonpage}%
-       {\bibnamedash\addcomma\addspace}%
-       {\printnames[sortname]{nameb}\addcomma\addspace%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parttransstrg}}}
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{nameb}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parttransstrg}}}
 
 \newbibmacro*{compiler}{%
   \ifthenelse{\ifnameundef{namec}\OR\NOT\ifusenamec}%
   {\let\bbx@lasthash\undefined}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \iffirstonpage}%
-    {\bibnamedash\addcomma\addspace}%
-    {\printnames[sortname]{namec}\addcomma\addspace%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{namec}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{compilestrg}}}
 
@@ -472,14 +596,29 @@
   {\ifnameundef{labelname}%
     {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
         \ifentrytype{periodical}}%
-      {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-          \newcunit}}%
-      {\ifentrytype{manual}%
-        {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+      {\printfield[journaltitle]{journaltitle}\newcunit}%
+      {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
+        {\printlist{organization}\newcunit}%
         {}}}%
-    {\usebibmacro{author/editor}%
-      \setunit{\addcomma\addspace}}%
-    \printfield[lostitle]{title}%
+    {\ifthenelse{\ifentrytype{customc}\OR\ifentrytype{dataset}}%
+      {\usebibmacro{justauthor}\setunit{\addspace}}%
+      {\usebibmacro{author/editor}\newunit}}%
+    \ifboolexpr{%
+      test {\ifentrytype{video}}%
+      and
+      test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+      and
+      not test {\iffieldundef{title}}%
+      and
+      not test {\iffieldundef{booktitle}}%
+    }%
+    {\printtext[booktitle]{%
+        \printfield[btnoformat]{booktitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[sbtnoformat]{booksubtitle}}% (?)
+      \setunit{\ctitleaddonpunct}%
+      \printfield{booktitleaddon}}%
+    {\printfield[lostitle]{title}}%
     \finentry}}
 
 \DeclareBibliographyDriver{shortjournal}{%
@@ -498,6 +637,9 @@
     \printlist[periodplace]{location}}%
   \finentry}%
 
+\DeclareBibliographyDriver{shortseries}{%
+  \printfield{series}\finentry}
+
 \DeclareStyleSourcemap{
   \maps[datatype=bibtex]{
     \map{
@@ -514,9 +656,16 @@
     }
     \map[overwrite]{
       \pertype{jurisdiction}
-      \step[fieldsource=shortjournal, match=\regexp{[^\\adddot][a-z]}, final]
+      \step[fieldsource=shortjournal, match=\regexp{\\adddot},%
+      replace=\regexp{\\ADDDOT}]
+      \step[fieldsource=shortjournal, match=\regexp{[a-z]}, final]
       \step[fieldset=shortjournal, fieldvalue=\addnbspace, append]
     }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{\\ADDDOT},%
+      replace=\regexp{\\adddot}]
+      }
     \map{
       \pertype{legislation}
       \step[fieldsource=title, match=\regexp{Const}, final]
@@ -531,10 +680,24 @@
       replace={canadasection}]
     }
     \map{
-      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldsource=pubstate, match=\regexp{forthcoming|inpreparation|%
+        submitted|inpress}, final]
       \step[fieldset=year, origfieldval, final]
-      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      \step[fieldsource=year, match=\regexp{(forthcoming|inpreparation|%
+        submitted|inpress)},
       replace=\regexp{\\bibstring\{$1\}}]%$
+      \step[fieldset=pubstate, null]
+    }
+    \map[overwrite]{
+      \step[fieldsource=relatedtype, match=\regexp{maintitle}, final]
+      \step[fieldsource=options, final]
+      \step[fieldsource=options, notmatch=\regexp{related=true}, final]
+      \step[fieldset=options, fieldvalue=\regexp{,related=true}, append]
+    }
+    \map{
+      \step[fieldsource=relatedtype, match=\regexp{maintitle}, final]
+      \step[notfield=options, final]
+      \step[fieldset=options, fieldvalue=\regexp{related=true}]
     }
     \map{
       \pertype{article}
@@ -545,6 +708,59 @@
       replace={magazine}]
     }
     \map[overwrite]{
+      \pertype{article}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \pertype{online}
+      \step[fieldsource=relatedtype, match=\regexp{commenton|reviewof}, final]
+      \step[fieldsource=options, final]
+      \step[fieldsource=options, notmatch=\regexp{related=true}, final]
+      \step[fieldset=options, fieldvalue=\regexp{,related=true}, append]
+    }
+    \map{
+      \pertype{article}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \pertype{online}
+      \step[fieldsource=relatedtype, match=\regexp{commenton|reviewof}, final]
+      \step[notfield=options, final]
+      \step[fieldset=options, fieldvalue=\regexp{related=true}]
+    }
+    \map{
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=relatedtype, match=\regexp{commenton|reviewof}, final]
+      \step[fieldsource=related, final]
+      \step[fieldset=title, origfieldval]
+    }
+    \map[overwrite]{
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=relatedtype, match=\regexp{commenton|reviewof}, final]
+      \step[fieldsource=related, final]
+      \step[fieldsource=related, match=\regexp{(.*)}]
+      \step[fieldsource=title, match=\regexp{^$1$}, final]
+      \step[fieldsource=relatedtype]
+      \step[fieldset=title, origfieldval, append]
+      \step[fieldsource=relatedstring, final]
+      \step[fieldset=title, origfieldval, append]
+    }
+    \map{
+      \pertype{online}
+      \step[fieldsource=relatedtype, match=commenton, final]
+      \step[fieldsource=related, final]
+      \step[fieldset=title, fieldvalue=CCCCCC]
+    }
+    \map[overwrite]{
+      \pertype{online}
+      \step[fieldsource=relatedtype, match=commenton, final]
+      \step[fieldsource=title, match=\regexp{^CCCCCC$}, final]%$
+      \step[fieldsource=related, final]
+      \step[fieldset=title, origfieldval, append]
+      \step[fieldsource=relatedstring, final]
+      \step[fieldset=title, origfieldval, append]
+    }
+    \map[overwrite]{
       \step[fieldsource=subtitle, final]
       \step[fieldsource=title,
       match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
@@ -579,33 +795,88 @@
       final]
       \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
     }
+    \map[overwrite, foreach=related]{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=\regexp{^maintitle$}, final]%$
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldsource=entrykey, match=\regexp{(.*)}]
+      \step[entryclone=$1-$MAPLOOP]
+      \step[fieldset=related, fieldvalue=$MAPLOOP,%$
+      entrytarget=$1-$MAPLOOP]
+    }
+    \map[overwrite, foreach=related]{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=\regexp{^maintitle$}, final]%$
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldsource=sorttitle, final]
+      \step[fieldsource=entrykey, match=\regexp{(.*)}]
+      \step[fieldset=sorttitle, fieldvalue=$MAPLOOP, append,%$
+      entrytarget=$1-$MAPLOOP]
+    }
+    \map{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=\regexp{^maintitle$}, final]%$
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldset=relatedtype, null]
+      \step[fieldset=related, null]
+    }
+    \map[overwrite, foreach=related]{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=maintitlenc, final]
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldsource=entrykey, match=\regexp{(.*)}]
+      \step[entryclone=$1-$MAPLOOP, entrynocite]
+      \step[fieldset=related, fieldvalue=$MAPLOOP,%$
+      entrytarget=$1-$MAPLOOP]
+    }
+    \map[overwrite, foreach=related]{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=maintitlenc, final]
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldsource=sorttitle, final]
+      \step[fieldsource=entrykey, match=\regexp{(.*)}]
+      \step[fieldset=sorttitle, fieldvalue=$MAPLOOP, append,%$
+      entrytarget=$1-$MAPLOOP]
+    }
+    \map{
+      \pertype{mvbook}
+      \pertype{mvcollection}
+      \pertype{mvproceedings}
+      \pertype{mvreference}
+      \step[fieldsource=relatedtype, match=maintitlenc, final]
+      \step[fieldsource=related, match=\regexp{.*,.*}, final]
+      \step[fieldset=relatedtype, null]
+      \step[fieldset=related, null]
+    }
+    \map{
+      \pertype{video}
+      \step[fieldsource=entrysubtype, match=tvepisode, final]
+      \step[fieldsource=title, final]
+      \step[fieldsource=booktitle, final]
+      \step[fieldset=sorttitle, origfieldval]
+    }
   }
 }%
 
-\DeclareBibliographyDriver{shorthands}{% For biblatex < 2.9
-  \iftoggle{cms@fullshhand}%
-  {\usedriver{\frenchspacing}%
-    {\thefield{entrytype}}%
-    \finentry}%
-  {\ifnameundef{labelname}%
-    {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-        \ifentrytype{periodical}}%
-      {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-          \newcunit}}%
-      {\ifentrytype{manual}%
-        {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-        {}}}%
-    {\usebibmacro{author/editor}%
-      \setunit{\addcomma\addspace}}%
-    \printfield[lostitle]{title}%
-    \finentry}}
-
 \DeclareBibliographyDriver{article}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{mag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{mag+news+title}%
   \setunit{\addspace}%
@@ -616,10 +887,12 @@
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock% 17th ed. clarifies punctuation
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{mag+news+date}%
+  \newunit\newblock
+  \printfield{type}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
   \newunit\newblock
@@ -637,6 +910,8 @@
     togl {cms@related}%
     and
     not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
   }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
@@ -646,8 +921,6 @@
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{mag+news+title}%
   \setunit{\addspace}%
@@ -660,7 +933,7 @@
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock% As above
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
   \usebibmacro{journal+issue+year+pages}%
@@ -679,6 +952,8 @@
     togl {cms@related}%
     and
     not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
   }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
@@ -691,28 +966,36 @@
 \DeclareBibliographyDriver{artwork}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{date}%
+  \newunit\newblock
+  \iffieldundef{origyear}% 17th ed.
+  {\printdate}%
+  {\usebibmacro{cmsorigdate}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \printfield{howpublished}%
+  \ifthenelse{\iffieldundef{origyear}\OR\iffieldundef{year}}% 17th ed.
+  {}%
+  {\usebibmacro{date}}%
   \newunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{institution+organization}%
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
+  \newunit
+  \printfield{howpublished}% 17th ed.
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}% 17th ed.
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
@@ -731,15 +1014,17 @@
 \DeclareBibliographyDriver{audio}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
   \newunit\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \newcunit%\setunit{\addperiod\addspace}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}% 17th ed.
+  \iffieldundef{eventyear}%
+  {\newcunit}%
+  {\newunit}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
@@ -748,7 +1033,7 @@
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
-  \newunit% unit, not cunit?
+  \usebibmacro{editorpunct}%\newunit%?
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
@@ -809,21 +1094,21 @@
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{bib:xref+date}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%\newunit\newblock
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
     {}%
-    {\usebibmacro{edition}}}%
+    {\usebibmacro{edition}}%
+    \setunit*{\addcomma\addspace}%
+    \usebibmacro{version}}%
   {}%
-  \newunit\newblock% 16th ed.
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{byauthor}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
   \ifboolexpr{%
@@ -841,6 +1126,10 @@
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
+  \newcunit
+  \iffieldundef{version}%
+  {}%
+  {\printfield{version}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \usebibmacro{editorpunct}%\newcunit\newblock
@@ -861,6 +1150,8 @@
   \newcunit
   \printlist[][-\value{listtotal}]{lista}%
   \newunit\newblock
+  \printfield{type}% 17th ed.
+  \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
   \iftoggle{cms@isbn}%
@@ -871,7 +1162,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
     {\usebibmacro{related:init}%
       \usebibmacro{related}%
       \newunit}%
@@ -889,7 +1184,11 @@
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -907,7 +1206,11 @@
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -918,8 +1221,6 @@
 \DeclareBibliographyDriver{bookinbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
   \setunit{\addspace}%
@@ -936,6 +1237,17 @@
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
   \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bookbibxref}%
@@ -977,7 +1289,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -995,7 +1311,11 @@
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1013,19 +1333,51 @@
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
+  \usebibmacro{finentry}}}%
+{\entrydata{\thefield{related}}{%
+    \ifboolexpr{%
+      test {\ifentryinbib{\strfield{clonesourcekey}}}%
+      and
+      not togl {cms@bookbibxref}%
+    }%
+    {\savefield{clonesourcekey}{\cms@shortmtkey}}%
+    {}}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \newunit\newblock%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{booklet}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
   \newunit\newblock% 16th ed.
@@ -1043,7 +1395,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1054,13 +1410,11 @@
 \DeclareBibliographyDriver{collection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{bib:xref+date}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
   \ifboolexpr{%
@@ -1082,6 +1436,14 @@
   \usebibmacro{byeditor+others}%
   \newunit
   \usebibmacro{volume+or+volumes}%
+  \ifcsdef{cms@mtchapter}%
+  {\newcunit\newblock
+    \printfield{chapter}}%
+  {}%
+  \ifcsdef{cms@mtpages}%
+  {\newcunit\newblock
+    \printfield{pages}}%
+  {}%
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
@@ -1099,9 +1461,13 @@
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{bib+doi+url}%
   \newunit\newblock
-  \usebibmacro{pageref}%
+  \usebibmacro{pageref}%!!!\printlist{pageref}::\strlist{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1119,7 +1485,11 @@
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1137,7 +1507,11 @@
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1147,32 +1521,105 @@
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{justauthor}%
+  \iffieldundef{nameaddon}%
+  {\newunit}%
+  {\setunit{\addspace}}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{dataset}{%
+  \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newunit% 16th ed.
+    \usebibmacro{byauthor}%
+    \newunit\newblock
+    \usebibmacro{byeditor+others}%
+    \setunit{\addspace}\newblock%
+    \ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{number}\AND\iffieldundef{type}}%
+    {}%
+    {\printtext[parens]{%
+        \printfield{howpublished}%
+        \newcunit
+        \printfield{type}%
+        \setunit{\addspace}%
+        \printfield{number}}}%
+    \newunit\newblock
+    \printfield{version}%
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{institution+organization}%
+    \setunit*{\addcomma\addspace}\newblock
+    \printlist{location}%
+    \setunit{\addsemicolon\addspace}%
+    \printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}%
   \newunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
+  \iffieldundef{pubstate}%
+  {}%
+  {\iffieldbibstring{pubstate}%
+    {\bibsstring{\thefield{pubstate}}}%
+    {\printfield[prenote]{pubstate}}%
+    \setunit{\addspace}}%
+  \usebibmacro{date}%
+  \clearfield{urlyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
-  \newcunit%\setunit{\addcomma\addspace}%
-  \usebibmacro{date}%
+  \newunit%\setunit{\addcomma\addspace}%
+  \iffieldundef{origyear}%
+  {\printdate}%
+  {\usebibmacro{cmsorigdate}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \printfield{howpublished}%
+  \ifthenelse{\iffieldundef{origyear}\OR\iffieldundef{year}}% 17th ed.
+  {}%
+  {\usebibmacro{date}}%
   \newunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1180,13 +1627,23 @@
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
   \newunit\newblock
+  \printfield{howpublished}% 17th ed.
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}% 17th ed.
+  \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1197,8 +1654,6 @@
 \DeclareBibliographyDriver{inbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
@@ -1208,6 +1663,17 @@
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
@@ -1248,7 +1714,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1267,7 +1737,11 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1286,19 +1760,45 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
+  \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+bib}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{chapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock%
+    \usebibmacro{originally+published+as}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
@@ -1308,6 +1808,17 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
@@ -1348,7 +1859,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1367,7 +1882,11 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1386,19 +1905,45 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
+  \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+bib}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{chapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock%
+    \usebibmacro{originally+published+as}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{inproceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%
@@ -1408,6 +1953,17 @@
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
@@ -1441,7 +1997,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1460,7 +2020,11 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1479,24 +2043,53 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
+  \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+bib}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{chapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock%
+    \usebibmacro{originally+published+as}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{inreference}{%
   \usebibmacro{bibindex}%
+  \iftoggle{cms@mtvolpunct}{\newcunit}{}%
   \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%\newunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
   {\iffieldundef{edition}%
     {}%
     {\usebibmacro{edition}}}%
   {}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%\newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1526,7 +2119,7 @@
   \ifnameundef{author}%
   {}%
   {\printtext{% 16th ed
-      \bibstring{by}%
+      \bibstring{byauthor}%
       \addspace%
       \printnames[byauthor]{author}}}%
   \newunit\newblock
@@ -1540,7 +2133,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1557,8 +2154,6 @@
 \DeclareBibliographyDriver{letter}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \printtext[title]{%
     \printfield[noformat]{title}}%
@@ -1572,6 +2167,17 @@
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
   \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
@@ -1609,7 +2215,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1628,7 +2238,11 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1647,19 +2261,45 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
+  \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+bib}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{chapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock%
+    \usebibmacro{originally+published+as}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{manual}{%
   \usebibmacro{bibindex}%
   \usebibmacro{bibauthor+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
   \newunit\newblock
@@ -1685,7 +2325,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1696,8 +2340,6 @@
 \DeclareBibliographyDriver{misc}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \iffieldundef{entrysubtype}%
   {\usebibmacro{italtitle+stitle}}%
@@ -1709,7 +2351,9 @@
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
     \newcunit\newblock%
-    \usebibmacro{unpubl+letter+date}}%
+    \usebibmacro{unpubl+letter+date}%
+    \newcunit
+    \printlist{origlocation}}% 17th ed.
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
@@ -1723,7 +2367,10 @@
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
-  \usebibmacro{institution+organization}%
+  \iffieldundef{entrysubtype}%
+  {\printfield{venue}\setunit*{\addcomma\addspace}}%
+  {}%
+  \usebibmacro{misc+institution+organization}%
   \setunit*{\addcomma\addspace}\newblock
   \printlist{location}%
   \iffieldundef{entrysubtype}%
@@ -1737,7 +2384,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1748,8 +2399,6 @@
 \DeclareBibliographyDriver{music}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
   \newunit% 16th ed.
@@ -1757,9 +2406,16 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\usebibmacro{byeditor+others}\newunit\newblock}{}%
   \usebibmacro{music+eventdate}%
   \newunit\newblock
-  \usebibmacro{chapinscore}%
+  \printfield{note}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \usebibmacro{chap+as+track}%inscore% 17th ed.
+  \usebibmacro{music+bookauthor}% Ditto.
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
   {\newunit}% Fix customc?
@@ -1767,9 +2423,9 @@
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit% unit, not cunit?
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {}{\usebibmacro{byeditor+others}}%
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}%
   {}%
@@ -1796,15 +2452,15 @@
   \usebibmacro{volume+pages}%
   \newunit\newblock
   \printfield{version}%
-  \newunit\newblock
-  \printfield{note}%
   \newunit\newblock%
-  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \usebibmacro{music+origdate}% Altered for 17th ed.
   \newunit\newblock
   \printlist{publisher}%
   \setunit*{\addcomma\addspace}\newblock
-  \printfield{series}%
-  \setunit{\addspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifboolexpr{test {\iflistundef{publisher}} and test {\iffieldundef{series}}}%
+  {\newunit}%
+  {\setunit{\addspace}}%
   \printfield{number}%
   \newcunit\newblock
   \usebibmacro{date}%
@@ -1815,7 +2471,7 @@
   \newcunit\newblock
   \printfield{type}%
   \newunit\newblock
-  \usebibmacro{pubstate}% 16th ed.
+  \usebibmacro{music+pubstate}% 17th ed.
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
@@ -1827,7 +2483,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1835,35 +2495,494 @@
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
-\DeclareBibliographyAlias{mvbook}{book}
+\DeclareBibliographyDriver{mvbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{related:mtpunct}%\newunit\newpunct%
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \usebibmacro{related:mtpunct}%\newunit\newblock
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \usebibmacro{mt+mvnames+save}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{byauthor}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{part+editor+translator}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{byeditor+others}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\usebibmacro{related:mtpunct}%newunit
+    \usebibmacro{volume+or+volumes}}%
+  \usebibmacro{related:mtpunct}%newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+    \newunit\newblock
+    \usebibmacro{origpubl+loc+year}%cmsorigdate%\printorigdate
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{publ+loc+year}%
+    \newcunit
+    \printlist[][-\value{listtotal}]{lista}%
+    \newunit\newblock
+    \printfield{addendum}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \iftoggle{cms@isbn}%
+    {\printfield{isbn}}%
+    {}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \usebibmacro{bib+doi+url}%
+    \newunit\newblock
+    \usebibmacro{pageref}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{xref}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\unspace% Needed for entries with langid (?)
+  \usebibmacro{related:init}%
+  \usebibmacro{related:mtsave}%
+  \usebibmacro{related}%
+  \newunit\newblock%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}}
 
-\DeclareBibliographyAlias{mvcollection}{collection}
+\DeclareBibliographyDriver{mvcollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{related:mtpunct}%\newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \usebibmacro{mt+mvnames+save}%
+  \usebibmacro{related:mtpunct}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{related:mtpunct}%\newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{byeditor+others}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\usebibmacro{related:mtpunct}%newunit
+    \usebibmacro{volume+or+volumes}}%
+  \usebibmacro{related:mtpunct}%newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+    \newunit\newblock
+    \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{publ+loc+year}%
+    \newunit\newblock
+    \printfield{addendum}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \iftoggle{cms@isbn}%
+    {\printfield{isbn}}%
+    {}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \usebibmacro{bib+doi+url}%
+    \newunit\newblock
+    \usebibmacro{pageref}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{xref}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\unspace% Needed for entries with langid (?)
+  \usebibmacro{related:init}%
+  \usebibmacro{related:mtsave}%
+  \usebibmacro{related}%
+  \newunit\newblock%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}}
 
-\DeclareBibliographyAlias{mvproceedings}{proceedings}
+\DeclareBibliographyDriver{mvproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{related:mtpunct}%\newunit\newblock%
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \usebibmacro{mt+mvnames+save}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{part+editor+translator}%
+  \usebibmacro{related:mtpunct}%
+  \usebibmacro{byeditor+others}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\usebibmacro{related:mtpunct}%newunit
+    \usebibmacro{volume+or+volumes}}%
+  \usebibmacro{related:mtpunct}%newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{org+publ+loc+year}%
+    \newunit\newblock
+    \printfield{addendum}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \iftoggle{cms@isbn}%
+    {\printfield{isbn}}%
+    {}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \usebibmacro{bib+doi+url}%
+    \newunit\newblock
+    \usebibmacro{pageref}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}%
+  {\ifboolexpr{% Changed for 16th ed.
+      test {\ifterm}%
+      or
+      test {\ifpunctmark{*}}%
+    }%
+    {\setunit{\addspace\bibsentence}}%
+    {\setunit{\addperiod\addspace}}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{xref}}%
+    \usebibmacro{xrefpostnote}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\unspace% Needed for entries with langid (?)
+  \usebibmacro{related:init}%
+  \usebibmacro{related:mtsave}%
+  \usebibmacro{related}%
+  \newunit\newblock%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}}
 
-\DeclareBibliographyAlias{mvreference}{reference}
+\DeclareBibliographyDriver{mvreference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock%\usebibmacro{related:mtpunct}% mvref always first
+  \usebibmacro{bybookauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%\usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\newunit
+    \usebibmacro{volume+or+volumes}}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \ifboolexpr{%
+    not togl {cms@related}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+    \newunit\newblock
+    \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+    \newunit\newblock
+    \printfield{note}%
+    \newunit\newblock
+    \usebibmacro{publ+loc+year}%
+    \newunit\newblock
+    \printfield{addendum}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \iftoggle{cms@isbn}%
+    {\printfield{isbn}}%
+    {}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \usebibmacro{bib+doi+url}%
+    \newunit\newblock
+    \usebibmacro{pageref}%
+    \newunit\newblock
+    \ifboolexpr{%
+      togl {cms@related}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+    \usebibmacro{originally+published+as}%
+    \usebibmacro{finentry}}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newunit\newblock%
+    \usebibmacro{pageref}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit% 16th ed.
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printlist{organization}% Rearranged for 16th ed.
+  \IfBeginWith{\thefield{title}}{CCCCCC}%
+  {}%
+  {\usebibmacro{title+stitle}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newunit% 16th ed.
+    \usebibmacro{byauthor}%
+    \newunit\newblock
+    \usebibmacro{byeditor+others}%
+    \newunit\newblock
+    \printlist{organization}% Rearranged for 16th ed.
+    \newunit\newblock
+    \printfield{note}%
+    \newcunit\newblock}% 17th ed.
+  \usebibmacro{date}%
+  \usebibmacro{time+stamp}% Ditto
   \newunit\newblock
-  \printfield{note}%
+  \printfield{type}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    test {\iffieldequalstr{relatedtype}{commenton}}% Ditto
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {}%
   \newunit\newblock
-  \usebibmacro{date}%
+  \printfield{addendum}%
   \newunit\newblock
   \iffieldundef{urlyear}%
   {}%
-  {\printurldate}% Date fix
+  {\printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}% Date fix
   \newunit\newblock
   \iftoggle{cms@doionly}%
   {\iffieldundef{doi}%
@@ -1876,11 +2995,15 @@
   \newunit\newblock
   \printfield{url}%
   \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -1892,7 +3015,14 @@
   \usebibmacro{bibindex}%
   \usebibmacro{author+holder}% + holder?
   \newunit\newblock
-  \usebibmacro{title}%
+  \iffieldundef{title}%
+  {}%
+  {\printtext{%
+      \printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[subtitle]{subtitle}}%
+    \setunit{\ptitleaddonpunct}%
+    \printfield{titleaddon}}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
   \setunit{\addperiod\addspace}%
@@ -1925,19 +3055,67 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{performance}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
   {}%
+  \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{periodical}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
@@ -1965,8 +3143,6 @@
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
@@ -1978,7 +3154,7 @@
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{periodical+issue+year+pages}%
+  \usebibmacro{journal+issue+year+pages}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
@@ -1990,7 +3166,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2001,13 +3181,11 @@
 \DeclareBibliographyDriver{proceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{bib:xref+date}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
   \ifboolexpr{%
@@ -2042,7 +3220,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2060,7 +3242,11 @@
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2078,7 +3264,11 @@
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2088,14 +3278,15 @@
 
 \DeclareBibliographyDriver{reference}{%
   \usebibmacro{bibindex}%
+  \iftoggle{cms@mtvolpunct}{\newcunit}{}%
   \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%\newunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
   {\iffieldundef{edition}%
     {}%
     {\usebibmacro{edition}}}%
   {}%
-  \newunit\newblock
+  \usebibmacro{related:mtpunct}%
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -2130,7 +3321,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2141,8 +3336,6 @@
 \DeclareBibliographyDriver{report}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \iffieldequalstr{entrysubtype}{unpublished}%
   {\usebibmacro{title+stitle}}%
@@ -2152,8 +3345,10 @@
   \newunit\newblock
   \printfield{type}%
   \newcunit
-  \printfield{series}%
-  \setunit{\addnbspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifthenelse{\iffieldundef{type}\AND\iffieldundef{series}}%
+  {\newunit}%
+  {\setunit{\addnbspace}}%
   \printfield{number}%
   \newunit
   \printfield{note}%
@@ -2170,7 +3365,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2184,14 +3383,18 @@
   {\usebibmacro{mag+news+author}}%
   {\usebibmacro{author/editor}}%
   \newunit\newblock
-  \printeventdate% 16th ed.
-  \setunit{\addspace}%
-  \printfield{nameaddon}% 16th ed.
+  \usebibmacro{music+eventdate}% 17th ed.
+  \newcunit\newblock
+  \printeventtime%
   \newunit\newblock
   \ifboolexpr{%
     togl {cms@related}%
     and
+    (
     test {\iffieldequalstr{relatedtype}{reviewof}}%
+    or
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    )
   }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}}%
@@ -2204,23 +3407,126 @@
   \usebibmacro{language+transtitle}%
   \newunit\newblock%
   \usebibmacro{part+editor+translator}%
-  \newunit\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }%
+    {\newunit\newblock%
+      \usebibmacro{issuetitle}%
+      \setunit*{\addcomma\addspace}%
+      \usebibmacro{byeditor+others}%
+      \newunit\newblock% 17th ed. clarifies punctuation
+      \printfield{note}%
+      \setunit*{\addcomma\addspace}\newblock%
+      \iffieldequalstr{entrysubtype}{magazine}%
+      {\usebibmacro{mag+news+date}%
+        \newunit\newblock
+        \printfield{type}%
+        \newcunit\newblock
+        \usebibmacro{chap+pag}}%
+      {\usebibmacro{journal+issue+year+pages}}%
+      \newunit\newblock
+      \printfield{addendum}%
+      \setunit*{\addcomma\addspace}\newblock%
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \setunit*{\addcomma\addspace}\newblock}%
+    {\newcunit\newblock
+      \usebibmacro{chap+pag}%
+      \newunit\newblock
+      \printfield{addendum}%
+      \setunit*{\addcomma\addspace}\newblock}}%
+  {\newcunit\newblock
+    \usebibmacro{chap+pag}%
+    \newunit\newblock
+    \printfield{addendum}%
+    \setunit*{\addcomma\addspace}\newblock}%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{standard}{%
+  \usebibmacro{bibindex}%
+  \ifnameundef{author}%
+  {\iflistundef{organization}%
+    {}%
+    {\ifboolexpr{%
+        test {\iflistequals{organization}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\printtext{\bibnamedash}}%
+      {\printlist{organization}%
+        \savelist{organization}{\bbx@lasthash}}}}%
+  {\usebibmacro{justauthor}}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock
+  \usebibmacro{edition}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
   \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newunit\newblock
+  \newunit\newblock
+  \usebibmacro{series+or+shortser}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
   \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}}%
-  {\usebibmacro{journal+issue+year+pages}}%
+  \newunit\newblock%
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+  \reprintpunct%
+  \iffieldundef{pubstate}%
+  {}%
+  {\iffieldbibstring{pubstate}%
+    {\biblstring{\thefield{pubstate}}}%
+    {\printfield[prenote]{pubstate}}%
+    \newcunit}%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\iflistundef{organization}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}%
+      \printlist{organization}%
+      \setunit*{\addcomma\addspace}}}%
+  {\setunit*{\addcolon\addspace}%
+    \printlist{publisher}%
+    \setunit*{\addcomma\addspace}}%
+  \usebibmacro{date}
+  \setunit{\addsemicolon\addspace}%
+  \printfield{howpublished}%
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
   \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
+  {\printfield{isbn}}%
   {}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{bib+doi+url}%
@@ -2230,7 +3536,7 @@
   \ifboolexpr{%
     togl {cms@related}%
     and
-    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    not test {\iffieldundef{related}}%
   }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
@@ -2242,8 +3548,6 @@
 \DeclareBibliographyDriver{suppbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{inforaft}%
   \setunit{\addspace}\newblock
@@ -2257,6 +3561,8 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \newcunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit\newblock
   \usebibmacro{chap+pag}%
   \newunit\newblock
   \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
@@ -2287,7 +3593,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2302,8 +3612,6 @@
 \DeclareBibliographyDriver{thesis}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}%\newblock%
@@ -2321,7 +3629,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2332,8 +3644,6 @@
 \DeclareBibliographyDriver{unpublished}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%
@@ -2365,7 +3675,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2375,27 +3689,50 @@
 
 \DeclareBibliographyDriver{video}{%
   \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\subtitlepunct}%
-    \printfield[noformat]{subtitle}}%
-  \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\setunit{\ctitleaddonpunct}}%
-  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}%\usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \setunit{\addperiod\addspace}% 16th ed.
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
+  \ifboolexpr{%
+    test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+    and
+    (
+    not test {\iffieldundef{title}}%
+    and
+    not test {\iffieldundef{booktitle}}%
+    )
+  }%
+  {\usebibmacro{author/editor}%
+    \newunit\newblock
+    \printtext[booktitle]{%
+      \printfield[btnoformat]{booktitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sbtnoformat]{booksubtitle}}%
+    \setunit{\ptitleaddonpunct}%
+    \printfield{booktitleaddon}%
+    \setunit*{\addcomma\addspace}%
+    \usebibmacro{title+stitle}%
+    \setunit{\addspace}\newblock%\bibsentence
+    \usebibmacro{language+transtitle}%
+    \setunit{\addperiod\addspace}% 16th ed.
+    \usebibmacro{byauthor}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{part+editor+translator}}%
+  {\usebibmacro{author/editor}%
+    \newunit\newblock
+    \printtext[title]{%
+      \printfield[noformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+    \iffieldundef{booktitle}% Comma after italics, period after quotes
+    {\setunit{\ctitleaddonpunct}}%
+    {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
+    \printfield{titleaddon}%\usebibmacro{title+stitle}%
+    \setunit{\addspace}\newblock%\bibsentence
+    \usebibmacro{language+transtitle}%
+    \setunit{\addperiod\addspace}% 16th ed.
+    \usebibmacro{byauthor}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{part+editor+translator}%
+    \setunit{\addperiod\addspace}%
+    \usebibmacro{chapinscore}%
+    \usebibmacro{btitle+bstitle}}%
   \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
@@ -2432,12 +3769,14 @@
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
   \usebibmacro{music+eventdate}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{usera}%
   \newunit\newblock
   \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
   \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \printfield{type}% 16th ed.
@@ -2452,7 +3791,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2467,8 +3810,15 @@
     togl {cms@url}%
     and
     not test {\iffieldundef{urlyear}}%
+  }%
+  {\printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
     }%
-  {\printurldate}% Date fix
+    {\newcunit\printurltime}%
+    {}}% Date fix
   {}%
   \iffieldundef{addendum}% Punctuation fixes in 0.9.9c
   {\newunit\newblock}%
@@ -2613,6 +3963,7 @@
 
 \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
+  \newunit% MT Fix
   \iffieldundef{maintitle}%
   {}%
   {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
@@ -2637,8 +3988,10 @@
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
-\newbibmacro*{journal+issue+year+pages}{%
-  \usebibmacro{cjournal+ser+vol+num}%
+\newbibmacro*{journal+issue+year+pages}{% 17th ed. eid changes
+  \ifentrytype{periodical}%
+  {\usebibmacro{cperiodical+ser+vol+num}}%
+  {\usebibmacro{cjournal+ser+vol+num}}%
   \ifboolexpr{% 16th ed.
     test {\iffieldundef{issue}}%
     and
@@ -2647,11 +4000,11 @@
     not togl {cms@switchdates}%
   }%
   {\iffieldundef{number}%
-    {\iffieldundef{bookpagination}%
+    {\ifthenelse{\iffieldundef{bookpagination}\AND\iffieldundef{eid}}%
       {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}%
-      \printfield{pages}}%
-    {\newcunit\printfield{pages}}}%
+      \usebibmacro{eid+or+pages}}%
+    {\newcunit\usebibmacro{eid+or+pages}}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
       \iffieldundef{issue}%
@@ -2659,7 +4012,7 @@
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}%
-      \newcunit\printfield{pages}}%
+      \newcunit\usebibmacro{eid+or+pages}}%
     {\setunit{\addspace}%
     \printtext[parens]{%
       \iffieldundef{issue}%
@@ -2668,40 +4021,12 @@
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
     \setunit{\addcolon\addspace}%
-    \printfield{pages}}}}
+    \usebibmacro{eid+or+pages}}}}
 
-\newbibmacro*{periodical+issue+year+pages}{%
-  \usebibmacro{cperiodical+ser+vol+num}%
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}%
-    and
-    test {\iffieldundef{year}}%
-    and
-    not togl {cms@switchdates}%
-  }%
-  {\iffieldundef{number}%
-    {\iffieldundef{bookpagination}%
-      {\setunit{\postvolpunct}}%
-      {\setunit{\addcolon\addspace}}%
-      \printfield{pages}}%
-    {\newcunit\printfield{pages}}}%
-  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
-    {\newcunit%
-      \iffieldundef{issue}%
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}%
-      \newcunit\printfield{pages}}%
-    {\setunit{\addspace}%
-    \printtext[parens]{%
-      \iffieldundef{issue}%
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}%
-    \printfield{pages}}}}
+\newbibmacro*{eid+or+pages}{%
+  \iffieldundef{eid}%
+  {\printfield{pages}}%
+  {\printfield{eid}}}
 
 \newbibmacro*{bycompiler}{%
   \ifnameundef{namec}%
@@ -2852,14 +4177,716 @@
   \usebibmacro{editorpunct}%
   \usebibmacro{withafterword}}
 
+%%%% New date macros enabling special handling of seasons, decades,
+%%%% centuries, date eras, and uncertain dates (circa and ?), along
+%%%% with CMS compression of year ranges.
+
+\newcount\cms@tempcnta
+\newcount\cms@tempcntb
+
+\protected\def\cmsunspecified#1#2{%
+  \ifboolexpr{%
+    test {\iffieldundef{#2dateunspecified}}%
+    or
+    togl {cms@alwaysrange}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{#2endyear}}%
+      or
+      test {\iffieldequalstr{#2dateera}{bce}}%
+      or
+      not togl {cms@compyears}%
+      or
+      not test {\iffieldnum{#2year}}%
+      or
+      not test {\iffieldnum{#2endyear}}%
+      or
+      not test {\if@cms@onlyyears{#2}}%
+    }%
+    {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2year}}%
+    {\cmscompcenturies{#2}%
+      \ifboolexpr{%
+        (
+        test {\if@cms@bracket}%
+        and
+        not test {\if@cms@endbracket}
+        )
+        or
+        (
+        not test {\if@cms@bracket}%
+        and
+        test {\if@cms@endbracket}%
+        )
+        or
+        (
+        test {\if@cms@endcirca}%
+        and
+        not test {\if@cms@circa}%
+        )
+        or
+        not test {\ifnumequal{\cms@tempcnta}{\cms@tempcntb}}%
+      }%
+      {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+      {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}}}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{#2dateunspecified}{yearindecade}}%
+      and
+      test {\ifbibstring{decade}}%
+      and
+      not togl {cms@decaderange}%
+    }%
+    {\cmsmkdecade{#1}{#2}}%
+    {\ifboolexpr{%
+        test {\iffieldequalstr{#2dateunspecified}{yearincentury}}%
+        and
+        test {\ifbibstring{century}}%
+        and
+        not togl {cms@centuryrange}%
+      }%
+      {\cmsmkcentury{#2}}%
+      {\iftoggle{cms@compyears}%
+        {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+          \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}}}}}%
+
+\protected\def\cmscompressyears#1{%
+  \def\cms@tempa{\thefield{#1year}--\thefield{#1endyear}}%
+  \edef\cms@tempb{\mkcomprange{\csuse{cms@tempa}}}%
+  \cms@tempb}%
+
+\def\cmscompcenturies#1{%
+  \cms@tempcnta=\thefield{#1year}%
+  \divide\cms@tempcnta100
+  \cms@tempcntb=\thefield{#1endyear}%
+  \divide\cms@tempcntb100}
+
+\protected\def\cmsformatextra{}% Author-date requires these
+
+\protected\def\cmsformatendextra{}%
+
+\newbibmacro*{cmsextradate}{}%
+
+\newbibmacro*{cmsparensextradate}{}%
+
+\protected\def\cmsdateeraprintpre#1{% AD/BC order depends on language
+  \ifdefstring\blx@dateera{astronomical}%
+  {\iffieldnum{#1}%
+    {\begingroup%
+      \let\blx@tempa\@empty%
+      \blx@ifstrendswith{#1}{endyear}%
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+        \def\blx@tempa{end}}%
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifnumless{0-\thefield{#1}}{0}%
+        {\printtext{\csuse{bibdateera\blx@tempa prefix}}}%
+        {}}%
+      {}%
+      \endgroup}%
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      test {\if@cms@adfirst}%
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}{}{\global\toggletrue{cms@bc}}}%
+        {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+          {\ifdefstring\blx@tempa{end}%
+            {\iftoggle{cms@bc}%
+              {\printtext{%
+                  \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+                \global\togglefalse{cms@bc}}%
+              {}}%
+            {\printtext{%
+                \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+              \global\togglefalse{cms@bc}}}%
+          {}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\protected\def\cmsdateeraprint#1{% AD/BC order depends on language
+  \ifboolexpr{%
+    test {\ifdefstring\blx@dateera{christian}}%
+    and
+    test {\if@cms@adfirst}%
+  }%
+  {\iffieldnum{#1}
+    {\begingroup
+      \let\blx@tempa\@empty
+      \blx@ifstrendswith{#1}{endyear}
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype
+        \def\blx@tempa{end}}
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifdefstring\blx@tempa{end}%
+        {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+          \printtext{\printdelim{dateeradelim}\midsentence%
+            \bibsstring{\blx@dateera@bce}}\relax%
+          \fi}%
+        {\csuse{if\blx@datetype enddateera}{bce}%
+          {}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}\relax%
+            \fi}}}%
+      {}%
+      \endgroup}
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{secular}}%
+      or
+      (
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      not test {\if@cms@adfirst}%
+      )
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}\relax%
+            \fi}%
+          {\csuse{if\blx@datetype enddateera}{bce}%
+            {}%
+            {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+              \printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@bce}}\relax%
+              \fi}}}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+            {\printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@ce}}}%
+            {}}%
+          {\csuse{if\blx@datetype enddateera}{ce}%
+            {}%
+            {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+              {\printtext{\printdelim{dateeradelim}\midsentence%
+                  \bibsstring{\blx@dateera@ce}}}%
+              {}}}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\newrobustcmd*{\cms@datebrackets}{%
+  \iftoggle{cms@nodatebrackets}%
+  {\global\boolfalse{cms:bracket}%
+    \ifboolexpr{%
+      test {\if@cms@bracket}%
+      and
+      togl {cms@nodates}%
+      and
+      not bool {cms:nd}%
+    }%
+    {\booltrue{cms:nd}\bibstring{nodate}\addcomma\addspace}%
+    {\boolfalse{cms:nd}}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@yearbrackets}{%
+  \iftoggle{cms@noyearbrackets}%
+  {\global\boolfalse{cms:bracket}%
+    \ifboolexpr{%
+      test {\if@cms@bracket}%
+      and
+      togl {cms@nodates}%
+      and
+      not bool {cms:nd}
+    }%
+    {\booltrue{cms:nd}\bibstring{nodate}\addcomma\addspace}%
+    {\boolfalse{cms:nd}}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@mkbibrangetrunc}[2]{% DATE FIX
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2day}}%
+          {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+            {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+              \clearfield{#2endyear}}% Clear up inheritance problem ???
+            {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkbibrangefull}[2]{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+        \ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkyearrangeextra}[3][]{%
+  \begingroup
+  \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}%
+  \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}%
+  \blx@metadateinfo{#3}%
+  \iffieldundef{#3year}
+  {\blx@nounit}%
+  {\printtext{%
+      \if@cms@bracket%
+      {\cms@yearbrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \ifdateyearsequal{#3}{#3end}%
+      {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3endyear}%
+        \clearfield{#3endyear}}%
+      {\ifblank{#1}%
+        {\cmsunspecified{#2}{#3}}%
+        {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#3endyear}
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#3endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@yearbrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \csuse{mkbibdate#2}{#3endyear}{}{}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#3endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#3endyear}}}%
+          {\if@cms@enduncertain%
+            {\bibdateuncertain}%
+            {}%
+            \cmsdateeraprint{#3endyear}}}}}}%
+  \endgroup}%
+
+\def\if@cms@adfirst{%
+  \ifboolexpr{%
+    test {\ifdefstring\blx@languagename{american}}%
+    or
+    test {\ifdefstring\blx@languagename{british}}%
+    or
+    test {\ifdefstring\blx@languagename{canadian}}%
+    or
+    test {\ifdefstring\blx@languagename{english}}%
+    or
+    test {\ifdefstring\blx@languagename{UKenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{USenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{australian}}%
+    or
+    test {\ifdefstring\blx@languagename{newzealand}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@bracket{%
+  \ifboolexpr{%
+    (
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endbracket{%
+  \ifboolexpr{%
+    (
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@circa{%
+  \ifboolexpr{%
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@uncertain{%
+  \ifboolexpr{%
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endcirca{%
+  \ifboolexpr{%
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@enduncertain{%
+  \ifboolexpr{%
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@onlyyears#1{%
+  \ifboolexpr{%
+    test {\iffieldundef{#1month}}%
+    and
+    test {\iffieldundef{#1endmonth}}%
+    and
+    test {\iffieldundef{#1day}}%
+    and
+    test {\iffieldundef{#1endday}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
 %%%% Related functionality from standard.bbx %%%%
 
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
+\newcounter{cms@reviewcount}%
+\newcounter{cms@currentnote}%
 
 \newbibmacro*{related:init}{%
   \csundef{bbx:relatedloop}}
 
+\newbibmacro*{related:mtpunct}{%
+  \iftoggle{cms@mtvolpunct}%
+  {\newcunit\newblock}%
+  {\newunit\newblock}}
+
+\newbibmacro*{related:mtsave}{%
+  \iffieldundef{pages}{}{\savefield*{pages}{\cms@mtpages}}%
+  \iffieldundef{bookpagination}{}{\savefield*{bookpagination}%
+    {\cms@mtpagination}}%
+  \iffieldundef{chapter}{}{\savefield*{chapter}{\cms@mtchapter}}}%
+
+\newbibmacro*{mt+mvnames+save}{%
+  \ifnameundef{author}{}{\savename*{author}{\cms@mtauthor}}%
+  \ifnameundef{editor}{}{\savename*{editor}{\cms@mteditor}}%
+  \ifnameundef{translator}{}{\savename*{translator}{\cms@mttranslator}}%
+  \ifnameundef{namec}{}{\savename*{namec}{\cms@mtnamec}}}%
+
+\newbibmacro*{related:noterefhelper}{%
+  \iftoggle{cms@noterefs}%
+  {\iftoggle{cms@endnote}%
+    {\ifnumequal{\value{cms@currentnote}}{\value{endnote}}%
+      {}%
+      {\csxdef{cms@parent@instcount}{\the\value{instcount}}%
+        \ifcsdef{cms@chap@\thefield{entrykey}}%
+        {\csxdef{cms@parent@chap}{\csuse{cms@chap@\thefield{entrykey}}}}%
+        {}%
+        \ifcsdef{cms@sec@\thefield{entrykey}}%
+        {\csxdef{cms@parent@sec}{\csuse{cms@sec@\thefield{entrykey}}}}%
+        {}%
+        \setcounter{cms@currentnote}{\value{endnote}}%
+        \def\cms@templista{}%
+        \def\cms@templistb{}}}%
+    {\ifnumequal{\value{cms@currentnote}}{\value{footnote}}%
+      {}%
+      {\csxdef{cms@parent@instcount}{\the\value{instcount}}%
+        \ifcsdef{cms@chap@\thefield{entrykey}}%
+        {\csxdef{cms@parent@chap}{\csuse{cms@chap@\thefield{entrykey}}}}%
+        {}%
+        \ifcsdef{cms@sec@\thefield{entrykey}}%
+        {\csxdef{cms@parent@sec}{\csuse{cms@sec@\thefield{entrykey}}}}%
+        {}%
+        \setcounter{cms@currentnote}{\value{footnote}}%
+        \def\cms@templista{}%
+        \def\cms@templistb{}}}%
+    \def\do##1{%
+      \entrydata{##1}{%
+        \listxadd\cms@templista{\strfield{clonesourcekey}}%
+        \listxadd\cms@templistb{\strfield{crossref}}%
+        \listxadd\cms@templistb{\strfield{xref}}}}%
+    \docsvfield{related}%
+    \def\do##1{%
+      \xifinlistcs{##1}{blx@bsee@\the\c@refsection}%
+      {\iftoggle{cms@relreview}%
+        {}%
+        {\csxdef{cbx@f@##1}{\csuse{cms@parent@instcount}}%
+          \csxdef{cms@recent@##1}{\csuse{cms@parent@instcount}}%
+          \csxdef{cms@invl@##1}%
+          {\the\value{\csuse{cms@noteref@interval}}}%
+          \ifcsdef{cms@parent@chap}%
+          {\csxdef{cms@chap@##1}{\csuse{cms@parent@chap}}}%
+          {}%
+          \ifcsdef{cms@parent@sec}%
+          {\csxdef{cms@sec@##1}{\csuse{cms@parent@sec}}}%
+          {}}}%
+      {\iftoggle{cms@relreview}%
+        {}%
+        {\listcsxadd{blx@bsee@\the\c@refsection}{##1}}%
+        \csxdef{cbx@f@##1}{\csuse{cms@parent@instcount}}%
+        \csxdef{cms@recent@##1}{\csuse{cms@parent@instcount}}%
+        \csxdef{cms@invl@##1}%
+        {\the\value{\csuse{cms@noteref@interval}}}%
+        \ifcsdef{cms@parent@chap}%
+        {\csxdef{cms@chap@##1}{\csuse{cms@parent@chap}}}%
+        {}%
+        \ifcsdef{cms@parent@sec}%
+        {\csxdef{cms@sec@##1}{\csuse{cms@parent@sec}}}%
+        {}}%
+    }%
+    \dolistloop{\cms@templista}%
+    \def\do##1{%
+      \csxdef{cbx@f@##1}{\csuse{cms@parent@instcount}}%
+      \csxdef{cms@recent@##1}{\csuse{cms@parent@instcount}}%
+      \csxdef{cms@invl@##1}%
+      {\value{\csuse{cms@noteref@interval}}}%
+      \ifcsdef{cms@parent@chap}%
+      {\csxdef{cms@chap@##1}{\csuse{cms@parent@chap}}}%
+      {}%
+      \ifcsdef{cms@parent@sec}%
+      {\csxdef{cms@sec@##1}{\csuse{cms@parent@sec}}}%
+      {}%
+    }%
+    \ifdefvoid{\cms@templistb}{}{\dolistloop{\cms@templistb}}}%
+  {}}%
+
 \newbibmacro*{begrelated}{\ifcsdef{bbx@lasthash}%
   {\let\cms@related@hash\bbx@lasthash}{}}%
 \newbibmacro*{endrelated}{\ifcsdef{cms@related@hash}%
@@ -2875,7 +4902,10 @@
 \newbibmacro*{related}{%
   \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }%
     {}%
-    {\usebibmacro{begrelated}%
+    {\ifcsundef{begrelateddelim\strfield{relatedtype}}%
+       {\printunit{\begrelateddelim}}%
+       {\printunit{\csuse{begrelateddelim\strfield{relatedtype}}}}%
+     \usebibmacro{begrelated}%
      \def\bbx@tempa{}%
      \setcounter{bbx:relatedtotal}{0}%
      \def\do##1{%
@@ -2895,7 +4925,13 @@
         \def\do{%
           \stepcounter{bbx:relatedcount}%
           \ifnumgreater{\value{bbx:relatedcount}}{1}%
-            {\printtext{\relateddelim}}%
+            {\ifcsundef{relateddelim\strfield{relatedtype}}%
+              {\printunit{\relateddelim}}%
+              {\expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter\printunit
+                \expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter{%
+                  \csuse{relateddelim\strfield{relatedtype}}}}}%
             {}}%
         \ifbibmacroundef{related:\strfield{relatedtype}}%
           {\appto{\do}{\usebibmacro{related:default}}}%
@@ -2929,4 +4965,272 @@
        {}%
      \usebibmacro{endrelated}}}%
 
+%%% List of all CMS bibliography strings %%%
+
+\NewBibliographyString{%
+   afterwordto,%
+   broadcast,%
+   by,%
+   bychoreographer,%
+   bycompileraf,%
+   bycompileran,%
+   bycompileranaf,%
+   bycompileranfo,%
+   bycompileranin,%
+   bycompilerco,%
+   bycompilercoaf,%
+   bycompilercofo,%
+   bycompilercoin,%
+   bycompilerfo,%
+   bycompilerin,%
+   byconductor,%
+   bydirector,%
+   byeditoralt,%
+   byeditorcp,%
+   byeditorcpaf,%
+   byeditorcpan,%
+   byeditorcpanaf,%
+   byeditorcpanfo,%
+   byeditorcpanin,%
+   byeditorcpco,%
+   byeditorcpcoaf,%
+   byeditorcpcofo,%
+   byeditorcpcoin,%
+   byeditorcpfo,%
+   byeditorcpin,%
+   byeditortrcp,%
+   byeditortrcpaf,%
+   byeditortrcpan,%
+   byeditortrcpanaf,%
+   byeditortrcpanfo,%
+   byeditortrcpanin,%
+   byeditortrcpco,%
+   byeditortrcpcoaf,%
+   byeditortrcpcofo,%
+   byeditortrcpcoin,%
+   byeditortrcpfo,%
+   byeditortrcpin,%
+   bynone,%
+   byproducer,%
+   bytranslatorcp,%
+   bytranslatorcpaf,%
+   bytranslatorcpan,%
+   bytranslatorcpanaf,%
+   bytranslatorcpanfo,%
+   bytranslatorcpanin,%
+   bytranslatorcpco,%
+   bytranslatorcpcoaf,%
+   bytranslatorcpcofo,%
+   bytranslatorcpcoin,%
+   bytranslatorcpfo,%
+   bytranslatorcpin,%
+   canadasection,%
+   canadasections,%
+   cbyannotator,%
+   cbyauthor,%
+   cbychoreographer,%
+   cbycollaborator,%
+   cbycommentator,%
+   cbycompiler,%
+   cbycompileraf,%
+   cbycompileran,%
+   cbycompileranaf,%
+   cbycompileranfo,%
+   cbycompileranin,%
+   cbycompilerco,%
+   cbycompilercoaf,%
+   cbycompilercofo,%
+   cbycompilercoin,%
+   cbycompilerfo,%
+   cbycompilerin,%
+   cbyconductor,%
+   cbycontinuator,%
+   cbydirector,%
+   cbyeditor,%
+   cbyeditoraf,%
+   cbyeditoralt,%
+   cbyeditoran,%
+   cbyeditoranaf,%
+   cbyeditoranfo,%
+   cbyeditoranin,%
+   cbyeditorco,%
+   cbyeditorcoaf,%
+   cbyeditorcofo,%
+   cbyeditorcoin,%
+   cbyeditorcp,%
+   cbyeditorcpaf,%
+   cbyeditorcpan,%
+   cbyeditorcpanaf,%
+   cbyeditorcpanfo,%
+   cbyeditorcpanin,%
+   cbyeditorcpco,%
+   cbyeditorcpcoaf,%
+   cbyeditorcpcofo,%
+   cbyeditorcpcoin,%
+   cbyeditorcpfo,%
+   cbyeditorcpin,%
+   cbyeditorfo,%
+   cbyeditorin,%
+   cbyeditortr,%
+   cbyeditortraf,%
+   cbyeditortran,%
+   cbyeditortranaf,%
+   cbyeditortranfo,%
+   cbyeditortranin,%
+   cbyeditortrco,%
+   cbyeditortrcoaf,%
+   cbyeditortrcofo,%
+   cbyeditortrcoin,%
+   cbyeditortrcp,%
+   cbyeditortrcpaf,%
+   cbyeditortrcpan,%
+   cbyeditortrcpanaf,%
+   cbyeditortrcpanfo,%
+   cbyeditortrcpanin,%
+   cbyeditortrcpco,%
+   cbyeditortrcpcoaf,%
+   cbyeditortrcpcofo,%
+   cbyeditortrcpcoin,%
+   cbyeditortrcpfo,%
+   cbyeditortrcpin,%
+   cbyeditortrfo,%
+   cbyeditortrin,%
+   cbyfounder,%
+   cbynone,%
+   cbyorganizer,%
+   cbyproducer,%
+   cbyredactor,%
+   cbytranslator,%
+   cbytranslatoraf,%
+   cbytranslatoran,%
+   cbytranslatoranaf,%
+   cbytranslatoranfo,%
+   cbytranslatoranin,%
+   cbytranslatorco,%
+   cbytranslatorcoaf,%
+   cbytranslatorcofo,%
+   cbytranslatorcoin,%
+   cbytranslatorcp,%
+   cbytranslatorcpaf,%
+   cbytranslatorcpan,%
+   cbytranslatorcpanaf,%
+   cbytranslatorcpanfo,%
+   cbytranslatorcpanin,%
+   cbytranslatorcpco,%
+   cbytranslatorcpcoaf,%
+   cbytranslatorcpcofo,%
+   cbytranslatorcpcoin,%
+   cbytranslatorcpfo,%
+   cbytranslatorcpin,%
+   cbytranslatorfo,%
+   cbytranslatorin,%
+   century,%
+   cfromamerican,%
+   cfrombrazilian,%
+   cfrombulgarian,%
+   cfromcatalan,%
+   cfromcroatian,%
+   cfromczech,%
+   cfromdanish,%
+   cfromdutch,%
+   cfromenglish,%
+   cfromestonian,%
+   cfromfinnish,%
+   cfromfrench,%
+   cfromgalician,%
+   cfromgerman,%
+   cfromgreek,%
+   cfromitalian,%
+   cfromjapanese,%
+   cfromlatin,%
+   cfromnorwegian,%
+   cfrompolish,%
+   cfromportuguese,%
+   cfromrussian,%
+   cfromslovak,%
+   cfromslovene,%
+   cfromspanish,%
+   cfromswedish,%
+   cfromukrainian,%
+   choreographer,%
+   choreographers,%
+   commenton,%
+   conductor,%
+   conductors,%
+   decade,%
+   director,%
+   directors,%
+   discrecorded,%
+   edamerican,%
+   edbrazilian,%
+   edbulgarian,%
+   edcatalan,%
+   edcroatian,%
+   edczech,%
+   eddanish,%
+   eddutch,%
+   edenglish,%
+   edestonian,%
+   edfinnish,%
+   edfrench,%
+   edgalician,%
+   edgerman,%
+   edgreek,%
+   editalian,%
+   editorcompiler,%
+   editorcompilers,%
+   editortranscompiler,%
+   editortranscompilers,%
+   editortranslator,%
+   editortranslators,%
+   edjapanese,%
+   edlatin,%
+   ednorwegian,%
+   edpolish,%
+   edportuguese,%
+   edrussian,%
+   edslovak,%
+   edslovene,%
+   edspanish,%
+   edswedish,%
+   edukrainian,%
+   forewordto,%
+   hereinafter,%
+   inlang,%
+   introductionto,%
+   none,%
+   nones,%
+   note,%
+   numbers,%
+   of,%
+   on,%
+   origedition,%
+   origpub,%
+   origpublin,%
+   origpubyear,%
+   origpubyearalt,%
+   origreleaseyear,%
+   origshownyear,%
+   partvolume,%
+   patentfiled,%
+   patentissued,%
+   preface,%
+   printed,%
+   producer,%
+   producers,%
+   pseudonym,%
+   review,%
+   revisededition,%
+   selfpublished,%
+   songrecorded,%
+   subsection,%
+   subsections,%
+   subverbis,%
+   subverbo,%
+   supranote,%
+   track,%
+   transcompiler,%
+   transcompilers%
+ }%
+
 \endinput
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 2839e02015b..82f4a000d69 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,23 +1,27 @@
-% $Id: chicago-notes.cbx,v 0.11.1.33 2018/01/10 16:41:54 dfussner Exp $
+% This is a biblatex citation style file, originally 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.
 
-% 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}[2018/01/10 v 3.10 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2020/04/20 v 3.14 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
+\newbool{cms:bracket}% Date-handling booleans
+\newbool{cms:extraparens}
+\newbool{cms:comma}
+\newbool{cms:nd}
+
 \providecommand*{\mkibid}[1]{#1}
 
 \providetoggle{cms@oneyear}% Needed for author-date
-\providetoggle{cms@reprint}% ditto
 \providetoggle{cms@switchdates}% ditto
 
 \providetoggle{cms@jrcomma}% For comma before Jr./Sr.
 
 \providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@urltime}% 17th ed.
 \providetoggle{cms@doi}
 \providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
@@ -25,14 +29,27 @@
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
 \providetoggle{cms@hidevolumes}% Modify volume fix
+\providetoggle{cms@mtvolpunct}
 \providetoggle{cms@bookseries}
+\providetoggle{cms@citeshser}% For shortseries
+\providetoggle{cms@bibshser}
 \providetoggle{cms@notefield}
 \providetoggle{cms@addendum}
 \providetoggle{cms@comprange}
+\providetoggle{cms@compyears}
 \providetoggle{cms@modpostnote}
 \providetoggle{cms@url@innotes}
 \providetoggle{cms@ukord}
 
+\providetoggle{cms@bc}% Attempt to provide correct dateera handling
+\providetoggle{cms@alwaysrange}% Turns off decade and century handling
+\providetoggle{cms@decaderange}% Only turns off decade handling
+\providetoggle{cms@centuryrange}% Only turns off century handling
+\providetoggle{cms@nodatebrackets}% For brackets in uncertain & circa
+\providetoggle{cms@noyearbrackets}%
+\providetoggle{cms@nodates}%
+
+\providetoggle{cms@strict}
 \providetoggle{cms@headlessnote}
 \providetoggle{cms@origcite}
 \providetoggle{cms@fullnote}
@@ -40,6 +57,8 @@
 \providetoggle{cms@allshort}
 \providetoggle{cms@noibid}
 \providetoggle{cms@noidem}
+\providetoggle{cms@namedash}
+\providetoggle{cms@useibid}
 \providetoggle{cms@usecompiler}
 \providetoggle{cms@shorthandibid}
 \providetoggle{cms@printshhand}
@@ -53,6 +72,15 @@
 \providetoggle{cms@legalnotes}% For legal types
 \providetoggle{cms@supranotes}% Ditto
 \providetoggle{cms@noneshort}% Ditto
+\providetoggle{cms@running@text}% For Jurisdiction entries
+\providetoggle{cms@noterefs}% Backrefs inside notes
+\providetoggle{cms@forcenoteref}% For shortrefcite command
+\providetoggle{cms@zeropages}% For replacing zero sections
+\providetoggle{cms@hidezeros}% Ditto, but differently
+\providetoggle{cms@fullrefs}% Force printing of sec. no. w/in same sec.
+\providetoggle{cms@ensplit}% Split endnotes w/o cmsendnotes
+\providetoggle{cms@endnote}% Distinguish foot- and endnotes
+\providetoggle{cms@relreview}%
 \providetoggle{cms@vol}
 \providetoggle{cms@postvol}
 \providetoggle{cms@usedvol}
@@ -64,6 +92,7 @@
 \providetoggle{cms@xrefpart}
 \providetoggle{cms@omitxrefdate}
 \providetoggle{cms@xrefurl}
+\providetoggle{cms@blogurl}% For 17th ed. blogs w/ comments
 \providetoggle{cms@related}
 \providetoggle{cms@citerel}
 \providetoggle{cms@gencite}
@@ -75,9 +104,6 @@
   {\nocite{\thefield{userc}}}%
   \global\togglefalse{cms@loccit}%
   \global\csundef{@cmsst}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
   \ifboolexpr{%
     test {\iffieldundef{origyear}}%
     or
@@ -108,47 +134,703 @@
   \PackageWarningNoLine{biblatex-chicago}{#1}%
   \endgroup}
 
-\DeclareBibliographyOption[boolean]{genallnames}[true]{%
-  \settoggle{cms@genallnames}{#1}}
+%% These are options for extended date attributes
+
+\DeclareBiblatexOption{global,entry}[boolean]{alwaysrange}[true]{%
+  \settoggle{cms@alwaysrange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{decaderange}[true]{%
+  \settoggle{cms@decaderange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{centuryrange}[true]{%
+  \settoggle{cms@centuryrange}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodatebrackets}[true]{%
+  \settoggle{cms@nodatebrackets}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{noyearbrackets}[true]{%
+  \settoggle{cms@noyearbrackets}{#1}}%
 
-\DeclareEntryOption[boolean]{genallnames}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{genallnames}[true]{%
   \settoggle{cms@genallnames}{#1}}
 
 \DeclareBibliographyOption{annotation}[true]{%
   \global\toggletrue{cms@annotation}}
 
-\DeclareBibliographyOption{noibid}[true]{%
+\DeclareBibliographyOption[boolean]{noibid}[true]{%
   \global\toggletrue{cms@noibid}}
 
+\DeclareBibliographyOption[boolean]{useibid}[true]{%
+  \global\toggletrue{cms@useibid}}
+
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
+  \settoggle{cms@namedash}{#1}}
+
 \DeclareBibliographyOption[boolean]{short}[true]{%
   \global\settoggle{cms@allshort}{#1}}
 
+\DeclareBibliographyOption[boolean]{hidezeros}[true]{%
+  \global\settoggle{cms@hidezeros}{#1}}
+
+\DeclareEntryOption[boolean]{hidezeros}[true]{%
+  \settoggle{cms@hidezeros}{#1}}
+
+\DeclareBibliographyOption[boolean]{pagezeros}[true]{%
+  \global\settoggle{cms@zeropages}{#1}}
+
+\DeclareEntryOption[boolean]{pagezeros}[true]{%
+  \settoggle{cms@zeropages}{#1}}
+
+\DeclareBibliographyOption[boolean]{endnotesplit}[true]{%
+  \global\settoggle{cms@ensplit}{#1}}
+
+\DeclareBibliographyOption[integer]{noterefinterval}[0]{%
+  \gdef\cms@note@distance{#1}}%
+
+\DeclareBibliographyOption[string]{noterefintro}[preface]{%
+  \def\cms@note@introname{#1}}%
+
+\DeclareBiblatexOption{global}[boolean]{fullnoterefs}[true]{%
+  \global\settoggle{cms@fullrefs}{#1}}%
+
+\DeclareBibliographyOption[string]{noteref}[none]{%
+  \global\toggletrue{cms@noterefs}%
+  \ifcsdef{cms@opt@noterefs@#1}%
+  {\letcs\cms@noteref@casenum{cms@opt@noterefs@#1}%
+    \def\cms@noteref@interval{#1}%
+    \def\cms@note@distance{0}}%
+  {\blx@err@invopt{noteref=#1}{}}}%
+\def\cms@opt@noterefs@none{0}%
+\def\cms@opt@noterefs@part{1}%
+\def\cms@opt@noterefs@chapter{2}%
+\def\cms@opt@noterefs@section{3}%
+\def\cms@opt@noterefs@subsection{4}%
+\def\cms@opt@noterefs@page{5}%
+
+\newbibmacro*{noteref+interval}{%
+  \ifcase\cms@noteref@casenum% 0
+  \cms@noteref{none}%
+  \or % 1
+  \cms@noteref{part}%
+  \or % 2
+  \cms@noteref{chapter}%
+  \or % 3
+  \cms@noteref{section}%
+  \or % 4
+  \cms@noteref{subsection}%
+  \or % 5
+  \cms@noteref{page}%
+  \fi}
+
+\newrobustcmd*{\cms@noteref}[1]{%
+  \ifcsundef{cms@recent@\thefield{entrykey}}%
+  {\cms@warning@noline%
+    {I can't find a long citation of\MessageBreak
+      the entry \thefield{entrykey}.\MessageBreak
+      Most likely the initial citation\MessageBreak
+      did not occur inside a note, or\MessageBreak
+      perhaps you used a \citejournal\MessageBreak
+      command for it. Biblatex-chicago\MessageBreak
+      won't be able to generate a back\MessageBreak
+      reference to it}}%
+  {\ifboolexpr{%
+      ((
+      test {\iffieldequalstr{relatedtype}{reviewof}}%
+      or
+      test {\iffieldequalstr{relatedtype}{commenton}}% 17th ed.
+      )
+      and
+      (
+      test {\ifentrytype{review}}%
+      or
+      test {\ifentrytype{suppperiodical}}%
+      or
+      (
+      test {\ifentrytype{online}}% 17th ed.
+      and
+      test {\IfBeginWith{\thefield{title}}{CCCCCC}}%
+      )))
+      or
+      (
+      test {\IfBeginWith{\thefield{relatedtype}}{maintitl}}%
+      and
+      test {\IfBeginWith{\thefield{entrytype}}{mv}}%
+      )
+    }%
+    {\csdef{cms@tempcounta}{\value{cms@reviewcount}}}%
+    {\csdef{cms@tempcounta}{\value{instcount}}}%
+    \ifboolexpr{%
+      test {\ifsamepage{\csuse{cms@tempcounta}}%{\the\value{instcount}}
+        {\csuse{cms@recent@\thefield{entrykey}}}}% Replaces cbx@f@...
+      and
+      not togl {cms@forcenoteref}%
+    }%
+    {}%
+    {\ifboolexpr{%
+        test {\ifnumless{\csuse{cms@tempcounta} -
+            \csuse{cms@recent@\thefield{entrykey}}}%
+          {\csuse{cms@note@distance}}}%
+        and
+        not togl {cms@forcenoteref}%
+      }%
+      {}%
+      {\ifnumequal{\csuse{cms@opt@noterefs@#1}}{0}%
+        {\setunit{\addspace\bibopenparen}%
+          \bibsstring{seenote}\addnbspace
+          \printtext{\ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+          \bibcloseparen}%
+        {\ifboolexpr{%
+            (
+            not test {\ifcsvoid{cms@end@split}}%
+            and
+            togl {cms@endnote}%
+            )
+            or
+            togl {cms@ensplit}%
+            or
+            test {\ifnumequal{\csuse{cms@opt@noterefs@#1}}{5}}%
+          }%
+          {\ifnumequal{\csuse{cms@opt@noterefs@#1}}{5}%
+            {\setunit{\addspace\bibopenparen}%
+              \bibstring{see}\addnbspace\bibsstring{page}\addnbspace%
+              \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+              \newcunit%
+              \bibsstring{note}\addnbspace%
+              \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+              \bibcloseparen}%
+            {\iftoggle{cms@ensplit}%
+              {\setunit{\addspace\bibopenparen}%
+                \bibstring{see}\addnbspace%
+                \getrefbykeydefault{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                    {name}{}%
+                \newcunit%
+                \bibsstring{note}\addnbspace%
+                \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                \bibcloseparen}%
+              {\setunit{\addspace\bibopenparen}%
+                \bibstring{see}\addnbspace%
+                \StrCut{%
+                  \getrefbykeydefault{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                  {name}{}}{\ }{\cms@AA}{\cms@BB}%
+                \ifcsvoid{cms@BB}%
+                {}%
+                {\StrLeft{\expandafter\string\cms@BB}{5}[\cms@CC]%
+                  \StrGobbleLeft{\expandafter\string\cms@CC}{1}[\cms@CC]}%
+                \ifboolexpr{%
+                  test {\ifcsvoid{cms@BB}}%
+                  or
+                  test {\ifdefstring{\cms@CC}{zeri}}%
+                }%
+                {\ifcsvoid{cms@BB}%
+                  {\ifbibxstring{\csuse{cms@note@introname}}%
+                    {\bibsstring{\csuse{cms@note@introname}}}%
+                    {\csuse{cms@note@introname}}}%
+                  {\ifbibxstring{\csuse{cms@note@introname}}%
+                    {\bibsstring{\csuse{cms@note@introname}}%
+                      \addcomma\addspace\cms@BB}%
+                    {\csuse{cms@note@introname}%
+                      \addcomma\addspace\cms@BB}}}%
+                {\ifcsvoid{cms@end@subheadername}%
+                  {\ifbibxstring{\csuse{cms@end@split}}%
+                    {\bibsstring{\csuse{cms@end@split}}\addnbspace\cms@BB}%
+                    {\csuse{cms@end@split}\addnbspace\cms@BB}}%
+                  {\ifbibxstring{\csuse{cms@end@subheadername}}%
+                    {\bibsstring{\csuse{cms@end@subheadername}}%
+                      \addnbspace\cms@BB}%
+                    {\csuse{cms@end@subheadername}\addnbspace\cms@BB}}}%
+                \newcunit%
+                \bibsstring{note}\addnbspace%
+                \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                \bibcloseparen}}}%
+          {\ifnumless{\csuse{cms@opt@noterefs@#1}}{3}%
+            {\ifboolexpr{%
+                test {\ifnumcomp{\value{\csuse{cms@noteref@interval}}}{>}%
+                  {\csuse{cms@invl@\thefield{entrykey}}}}%
+                or
+                togl {cms@fullrefs}%
+              }%
+              {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                {\ifcsundef{cms@note@introname}%
+                  {\iftoggle{cms@zeropages}%
+                    {\setunit{\addspace\bibopenparen}%
+                      \bibstring{see}\addnbspace\bibsstring{page}%
+                      \addnbspace%
+                      \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                      \newcunit%
+                      \bibsstring{note}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                      \bibcloseparen}%
+                    {\setunit{\addspace\bibopenparen}%
+                      \bibstring{see}\addnbspace%
+                      \bibsstring{\csuse{cms@noteref@interval}}\addnbspace%
+                      \printtext{\csuse{cms@invl@\thefield{entrykey}}}%
+                      \newcunit%
+                      \bibsstring{note}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                      \bibcloseparen}}%
+                  {\setunit{\addspace\bibopenparen}%
+                    \bibstring{see}\addnbspace%
+                    \cms@ifcsstring{cms@note@introname}\newcunit%
+                    \bibsstring{note}\addnbspace%
+                    \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                    \bibcloseparen}}%
+                {\setunit{\addspace\bibopenparen}%
+                  \bibstring{see}\addnbspace%
+                  \printtext[nr#1]{\csuse{cms@invl@\thefield{entrykey}}}%
+                  \newcunit%
+                  \bibsstring{note}\addnbspace%
+                  \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                  \bibcloseparen}}%
+              {\setunit{\addspace\bibopenparen}%
+                \printtext{\bibsstring{seenote}\addnbspace%
+                  \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+                \bibcloseparen}}%
+            {\ifnumequal{\csuse{cms@opt@noterefs@#1}}{3}%
+              {\ifundef{\chapter}%
+                {\ifboolexpr{%
+                    test {\ifnumcomp{\value{\csuse{cms@noteref@interval}}}{>}%
+                      {\csuse{cms@invl@\thefield{entrykey}}}}%
+                    or
+                    togl {cms@fullrefs}%
+                  }%
+                  {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                    {\ifcsundef{cms@note@introname}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}%
+                      {\setunit{\addspace\bibopenparen}%
+                        \bibstring{see}\addnbspace%
+                        \cms@ifcsstring{cms@note@introname}\newcunit%
+                        \bibsstring{note}\addnbspace%
+                        \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                        \bibcloseparen}}%
+                    {\setunit{\addspace\bibopenparen}%
+                      \bibstring{see}\addnbspace%
+                      \bibsstring{section}\addnbspace%
+                      \printtext{\csuse{cms@invl@\thefield{entrykey}}}%
+                      \newcunit%
+                      \bibsstring{note}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                      \bibcloseparen}}%
+                  {\setunit{\addspace\bibopenparen}%
+                    \printtext{\bibsstring{seenote}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+                    \bibcloseparen}}%
+                {\ifboolexpr{%
+                    test {\ifnumcomp{\value{\csuse{cms@noteref@interval}}}{>}%
+                      {\csuse{cms@invl@\thefield{entrykey}}}}%
+                    or
+                    test {\ifnumcomp{\value{chapter}}{>}%
+                      {\csuse{cms@chap@\thefield{entrykey}}}}%
+                    or
+                    togl {cms@fullrefs}%
+                  }%
+                  {\ifnumequal{\csuse{cms@chap@\thefield{entrykey}}}{0}%
+                    {\ifcsundef{cms@note@introname}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                            \csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}%
+                      {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \cms@ifcsstring{cms@note@introname}\newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \cms@ifcsstring{cms@note@introname}\newcunit%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}}%
+                    {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\iftoggle{cms@hidezeros}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{%
+                              \csuse{cms@chap@\thefield{entrykey}}.%
+                              1\addnbspace\mkbibparens{\cmspref}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                              \csuse{cms@invl@\thefield{entrykey}}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}}}%
+                      {\setunit{\addspace\bibopenparen}%
+                        \bibstring{see}\addnbspace%
+                        \bibsstring{section}\addnbspace%
+                        \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                          \csuse{cms@invl@\thefield{entrykey}}}%
+                        \newcunit%
+                        \bibsstring{note}\addnbspace%
+                        \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                        \bibcloseparen}}}%
+                  {\setunit{\addspace\bibopenparen}%
+                    \printtext{\bibsstring{seenote}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+                    \bibcloseparen}}}%
+              {\ifundef{\chapter}%
+                {\ifboolexpr{%
+                    test {\ifnumcomp{\value{\csuse{cms@noteref@interval}}}{>}%
+                      {\csuse{cms@invl@\thefield{entrykey}}}}%
+                    or
+                    test {\ifnumcomp{\value{section}}{>}%
+                      {\csuse{cms@sec@\thefield{entrykey}}}}%
+                    or
+                    togl {cms@fullrefs}%
+                  }%
+                  {\ifnumequal{\csuse{cms@sec@\thefield{entrykey}}}{0}%
+                    {\ifcsundef{cms@note@introname}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@sec@\thefield{entrykey}}.%
+                            \csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}%
+                      {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \cms@ifcsstring{cms@note@introname}\newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \cms@ifcsstring{cms@note@introname}\newcunit%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}}%
+                    {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\iftoggle{cms@hidezeros}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{%
+                              \csuse{cms@sec@\thefield{entrykey}}.%
+                              1\addnbspace\mkbibparens{\cmspref}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{\csuse{cms@sec@\thefield{entrykey}}.%
+                              \csuse{cms@invl@\thefield{entrykey}}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}}}%
+                      {\setunit{\addspace\bibopenparen}%
+                        \bibstring{see}\addnbspace%
+                        \bibsstring{section}\addnbspace%
+                        \printtext{\csuse{cms@sec@\thefield{entrykey}}.%
+                          \csuse{cms@invl@\thefield{entrykey}}}%
+                        \newcunit%
+                        \bibsstring{note}\addnbspace%
+                        \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                        \bibcloseparen}}}%
+                  {\setunit{\addspace\bibopenparen}%
+                    \printtext{\bibsstring{seenote}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+                    \bibcloseparen}}%
+                {\ifboolexpr{%
+                    test {\ifnumcomp{\value{\csuse{cms@noteref@interval}}}{>}%
+                      {\csuse{cms@invl@\thefield{entrykey}}}}%
+                    or
+                    test {\ifnumcomp{\value{chapter}}{>}%
+                      {\csuse{cms@chap@\thefield{entrykey}}}}%
+                    or
+                    test {\ifnumcomp{\value{section}}{>}%
+                      {\csuse{cms@sec@\thefield{entrykey}}}}%
+                    or
+                    togl {cms@fullrefs}%
+                  }%
+                  {\ifnumequal{\csuse{cms@chap@\thefield{entrykey}}}{0}%
+                    {\ifcsundef{cms@note@introname}%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \bibsstring{section}\addnbspace%
+                          \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                            \csuse{cms@sec@\thefield{entrykey}}.%
+                            \csuse{cms@invl@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}}%
+                      {\ifboolexpr{%
+                          test
+                          {\ifnumequal{\csuse{cms@sec@\thefield{entrykey}}}%
+                            {0}}%
+                          and
+                          test
+                          {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}%
+                            {0}}%
+                        }%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace%
+                          \cms@ifcsstring{cms@note@introname}\newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\ifboolexpr{%
+                            togl {cms@zeropages}%
+                            and
+                            (
+                            test
+                            {\ifnumequal{\csuse{cms@sec@\thefield{entrykey}}}%
+                              {0}}%
+                            or
+                            test
+                            {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}%
+                              {0}}%
+                            )
+                          }%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \cms@ifcsstring{cms@note@introname}\newcunit%
+                            \bibsstring{page}%
+                            \addnbspace%
+                            \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \cms@ifcsstring{cms@note@introname}\newcunit%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{\csuse{cms@sec@\thefield{entrykey}}.%
+                              \csuse{cms@invl@\thefield{entrykey}}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}}}}%
+                    {\ifboolexpr{%
+                        test
+                        {\ifnumequal{\csuse{cms@sec@\thefield{entrykey}}}{0}}%
+                        or
+                        test
+                        {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}{0}}%
+                      }%
+                      {\iftoggle{cms@zeropages}%
+                        {\setunit{\addspace\bibopenparen}%
+                          \bibstring{see}\addnbspace\bibsstring{page}%
+                          \addnbspace%
+                          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \newcunit%
+                          \bibsstring{note}\addnbspace%
+                          \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                          \bibcloseparen}%
+                        {\iftoggle{cms@hidezeros}%
+                          {\ifnumequal{\csuse{cms@sec@\thefield{entrykey}}}%
+                            {0}%
+                            {\ifnumequal{\csuse{cms@invl@\thefield{entrykey}}}%
+                              {0}%
+                              {\setunit{\addspace\bibopenparen}%
+                                \bibstring{see}\addnbspace%
+                                \bibsstring{section}\addnbspace%
+                                \printtext{%
+                                  \csuse{cms@chap@\thefield{entrykey}}.%
+                                  1\addnbspace\mkbibparens{\cmspref}}%
+                                \newcunit%
+                                \bibsstring{note}\addnbspace%
+                                \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                                \bibcloseparen}%
+                              {\setunit{\addspace\bibopenparen}%
+                                \bibstring{see}\addnbspace%
+                                \bibsstring{section}\addnbspace%
+                                \printtext{%
+                                  \csuse{cms@chap@\thefield{entrykey}}.%
+                                  \cmspref\adddot%
+                                  \csuse{cms@invl@\thefield{entrykey}}}%
+                                \newcunit%
+                                \bibsstring{note}\addnbspace%
+                                \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                                \bibcloseparen}}%
+                            {\setunit{\addspace\bibopenparen}%
+                              \bibstring{see}\addnbspace%
+                              \bibsstring{section}\addnbspace%
+                              \printtext{%
+                                \csuse{cms@chap@\thefield{entrykey}}.%
+                                \csuse{cms@sec@\thefield{entrykey}}.%
+                                1\addnbspace\mkbibparens{\cmspref}}%
+                              \newcunit%
+                              \bibsstring{note}\addnbspace%
+                              \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                              \bibcloseparen}}%
+                          {\setunit{\addspace\bibopenparen}%
+                            \bibstring{see}\addnbspace%
+                            \bibsstring{section}\addnbspace%
+                            \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                              \csuse{cms@sec@\thefield{entrykey}}.%
+                              \csuse{cms@invl@\thefield{entrykey}}}%
+                            \newcunit%
+                            \bibsstring{note}\addnbspace%
+                            \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                            \bibcloseparen}}}%
+                      {\setunit{\addspace\bibopenparen}%
+                        \bibstring{see}\addnbspace%
+                        \bibsstring{section}\addnbspace%
+                        \printtext{\csuse{cms@chap@\thefield{entrykey}}.%
+                          \csuse{cms@sec@\thefield{entrykey}}.%
+                          \csuse{cms@invl@\thefield{entrykey}}}%
+                        \newcunit%
+                        \bibsstring{note}\addnbspace%
+                        \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+                        \bibcloseparen}}}%
+                  {\setunit{\addspace\bibopenparen}%
+                    \printtext{\bibsstring{seenote}\addnbspace%
+                      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}%
+                    \bibcloseparen}}}}}}%
+        \ifnumequal{\csuse{cms@tempcounta}}{\value{cms@reviewcount}}%
+        {\csxdef{cms@recent@\thefield{entrykey}}%
+          {\the\value{cms@reviewcount}}}%
+        {\csxdef{cms@recent@\thefield{entrykey}}{\the\value{instcount}}}}}}}%
+
+\newrobustcmd*{\cmspref}{pref.\@}%
+\newrobustcmd*{\cmsintrosection}{\S}%
+
+\newrobustcmd*{\cms@ifcsstring}[1]{%
+  \ifbibxstring{\csuse{#1}}%
+  {\bibsstring{\csuse{#1}}}%
+  {\csuse{#1}}}
+
+\newrobustcmd*{\cms@save@locdata}[1]{%
+  \iftoggle{cms@noterefs}%
+  {\csxdef{cbx@f@\thefield{#1}}{\the\value{instcount}}%
+    \csxdef{cms@recent@\thefield{#1}}{\the\value{instcount}}%
+    \ifcase\cms@noteref@casenum%
+    \or% 1
+    \csxdef{cms@invl@\thefield{#1}}%
+    {\the\value{\csuse{cms@noteref@interval}}}%
+    \or% 2
+    \csxdef{cms@invl@\thefield{#1}}%
+    {\the\value{\csuse{cms@noteref@interval}}}%
+    \or% 3
+    \ifundef{\chapter}%
+    {\csxdef{cms@invl@\thefield{#1}}%
+      {\the\value{\csuse{cms@noteref@interval}}}}%
+    {\csxdef{cms@invl@\thefield{#1}}%
+      {\the\value{\csuse{cms@noteref@interval}}}%
+      \csxdef{cms@chap@\thefield{#1}}{\the\value{chapter}}}%
+    \or% 4
+    \ifundef{\chapter}%
+    {\csxdef{cms@invl@\thefield{#1}}%
+      {\the\value{\csuse{cms@noteref@interval}}}%
+      \csxdef{cms@sec@\thefield{#1}}{\the\value{section}}}%
+    {\csxdef{cms@invl@\thefield{#1}}%
+      {\the\value{\csuse{cms@noteref@interval}}}%
+      \csxdef{cms@sec@\thefield{#1}}{\the\value{section}}%
+      \csxdef{cms@chap@\thefield{#1}}{\the\value{chapter}}}%
+    \or% 5
+    \csxdef{cms@invl@\thefield{#1}}%
+    {\the\value{\csuse{cms@noteref@interval}}}%
+    \fi}%
+  {}}
+
 \DeclareBibliographyOption[boolean]{legalnotes}[true]{%
   \global\settoggle{cms@legalnotes}{#1}}
 
-\DeclareBibliographyOption[boolean]{supranotes}[true]{%
-  \global\settoggle{cms@supranotes}{#1}}
-
-\DeclareEntryOption[boolean]{supranotes}[true]{%
-  \global\settoggle{cms@supranotes}{#1}}
+\DeclareBiblatexOption{global,entry}[boolean]{supranotes}[true]{%
+  \settoggle{cms@supranotes}{#1}}
 
-\DeclareBibliographyOption[boolean]{noneshort}[true]{%
-  \global\settoggle{cms@noneshort}{#1}}
-
-\DeclareTypeOption[boolean]{noneshort}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{noneshort}[true]{%
   \settoggle{cms@noneshort}{#1}}
 
-\DeclareEntryOption[boolean]{noneshort}[true]{%
-  \settoggle{cms@noneshort}{#1}}
-
-\DeclareBibliographyOption{shorthandibid}[true]{%
+\DeclareBibliographyOption[boolean]{shorthandibid}[true]{%
   \global\toggletrue{cms@shorthandibid}}
 
-\DeclareBibliographyOption{shorthandfull}[true]{%
+\DeclareBibliographyOption[boolean]{shorthandfull}[true]{%
   \settoggle{cms@fullshhand}{#1}}
 
-\DeclareBibliographyOption{inheritshorthand}[true]{%
-  \settoggle{cms@inheritshhand}{#1}
+\DeclareBibliographyOption[boolean]{inheritshorthand}[true]{%
+  \settoggle{cms@inheritshhand}{#1}%
   \iftoggle{cms@inheritshhand}%
   {\DeclareDataInheritance{*}{*}{%
   \inherit{shorthand}{shorthand}
@@ -156,24 +838,16 @@
   }}%
   {}}%
 
-\DeclareBibliographyOption[boolean]{shorthandfirst}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{shorthandfirst}[true]{%
   \settoggle{cms@firstshort}{#1}}
 
-\DeclareEntryOption[boolean]{shorthandfirst}[true]{%
-  \settoggle{cms@firstshort}{#1}}
+\DeclareBibliographyOption[boolean]{compresspages}[true]{%
+  \global\settoggle{cms@comprange}{#1}}%
 
-\DeclareBibliographyOption{compresspages}[true]{%
-  \ifcsdef{cms@opt@crange@#1}%
-  {\csuse{cms@opt@crange@#1}}%
-  {\blx@err@invopt{compresspages=#1}{}}}%
-\def\cms@opt@crange@true{%
-  \global\toggletrue{cms@comprange}%
-  \setcounter{mincomprange}{100}%
-  \setcounter{mincompwidth}{10}%
-}%
-\def\cms@opt@crange@false{}%
+\DeclareBibliographyOption[boolean]{compressyears}[true]{%
+  \global\settoggle{cms@compyears}{#1}}%
 
-\DeclareBibliographyOption{postnotepunct}[true]{%
+\DeclareBibliographyOption[string]{postnotepunct}[true]{%
   \ifcsdef{cms@opt@ppunct@#1}%
   {\csuse{cms@opt@ppunct@#1}}%
   {\blx@err@invopt{postnotepunct=#1}{}}}%
@@ -181,25 +855,16 @@
   \global\toggletrue{cms@modpostnote}}%
 \def\cms@opt@ppunct@false{}%
 
-\DeclareBibliographyOption[boolean]{usecompiler}[true]{%
-  \settoggle{blx@usenamec}{#1}}
-
-\DeclareEntryOption[boolean]{usecompiler}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
   \settoggle{blx@usenamec}{#1}}
 
-\DeclareBibliographyOption{juniorcomma}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{juniorcomma}[true]{%
   \settoggle{cms@jrcomma}{#1}}
 
-\DeclareEntryOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareBibliographyOption{delayvolume}[true]{%
-  \settoggle{cms@postvol}{#1}}
-
-\DeclareEntryOption{delayvolume}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{delayvolume}[true]{%
   \settoggle{cms@postvol}{#1}}
 
-\DeclareBibliographyOption{longcrossref}[false]{%
+\DeclareBiblatexOption{global,entry}[string]{longcrossref}[false]{%
   \ifcsdef{cms@opt@lxref@#1}%
   {\csuse{cms@opt@lxref@#1}}%
   {\blx@err@invopt{longcrossref=#1}{}}}%
@@ -221,12 +886,7 @@
   \togglefalse{cms@citecrossref}%
   \toggletrue{cms@bibcrossref}}%
 
-\DeclareEntryOption{longcrossref}[false]{%
-  \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}%
-  {\blx@err@invopt{longcrossref=#1}{}}}%
-
-\DeclareBibliographyOption{booklongxref}[true]{%
+\DeclareBiblatexOption{global,entry}[string]{booklongxref}[true]{%
   \ifcsdef{cms@opt@bklxref@#1}%
   {\csuse{cms@opt@bklxref@#1}}%
   {\blx@err@invopt{booklongxref=#1}{}}}%
@@ -243,24 +903,16 @@
   \togglefalse{cms@bookcitexref}%
   \toggletrue{cms@bookbibxref}}%
 
-\DeclareEntryOption{booklongxref}[true]{%
-  \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}%
-  {\blx@err@invopt{booklongxref=#1}{}}}%
-
-\DeclareBibliographyOption{omitxrefdate}[true]{%
-  \settoggle{cms@omitxrefdate}{#1}}%
-
-\DeclareEntryOption{omitxrefdate}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{omitxrefdate}[true]{%
   \settoggle{cms@omitxrefdate}{#1}}%
 
-\DeclareBibliographyOption[boolean]{xrefurl}[true]{%
+\DeclareBiblatexOption{global,entry}[boolean]{xrefurl}[true]{%
   \settoggle{cms@xrefurl}{#1}}%
 
-\DeclareEntryOption[boolean]{xrefurl}[true]{%
-  \settoggle{cms@xrefurl}{#1}}%
+\DeclareBibliographyOption[boolean]{blogurl}[true]{%
+  \settoggle{cms@blogurl}{#1}}%
 
-\DeclareBibliographyOption[string]{journalabbrev}[false]{%
+\DeclareBiblatexOption{global,entry}[string]{journalabbrev}[false]{%
   \ifcsdef{cms@opt@jtabb@#1}%
   {\csuse{cms@opt@jtabb@#1}}%
   {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
@@ -281,31 +933,43 @@
   \togglefalse{cms@citejtabb}%
   \toggletrue{cms@bibjtabb}}%
 
-\DeclareEntryOption[string]{journalabbrev}[false]{%
-  \ifcsdef{cms@opt@jtabb@#1}%
-  {\csuse{cms@opt@jtabb@#1}}%
-  {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
-    {'journalabbrev=#1' isn't a valid option.\MessageBreak
+\DeclareBiblatexOption{global,type,entry}[string]{seriesabbrev}[false]{%
+  \ifcsdef{cms@opt@shser@#1}%
+  {\csuse{cms@opt@shser@#1}}%
+  {\csuse{cms@opt@shser@false}\cms@warning@noline%
+    {'seriesabbrev=#1' isn't a valid option.\MessageBreak
       The default - 'false' - has been set.\MessageBreak
       Please see biblatex-chicago.pdf for valid\MessageBreak
       option keys}}}%
+\def\cms@opt@shser@true{%
+  \toggletrue{cms@citeshser}%
+  \toggletrue{cms@bibshser}}%
+\def\cms@opt@shser@false{%
+  \togglefalse{cms@citeshser}%
+  \togglefalse{cms@bibshser}}%
+\def\cms@opt@shser@notes{%
+  \toggletrue{cms@citeshser}%
+  \togglefalse{cms@bibshser}}%
+\def\cms@opt@shser@bib{%
+  \togglefalse{cms@citeshser}%
+  \toggletrue{cms@bibshser}}%
 
 \DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
   \settoggle{cms@ukord}{#1}}%
 
 % The field-exclusion options %
 
-\DeclareBibliographyOption[boolean]{urlnotes}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlnotes}[true]{%
   \settoggle{cms@url@innotes}{#1}}%
 
-\DeclareEntryOption[boolean]{urlnotes}[true]{%
-  \settoggle{cms@url@innotes}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlstamp}[true]{%
+  \settoggle{cms@urltime}{#1}}%
 
-\DeclareBibliographyOption{isbn}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}%
-\DeclareBibliographyOption{url}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{url}[true]{%
   \settoggle{cms@url}{#1}}%
-\DeclareBibliographyOption{doi}[true]{%
+\DeclareBiblatexOption{global,type,entry}[string]{doi}[true]{%
   \ifcsdef{cms@opt@doi@#1}%
   {\csuse{cms@opt@doi@#1}}%
   {\blx@err@invopt{doi=#1}{}}}%
@@ -315,64 +979,35 @@
   \togglefalse{cms@doi}}%
 \def\cms@opt@doi@only{%
   \toggletrue{cms@doionly}}%
-\DeclareBibliographyOption{eprint}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}%
-\DeclareBibliographyOption{numbermonth}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{numbermonth}[true]{%
   \settoggle{cms@numbermonth}{#1}}%
-\DeclareBibliographyOption{bookpages}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookpages}[true]{%
   \settoggle{cms@bookpages}{#1}}%
-\DeclareBibliographyOption{includeall}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{includeall}[true]{%
   \settoggle{cms@isbn}{#1}%
   \settoggle{cms@url}{#1}%
+  \settoggle{cms@urltime}{#1}% 17th ed.
   \settoggle{cms@doi}{#1}%
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
   \settoggle{cms@bookpages}{#1}}%
-\DeclareBibliographyOption{hidevolumes}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{hidevolumes}[true]{%
   \settoggle{cms@hidevolumes}{#1}}%
 
-\DeclareBibliographyOption{addendum}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{addendum}[true]{%
   \settoggle{cms@addendum}{#1}}%
-\DeclareBibliographyOption{bookseries}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookseries}[true]{%
   \settoggle{cms@bookseries}{#1}}%
-\DeclareBibliographyOption{notefield}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{notefield}[true]{%
   \settoggle{cms@notefield}{#1}}%
 \DeclareBibliographyOption{completenotes}[true]{%
   \settoggle{cms@addendum}{#1}%
   \settoggle{cms@bookseries}{#1}%
   \settoggle{cms@notefield}{#1}}%
 
-\DeclareEntryOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}%
-\DeclareEntryOption{url}[true]{%
-  \settoggle{cms@url}{#1}}%
-\DeclareEntryOption{doi}[true]{%
-  \ifcsdef{cms@opt@doi@#1}%
-  {\iftoggle{cms@doi}%
-    {\togglefalse{cms@doi}%
-      \iftoggle{cms@doionly}%
-      {\togglefalse{cms@doionly}}% !!
-      {}}%
-    {\toggletrue{cms@doi}}% !!
-    \csuse{cms@opt@doi@#1}}%
-  {\blx@err@invopt{doi=#1}{}}}%
-\DeclareEntryOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}%
-\DeclareEntryOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}%
-\DeclareEntryOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}%
-\DeclareEntryOption{hidevolumes}[true]{%
-  \settoggle{cms@hidevolumes}{#1}}%
-
-\DeclareEntryOption{addendum}[true]{%
-  \settoggle{cms@addendum}{#1}}%
-\DeclareEntryOption{bookseries}[true]{%
-  \settoggle{cms@bookseries}{#1}}%
-\DeclareEntryOption{notefield}[true]{%
-  \settoggle{cms@notefield}{#1}}%
-
-\DeclareBibliographyOption[string]{related}[bib]{%
+\DeclareBiblatexOption{global,type,entry}[string]{related}[bib]{%
   \ifcsdef{cms@opt@rel@#1}%
   {\csuse{cms@opt@rel@#1}}%
   {\csuse{cms@opt@rel@bib}\cms@warning@noline%
@@ -393,39 +1028,18 @@
   \settoggle{cms@citerel}{true}%
   \settoggle{cms@related}{false}}%
 
-\DeclareEntryOption[string]{related}[bib]{%
-  \ifcsdef{cms@opt@rel@#1}%
-  {\csuse{cms@opt@rel@#1}}%
-  {\csuse{cms@opt@rel@bib}\cms@warning@noline%
-    {'related=#1' is not a valid option.\MessageBreak
-      The default - 'bib' - has been set.\MessageBreak
-      Please see biblatex-chicago.pdf for valid\MessageBreak
-      option keys}}}%
-
 % Adding a disambiguating field to short notes otherwise identical %
 
-\DeclareBibliographyOption[string]{shortextrafield}{%
-  \def\cms@xfield{#1}}%
-
-\DeclareTypeOption[string]{shortextrafield}{%
-  \def\cms@xfield{#1}}%
-
-\DeclareEntryOption[string]{shortextrafield}{%
+\DeclareBiblatexOption{global,type,entry}[string]{shortextrafield}{%
   \def\cms@xfield{#1}}%
 
-\DeclareBibliographyOption[string]{shortextraformat}{%
-  \def\cms@xformat{#1}}%
-
-\DeclareTypeOption[string]{shortextraformat}{%
-  \def\cms@xformat{#1}}%
-
-\DeclareEntryOption[string]{shortextraformat}{%
+\DeclareBiblatexOption{global,type,entry}[string]{shortextraformat}{%
   \def\cms@xformat{#1}}%
 
-\DeclareBibliographyOption[string]{shortextrapunct}[comma]{%
+\DeclareBiblatexOption{global,type,entry}[string]{shortextrapunct}[comma]{%
   \ifcsdef{cms@opt@shxp@#1}%
     {\csuse{cms@opt@shxp@#1}}%
-    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
+    {\csuse{cms@opt@shxp@comma}\cms@warning@noline%
       {'shortextrapunct=#1' is not a valid option.\MessageBreak
         The default - 'comma' - has been set.\MessageBreak
         Please see biblatex-chicago.pdf for valid\MessageBreak
@@ -443,27 +1057,9 @@
 \def\cms@opt@shxp@period{%
   \def\shortextrapunct{\addperiod\addspace}}%
 
-\DeclareTypeOption[string]{shortextrapunct}[comma]{%
-  \ifcsdef{cms@opt@shxp@#1}%
-    {\csuse{cms@opt@shxp@#1}}%
-    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
-      {'shortextrapunct=#1' is not a valid option.\MessageBreak
-        The default - 'comma' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
-\DeclareEntryOption[string]{shortextrapunct}[comma]{%
-  \ifcsdef{cms@opt@shxp@#1}%
-    {\csuse{cms@opt@shxp@#1}}%
-    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
-      {'shortextrapunct=#1' is not a valid option.\MessageBreak
-        The default - 'comma' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-  
 % Controlling punctuation before titleaddon fields %
 
-\DeclareBibliographyOption[string]{ptitleaddon}[period]{%
+\DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
   \ifcsdef{cms@opt@ptao@#1}%
     {\csuse{cms@opt@ptao@#1}}%
     {\csuse{cms@opt@ptao@period}\cms@warning@noline%
@@ -484,16 +1080,7 @@
 \def\cms@opt@ptao@period{%
   \def\ptitleaddonpunct{\addperiod\addspace}}%
 
-\DeclareEntryOption[string]{ptitleaddon}[period]{%
-  \ifcsdef{cms@opt@ptao@#1}%
-    {\csuse{cms@opt@ptao@#1}}%
-    {\csuse{cms@opt@ptao@period}\cms@warning@noline%
-      {'ptitleaddon=#1' is not a valid option.\MessageBreak
-        The default - 'period' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
-\DeclareBibliographyOption[string]{ctitleaddon}[comma]{%
+\DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
   \ifcsdef{cms@opt@ctao@#1}%
     {\csuse{cms@opt@ctao@#1}}%
     {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
@@ -514,18 +1101,9 @@
 \def\cms@opt@ctao@period{%
   \def\ctitleaddonpunct{\addperiod\addspace}}%
 
-\DeclareEntryOption[string]{ctitleaddon}[comma]{%
-  \ifcsdef{cms@opt@ctao@#1}%
-    {\csuse{cms@opt@ctao@#1}}%
-    {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
-      {'ctitleaddon=#1' is not a valid option.\MessageBreak
-        The default - 'comma' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
 % Controlling punctuation before shorthand in notes %
 
-\DeclareBibliographyOption[string]{shorthandpunct}[space]{%
+\DeclareBiblatexOption{global,type,entry}[string]{shorthandpunct}[space]{%
   \ifcsdef{cms@opt@shp@#1}%
     {\csuse{cms@opt@shp@#1}}%
     {\csuse{cms@opt@shp@space}\cms@warning@noline%
@@ -550,18 +1128,11 @@
 \def\cms@opt@shp@endash{%
   \def\shorthandpunct{\addspace\textendash\addspace}}%
 
-\DeclareEntryOption[string]{shorthandpunct}[space]{%
-  \ifcsdef{cms@opt@shp@#1}%
-    {\csuse{cms@opt@shp@#1}}%
-    {\csuse{cms@opt@shp@space}\cms@warning@noline%
-      {'shorthandpunct=#1' isn't a valid option.\MessageBreak
-        The default - 'space' - has been set.\MessageBreak
-        Please see biblatex-chicago.pdf for valid\MessageBreak
-        option keys}}}%
-
 \ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
   related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes,%
-  legalnotes,supranotes,shortextrapunct}
+  legalnotes,supranotes,shortextrapunct,dashed}
+
+\ExecuteBibliographyOptions[standard]{useeditor=false,usenamec=false}%
 
 \iftoggle{cms@legalnotes}%
 {\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
@@ -569,33 +1140,38 @@
 
 % For author-date compatibility %
 
-\DeclareEntryOption{switchdates}[true]{%
+\DeclareEntryOption[boolean]{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}%
 
 \DeclareEntryOption{cmsdate}{}%
 
 \DeclareBibliographyOption{cmsdate}{}%
 
-\DeclareBibliographyOption{strict}[true]{%
-  \let\splitfootnoterule\footnoterule
-  \renewcommand\footnoterule{}%
-  \advance\skip\footins 4\p@\@plus2\p@\relax
-  \gdef\split@prev{0}
-  \let\pagefootnoterule\footnoterule
-  % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
-  \def\footnoterule{\relax
-    \ifnum\split@prev=\z@
-    \pagefootnoterule
-    \else
-    \splitfootnoterule
-    \fi
-    \xdef\split@prev{\the\insertpenalties}%
-  }}
+\DeclareBibliographyOption[boolean]{strict}[true]{%
+  \settoggle{cms@strict}{#1}%
+  \iftoggle{cms@strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split@prev{0}
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split@prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split@prev{\the\insertpenalties}%
+    }}%
+  {}}
 
 
 \protected\def\blx@newcunit{%
-  \global\let\blx@unitpunct\newcunitpunct
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}%
+  {}%
+  {\global\let\blx@unitpunct\newcunitpunct
+    \global\toggletrue{blx@unit}}}%
 
 \appto\blx@blxinit{%
   \let\newcunit\blx@newcunit}
@@ -670,7 +1246,7 @@
            \usebibmacro{cite:save}}%
           {\global\toggletrue{cms@shortnote}%
             \global\togglefalse{cms@fullnote}%
-            \usebibmacro{cite:short}%
+            \usebibmacro{cite:short}{\thefield{entrytype}}%
            \usebibmacro{cite:save}}}%
        {\iftoggle{cms@shorthandibid}%
          {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -694,12 +1270,12 @@
          {\global\toggletrue{cms@shortnote}%
            \global\togglefalse{cms@fullnote}%
            \global\toggletrue{cms@printshhand}%
-           \usebibmacro{cite:short}%
+           \usebibmacro{cite:short}{\thefield{entrytype}}%
            \usebibmacro{cite:save}}%
          {\global\toggletrue{cms@fullnote}%
            \global\togglefalse{cms@shortnote}%
-           \usebibmacro{cite:full}%
            \usebibmacro{footcite:save}% FIXME!!
+           \usebibmacro{cite:full}%
            \usebibmacro{cite:save}}}}}%
 
 \newbibmacro*{cite:full}{%
@@ -708,17 +1284,14 @@
       {\DeclareNameAlias{sortname}{default}\frenchspacing}%
       {cite:\thefield{entrytype}}}}%
 
-\newbibmacro*{cite:short}{%
-  \ifentrytype{jurisdiction}%
-  {\usebibmacro{cite:short:jurisdiction}}%
-  {\ifentrytype{legal}%
-    {\usebibmacro{cite:short:legal}}%
-    {\ifentrytype{legislation}%
-      {\usebibmacro{cite:short:legislation}}%
-      {\usebibmacro{cite:short:cms}}}}}%
-
-\newbibmacro*{cite:short:cms}{% was cite:short
-  \usebibmacro{allshort+firstcite+xref}%
+% {<entrytype>}
+\newbibmacro*{cite:short}[1]{%
+  \global\let\cms@pnsaved\undefined%
+  \ifcsundef{cite:short:#1}%
+  {\csuse{cite:short:book}}%
+  {\csuse{cite:short:#1}}}
+
+\newbibmacro*{cite:short:ibid}{% For 17th edition
   \ifthenelse{\ifnameundef{labelname}\OR%
     \ifentrytype{inreference}\OR%
     \ifentrytype{reference}\OR%
@@ -741,77 +1314,41 @@
           togl {cms@bibjtabb}%
           ))
         }%
-        {\printfield[shortjournal]{shortjournal}\newcunit}%
-        {\printfield[journaltitle]{journaltitle}\newcunit}}%
+        {\cmshyper{\printfield[shortjournal]{shortjournal}}\newcunit}%
+        {\cmshyper{\printfield[journaltitle]{journaltitle}}\newcunit}}%
       {}}%
     {\ifentrytype{manual}%
-      {\printlist{organization}\isdot\newcunit}%
-      {}}}%
-  {\ifboolexpr{%
-      test {\ifciteidem}%
-      and
-      not test {\ifbibliography}%
-      and
-      not test {\iffirstonpage}%
-      and
-      not togl {cms@noidem}%
-      and
-      not togl {cms@headlessnote}%
-    }%
-    {\bibstring[\mkibid]{idem\thefield{gender}}%
-      \classicpunct}%
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{labelname}%
+      {\cmshyper{\printlist{organization}\isdot}\newcunit}%
+      {\ifboolexpr{%
+          test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+          and
+          not test {\iffieldundef{title}}%
+          and
+          not test {\iffieldundef{booktitle}}%
+          and
+          test {\iffieldundef{shorttitle}}%
+        }%
+        {\cmshyper{\printtext[booktitle]{%
+              \printfield[btnoformat]{booktitle}%
+              \setunit{\subtitlepunct}%
+              \printfield[sbtnoformat]{booksubtitle}}%
+            \setunit{\ctitleaddonpunct}%
+            \printfield{booktitleaddon}}}%
+        {\cmshyper{\printfield[citetitle]{labeltitle}}}}}}%
+  {\iffieldequalstr{authortype}{anon}%
+    {\bibleftbracket\cmshyper{\printnames{labelname}}%
+      \bibrightbracket\classicpunct}%
+    {\iffieldequalstr{authortype}{anon?}%
+      {\bibleftbracket\cmshyper{\printnames{labelname}?}%
         \bibrightbracket\classicpunct}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{labelname}?%
-          \bibrightbracket\classicpunct}%
-        {\printnames{labelname}%\usebibmacro{choose+labelname}%
-          \isdot\classicpunct}}}}%
-  \ifboolexpr{%
-    (
-    test {\ifentrytype{review}}%
-    or
-    test {\ifentrytype{suppperiodical}}%
-    )
-    and
-    test {\iffieldequalstr{relatedtype}{reviewof}}%
-    and
-    togl {cms@citerel}%
-  }%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}}%
-  {\ifboolexpr{%
-      togl {cms@allshort}%
-      or
-      test {\ifbibliography}%
-    }%
-    {\printtext[bibhyperref]{%
-        \printfield[citetitle]{labeltitle}}}%
-    {\printtext[cmshyperlink]{%
-        \printfield[citetitle]{labeltitle}}}%
-    \ifboolexpr{%
-      test {\ifuniquework}%
-      or
-      test {\ifcsundef{cms@xfield}}%
-    }%
-    {}%
-    {\setunit{\shortextrapunct}%
-      \usebibmacro{shortnote+extrafield}}}}%:\thefield{entrytype}?
+      {\cmshyper{\printnames{labelname}}%\usebibmacro{choose+labelname}%
+        \isdot\classicpunct}}}}%
 
 \newbibmacro*{shortnote+extrafield}{% Disambiguate otherwise identical
   \iffieldundef{\csuse{cms@xfield}}% short notes
   {\iflistundef{\csuse{cms@xfield}}%
     {\ifnameundef{\csuse{cms@xfield}}%
-      {\ifcsstring{cms@xfield}{date}%
-        {\printtext[\csuse{cms@xformat}]{\printdate}}%
-        {\ifcsstring{cms@xfield}{origdate}%
-          {\printtext[\csuse{cms@xformat}]{\printorigdate}}%
-          {\ifcsstring{cms@xfield}{eventdate}%
-            {\printtext[\csuse{cms@xformat}]{\printeventdate}}%
-            {\ifcsstring{cms@xfield}{urldate}%
-              {\printtext[\csuse{cms@xformat}]{\printurldate}}%
-              {\printtext[\csuse{cms@xformat}]{\cms@xfield}}}}}}%
+      {\cms@xtime}% See below; stops spurious parentheses appearing
       {\printtext[\csuse{cms@xformat}]{%
           \printnames[default]{\csuse{cms@xfield}}}}}%
     {\printtext[\csuse{cms@xformat}]{%
@@ -838,41 +1375,135 @@
       }%
       {\printtext[\csuse{cms@xformat}]{%
           \printfield[letterday]{\csuse{cms@xfield}}}}%
+      {\ifboolexpr{%
+          test {\ifcsstring{cms@xfield}{season}}%
+          or
+          test {\ifcsstring{cms@xfield}{origseason}}%
+          or
+          test {\ifcsstring{cms@xfield}{eventseason}}%
+          or
+          test {\ifcsstring{cms@xfield}{urlseason}}%
+        }%
+        {\printtext[\csuse{cms@xformat}]{%
+            \mkbibseason{\thefield{\csuse{cms@xfield}}}}}%
+        {\IfSubStr{\cms@xfield}{year}%
+          {\StrCut{\cms@xfield}{year}\cms@yeartype\cms@tempnull%
+            \iffieldundef{\csuse{cms@yeartype}year}%
+            {}%
+            {\printtext[\csuse{cms@xformat}]{%
+                \csuse{print\cms@yeartype dateextra}}}}%
+          {\printtext[\csuse{cms@xformat}]{%
+              \printfield{\csuse{cms@xfield}}}}}}}}}%
+
+\newrobustcmd*{\cms@xtime}{% Tests for presence of field before printing
+  \IfSubStr{\cms@xfield}{time}%
+  {\StrCut{\cms@xfield}{time}\cms@timetype\cms@tempnull%
+    \iffieldundef{\csuse{cms@timetype}hour}%
+    {}%
+    {\printtext[\csuse{cms@xformat}]{%
+        \csuse{print\cms@timetype date}%
+        \newcunit\csuse{print\cms@timetype time}}}}%
+  {\IfSubStr{\cms@xfield}{date}%
+    {\StrCut{\cms@xfield}{date}\cms@datetype\cms@tempnull%
+      \ifthenelse{\iffieldundef{\csuse{cms@datetype}year}\AND%
+        \iffieldundef{\csuse{cms@datetype}month}\AND%
+        \iffieldundef{\csuse{cms@datetype}season}}%
+      {}%
       {\printtext[\csuse{cms@xformat}]{%
-          \printfield{\csuse{cms@xfield}}}}}}}%
+          \csuse{print\cms@datetype date}}}}%
+    {}}}
 
 \newbibmacro*{footcite:save}{%
+  \iffootnote%
+  {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+      \ifentrytype{legislation}}%
+    {\ifboolexpr{%
+        test {\ifentrytype{legal}}%
+        or
+        (
+        test {\ifentrytype{legislation}}%
+        and
+        (
+        test {\iffieldequalstr{entrysubtype}{un}}%
+        or
+        test {\iffieldequalstr{entrysubtype}{hearing}}%
+        ))
+      }%
+      {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
+        \label{cbx@\the\value{instcount}}}%
+      {}}%
+    {\cms@save@locdata{entrykey}%
+      \label{cbx@\the\value{instcount}}}}%
+  {}}
+
+\newbibmacro*{print+noteref}{%
   \ifboolexpr{%
-    test {\iffootnote}%
+    togl {cms@noterefs}%
+    and
+    test {\ifbool{citetracker}}% For non-tracked citation commands
     and
+    not togl {cms@allshort}%
+    and
+    test {\iffootnote}%
+    and not
     (
+    test {\ifentrytype{jurisdiction}}%
+    or
     test {\ifentrytype{legal}}%
     or
-    (
     test {\ifentrytype{legislation}}%
-    and
-    (
-    test {\iffieldequalstr{entrysubtype}{un}}%
-    or
-    test {\iffieldequalstr{entrysubtype}{hearing}}%
-    )))
+    )
   }%
-  {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
-    \label{cbx@\the\value{instcount}}}%
-  {}}%
+  {\usebibmacro{noteref+interval}}%
+  {}}
 
-\newbibmacro*{cite:short:jurisdiction}{%
+%%% The cite:short per-type macros, with helper macros %%%
+
+\csdef{cite:short:article}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {\iffieldequalstr{entrysubtype}{magazine}%
+    {\ifuseauthor%
+      {\ifboolexpr{%
+          not test {\iffieldundef{shortjournal}}%
+          and
+          ((
+          test {\ifcitation}%
+          and
+          togl {cms@citejtabb}%
+          )
+          or
+          (
+          test {\ifbibliography}%
+          and
+          togl {cms@bibjtabb}%
+          ))
+        }%
+        {\printfield[shortjournal]{shortjournal}\newcunit}%
+        {\printfield[journaltitle]{journaltitle}\newcunit}}%
+      {}}%
+    {}}%
+  {\usebibmacro{cms+name+idem}}%
+  \cmshyper{\printfield[citetitle]{labeltitle}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csdef{cite:short:book}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {}%
+  {\usebibmacro{cms+name+idem}}%
+  \cmshyper{\printfield[citetitle]{labeltitle}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csdef{cite:short:inreference}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \cmshyper{\printfield[citetitle]{labeltitle}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csdef{cite:short:jurisdiction}{%
   \iffieldundef{labeltitle}%
   {}%
-  {\ifboolexpr{%
-    togl {cms@allshort}%
-    or
-    test {\ifbibliography}%
-  }%
-  {\printtext[bibhyperref]{%
-      \printfield[citetitle]{labeltitle}}}%
-  {\printtext[cmshyperlink]{%
-      \printfield[citetitle]{labeltitle}}}}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
   \newcunit% Fixme: giving us a duplicate comma
   \printfield[jourvol]{volume}%
   \setunit*{\addnbspace}%
@@ -887,18 +1518,10 @@
   % \newcunit%
   \usebibmacro{juridpostnote}}%
 
-\newbibmacro*{cite:short:legal}{%
+\csdef{cite:short:legal}{%
   \iffieldundef{labeltitle}%
   {}%
-  {\ifboolexpr{%
-    togl {cms@allshort}%
-    or
-    test {\ifbibliography}%
-  }%
-  {\printtext[bibhyperref]{%
-      \printfield[citetitle]{labeltitle}}}%
-  {\printtext[cmshyperlink]{%
-      \printfield[citetitle]{labeltitle}}}}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
   \newcunit% Fixme: giving us a duplicate comma
   \printfield[jourvol]{volume}%
   \setunit*{\addnbspace}%
@@ -921,7 +1544,7 @@
   {}%
   \usebibmacro{juridpostnote}}%
 
-\newbibmacro*{cite:short:legislation}{%
+\csdef{cite:short:legislation}{%
   \iffieldequalstr{entrysubtype}{constitution}%
   {\usebibmacro{clegis+news+title}%
     \setunit{\addspace}%
@@ -931,15 +1554,7 @@
     \newcunit%
     \printfield{chapter}}%
   {\iffieldequalstr{labeltitlesource}{shorttitle}%
-    {\ifboolexpr{%
-        togl {cms@allshort}%
-        or
-        test {\ifbibliography}%
-      }%
-      {\printtext[bibhyperref]{%
-          \printfield[citetitle]{labeltitle}}}%
-      {\printtext[cmshyperlink]{%
-          \printfield[citetitle]{labeltitle}}}}%
+    {\cmshyper{\printfield[citetitle]{labeltitle}}}%
     {\ifboolexpr{%
         test {\iffieldundef{shortjournal}}%
         or
@@ -957,15 +1572,7 @@
         {\printlist{location}%
           \setunit{\addspace}}%
         {}%
-        \ifboolexpr{%
-          togl {cms@allshort}%
-          or
-          test {\ifbibliography}%
-        }%
-        {\printtext[bibhyperref]{%
-            \printfield[citetitle]{labeltitle}}}%
-        {\printtext[cmshyperlink]{%
-            \printfield[citetitle]{labeltitle}}}%
+        \cmshyper{\printfield[citetitle]{labeltitle}}%
         \setunit{\addspace}%
         \printfield[juridnum]{number}%
         \newcunit%
@@ -1006,7 +1613,185 @@
   {}%
   \usebibmacro{juridpostnote}}%
 
+\csdef{cite:short:manual}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {\ifboolexpr{%
+      test {\iflistundef{organization}}%
+      or
+      togl {cms@headlessnote}%
+    }%
+    {}%
+    {\printlist{organization}\isdot\newcunit}}%
+  {\usebibmacro{cms+name+idem}}%
+  \cmshyper{\printfield[citetitle]{labeltitle}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csletcs{cite:short:mvreference}{cite:short:inreference}%
+
+\csdef{cite:short:online}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {}%
+  {\usebibmacro{cms+name+idem}}%
+  \ifboolexpr{%
+    test {\IfBeginWith{\thefield{title}}{CCCCCC}}%
+    and
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    togl {cms@citerel}%
+  }%
+  {\setcounter{cms@reviewcount}{\value{instcount}}%
+    \usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csdef{cite:short:periodical}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {}%
+  {\usebibmacro{cms+name+idem}}%
+  \iffieldundef{issuetitle}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
+  {\printfield{issuetitle}}
+  \usebibmacro{cms+extra+test}}%
+
+\csletcs{cite:short:reference}{cite:short:inreference}%
+
+\csdef{cite:short:review}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {\iffieldequalstr{entrysubtype}{magazine}%
+    {\ifuseauthor%
+      {\ifboolexpr{%
+          not test {\iffieldundef{shortjournal}}%
+          and
+          ((
+          test {\ifcitation}%
+          and
+          togl {cms@citejtabb}%
+          )
+          or
+          (
+          test {\ifbibliography}%
+          and
+          togl {cms@bibjtabb}%
+          ))
+        }%
+        {\printfield[shortjournal]{shortjournal}\newcunit}%
+        {\printfield[journaltitle]{journaltitle}\newcunit}}%
+      {}}%
+    {}}%
+  {\usebibmacro{cms+name+idem}}%
+  \ifboolexpr{%
+    (
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+    or
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    )
+    and
+    togl {cms@citerel}%
+  }%
+  {\setcounter{cms@reviewcount}{\value{instcount}}%
+    \usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
+  \usebibmacro{cms+extra+test}}%
+
+\csdef{cite:short:standard}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifboolexpr{%
+    (
+    togl {cms@allshort}%
+    and
+    not test {\ifciteseen}%
+    )
+    or
+    not test {\iffieldundef{entrysubtype}}%
+  }%
+  {\ifnameundef{labelname}%
+    {\ifboolexpr{%
+        test {\iflistundef{organization}}%
+        or
+        togl {cms@headlessnote}%
+      }%
+      {}%
+      {\printlist{organization}\isdot\newcunit}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{labelname}%
+        \bibrightbracket\classicpunct}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\classicpunct}%
+        {\printnames{labelname}%
+          \isdot\classicpunct}}}}%
+  {}%
+  \cmshyper{\printfield[citetitle]{labeltitle}}%
+  \usebibmacro{cms+extra+test}}
+
+\csletcs{cite:short:suppperiodical}{cite:short:review}%
+
+\csdef{cite:short:video}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifnameundef{labelname}%
+  {}%
+  {\usebibmacro{cms+name+idem}}%
+  \ifboolexpr{%
+    test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+    and
+    not test {\iffieldundef{title}}%
+    and
+    not test {\iffieldundef{booktitle}}%
+  }%
+  {\iffieldundef{shorttitle}%
+    {\cmshyper{\printtext[booktitle]{%
+          \printfield[btnoformat]{booktitle}%
+          \setunit{\subtitlepunct}%
+          \printfield[sbtnoformat]{booksubtitle}}% (?)
+        \setunit{\ctitleaddonpunct}%
+        \printfield{booktitleaddon}}}%
+    {\cmshyper{\printfield[citetitle]{labeltitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{booktitleaddon}}}%
+  {\cmshyper{\printfield[citetitle]{labeltitle}}}%
+  \usebibmacro{cms+extra+test}}%
+
+\newbibmacro*{cms+extra+test}{% Used in previous defs
+  \ifboolexpr{%
+    test {\iffieldundef{extratitle}}% Most reliable test
+    or
+    test {\ifcsundef{cms@xfield}}%
+  }%
+  {}%
+  {\setunit{\shortextrapunct}%
+    \usebibmacro{shortnote+extrafield}}}
+
+\newbibmacro*{cms+name+idem}{% Used in previous defs
+  \ifboolexpr{%
+    test {\ifciteidem}%
+    and
+    not test {\ifbibliography}%
+    and
+    not test {\iffirstonpage}%
+    and
+    not togl {cms@noidem}%
+    and
+    not togl {cms@headlessnote}%
+  }%
+  {\bibstring[\mkibid]{idem\thefield{gender}}%
+    \classicpunct}%
+  {\iffieldequalstr{authortype}{anon}%
+    {\bibleftbracket\printnames{labelname}%
+      \bibrightbracket\classicpunct}%
+    {\iffieldequalstr{authortype}{anon?}%
+      {\bibleftbracket\printnames{labelname}?%
+        \bibrightbracket\classicpunct}%
+      {\printnames{labelname}%
+        \isdot\classicpunct}}}}
+
 \newbibmacro*{cite:shorthand}{%
+  \global\let\cms@pnsaved\undefined%
   \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
     \ifentrytype{legislation}}%
   {\usebibmacro{cite:shorthand:legal}}%
@@ -1014,22 +1799,16 @@
 
 \newbibmacro*{cite:shorthand:cms}{%
   \usebibmacro{allshort+firstcite+xref}%
-  \iftoggle{cms@allshort}%
-  {\printtext[bibhyperref]{%
-      \printfield{shorthand}}}%
-  {\printtext[cmshyperlink]{%
-      \printfield{shorthand}}}}
+  \cmshyper{\printfield{shorthand}}}
 
 \newbibmacro*{cite:shorthand:legal}{%
   \usebibmacro{allshort+firstcite+xref}%
-  \iftoggle{cms@allshort}%
-  {\printtext[bibhyperref]{%
-      \printfield{shorthand}}}%
-  {\printtext[cmshyperlink]{%
-      \printfield{shorthand}}}%
+  \cmshyper{\printfield{shorthand}}%
   \ifboolexpr{%
     test {\iffootnote}%
     and
+    togl {cms@supranotes}%
+    and
     (
     test {\ifentrytype{legal}}%
     or
@@ -1063,13 +1842,13 @@
     {%\addspace%\setunit{\addspace}% Ditto
       \printfield{shorthandintro}}}}
 
-\newbibmacro*{choose:ibidstring}{%
+\newbibmacro*{cite:ibid}{%
   \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
     \ifentrytype{legislation}}%
-  {\bibsstring[\mkbibemph]{ibidem}}%
-  {\bibstring[\mkibid]{ibidem}}}
+  {\usebibmacro{cite:ibid:legal}}%
+  {\usebibmacro{cite:ibid:cms}}}
 
-\newbibmacro*{cite:ibid}{%
+\newbibmacro*{cite:ibid:legal}{%
   \ifboolexpr{%
     togl {cms@noibid}%
     or
@@ -1077,13 +1856,9 @@
   }%
   {\global\toggletrue{cms@shortnote}%
     \global\togglefalse{cms@fullnote}%
-    \usebibmacro{cite:short}%
+    \usebibmacro{cite:short:legal}%
     \usebibmacro{cite:save}}%
-  {\iftoggle{cms@allshort}%
-    {\printtext[bibhyperref]{%
-        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
-    {\printtext[cmshyperlink]{%
-        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
+  {\cmshyper{\bibsstring[\mkbibemph]{ibidem}}%
     \ifboolexpr{%
       test {\ifloccit}%
       or
@@ -1098,6 +1873,33 @@
     {\global\toggletrue{cms@loccit}}%
     {}}}%
 
+\newbibmacro*{cite:ibid:cms}{%
+  \iftoggle{cms@useibid}%
+  {\ifbibliography%
+    {\global\toggletrue{cms@shortnote}%
+      \global\togglefalse{cms@fullnote}%
+      \usebibmacro{cite:short}{\thefield{entrytype}}%
+      \usebibmacro{cite:save}}%
+    {\cmshyper{\bibstring[\mkibid]{ibidem}}%
+      \ifboolexpr{%
+        test {\ifloccit}%
+        or
+        (
+        test {\ifciteibid}%
+        and
+        test {\iffieldequalcs{postnote}{cms@pnsaved}}%
+        and
+        not test {\ifdefvoid{\blx@loccittracker}}% Package option=false
+        )
+      }%
+      {\global\toggletrue{cms@loccit}%
+        \global\let\cms@pnsaved\undefined}%
+      {\global\let\cms@pnsaved\undefined}}}%
+  {\global\toggletrue{cms@shortnote}%
+    \global\togglefalse{cms@fullnote}%
+    \usebibmacro{cite:short:ibid}%
+    \usebibmacro{cite:save}}}%
+
 \newbibmacro*{cite:journal}{%
   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
   {\iffieldundef{prenote}%
@@ -1105,7 +1907,7 @@
     {\usebibmacro{cite:ibid}}%
     \usebibmacro{cite:save}}%
   {\iffieldundef{journaltitle}%
-    {\usebibmacro{cite:short}%
+    {\usebibmacro{cite:short}{\thefield{entrytype}}%
       \usebibmacro{cite:save}}%
     {\ifboolexpr{%
       test {\ifciteidem}%
@@ -1257,7 +2059,7 @@
       not test {\iffieldundef{shorthand}}%
     }%
     {\usebibmacro{cite}}%
-    {\usebibmacro{cite:short}}}% Would {cite} be better?
+    {\usebibmacro{cite:short}{\thefield{entrytype}}}}% Would {cite} be better?
   {}%
   {\usebibmacro{crossref:volume+postnote}}% Volume fix
 
@@ -1283,7 +2085,7 @@
       not test {\iffieldundef{shorthand}}%
     }%
     {\usebibmacro{cite}}%
-    {\usebibmacro{cite:short}}}%
+    {\usebibmacro{cite:short}{\thefield{entrytype}}}}%
   {}%
   {\usebibmacro{crossref:volume+postnote}}% Volume fix
 
@@ -1326,8 +2128,8 @@
   {\usebibmacro{citeindex}%
     \toggletrue{cms@fullnote}%
     \togglefalse{cms@shortnote}%
-    \usebibmacro{cite:full}%
     \usebibmacro{footcite:save}%
+    \usebibmacro{cite:full}%
     \usebibmacro{cite:save}}
   {\multicitedelim}
   {}
@@ -1337,8 +2139,8 @@
   {\usebibmacro{citeindex}%
     \toggletrue{cms@fullnote}%
     \togglefalse{cms@shortnote}%
-    \usebibmacro{cite:full}%
     \usebibmacro{footcite:save}%
+    \usebibmacro{cite:full}%
     \usebibmacro{cite:save}}
   {\multicitedelim}
   {}
@@ -1348,7 +2150,7 @@
     \ifhyperref%
     {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
     {}%
-    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
+    \nopunct}% Remove \unspace for v. 2.0
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearorigin}\clearfield{userf}\clearfield{shorthand}%
@@ -1383,29 +2185,30 @@
   {\finentry}
 
 \DeclareCiteCommand{\headlessfullcite}
-  {\usebibmacro{hlprenote}}%
+  {\usebibmacro{prenote}}%
   {\printtext[bibhypertarget]{%
       \usedriver
-      {\DeclareNameAlias{sortname}{default}\usebibmacro{cite:save}%
-        \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
-        \usebibmacro{clear+labelname}\global\toggletrue{cms@noidem}}%
+      {\DeclareNameAlias{sortname}{default}\toggletrue{cms@fullnote}%
+        \toggletrue{cms@headlessnote}\usebibmacro{footcite:save}%
+        \usebibmacro{cite:save}\usebibmacro{clear+labelname}%
+        \global\toggletrue{cms@noidem}}%
       {cite:\thefield{entrytype}}}}%
   {\multicitedelim}%
   {}%\usebibmacro{finentry}}
 
 \DeclareCiteCommand{\headlesscite}
-  {\usebibmacro{hlcprenote}}
+  {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
     \toggletrue{cms@headlessnote}%
     \usebibmacro{clear+labelname}%
     \clearname{labelname}%
     \usebibmacro{cite}%
-    \global\toggletrue{cms@noidem}}
+    \global\toggletrue{cms@noidem}}%
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\headlessparencite}[\mkbibparens]
-  {\usebibmacro{hlcprenote}}
+  {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
     \toggletrue{cms@headlessnote}%
     \usebibmacro{clear+labelname}%
@@ -1428,7 +2231,7 @@
       \toggletrue{cms@shortnote}%
       \togglefalse{cms@fullnote}%
       \clearname{labelname}%
-      \usebibmacro{cite:short}}%
+      \usebibmacro{cite:short}{\thefield{entrytype}}}%
     \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
@@ -1445,12 +2248,12 @@
       and
       not togl {cms@noneshort}%
     }%
-    {\usebibmacro{cite:short}}
+    {\usebibmacro{cite:short}{\thefield{entrytype}}}%
     {\renewbibmacro*{author/editor}{\usebibmacro{choose+surname}}%
       \renewbibmacro*{editor}{\usebibmacro{choose+surname}}%
       \renewbibmacro*{author}{\usebibmacro{choose+surname}}%
-      \usebibmacro{cite}}}
-  {\multicitedelim}
+      \usebibmacro{cite}}}%
+  {\multicitedelim}%
   {\usebibmacro{cite:postnote}}
 
 \DeclareMultiCiteCommand{\surnamecites}{surnamecite}{\multicitedelim}
@@ -1460,11 +2263,35 @@
   {\toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
     \usebibmacro{citeindex}%
-    \usebibmacro{cite:short}%
+    \usebibmacro{cite:short}{\thefield{entrytype}}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\shortcite}
+  {\boolfalse{citetracker}%
+    \boolfalse{pagetracker}%
+    \usebibmacro{prenote}}%
+  {\toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \usebibmacro{citeindex}%
+    \usebibmacro{cite:short}{\thefield{entrytype}}%
     \usebibmacro{cite:save}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand{\shortrefcite}
+  {\usebibmacro{prenote}}
+  {\toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \usebibmacro{citeindex}%
+    \usebibmacro{cite:short}{\thefield{entrytype}}%
+    \usebibmacro{cite:save}}%
+  {\multicitedelim}
+  {\toggletrue{cms@forcenoteref}%
+    \usebibmacro{postnote}%
+    \togglefalse{cms@forcenoteref}}%
+
 \DeclareCiteCommand{\shorthandcite}
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -1481,6 +2308,42 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand*{\shorthandcite}
+  {\boolfalse{citetracker}%
+    \boolfalse{pagetracker}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \iftoggle{cms@shorthandibid}%
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+      {\usebibmacro{cite:ibid}%
+        \usebibmacro{cite:save}}%
+      {\usebibmacro{cite:shorthand}%
+        \usebibmacro{cite:save}%
+        \global\toggletrue{cms@noidem}}}%
+    {\usebibmacro{cite:shorthand}%
+      \usebibmacro{cite:save}%
+      \global\toggletrue{cms@noidem}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\shorthandrefcite}
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \iftoggle{cms@shorthandibid}%
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+      {\usebibmacro{cite:ibid}%
+        \usebibmacro{cite:save}}%
+      {\usebibmacro{cite:shorthand}%
+        \usebibmacro{cite:save}%
+        \global\toggletrue{cms@noidem}}}%
+    {\usebibmacro{cite:shorthand}%
+      \usebibmacro{cite:save}%
+      \global\toggletrue{cms@noidem}}}
+  {\multicitedelim}
+  {\toggletrue{cms@forcenoteref}%
+    \usebibmacro{postnote}%
+    \togglefalse{cms@forcenoteref}}
+
 \DeclareCiteCommand{\citejournal}% Name?
   {\usebibmacro{prenote}}
   {\toggletrue{cms@shortnote}%
@@ -1494,6 +2357,15 @@
     {}%
     {\usebibmacro{fullpostnote}}}
 
+\DeclareCiteCommand{\runcite}% 17th ed.
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@running@text}%
+    \usebibmacro{cite}%
+    \togglefalse{cms@running@text}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
 \DeclareCiteCommand{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -1507,10 +2379,21 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\newrobustcmd*{\Shortcite}{%
+  \@ifstar{\bibsentence\shortcite*}{\bibsentence\shortcite}}%
+
+\newrobustcmd*{\Shortrefcite}{\bibsentence\shortrefcite}%
+
+\newrobustcmd*{\Headlesscite}{\bibsentence\headlesscite}
+
+\newrobustcmd*{\Headlesscites}{\bibsentence\headlesscites}
+
 \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
 
 \DeclareMultiCiteCommand{\headlesscites}{headlesscite}{\multicitedelim}
 
+\DeclareMultiCiteCommand{\headlessfullcites}{headlessfullcite}{\multicitedelim}
+
 \DeclareMultiCiteCommand{\headlessparencites}[\mkbibparens]%
 {headlessparencite}{\multicitedelim}
 
@@ -1694,9 +2577,7 @@
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{cmag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{cmag+news+title}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -1710,8 +2591,9 @@
   \printfield{note}%
   \setunit{\addcomma\addspace}\newblock
   \usebibmacro{mag+news+date}%
-  \usebibmacro{fullpostnote}%
   \newcunit\newblock
+  \printfield{type}%
+  \usebibmacro{fullpostnote}%
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -1728,17 +2610,18 @@
     togl {cms@citerel}%
     and
     not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
     }%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}}
+    {\usebibmacro{related:init}%
+      \usebibmacro{related:noterefhelper}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+  \usebibmacro{finentry}}%
   {\usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{cmag+news+title}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -1754,8 +2637,9 @@
   \printfield{note}%
   \setunit{\addcomma\addspace}%
   \usebibmacro{cjournal+issue+year+pages}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{eid+fullpostnote}%
   \newcunit\newblock
+  \printfield{eid}%
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -1772,40 +2656,49 @@
     togl {cms@citerel}%
     and
     not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
     }%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related:noterefhelper}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
   \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:artwork}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
-  \usebibmacro{date}%
+  \iffieldundef{origyear}% 17th ed.
+  {\printdate}%
+  {\usebibmacro{cmsorigdate}}%
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit\newblock
   \usebibmacro{cbyeditor+others}%
   \newcunit\newblock
-  \printfield{howpublished}%
+  \ifthenelse{\iffieldundef{origyear}\OR\iffieldundef{year}}% 17th ed.
+  {}%
+  {\usebibmacro{date}}%
   \newcunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \usebibmacro{cnotefield}%
   \newcunit\newblock
   \usebibmacro{institution+organization}%
   \newcunit\newblock
   \printlist{location}%
-  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -1813,8 +2706,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -1823,9 +2721,7 @@
 \DeclareBibliographyDriver{cite:audio}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
@@ -1834,6 +2730,8 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \newcunit
+  \usebibmacro{music+eventdate}%
+  \newcunit
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
   \newcunit
@@ -1878,7 +2776,6 @@
   \newcunit
   \printfield{type}%
   \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -1893,8 +2790,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -1903,9 +2805,7 @@
 \DeclareBibliographyDriver{cite:book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{cite:xref+date}%
@@ -1913,13 +2813,15 @@
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
     {}%
-    {\usebibmacro{edition}}}%
+    {\usebibmacro{edition}}%
+    \newcunit
+    \usebibmacro{version}}% 17th ed.
   {}%
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit
   \usebibmacro{cpart+editor+translator}%
-  \newcunit
+  \newcunit%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -1934,69 +2836,110 @@
       or
       togl {cms@bookcitexref}%
     }%
-  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit\newblock
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}}%
-  \newcunit
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \iftoggle{cms@bookpages}%
-  {}%
-  {\clearfield{pages}}%
-  \usebibmacro{caddendum}%
-  \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
-  \printlist[][-\value{listtotal}]{lista}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \setunit{\shorthandpunct}%
-  \usebibmacro{cms:shorthandintro}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \newcunit\newblock
-  \iftoggle{cms@citerel}%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}%
-  \usebibmacro{book:xref+finentry}}%
-    {\ifpunctmark{.}% This seems to work.
+    {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+      \newcunit\newblock
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \iffieldundef{version}% 17th ed.
+      {}%
+      {\usebibmacro{version}}%
+      \newcunit
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \iftoggle{cms@bookpages}%
+      {}%
+      {\clearfield{pages}}%
+      \usebibmacro{volfullpostnote}%
+      \newcunit\newblock
+      \printlist[][-\value{listtotal}]{lista}%
+      \newcunit\newblock
+      \printfield{type}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
       {\ifbibliography%
         {\setunit{\bibsentence}}{\addspace\bibsentence}}%
       {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
       \usebibmacro{xrefprenote}% Volume fix
       \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}% This seems to work.
-      {\ifbibliography%
-        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
-      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
     \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:bookinbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{cite:xref+date}%
@@ -2006,6 +2949,17 @@
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
   \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
@@ -2019,65 +2973,126 @@
       or
       togl {cms@bookcitexref}%
     }%
-  {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{caddendum}%
-  \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \setunit{\shorthandpunct}%
-  \usebibmacro{cms:shorthandintro}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \newcunit\newblock
-  \iftoggle{cms@citerel}%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}%
-  \usebibmacro{book:xref+finentry}}%
-    {\ifpunctmark{.}% This seems to work.
+    {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
       {\ifbibliography%
         {\setunit{\bibsentence}}{\addspace\bibsentence}}%
       {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
       \usebibmacro{xrefprenote}% Volume fix
       \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}% This seems to work.
-      {\ifbibliography%
-        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
-      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\entrydata{\thefield{related}}{%
+    \ifboolexpr{%
+      test {\ifentryseen{\thefield{clonesourcekey}}}%
+      and
+      not togl {cms@bookcitexref}%
+    }%
+    {\savefield{clonesourcekey}{\cms@shortmtkey}}%
+    {}}%
+  \iftoggle{cms@noterefs}{\addtocounter{instcount}{-1}}{}% Alternatives?
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}%
+  {\ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{cite:booklet}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
   \usebibmacro{byauthor}%
@@ -2086,8 +3101,8 @@
   \setunit{\addspace}\newblock%
   \printtext[parens]{%
   \usebibmacro{howpubl+loc+year}}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -2095,8 +3110,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -2105,9 +3125,7 @@
 \DeclareBibliographyDriver{cite:collection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
   \setunit{\addspace}
   \usebibmacro{cite:xref+date}%
@@ -2128,94 +3146,210 @@
       or
       togl {cms@bookcitexref}%
     }%
-  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit\newblock
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}}%
-  \newcunit
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{caddendum}%
-  \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \setunit{\shorthandpunct}%
-  \usebibmacro{cms:shorthandintro}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \newcunit\newblock
-  \iftoggle{cms@citerel}%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}%
-  \usebibmacro{book:xref+finentry}}%
-    {\ifpunctmark{.}% This seems to work.
+    {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+      \newcunit\newblock
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \usebibmacro{cbyeditor+others}%
+      \newcunit\newblock
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
       {\ifbibliography%
         {\setunit{\bibsentence}}{\addspace\bibsentence}}%
       {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
       \usebibmacro{xrefprenote}% Volume fix
       \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}% This seems to work. Only with Vol?
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work. Only with Vol?
     {\ifbibliography%
       {\setunit{\bibsentence}}{\addspace\bibsentence}}%
     {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
     \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{justauthor}%
+  \iffieldundef{nameaddon}%
+  {\newcunit}
+  {\setunit{\addspace}}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:dataset}{%
+  \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
+  \iftoggle{cms@headlessnote}{}{\setunit{\addspace}\newblock}%
+  \printtext[parens]{%
+    \printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newcunit
+    \usebibmacro{byauthor}%
+    \newcunit\newblock
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addspace}\newblock%
+    \ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{number}\AND\iffieldundef{type}}%
+    {}%
+    {\printtext[parens]{%
+        \printfield{howpublished}%
+        \newcunit
+        \printfield{type}%
+        \setunit{\addspace}%
+        \printfield{number}}}%
+    \newcunit\newblock
+    \printfield{version}%
+    \newcunit\newblock
+    \printfield{note}%
+    \newcunit\newblock
+    \usebibmacro{institution+organization}%
+    \newcunit\newblock
+    \printlist{location}%
+    \setunit{\addsemicolon\addspace}%
+    \printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}%
+  \usebibmacro{fullpostnote}%
   \newcunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
+  \iffieldundef{pubstate}%
+  {}%
+  {\iffieldbibstring{pubstate}%
+    {\bibsstring{\thefield{pubstate}}}%
+    {\printfield[prenote]{pubstate}}%
+    \setunit{\addspace}}%
+  \usebibmacro{date}%
+  \clearfield{urlyear}%
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:image}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
   \newcunit%\setunit{\addcomma\addspace}%
-  \usebibmacro{date}%
+  \iffieldundef{origyear}% 17th ed.
+  {\printdate}%
+  {\usebibmacro{cmsorigdate}}%
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit\newblock
   \usebibmacro{cbyeditor+others}%
   \newcunit\newblock
-  \printfield{howpublished}%
+  \ifthenelse{\iffieldundef{origyear}\OR\iffieldundef{year}}% 17th ed.
+  {}%
+  {\usebibmacro{date}}%
   \newcunit\newblock
   \printfield{type}%
   \newcunit\newblock
-  \printfield{version}%
+  \printfield[type]{version}%
   \newcunit\newblock
   \usebibmacro{cnotefield}%
   \newcunit\newblock
   \usebibmacro{institution+organization}%
   \newcunit\newblock
   \printlist{location}%
-  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \printfield{howpublished}% 17th ed.
+  \setunit*{\addspace}%
+  \usebibmacro{music+eventdate}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -2223,8 +3357,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -2233,9 +3372,7 @@
 \DeclareBibliographyDriver{cite:inbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
@@ -2245,6 +3382,17 @@
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
   \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
@@ -2258,62 +3406,113 @@
       or
       togl {cms@citecrossref}%
     }%
-  {\usebibmacro{chapincoll}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{caddendum}%
-  \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \setunit{\shorthandpunct}%
-  \usebibmacro{cms:shorthandintro}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \newcunit\newblock
-  \iftoggle{cms@citerel}%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}%
-  \usebibmacro{cite:xref+finentry}}%
-{\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{cite:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{cite:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{xrefchapincoll}%
       \bibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{xrefchapincoll}%
     \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+note}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{cite:incollection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock%
+  \usebibmacro{hlpunct}%\newcunit\newblock%
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
@@ -2323,6 +3522,17 @@
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
   \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
@@ -2353,8 +3563,8 @@
       \usebibmacro{cnotefield}%
       \newcunit\newblock
       \usebibmacro{cpubl+loc+year}%
-      \usebibmacro{caddendum}%
       \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
@@ -2366,32 +3576,83 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
-      {\usebibmacro{related:init}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{cite:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
         \usebibmacro{related}%
         \newcunit}%
+      {\usebibmacro{cite:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
       {}%
-      \usebibmacro{finentry}%
-      \usebibmacro{cite:xref+finentry}}%
-    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{xrefchapincoll}%
       \bibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{xrefchapincoll}%
     \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+note}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{cite:inproceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
@@ -2401,6 +3662,17 @@
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
   \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
@@ -2427,8 +3699,8 @@
       \setunit{\addspace}\newblock%
       \printtext[parens]{%
         \usebibmacro{org+publ+loc+year}}%
-      \usebibmacro{caddendum}%
       \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
@@ -2440,28 +3712,82 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
-      {\usebibmacro{related:init}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{cite:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
         \usebibmacro{related}%
         \newcunit}%
+      {\usebibmacro{cite:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
       {}%
-      \usebibmacro{finentry}%
-      \usebibmacro{cite:xref+finentry}}%
-    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{xrefchapincoll}%
       \bibxrefcite{\thefield{xref}}%
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{xrefchapincoll}%
     \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+note}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{cite:inreference}{%
   \usebibmacro{bibindex}%
+  \iffieldundef{clonesourcekey}{}{\newcunit}%
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
@@ -2485,10 +3811,7 @@
   \newcunit\newblock
   \usebibmacro{cser+num}%
   \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{caddendum}%
+  \usebibmacro{crefpubl+loc+year}% 17th ed.
   \usebibmacro{inreffullpostnote}%
   \newcunit\newblock%setunit{\addspace}% 16th ed
   \ifnameundef{author}%
@@ -2497,6 +3820,7 @@
       \bibstring{by}%
       \addspace%
       \printnames{author}}}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
@@ -2508,8 +3832,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -2567,7 +3896,11 @@
     \newcunit\newblock
     \usebibmacro{pageref}%
     \newcunit\newblock
-    \iftoggle{cms@citerel}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
     {\usebibmacro{related:init}%
       \usebibmacro{related}%
       \newcunit}%
@@ -2624,7 +3957,11 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
       {\usebibmacro{related:init}%
         \usebibmacro{related}%
         \newcunit}%
@@ -2688,7 +4025,11 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
       {\usebibmacro{related:init}%
         \usebibmacro{related}%
         \newcunit}%
@@ -2698,9 +4039,7 @@
 \DeclareBibliographyDriver{cite:legal}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{clegis+news+title}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -2754,7 +4093,11 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newcunit}%
@@ -2765,9 +4108,7 @@
   \iffieldequalstr{entrysubtype}{uk}% FIXME?
   {\usebibmacro{bibindex}%
     \usebibmacro{author/editor}%
-    \setunit{\addspace}%
-    \printfield{nameaddon}%
-    \newcunit\newblock
+    \usebibmacro{hlpunct}%\newcunit\newblock
     \usebibmacro{clegis+news+title}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
@@ -2821,7 +4162,11 @@
     \newcunit\newblock
     \usebibmacro{pageref}%
     \newcunit\newblock
-    \iftoggle{cms@citerel}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
     {\usebibmacro{related:init}%
       \usebibmacro{related}%
       \newcunit}%
@@ -2830,9 +4175,7 @@
   {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
     {\usebibmacro{bibindex}%
       \usebibmacro{author/editor}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}%
-      \newcunit\newblock
+      \usebibmacro{hlpunct}%\newcunit\newblock
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -2880,7 +4223,11 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
       {\usebibmacro{related:init}%
         \usebibmacro{related}%
         \newcunit}%
@@ -2888,9 +4235,7 @@
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
       \usebibmacro{author/editor}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}%
-      \newcunit\newblock
+      \usebibmacro{hlpunct}%\newcunit\newblock
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -2952,7 +4297,11 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
       {\usebibmacro{related:init}%
         \usebibmacro{related}%
         \newcunit}%
@@ -2974,6 +4323,17 @@
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
   \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
@@ -3004,8 +4364,8 @@
       \usebibmacro{cnotefield}%
       \newcunit\newblock
       \usebibmacro{cpubletter+loc+year}%
-      \usebibmacro{caddendum}%
       \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
@@ -3017,32 +4377,83 @@
       \newcunit\newblock
       \usebibmacro{pageref}%
       \newcunit\newblock
-      \iftoggle{cms@citerel}%
-      {\usebibmacro{related:init}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{cite:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
         \usebibmacro{related}%
-        \newcunit}%
+      \newcunit}%
+      {\usebibmacro{cite:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
       {}%
-      \usebibmacro{finentry}%
-      \usebibmacro{cite:xref+finentry}}%
-    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{xrefchapincoll}%
       \bibxrefcite{\thefield{xref}}%
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{xrefchapincoll}%
     \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\usebibmacro{extract+clonekey+note}%
+  \ifcsundef{cms@shortmtkey}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\csuse{cms@shortmtkey}}%
+    \usebibmacro{xrefpostnote}%
+    \csgundef{cms@shortmtkey}%
+    \usebibmacro{finentry}}}}
 
 \DeclareBibliographyDriver{cite:manual}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
   \newcunit
   \usebibmacro{edition}%
@@ -3057,8 +4468,8 @@
   \setunit{\addspace}\newblock%
   \printtext[parens]{%
   \usebibmacro{org+publ+loc+year}}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
@@ -3070,8 +4481,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3080,9 +4496,7 @@
 \DeclareBibliographyDriver{cite:misc}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \iffieldundef{entrysubtype}%
   {\usebibmacro{citaltitle+stitle}}%
   {\printfield{title}%
@@ -3093,7 +4507,9 @@
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
     \newcunit%
-    \usebibmacro{unpubl+letter+date}}%
+    \usebibmacro{unpubl+letter+date}%
+    \newcunit
+    \printlist{origlocation}}% 17th ed.
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit\newblock
@@ -3107,15 +4523,18 @@
   \newcunit\newblock
   \printfield{note}%
   \newcunit\newblock
-  \usebibmacro{institution+organization}%
+  \iffieldundef{entrysubtype}%
+  {\printfield{venue}\newcunit}%
+  {}%
+  \usebibmacro{misc+institution+organization}%
   \newcunit\newblock
   \printlist{location}%
   \iffieldundef{entrysubtype}%
   {\newcunit\newblock
     \usebibmacro{date}}%
   {}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -3123,8 +4542,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3133,26 +4557,31 @@
 \DeclareBibliographyDriver{cite:music}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit\newblock
   \usebibmacro{cpart+editor+translator}%
   \newcunit\newblock
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\usebibmacro{cbyeditor+others}\newcunit\newblock}{}%
   \usebibmacro{music+eventdate}%
   \newcunit\newblock
-  \usebibmacro{chapinscore}%
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \newcunit\newblock
+  \usebibmacro{chap+as+track}%inscore% 17th ed.
+  \usebibmacro{music+bookauthor}% Ditto
   \usebibmacro{btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
   {\usebibmacro{edition}}%
   \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {}{\usebibmacro{cbyeditor+others}}%
   \iffieldundef{maintitle}%
   {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
@@ -3182,14 +4611,14 @@
   \newcunit\newblock
   \printfield{version}%
   \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \usebibmacro{music+origdate}% Altered for 17th ed.
   \newcunit\newblock
   \printlist{publisher}%
   \newcunit\newblock
-  \printfield{series}%
-  \setunit{\addspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifboolexpr{test {\iflistundef{publisher}} and test {\iffieldundef{series}}}%
+  {\newcunit}%
+  {\setunit{\addspace}}%
   \printfield{number}%
   \newcunit\newblock
   \usebibmacro{date}%
@@ -3200,10 +4629,9 @@
   \newcunit\newblock
   \printfield{type}%
   \usebibmacro{fullpostnote}%
-  \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
-  \usebibmacro{pubstate}% 16th ed.
+  \usebibmacro{music+pubstate}% 17th ed.
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{iswc}}%
@@ -3215,43 +4643,535 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
   \usebibmacro{finentry}}
 
-\DeclareBibliographyAlias{cite:mvbook}{cite:book}
+\DeclareBibliographyDriver{cite:mvbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{cite:xref+date}%
+  \usebibmacro{mt+mvnames+save}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\newcunit
+    \usebibmacro{volume+or+volumes}}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+    {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \iftoggle{cms@bookpages}%
+      {}%
+      {\clearfield{pages}}%
+      \usebibmacro{volfullpostnote}%
+      \newcunit\newblock
+      \printlist[][-\value{listtotal}]{lista}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}%
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\unspace% Needed for entries with langid (?)
+  \usebibmacro{related:init}%
+  \usebibmacro{related:noterefhelper}%
+  \usebibmacro{related:mtsave}%
+  \usebibmacro{related}%
+  \newcunit%
+  \usebibmacro{finentry}}}
 
-\DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
+\DeclareBibliographyDriver{cite:mvcollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
+  \usebibmacro{mt+mvnames+save}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\newcunit\newblock
+    \usebibmacro{volume+or+volumes}}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{crossref}}%
+      or
+      not test {\ifentryseen{\thefield{crossref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+    {\ifboolexpr{%
+        test {\iffieldundef{xref}}%
+        or
+        not test {\ifentryseen{\thefield{xref}}}%
+        or
+        togl {cms@bookcitexref}%
+      }%
+      {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+        \newcunit\newblock
+        \usebibmacro{cnotefield}%
+        \newcunit\newblock
+        \usebibmacro{cpubl+loc+year}%
+        \usebibmacro{volfullpostnote}%
+        \usebibmacro{caddendum}%
+        \newcunit\newblock
+        \iftoggle{cms@isbn}%
+        {\printfield{isbn}}%
+        {}%
+        \newcunit\newblock
+        \usebibmacro{cite+doi+url}%
+        \setunit{\shorthandpunct}%
+        \usebibmacro{cms:shorthandintro}%
+        \newcunit\newblock
+        \usebibmacro{pageref}%
+        \newcunit\newblock
+        \ifboolexpr{%
+          togl {cms@citerel}%
+          and
+          not test {\iffieldundef{related}}%
+        }%
+        {\usebibmacro{book:xref+finentry}%
+          \usebibmacro{related:init}%
+          \usebibmacro{related:noterefhelper}%
+          \usebibmacro{related}%
+          \newcunit}%
+        {\usebibmacro{book:xref+finentry}}%
+        \usebibmacro{finentry}}%
+      {\ifboolexpr{%
+          togl {cms@citerel}%
+          and
+          not test {\iffieldundef{related}}%
+        }%
+        {\usebibmacro{related:noterefhelper}}%
+        {}%
+        \ifpunctmark{.}% This seems to work.
+        {\ifbibliography%
+          {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+        {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+        \usebibmacro{xrefprenote}% Volume fix
+        \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+        \usebibmacro{xrefpostnote}%
+        \ifboolexpr{%
+          togl {cms@citerel}%
+          and
+          not test {\iffieldundef{related}}%
+        }%
+        {\usebibmacro{related:init}%
+          \usebibmacro{related}%
+          \newcunit}%
+        {}%
+        \usebibmacro{finentry}}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work. Only with Vol?
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{crossref}}%
+      \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}}%
 
-\DeclareBibliographyAlias{cite:mvproceedings}{cite:proceedings}
+\DeclareBibliographyDriver{cite:mvproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
+  \usebibmacro{mt+mvnames+save}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\newcunit\newblock
+    \usebibmacro{volume+or+volumes}}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+    {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \setunit{\addspace}\newblock%
+      \printtext[parens]{%
+        \usebibmacro{org+publ+loc+year}}%
+      \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}%
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}}%
+{\unspace% Needed for entries with langid (?)
+  \usebibmacro{related:init}%
+  \usebibmacro{related:noterefhelper}%
+  \usebibmacro{related:mtsave}%
+  \usebibmacro{related}%
+  \newcunit%
+  \usebibmacro{finentry}}}
 
-\DeclareBibliographyAlias{cite:mvreference}{cite:reference}
+\DeclareBibliographyDriver{cite:mvreference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit\newblock
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}{}%
+  {\newcunit
+    \usebibmacro{volume+or+volumes}}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \setunit*{\addcomma\addspace}%
+  \ifboolexpr{%
+    not togl {cms@citerel}%
+    or
+    (
+    not test {\iffieldequalstr{relatedtype}{maintitle}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{maintitlenc}}%
+    )
+    or
+    test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+    \newcunit\newblock
+    \usebibmacro{crefpubl+loc+year}%
+    \usebibmacro{volfullpostnote}%
+    \usebibmacro{caddendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{isbn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \setunit{\shorthandpunct}%
+    \usebibmacro{cms:shorthandintro}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related:noterefhelper}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}%
+  {\unspace% Needed for entries with langid (?)
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related:mtsave}%
+    \usebibmacro{related}%
+    \newcunit%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \printlist{organization}% Rearranged for 16th ed.
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cnotefield}%
-  \setunit{\addcomma\addspace}
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \IfBeginWith{\thefield{title}}{CCCCCC}%
+  {}%
+  {\usebibmacro{ctitle+stitle}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \newcunit\newblock
+    \printlist{organization}% Rearranged for 16th ed.
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cnotefield}%
+    \setunit{\addcomma\addspace}}%
   \usebibmacro{date}%
+  \usebibmacro{time+stamp}%
+  \newcunit\newblock
+  \printfield{type}% 17th ed.
+  \ifboolexpr{%
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    togl {cms@citerel}%
+  }%
+  {\toggletrue{cms@relreview}%
+    \usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related}%
+    \togglefalse{cms@relreview}}%
+  {}%
   \usebibmacro{fullpostnote}%
-  \setunit{\addcomma\addspace}%
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
   \iffieldundef{urlyear}%
   {}%
-  {\printurldate}% Date fix
+  {\printurldate%
+    \ifboolexpr{%
+      togl {cms@urltime}%
+      and
+      not test {\iffieldundef{urlhour}}%
+    }%
+    {\newcunit\printurltime}%
+    {}}% Date fix
   \newcunit\newblock
   \iftoggle{cms@doionly}%
   {\iffieldundef{doi}%
@@ -3263,15 +5183,20 @@
   \usebibmacro{eprint}%
   \newcunit\newblock
   \printfield{url}%
-  \newcunit\newblock
-  \usebibmacro{caddendum}%
   \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3280,8 +5205,15 @@
 \DeclareBibliographyDriver{cite:patent}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author+holder}% +holder?
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \iffieldundef{title}%
+  {}%
+  {\printtext{%
+      \printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[subtitle]{subtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
   \setunit{\addcomma\addspace}\newblock%
@@ -3318,8 +5250,61 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:performance}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+    \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newcunit\newblock
+  \printfield{venue}%
+  \newcunit\newblock%
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3329,9 +5314,7 @@
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -3342,7 +5325,6 @@
   \setunit{\addcomma\addspace}\newblock
   \usebibmacro{periodical+date+issue}%
   \usebibmacro{fullpostnote}%
-  \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -3355,17 +5337,20 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
   \usebibmacro{finentry}}%
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -3376,9 +5361,10 @@
   \setunit{\addcomma\addspace}%
   \printfield{note}%
   \setunit{\addcomma\addspace}%
-  \usebibmacro{cperiodical+issue+year+pages}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{cjournal+issue+year+pages}%
+  \usebibmacro{eid+fullpostnote}%
   \newcunit\newblock
+  \printfield{eid}%
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -3391,8 +5377,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3401,9 +5392,7 @@
 \DeclareBibliographyDriver{cite:proceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
   \setunit{\addspace}
   \usebibmacro{cite:xref+date}%
@@ -3424,57 +5413,95 @@
       or
       togl {cms@bookcitexref}%
     }%
-  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{org+publ+loc+year}}%
-  \usebibmacro{caddendum}%
-  \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \setunit{\shorthandpunct}%
-  \usebibmacro{cms:shorthandintro}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \newcunit\newblock
-  \iftoggle{cms@citerel}%
-  {\usebibmacro{related:init}%
-    \usebibmacro{related}%
-    \newcunit}%
-  {}%
-  \usebibmacro{finentry}%
-  \usebibmacro{book:xref+finentry}}%
-    {\ifpunctmark{.}% This seems to work.
+    {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+      \newcunit
+      \usebibmacro{cbyeditor+others}%
+      \newcunit\newblock
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \setunit{\addspace}\newblock%
+      \printtext[parens]{%
+        \usebibmacro{org+publ+loc+year}}%
+      \usebibmacro{volfullpostnote}%
+      \usebibmacro{caddendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{book:xref+finentry}%
+        \usebibmacro{related:init}%
+        \usebibmacro{related:noterefhelper}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {\usebibmacro{book:xref+finentry}}%
+      \usebibmacro{finentry}}%
+    {\ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:noterefhelper}}%
+      {}%
+      \ifpunctmark{.}% This seems to work.
       {\ifbibliography%
         {\setunit{\bibsentence}}{\addspace\bibsentence}}%
       {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
       \usebibmacro{xrefprenote}% Volume fix
       \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
       \usebibmacro{finentry}}}%
-  {\ifpunctmark{.}% This seems to work.
-      {\ifbibliography%
-        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
-      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+  {\ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:noterefhelper}}%
+    {}%
+    \ifpunctmark{.}% This seems to work.
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
     \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:reference}{%
   \usebibmacro{bibindex}%
+  \iffieldundef{clonesourcekey}{}{\newcunit}%
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
@@ -3498,11 +5525,9 @@
   \newcunit\newblock
   \usebibmacro{cser+num}%
   \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{caddendum}%
+  \usebibmacro{crefpubl+loc+year}%
   \usebibmacro{volfullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
@@ -3514,8 +5539,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3524,9 +5554,7 @@
 \DeclareBibliographyDriver{cite:report}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \iffieldequalstr{entrysubtype}{unpublished}%
   {\usebibmacro{ctitle+stitle}}%
   {\usebibmacro{citaltitle+stitle}}%
@@ -3535,16 +5563,18 @@
   \newcunit%
   \printfield{type}%
   \newcunit
-  \printfield{series}%
-  \setunit{\addnbspace}%
+  \usebibmacro{series+or+shortser}%
+  \ifthenelse{\iffieldundef{type}\AND\iffieldundef{series}}%
+  {\newcunit}%
+  {\setunit{\addnbspace}}%
   \printfield{number}%
   \newcunit%
   \usebibmacro{cnotefield}%
   \setunit{\addspace}\newblock%
-  \printtext[parens]{% 
+  \printtext[parens]{%
   \usebibmacro{inst+loc+year}}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isrn}}%
@@ -3556,8 +5586,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3568,18 +5603,25 @@
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{cmag+news+author}}%
   {\usebibmacro{author/editor}}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{music+eventdate}% 17th ed.
   \newcunit\newblock
-  \printeventdate% 16th ed.
-  \setunit{\addspace}%
-  \printfield{nameaddon}% 16th ed.
+  \printeventtime%
   \newcunit\newblock
   \ifboolexpr{%
+    (
     test {\iffieldequalstr{relatedtype}{reviewof}}%
+    or
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    )
     and
     togl {cms@citerel}%
     }%
-    {\usebibmacro{related:init}%
-      \usebibmacro{related}}%
+    {\toggletrue{cms@relreview}%
+      \usebibmacro{related:init}%
+      \usebibmacro{related:noterefhelper}%
+      \usebibmacro{related}%
+      \togglefalse{cms@relreview}}%
     {\printfield{title}%
       \setunit{\subtitlepunct}%
       \printfield[noformat]{subtitle}}%
@@ -3589,22 +5631,135 @@
   \usebibmacro{language+transtitle}%
   \setunit{\addcomma\addspace}%\newblock%
   \usebibmacro{cpart+editor+translator}%
-  \newcunit%
-  \usebibmacro{issuetitle}%
-  \setunit{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }%
+    {\iffieldequalstr{relatedtype}{commenton}%
+      {\usebibmacro{eid+fullpostnote}%
+        \newcunit\newblock
+        \printfield{eid}%
+        \newcunit\newblock
+        \usebibmacro{caddendum}}%
+      {\newcunit%
+        \usebibmacro{issuetitle}%
+        \setunit{\addcomma\addspace}%
+        \usebibmacro{cbyeditor+others}%
+        \setunit{\addcomma\addspace}%
+        \printfield{note}%
+        \setunit{\addcomma\addspace}%
+        \iffieldequalstr{entrysubtype}{magazine}%
+        {\usebibmacro{mag+news+date}%
+          \newcunit\newblock
+          \printfield{type}}%
+        {\usebibmacro{cjournal+issue+year+pages}}%
+        \usebibmacro{eid+fullpostnote}%
+        \newcunit\newblock
+        \printfield{eid}%
+        \usebibmacro{caddendum}%
+        \newcunit\newblock
+        \iftoggle{cms@isbn}%
+        {\printfield{issn}}%
+        {}%
+        \usebibmacro{cite:xref+finentry}}}%
+    {\usebibmacro{eid+fullpostnote}%
+      \newcunit\newblock
+      \printfield{eid}%
+      \newcunit\newblock
+      \usebibmacro{caddendum}}}%
+  {\usebibmacro{eid+fullpostnote}%
+    \newcunit\newblock
+    \printfield{eid}%
+    \newcunit\newblock
+    \usebibmacro{caddendum}}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related:noterefhelper}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:standard}{%
+  \usebibmacro{bibindex}%
+  \iffieldundef{entrysubtype}%
+  {}%
+  {\ifnameundef{author}%
+    {\iflistundef{organization}%
+      {}%
+      {\printlist{organization}}}%
+    {\usebibmacro{justauthor}}%
+    \usebibmacro{hlpunct}}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit
+  \usebibmacro{edition}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
   \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{mag+news+date}}%
-  {\usebibmacro{cjournal+issue+year+pages}}%
-  \usebibmacro{fullpostnote}%
   \newcunit\newblock
+  \usebibmacro{series+or+shortser}%
+  \setunit*{\addnbspace}%
+  \printfield{number}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+    \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+    \reprintpunct%
+    \iffieldundef{pubstate}%
+    {}%
+    {\iffieldbibstring{pubstate}%
+      {\bibsstring{\thefield{pubstate}}}%
+      {\printfield[prenote]{pubstate}}%
+      \newcunit}%
+    \printlist{location}%
+    \iflistundef{organization}%
+    {\iflistundef{publisher}%
+      {\setunit*{\addcomma\addspace}}%
+      {\setunit*{\addcolon\addspace}%
+        \printlist{publisher}%
+        \setunit*{\addcomma\addspace}}}%
+    {\setunit*{\addcolon\addspace}%
+      \printlist{organization}%
+      \setunit*{\addcomma\addspace}}%
+    \usebibmacro{date}%
+    \setunit{\addsemicolon\addspace}%
+    \printfield{howpublished}%
+    \setunit*{\addspace}%
+    \usebibmacro{music+eventdate}}%
+  \usebibmacro{fullpostnote}%
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
+  {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
@@ -3616,9 +5771,10 @@
   \ifboolexpr{%
     togl {cms@citerel}%
     and
-    not test {\iffieldequalstr{relatedtype}{reviewof}}%
-    }%
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3627,9 +5783,7 @@
 \DeclareBibliographyDriver{cite:suppbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
+  \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{inforaft}%
   \setunit{\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -3642,6 +5796,8 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \newcunit\newblock
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit\newblock
   \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -3658,8 +5814,8 @@
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
   \clearfield{pages}% ?? For 16th ed.
-  \usebibmacro{caddendum}%
   \usebibmacro{volfullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
@@ -3671,8 +5827,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3685,9 +5846,7 @@
 \DeclareBibliographyDriver{cite:thesis}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
@@ -3698,8 +5857,8 @@
   \setunit{\addspace}%
   \printtext[parens]{%
   \usebibmacro{type+inst+year}}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -3707,8 +5866,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3717,9 +5881,7 @@
 \DeclareBibliographyDriver{cite:unpublished}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{ctitle+stitle}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -3744,8 +5906,8 @@
     \iffieldundef{eventyear}%
     {\usebibmacro{date}}%
     {\printeventdate}}%
-  \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
+  \usebibmacro{caddendum}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
   \setunit{\shorthandpunct}%
@@ -3753,8 +5915,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3762,20 +5929,38 @@
 
 \DeclareBibliographyDriver{cite:video}{%
   \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \newcunit
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
+  \ifboolexpr{%
+    test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+    and
+    (
+    not test {\iffieldundef{title}}%
+    and
+    not test {\iffieldundef{booktitle}}%
+    )
+  }%
+  {\usebibmacro{author/editor}%
+    \usebibmacro{hlpunct}%\newcunit\newblock
+    \usebibmacro{btitle+bstitle}%
+    \newcunit\newblock
+    \usebibmacro{ctitle+stitle}%
+    \setunit{\addspace}\newblock%
+    \usebibmacro{language+transtitle}%
+    \newcunit
+    \usebibmacro{byauthor}%
+    \newcunit
+    \usebibmacro{cpart+editor+translator}}%
+  {\usebibmacro{author/editor}%
+    \usebibmacro{hlpunct}%\newcunit\newblock
+    \usebibmacro{ctitle+stitle}%
+    \setunit{\addspace}\newblock%
+    \usebibmacro{language+transtitle}%
+    \newcunit
+    \usebibmacro{byauthor}%
+    \newcunit
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit
+    \usebibmacro{chapinscore}%
+    \usebibmacro{btitle+bstitle}}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -3812,15 +5997,16 @@
   \newcunit\newblock
   \usebibmacro{cser+num}%
   \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
   \usebibmacro{music+eventdate}%
   \newcunit\newblock
-  \usebibmacro{cnotefield}%
+  \printfield{usera}%
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \printfield{type}% Order of this and next?
   \usebibmacro{volfullpostnote}%
-  \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
@@ -3833,8 +6019,13 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
   {\usebibmacro{related:init}%
+    \usebibmacro{related:noterefhelper}%
     \usebibmacro{related}%
     \newcunit}%
   {}%
@@ -3897,7 +6088,7 @@
 
 \DeclareListFormat{periodplace}{\mkbibparens{#1}}
 
-\DeclareListFormat{lista}{% 
+\DeclareListFormat{lista}{%
   \ifthenelse{\value{listtotal}<2}%
   {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
   {\ifthenelse{\value{listcount}=1}%
@@ -3935,42 +6126,43 @@
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[artwork,image]{title}{%
+\DeclareFieldFormat[artwork,image,inreference]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
 
-\DeclareFieldFormat[artwork,image]{citetitle}{%
+\DeclareFieldFormat[artwork,image,inreference]{citetitle}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
 
-\DeclareFieldFormat[artwork,image]{lostitle}{%
+\DeclareFieldFormat[artwork,image,inreference]{lostitle}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
 
-\DeclareFieldFormat[letter,patent]{title}{#1\isdot}
+\DeclareFieldFormat[letter]{title}{#1\isdot}
+
+\DeclareFieldFormat[patent]{title}{\MakeSentenceCase*{#1}\isdot}
+
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
 
-\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
+\DeclareFieldFormat[patent]{citetitle}{\MakeSentenceCase*{#1}\isdot}
 
-\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[patent]{lostitle}{\MakeSentenceCase*{#1}\isdot}
 
 \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
 
-\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
-{\patchcmd{\blx@comprange@check}%
-  {\blx@comprange@comp{#1}{#2}}%
-  {\blx@tempcnta=#1%
-    \divide\blx@tempcnta100%
-    \multiply\blx@tempcnta100%
-    \ifnumequal{\blx@tempcnta}{#1}%
-    {\blx@range@out@value{#1\bibrangedash#2}}%
-    {\blx@comprange@comp{#1}{#2}}}%
-  {}{}}{}%
+%% comprange code moved to .sty
 
 \DeclareFieldFormat{postnote}{% Changed for page compression option
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\mkcomprange{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -3979,7 +6171,11 @@
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat[inreference]{postnote}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -4003,7 +6199,11 @@
       {\printtext{at}\addspace #1}}}}%
 
 \DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{pagination}%
     {\mkcomprange[\mkjuridprefix]{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
@@ -4012,7 +6212,11 @@
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat{pages}{%
-  \iftoggle{cms@comprange}%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
   {\iffieldundef{bookpagination}%
     {\mkcomprange{#1}\isdot}%
     {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
@@ -4020,13 +6224,6 @@
     {#1\isdot}%
     {\mkpageprefix[bookpagination]{#1}}}}%
 
-% \DeclareFieldFormat{edlang}{%
-%   \ifbibstring{#1}%
-%   {\bibstring{#1}}%
-%   {\ifbibstring{ed#1}%
-%     {\bibstring{ed#1}}%
-%     {\ifcapital{\MakeCapital{#1}}{#1}}}}
-
 \DeclareListFormat{edlang}{% Required for feminine forms in some
   \usebibmacro{list:delim}{% languages
     \ifbibstring{#1}%
@@ -4067,6 +6264,8 @@
     #1}%
   {\printfield{nameaddon}\addspace #1}}
 
+\DeclareFieldAlias[customc]{lostitle}[customc]{title}
+
 \DeclareFieldFormat[misc]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
@@ -4082,6 +6281,15 @@
   {\mkbibemph{#1}\isdot}%
   {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
+\DeclareFieldFormat[dataset]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldFormat[dataset]{citetitle}{%
+  \mkbibparens{\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldFormat[dataset]{lostitle}{%
+  \mkbibparens{\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
 \DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
@@ -4106,22 +6314,52 @@
   {\mkbibquote{#1\isdot}}%
   {\mkbibemph{#1}\isdot}}
 
-\DeclareFieldFormat[audio,music,video]{title}{%
-  \iffieldundef{booktitle}%
+\DeclareFieldFormat[audio,music]{title}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[audio,music,video]{citetitle}{%
-  \iffieldundef{booktitle}%
+\DeclareFieldFormat[audio,music]{citetitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[audio,music,video]{lostitle}{%
-  \iffieldundef{booktitle}%
+\DeclareFieldFormat[audio,music]{lostitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+\DeclareFieldFormat[video]{title}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[video]{citetitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{entrysubtype}{tvepisode}}%
+      and
+      not test {\iffieldundef{title}}%
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not test {\iffieldundef{shorttitle}}%
+    }%
+    {\mkbibemph{#1}\isdot}%
+    {\mkbibquote{#1\isdot}}}}
+
+\DeclareFieldFormat[video]{lostitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{entrysubtype}}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[jurisdiction]{title}{%
+  \iftoggle{cms@running@text}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{title}{#1\isdot}
 
 \DeclareFieldFormat[legislation]{title}{%
   \iffieldequalstr{entrysubtype}{hearing}%
@@ -4146,8 +6384,6 @@
 
 %%%% Other Field Formats %%%%
 
-\DeclareNumChars*{:}% For proper ibidem with multi-volume works.
-
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
 
 \DeclareFieldFormat{note}{%
@@ -4162,18 +6398,26 @@
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
 
-\DeclareFieldFormat[artwork,image]{type}{%
+\DeclareFieldFormat[artwork,image,online,article,review,suppperiodical,book]
+{type}{%
+  \ifcapital%
+  {\MakeCapital{#1}}%
+  {#1}}
+
+\DeclareFieldFormat[artwork,image,music]{howpublished}{%
   \ifcapital%
   {\MakeCapital{#1}}%
   {#1}}
 
+\DeclareFieldFormat[video]{usera}{%
+  \bibstring{on}\addspace #1}
+
+\DeclareFieldFormat{version}{\bibsstring{version}\addspace #1}%
+
 \DeclareFieldFormat{url}{\url{#1}}
 
 \DeclareFieldFormat{doi}{%
-  \textrm{doi}\addcolon
-  \ifhyperref
-    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
-    {\nolinkurl{#1}}}
+  \url{https://doi.org/#1}}
 
 \DeclareFieldFormat[music]{date}{% Generalize userd ???
   \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
@@ -4187,6 +6431,37 @@
   {#1}%
   {\printfield{userd}\addspace #1}}
 
+\DeclareFieldFormat[artwork,image]{date}{%
+  \iffieldundef{origyear}%
+  {#1}%
+  {\iftoggle{cms@switchdates}%
+    {#1}%
+    {\iffieldundef{userd}%
+      {\bibstring{printed}\addspace #1}%
+      {\printfield{userd}\addspace #1}}}}
+
+\DeclareFieldFormat[artwork,image]{origdate}{%
+  \iffieldundef{year}%
+  {#1}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{userd}%
+      {\bibstring{printed}\addspace #1}%
+      {\printfield{userd}\addspace #1}}%
+    {#1}}}
+
+\DeclareFieldFormat[artwork,image]{urldate}{%
+  \ifboolexpr{%
+    test {\iffieldundef{userd}}%
+    or
+    (
+    not test {\iffieldundef{year}}%
+    and
+    not test {\iffieldundef{origyear}}%
+    )
+  }%
+  {\bibstring{urlseen}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
 \DeclareFieldFormat{date}{% Generalize userd ???
   \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
   {#1}%
@@ -4209,7 +6484,7 @@
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \iftoggle{cms@reprint}% Date fix
+  \iffieldequalstr{pubstate}{reprint}% Date fix
   {#1}%
   {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
     {\bibstring{discrecorded}\addspace #1}% Can now match gender
@@ -4229,7 +6504,12 @@
 
 \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
 
-\DeclareFieldFormat[review,suppperiodical]{nameaddon}{#1\bibsentence}
+\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{#1\bibsentence}
+
+\DeclareFieldFormat[misc]{nameaddon}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibbrackets{#1\bibsentence}}%
+  {#1\bibsentence}}
 
 \DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
   \ifbibstring{#1}%
@@ -4264,7 +6544,7 @@
 \DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
 
 \DeclareFieldFormat{titleaddon}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%
 
 \DeclareFieldAlias{booktitleaddon}{titleaddon}
 
@@ -4335,6 +6615,8 @@
 
 \DeclareFieldFormat{series}{#1\isdot}
 
+\DeclareFieldFormat{shortseries}{#1\isdot}
+
 \DeclareFieldFormat{addendum}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
@@ -4351,6 +6633,10 @@
   {\addcomma\addspace\bibstring{partvolume}~#1}%
   {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
 
+\global\let\cmsnrpart\RN
+\DeclareFieldFormat{nrpart}{\bibsstring{part}~\cmsnrpart{#1}}% Noterefs
+\DeclareFieldFormat{nrchapter}{\bibsstring{chapter}~#1}%
+
 \DeclareFieldFormat{xrefpart}{% xref revision ???
   \ifnumerals{#1}%
   {\bibstring{partvolume}~#1}%
@@ -4361,16 +6647,14 @@
   {\bibsstring{part}~#1}%
   {#1\isdot}}%
 
-\DeclareFieldFormat[legal,legislation]{chapter}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
-    \iffieldequalstr{entrysubtype}{hansard}}%
-  {c\adddotspace #1}%
-  {\bibsstring{chapter}~#1}}%
+\DeclareFieldFormat[legal,legislation]{chapter}{c\adddotspace #1}%
+
+\DeclareFieldFormat[music]{chapter}{\bibstring{track}~#1}
 
 %% This tries to get hyperlinks from shortened cross-ref'd notes to %%
 %% long notes working properly.  Used in short and shorthand cites. %%
 
-\DeclareFieldFormat{cmshyperlink}{%
+\DeclareFieldFormat{cmshyperlink}{% Obsolete?
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
     {\bibhyperlink{\thefield{entrykey}}{#1}}%
@@ -4431,6 +6715,34 @@
       {\bibhyperlink{\thefield{crossref}}{#1}}%
       {\bibhyperlink{\thefield{entrykey}}{#1}}}}
 
+\newrobustcmd*{\cmshyper}[1]{%
+  \ifbibliography%
+  {\ifboolexpr{%
+      test {\ifentryinbib{\thefield{entrykey}}}%
+      and
+      not togl {blx@skipbib}%
+    }%
+    {\printtext[bibhyperref]{#1}}%
+    {#1}}%
+  {\iftoggle{cms@allshort}%
+    {\iftoggle{blx@skipbib}{#1}{\printtext[bibhyperref]{#1}}}%
+    {\printtext[bibhyperlink]{#1}}}}%
+
+\newrobustcmd*{\cmsshhyper}[1]{%
+  \iffootnote%
+  {\iftoggle{cms@allshort}%
+    {\iftoggle{blx@skipbib}{#1}{\printtext[bibhyperref]{#1}}}%
+    {\printtext[bibhyperlink]{#1}}}%
+  {\ifboolexpr{%
+      test {\ifentryinbib{\thefield{entrykey}}}%
+      and
+      not togl {blx@skipbib}%
+    }%
+    {\printtext[bibhyperref]{#1}}%
+    {\iftoggle{cms@allshort}%
+      {#1}%
+      {\printtext[bibhyperlink]{#1}}}}}%
+
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
 \DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
@@ -4453,7 +6765,7 @@
     {#1}}%
   \ifentrytype{jurisdiction}%
   {\newcunit}%
-  {\printunit{\relatedpunct}}}%
+  {\printunit{\relatedpunct}}}% Issue w/ printunit. Our bug?
 
 \DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
   \ifboolexpr{%
@@ -4469,11 +6781,6 @@
 
 %%%% Commands, for users and internal %%%%
 
-\newcommand*{\cbytypeeditor}{%
-  \iffieldundef{editortype}%
-    {\bibstring{cbytypeeditor}}%
-    {\bibstring{cbytype\thefield{editortype}}}}%
-
 \renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 
 \renewcommand*{\iffinalcitedelim}{%
@@ -4490,45 +6797,27 @@
     \global\csundef{@cmsst}}%
 }
 
-\newcommand{\custpunct}{%
-  \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{type}{plain}%
-    {}%
-    {\addcomma}}%
-  {\iftoggle{cms@shortnote}%
-    {\iffieldundef{postnote}%
-      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}%
-        {\addperiod}}%
-      {\addcomma}}%
-    {\addperiod}}}
-
-\newcommand{\custpunctb}{%
-  \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{userb}{plain}%
-    {}%
-    {\addcomma}}%
-  {\iftoggle{cms@shortnote}%
-    {\iffieldundef{postnote}%
-      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}%
-        {\addperiod}}%
-      {\addcomma}}%
-    {\addperiod}}}
-
-\newcommand{\classicpunct}{% 16th ed.
-  \ifthenelse{\(\iffieldequalstr{entrysubtype}{classical}\AND%
-    \iffieldundef{labeltitle}\)\OR
-    \ifentrytype{letter}}%
+\newcommand*{\classicpunct}{% 17th ed.
+  \ifboolexpr{%
+    (
+    test {\iffieldequalstr{entrysubtype}{classical}}%
+    and
+    test {\iffieldundef{labeltitle}}%
+    )
+    or
+    test {\ifentrytype{letter}}%
+    or
+    test {\ifentrytype{dataset}}%
+  }%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
 
-\newcommand{\reprintpunct}{%
+\newcommand*{\reprintpunct}{%
   \iftoggle{cms@fullnote}%
   {\setunit*{\addsemicolon\addspace}}%
   {\setunit*{\addperiod\addspace}}}
 
-\newcommand{\encypunct}{% for named entries in an encyclopedia
+\newcommand*{\encypunct}{% for named entries in an encyclopedia
   \iftoggle{cms@fullnote}%
   {\ifentrytype{book}%
     {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
@@ -4551,22 +6840,13 @@
       {\addperiod}%
       {}}}}%
 
-\newcommand{\postvolpunct}{\addcolon}% For vol:page customization
+\newcommand*{\postvolpunct}{\addcolon}% For vol:page customization
 
-\newcommand{\parttrans}{%
+\newcommand*{\parttrans}{%
   \iftoggle{cms@fullnote}%
   {\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}}}%
-
 \protected\def\partedit#1{%
   \ifcat\noexpand~\noexpand#1%
   \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
@@ -4598,37 +6878,37 @@
   \cms@tempa%
 }%
 
-\newcommand{\part@edit@i}{%
+\newcommand*{\part@edit@i}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbyeditor}\addspace}%
   {\bibstring{byeditor}\addspace}}%
 
-\newcommand{\partcomp}{%
+\newcommand*{\partcomp}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbycompiler}\addspace}%
   {\bibstring{bycompiler}\addspace}}%
 
-\newcommand{\parteditandcomp}{%
+\newcommand*{\parteditandcomp}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbyeditorcp}\addspace}%
   {\bibstring{byeditorcp}\addspace}}%
 
-\newcommand{\parttransandcomp}{%
+\newcommand*{\parttransandcomp}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbytranslatorcp}\addspace}%
   {\bibstring{bytranslatorcp}\addspace}}%
 
-\newcommand{\partedittransandcomp}{%
+\newcommand*{\partedittransandcomp}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbyeditortrcp}\addspace}%
   {\bibstring{byeditortrcp}\addspace}}%
 
-\newcommand{\parteditandtrans}{%
+\newcommand*{\parteditandtrans}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbyeditortr}\addspace}%
   {\bibstring{byeditortr}\addspace}}%
 
-\newcommand{\reprint}{%
+\newcommand*{\reprint}{%
   \iftoggle{cms@fullnote}%
   {\bibsstring{reprint}}%
   {\bibstring{reprint}}}%
@@ -4666,10 +6946,10 @@
   {\addspace}%
   {\iftoggle{cms@shortnote}%
     {\iffieldequalstr{entrysubtype}{classical}%
-      {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% Makes classical
+      {\DeclareNumChars*{abcdeABCDE:}% Makes classical
         \iffieldpages{postnote}% test more accurate. See 17.253.
         {\addspace}%
-        {\addcomma\addspace}}%
+        {\addcomma\addspace}\DeclareNumChars{.}}%
       {\addcomma\addspace}}% 16th ed -- no more volumes test.
     {\iftoggle{cms@fullnote}%
       {\ifthenelse{\(\ifentrytype{article}\OR
@@ -4715,8 +6995,8 @@
     and
     not togl {cms@fullnote}%
   }%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
 
 \newcommand*{\nameadelim}{%
   \ifboolexpr{%
@@ -4724,8 +7004,11 @@
     and
     not togl {cms@fullnote}%
   }%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\DeclareDelimFormat{dateeradelim}{\addnbspace}%
+\DeclareDelimFormat{dateaddelim}{\addnbspace}%
 
 \DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
   \begingroup% final {by}.
@@ -4740,7 +7023,7 @@
   {\ifboolexpr{%
       test {\ifnumless{\value{listcount}}{\value{liststop}}}%
       or
-      test \ifmoreitems%
+      test {\ifmoreitems}%
      }%
      {\bibstring{from#1}}%
      {\bibstring{cfrom#1}}}%
@@ -4754,7 +7037,7 @@
   \ifboolexpr{%
     test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
     and
-    test \ifmoreitems%
+    test {\ifmoreitems}%
   }%
     {\ifnumgreater{\value{liststop}}{1}%
        {\finalandcomma}%
@@ -4830,7 +7113,7 @@
     (
     togl {cms@citecrossref}%
     and
-    togl {cms@bookcitexref}% 
+    togl {cms@bookcitexref}%
     )
     or
     not togl {cms@allshort}%
@@ -4844,21 +7127,31 @@
         {\cms@citetracker@xref}}%
       {\cms@citetracker@crossref}}}}%
 
-
 \def\cms@citetracker@crossref{% cf. \blx@citetracker@global
   \ifbool{citetracker}%
     {\xifinlistcs\abx@field@crossref{blx@bsee@\the\c@refsection}%
        {}%
-       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@crossref}}%
+       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@crossref%
+         \iffieldundef{clonesourcekey}%
+         {\cms@save@locdata{crossref}}{}}}%
     {}}%
 
 \def\cms@citetracker@xref{% cf. \blx@citetracker@global
   \ifbool{citetracker}%
     {\xifinlistcs\abx@field@xref{blx@bsee@\the\c@refsection}%
        {}%
-       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@xref}}%
+       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@xref%
+         \iffieldundef{clonesourcekey}%
+         {\cms@save@locdata{xref}}{}}}%
     {}}%
 
+\def\cms@citetracker@clonesourcekey{%
+  \ifbool{citetracker}%
+  {\xifinlistcs\abx@field@clonesourcekey{blx@bsee@\the\c@refsection}%
+    {}%
+    {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@clonesourcekey%
+      \cms@save@locdata{clonesourcekey}}}%
+  {}}%
 
 \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
   \newunit\newblock
@@ -4877,12 +7170,17 @@
        {\setunit{\addspace}%
         \printtext[parens]{\printnames{holder}}}}}
 
-\renewbibmacro*{byauthor}{%
-  \ifthenelse{\ifuseauthor\OR%
-              \ifnameundef{author}}%
+\renewbibmacro*{byauthor}{% MT fix
+  \ifnameundef{author}%
+  {}%
+  {\ifboolexpr{%
+      test {\ifuseauthor}%
+      and not
+      test {\ifcsempty{abx@macro@author/editor}}%
+    }%
     {}%
-    {\bibstring{by}\addspace%
-     \printnames[byauthor]{author}}}
+    {\bibstring{byauthor}\addspace%
+     \printnames[byauthor]{author}}}}
 
 \newbibmacro*{byauthorpunct}{%
   \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
@@ -4894,7 +7192,15 @@
     {}%
     {\ifnamesequal{author}{bookauthor}%
       {}%
-      {\bibstring{by}\addspace\printnames[default]{bookauthor}%
+      {\bibstring{byauthor}\addspace\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
+\newbibmacro*{music+bookauthor}{%
+  \ifnameundef{bookauthor}%
+    {}%
+    {\ifnamesequal{author}{bookauthor}%
+      {}%
+      {\printnames[default]{bookauthor}%
      \newcunit\newblock}}}
 
 \newbibmacro*{editorpunct}{%
@@ -4902,14 +7208,22 @@
     \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\ifentrytype{video}% Change for Video type?  Appears
+  {\ifboolexpr{%
+      test {\ifentrytype{video}}% Change for Video type?  Appears
+      or
+      togl {cms@mtvolpunct}%
+    }%
     {\newcunit\newblock}% to treat italicized title as booktitle in
     {\newunit\newblock}}% available examples.  Added issuetitle 0.9.9c.
   {\newcunit\newblock}}
 
 \newbibmacro*{edition}{%
   \printfield{edition}%
-    \clearfield{edition}}%
+  \clearfield{edition}}%
+
+\newbibmacro*{version}{%
+  \printfield{version}%
+  \clearfield{version}}%
 
 \newbibmacro*{inforaft}{%
   \ifnameundef{introduction}%
@@ -4932,9 +7246,14 @@
 
 \newbibmacro*{mag+news+author}{%
   \ifnameundef{author}%
-  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
+  {\ifboolexpr{%
+      test {\iffieldequals{journaltitle}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\printtext{\bibnamedash}}%
     {\usebibmacro{journal+sub}%
       \setunit*{\addspace}%
       \printlist[periodplace]{location}%
@@ -4955,7 +7274,7 @@
   \newcunit
   \printlist{institution}%
   \setunit*{\addcomma\addspace}%
-  \usebibmacro{cmsyear}}
+  \usebibmacro{date}}%  Instead of cmsyear
 
 \newbibmacro*{institution+organization}{%
   \iflistundef{organization}%
@@ -4966,6 +7285,35 @@
     \newcunit%
     \printlist{institution}}}
 
+\newbibmacro*{misc+institution+organization}{% 17th ed.
+  \iffieldundef{number}%
+  {\iflistundef{organization}%
+    {\iflistundef{institution}%
+      {}%
+      {\printlist{institution}}}%
+    {\printlist{organization}%
+      \newcunit%
+      \printlist{institution}}}%
+  {\iflistundef{organization}%
+    {\iflistundef{institution}%
+      {\newcunit\printfield{number}}%
+      {\newcunit\printfield{number}%
+        \iftoggle{cms@fullnote}%
+        {\newcunit}%
+        {\newunit}%
+        \printlist{institution}}}%
+    {\iflistundef{institution}%
+      {\newcunit\printfield{number}%
+        \iftoggle{cms@fullnote}%
+        {\newcunit}%
+        {\newunit}%
+        \printlist{organization}}%
+      {\printlist{organization}%
+        \newcunit%
+        \printfield{number}%
+        \newcunit%
+        \printlist{institution}}}}}
+
 \newbibmacro*{bibauthor+org}{%
   \ifnameundef{author}%
   {\ifnameundef{editor}%
@@ -4975,8 +7323,10 @@
           test {\iflistequals{organization}{\bbx@lasthash}}%
           and
           not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
         }%
-        {\bibnamedash\addperiod\addspace}%
+        {\printtext{\bibnamedash}}%
         {\printlist{organization}%
           \savelist{organization}{\bbx@lasthash}}}}%
     {\usebibmacro{editor}}}%
@@ -4991,10 +7341,19 @@
     {\usebibmacro{editor}}}%
   {\usebibmacro{author/editor}}}
 
+\renewbibmacro*{bytypestrg}[2]{% From biblatex.def
+  \iffieldundef{#1type}%
+    {\bibstring{by#2}}%
+    {\ifbibxstring{by\thefield{#1type}}%
+      {\bibstring{by\thefield{#1type}}}%
+      {\printtext[note]{\thefield{#1type}}}}}%
+
 \newbibmacro*{cbytypestrg}[2]{%
   \iffieldundef{#1type}%
     {\bibstring{cby#2}}%
-    {\bibstring{cby\thefield{#1type}}}}%
+    {\ifbibxstring{cby\thefield{#1type}}%
+      {\bibstring{cby\thefield{#1type}}}%
+      {\printtext[note]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbyeditor}{%
   \ifnameundef{editor}%
@@ -5104,7 +7463,7 @@
         {\edef\@tempa{\@tempa af}%
           \clearname{afterword}}%
         {}}}%
-    \bibstring{\@tempa}\addspace%
+    \bibstring{\@tempa}\addspace% \setunit here?
     \printnames[byeditor]{editor}%
     \clearname{editor}%
     \newcunit%
@@ -5202,7 +7561,7 @@
         \printnames[byeditor]{namea}%
         \ifnameundef{nameb}%
         {}%
-        {\newunit%
+        {\usebibmacro{related:mtpunct}%\newunit% MT fix
           \bibstring{bytranslator}\addspace%
           \printnames[bytranslator]{nameb}}}}%
     {\usebibmacro{bytypestrg}{namea}{editor}%
@@ -5210,7 +7569,7 @@
       \printnames[byeditor]{namea}%
       \ifnameundef{nameb}%
       {}%
-      {\newunit%
+      {\usebibmacro{related:mtpunct}%\newunit% MT fix
         \bibstring{bytranslator}\addspace%
         \printnames[bytranslator]{nameb}}}}}
 
@@ -5237,7 +7596,7 @@
       \printnames[byeditor]{namea}%
       \ifnameundef{nameb}%
       {}%
-      {\newunit%
+      {\newcunit%
         \bibstring{cbytranslator}\addspace%
         \printnames[bytranslator]{nameb}}}}}
 
@@ -5254,8 +7613,11 @@
       \ifcsdef{cbx@incollpart}%
       {\restorefield{part}{\cbx@incollpart}}%
       {}%
-      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
-        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      \ifboolexpr{%
+        test {\IfBeginWith{\thefield{entrytype}}{mv}}%
+        and
+        not test {\IfBeginWith{\thefield{relatedtype}}{maintitl}}%
+      }%
       {\printfield{volume}%
         \clearfield{volume}%
         \global\let\cbx@incollvol\undefined% Volume fix
@@ -5271,8 +7633,11 @@
         {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
         {}}%
       {}%
-      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
-        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      \ifboolexpr{%
+        test {\IfBeginWith{\thefield{entrytype}}{mv}}%
+        and
+        not test {\IfBeginWith{\thefield{relatedtype}}{maintitl}}%
+      }%
       {\printfield[xrefpart]{part}%
         \clearfield{part}%
         \global\let\cbx@incollpart\undefined% Volume fix
@@ -5313,19 +7678,35 @@
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
   {\ifboolexpr{%
-      test {\ifentrytype{music}}% 16th ed.
+      not test {\iffieldundef{eventyear}}%
       and
       not test {\iffieldundef{booktitle}}%
       and
+      test {\ifentrytype{audio}}%
+      and
       not togl {cms@origpublished}%
     }%
-    {\bibstring{on}\setunit{\addspace}}%
+    {\bibstring{in}\setunit{\addspace}}%
     {}}%
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
     {\addspace\bibstring{of}\setunit{\addspace}}}}%
 
+\newbibmacro*{chap+as+track}{%
+  \iffieldundef{chapter}%
+  {\ifboolexpr{%
+      not test {\iffieldundef{booktitle}}%
+      and
+      not togl {cms@origpublished}%
+    }%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\printfield{chapter}\clearfield{chapter}%
+    \iffieldundef{booktitle}%
+    {}%
+    {\addspace\bibstring{on}\setunit{\addspace}}}}%
+
 \newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
   \ifboolexpr{%
     togl {cms@addendum}%
@@ -5342,20 +7723,51 @@
 
 \newbibmacro*{cser+num}{%
   \iftoggle{cms@bookseries}%
-  {\printfield{series}%
+  {\usebibmacro{series+or+shortser}%
     \printfield[sernum]{number}}%
   {}}%
 
 \newbibmacro*{ser+num}{%
-  \printfield{series}%
+  \usebibmacro{series+or+shortser}%
   \printfield[sernum]{number}}
 
+\newbibmacro*{series+or+shortser}{%
+  \iffieldundef{shortseries}%
+  {\printfield{series}}%
+  {\ifboolexpr{%
+      (
+      test {\ifcitation}%
+      and
+      togl {cms@citeshser}%
+      )
+      or
+      (
+      test {\ifbibliography}%
+      and
+      togl {cms@bibshser}%
+      )
+    }%
+    {\printfield{shortseries}}%
+    {\printfield{series}}}}
+
 \newbibmacro*{music+origdate}{%
-  \iftoggle{cms@reprint}% 16th ed.
+  \iffieldequalstr{pubstate}{reprint}% 17th ed.
   {}%
   {\iffieldundef{origyear}%
     {}%
-    {\usebibmacro{cmsorigdate}}}}% Date fix
+    {\usebibmacro{cmsorigdate}}%
+    \iffieldundef{pubstate}%
+    {}%
+    {\iffieldbibstring{pubstate}%
+      {\iftoggle{cms@fullnote}%
+        {\newcunit
+          \bibsstring{\thefield{pubstate}}}%
+        {\newunit
+          \biblstring{\thefield{pubstate}}}}%
+      {\iftoggle{cms@fullnote}%
+        {\newcunit}%
+        {\newunit}%
+        \printfield[prenote]{pubstate}}}}}% Date fix
 
 \newbibmacro*{music+eventdate}{%
   \iffieldundef{eventyear}%
@@ -5365,20 +7777,17 @@
 \newbibmacro*{ctitle+stitle}{% New test here for related entries.
   \iffieldundef{title}%
   {}%
-  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  {\printtext[title]{%
       \printfield[tnoformat]{title}%
       \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
   \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \setunit*{\addcomma}\newblock}
 
 \newbibmacro*{citaltitle+stitle}{% New test, as above.
   \iffieldundef{title}%
   {}%
-  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  {\printtext[title]{%
       \printfield[tnoformat]{title}%
       \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
@@ -5389,18 +7798,15 @@
   \newcunit\newblock}
 
 \newbibmacro*{title+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  \printtext[title]{%
     \printfield[noformat]{title}%
     \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \newunit\newblock}
 
 \newbibmacro*{italtitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  \printtext[title]{%
     \printfield[noformat]{title}%
     \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}}%
@@ -5411,7 +7817,7 @@
   \newunit\newblock}
 
 \newbibmacro*{mag+news+title}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  \printtext[title]{%
        \printfield[noformat]{title}%
        \setunit{\subtitlepunct}%
        \printfield[noformat]{subtitle}}%
@@ -5424,12 +7830,12 @@
      {\usebibmacro{related:init}%
        \usebibmacro{related}}%
      {\printfield{titleaddon}}%
-     }%\newcunit\newblock}
+     }%
 
 \newbibmacro*{cmag+news+title}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  \printtext[title]{%
        \printfield[noformat]{title}%
-       \setunit{\subtitlepunct}%{\addcolon\addspace}%
+       \setunit{\subtitlepunct}%
        \printfield[noformat]{subtitle}}%
      \setunit{\ctitleaddonpunct}%
      \ifboolexpr{%
@@ -5437,22 +7843,25 @@
        and
        togl {cms@citerel}%
      }%
-     {\usebibmacro{related:init}%
-       \usebibmacro{related}}%
+     {\toggletrue{cms@relreview}%
+       \usebibmacro{related:init}%
+       \usebibmacro{related:noterefhelper}%
+       \usebibmacro{related}%
+       \togglefalse{cms@relreview}}%
      {\printfield{titleaddon}}%
-     }%\newcunit\newblock}
+     }%
 
 \newbibmacro*{clegis+news+title}{%
   \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
     \iffieldundef{titleaddon}}%
   {}%
-  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+  {\printtext[title]{%
       \printfield[noformat]{title}%
       \setunit{\subtitlepunct}%
       \printfield[noformat]{subtitle}}%
     \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
-  }}%\newcunit\newblock}
+  }}%
 
 \newbibmacro*{language+transtitle}{%
   \iffieldundef{usere}%
@@ -5484,18 +7893,21 @@
       \setunit{\subtitlepunct}%
       \printfield[sbtnoformat]{booksubtitle}}%
     \setunit{\ctitleaddonpunct}%
-    \printfield{booktitleaddon}%
-    \setunit*{\addcomma\addspace}}}
+    \printfield{booktitleaddon}}}%
 
-\newbibmacro*{publ+loc+year}{% Revised for reprint
-  \ifboolexpr{%
-    togl {cms@reprint}%
-    and
-    not test {\ifentrytype{video}}%
-  }%
-  {\bibstring{reprint}%
-    \newcunit}%
+\newbibmacro*{publ+loc+year}{% Revised for reprint (17th ed.)
+  \iffieldundef{pubstate}%
   {}%
+  {\iffieldequalstr{pubstate}{reprint}%
+    {\ifentrytype{video}%
+      {}%
+      {\bibstring{reprint}%
+        \newcunit}}%
+    {\iffieldbibstring{pubstate}%
+      {\bibstring{\thefield{pubstate}}%
+        \newcunit}%
+      {\printfield[prenote]{pubstate}%
+        \newcunit}}}%
   \printlist{location}%
   \iflistundef{publisher}%
   {\setunit*{\addcomma\addspace}}%
@@ -5515,12 +7927,17 @@
   \usebibmacro{cmsorigdate}%
 }
 
-\newbibmacro*{howpubl+loc+year}{% Revised for reprint
+\newbibmacro*{howpubl+loc+year}{% Revised for reprint (17th ed)
   \usebibmacro{cmsorigdate}%
   \reprintpunct%
-  \iftoggle{cms@reprint}%
-  {\reprint\newcunit}%
+  \iffieldundef{pubstate}%
   {}%
+  {\iffieldbibstring{pubstate}%
+    {\iftoggle{cms@fullnote}%
+      {\bibsstring{\thefield{pubstate}}}%
+      {\biblstring{\thefield{pubstate}}}}%
+    {\printfield[prenote]{pubstate}}%
+    \newcunit}%
   \printlist{location}%
   \iffieldundef{howpublished}%
   {\setunit*{\addcomma\addspace}}%
@@ -5530,12 +7947,17 @@
   \usebibmacro{date}%
 }
 
-\newbibmacro*{inst+loc+year}{% Revised for reprint
-  \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+\newbibmacro*{inst+loc+year}{% Revised for reprint (17th ed)
+  \usebibmacro{origpubl+loc+year}% 16th ed.
   \reprintpunct%
-  \iftoggle{cms@reprint}%
-  {\reprint\newcunit}%
+  \iffieldundef{pubstate}%
   {}%
+  {\iffieldbibstring{pubstate}%
+    {\iftoggle{cms@fullnote}%
+      {\bibsstring{\thefield{pubstate}}}%
+      {\biblstring{\thefield{pubstate}}}}%
+    {\printfield[prenote]{pubstate}}%
+    \newcunit}%
   \printlist{location}%
   \iflistundef{institution}%
   {\setunit*{\addcomma\addspace}}%
@@ -5553,21 +7975,64 @@
     and
     test {\iffieldundef{year}}%
     and
-    not togl {cms@reprint}%
+    test {\iffieldundef{pubstate}}% 17th ed
   }%
   {}%
   {\setunit{\addspace}%
     \printtext[parens]{%
-      \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}%
+      \usebibmacro{origpubl+loc+year}%
       \setunit*{\addsemicolon\addspace}%
-      \ifboolexpr{%
-        togl {cms@reprint}%
-        and
-        not test{\ifentrytype{video}}%
-      }%
-      {\bibsstring{reprint}%
-        \newcunit}%
+      \iffieldundef{pubstate}% 17th ed
+      {}%
+      {\iffieldequalstr{pubstate}{reprint}%
+        {\ifentrytype{video}%
+          {}%
+          {\bibsstring{reprint}%
+            \newcunit}}%
+        {\iffieldbibstring{pubstate}%
+          {\bibsstring{\thefield{pubstate}}%
+            \newcunit}%
+          {\printfield[prenote]{pubstate}%
+            \newcunit}}}%
+      \printlist{location}%
+      \iflistundef{publisher}%
+      {\setunit*{\addspace}}%
+      {\setunit*{\addcolon\addspace}}%
+      \printlist{publisher}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{date}}}}%
+
+\newbibmacro*{crefpubl+loc+year}{% 17th ed.
+  \ifboolexpr{%
+    test {\iflistundef{location}}%
+    and
+    test {\iflistundef{publisher}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    test {\iffieldundef{pubstate}}%
+    and
+    test {\iffieldundef{note}}%
+  }%
+  {}%
+  {\setunit{\addspace}%
+    \printtext[parens]{%
+      \usebibmacro{origpubl+loc+year}%
+      \setunit*{\addsemicolon\addspace}%
+      \iffieldundef{pubstate}%
       {}%
+      {\iffieldequalstr{pubstate}{reprint}%
+        {\ifentrytype{video}%
+          {}%
+          {\bibsstring{reprint}%
+            \newcunit}}%
+        {\iffieldbibstring{pubstate}%
+          {\bibsstring{\thefield{pubstate}}%
+            \newcunit}%
+          {\printfield[prenote]{pubstate}%
+            \newcunit}}}%
+      \usebibmacro{cnotefield}%
+      \setunit*{\addcomma\addspace}%
       \printlist{location}%
       \iflistundef{publisher}%
       {\setunit*{\addspace}}%
@@ -5595,8 +8060,8 @@
       \setunit{\addcomma\addspace}%
       \usebibmacro{date}}}}% Changed for 0.9
 
-\newbibmacro*{originally+published+as}{% Punctuation fix now in 
-  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+\newbibmacro*{originally+published+as}{% Punctuation fix now in
+  \iffieldundef{userf}%                  \origfullcite for 0.8e.
   {\iffieldundef{reprinttitle}%
     {}%
     {\usebibmacro{begrelated}%
@@ -5628,9 +8093,14 @@
 \newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
   \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
   \reprintpunct%
-  \iftoggle{cms@reprint}% Revised for reprint
-  {\reprint\newcunit}%
+  \iffieldundef{pubstate}%
   {}%
+  {\iffieldbibstring{pubstate}%
+    {\iftoggle{cms@fullnote}%
+      {\bibsstring{\thefield{pubstate}}}%
+      {\biblstring{\thefield{pubstate}}}}%
+    {\printfield[prenote]{pubstate}}%
+    \newcunit}%
   \printlist{location}%
   \iflistundef{organization}%
   {\iflistundef{publisher}%
@@ -5643,44 +8113,10 @@
   \setunit*{\addcomma\addspace}%
   \usebibmacro{date}}
 
-\newbibmacro*{year+in+parens}{%
-  \iffieldundef{volume}%
-  {noformat}%
-  {parens}}
-
 \newbibmacro*{cjournal+issue+year+pages}{%
-  \usebibmacro{cjournal+ser+vol+num}%
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}%
-    and
-    test {\iffieldundef{year}}%
-    and
-    not togl {cms@switchdates}%
-  }%
-  {\iffieldundef{number}%
-    {\ifthenelse{\iffieldundef{pagination}\AND%
-        \iffieldundef{bookpagination}}%
-      {\setunit{\postvolpunct}}%
-      {\setunit{\addcolon\addspace}}}%
-    {\addcomma\addspace}}%
-  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
-    {\newcunit%
-      \iffieldundef{issue}%
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}%
-      \addcomma\addspace}%
-    {\setunit{\addspace}%
-    \printtext[parens]{% parens is the default here
-      \iffieldundef{issue}%
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}}}}
-
-\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
-  \usebibmacro{cperiodical+ser+vol+num}% subtype article
+  \ifentrytype{periodical}%
+  {\usebibmacro{cperiodical+ser+vol+num}}%
+  {\usebibmacro{cjournal+ser+vol+num}}%
   \ifboolexpr{% 16th ed.
     test {\iffieldundef{issue}}%
     and
@@ -5690,7 +8126,7 @@
   }%
   {\iffieldundef{number}%
     {\ifthenelse{\iffieldundef{pagination}\AND%
-        \iffieldundef{bookpagination}}%
+        \iffieldundef{bookpagination}\AND\iffieldundef{eid}}%
       {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}}%
     {\addcomma\addspace}}%
@@ -5716,28 +8152,32 @@
   {\printlist{origlocation}%
     \newcunit\newblock}%
   \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
     {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
     {}%
-    {\cms@datelong}}}
+    {\cms@datelong{orig}}}}
 
 \newbibmacro*{unpubl+letter+date}{% For Misc entries
-  \iflistundef{origlocation}%
+  \iffieldundef{venue}%
   {}%
-  {\printlist{origlocation}%
+  {\printfield{venue}%
     \newcunit\newblock}%
   \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
     {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
     {\printdate}% For interviews and other dated non-letters.
-    {\cms@datelong}}}
+    {\cms@datelong{orig}}}}
 
-\newbibmacro*{pubstate}{%
-  \iftoggle{cms@reprint}%
+\newbibmacro*{music+pubstate}{%
+  \iffieldequalstr{pubstate}{reprint}%
   {\iftoggle{cms@switchdates}%
     {\iffieldundef{year}%
       {}%
@@ -5762,6 +8202,15 @@
   {\printorigdate}%
   {\printdate}}
 
+\newbibmacro*{time+stamp}{% 17th ed.
+  \iftoggle{cms@switchdates}%
+  {\iffieldundef{orighour}%
+    {}%
+    {\newcunit\printorigtime}}%
+  {\iffieldundef{hour}%
+    {}%
+    {\newcunit\printtime}}}
+
 \newbibmacro{cite:xref+date}{%
   \ifboolexpr{%
     togl {cms@omitxrefdate}%
@@ -5818,8 +8267,8 @@
 
 \newbibmacro*{cmsyear}{%
   \iftoggle{cms@switchdates}%
-  {\printfield{origyear}}%
-  {\printfield{year}}}
+  {\printorigdateextra}% \printfield{origyear}
+  {\printdateextra}}% \printfield{year}
 
 \newbibmacro*{number+or+month}{%
   \iffieldundef{number}%
@@ -5828,36 +8277,37 @@
     {\usebibmacro{date}}%
     {\usebibmacro{cmsyear}}}}
 
-\newcommand*{\cms@datelong}{% Modified for 0.9
-  \iffieldundef{origmonth}%
-  {\printfield{origyear}}%
-  {\printfield[letterday]{origday}\setunit*{\nobreakspace}% Bug fix
-    \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-    \printfield{origyear}}}%
-
-\newcommand*{\cms@datelongalt}{% Modified for 0.9
-  \iffieldundef{month}%
-  {\printfield{year}}%
-  {\printfield[letterday]{day}\setunit*{\nobreakspace}%
-    \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-    \printfield{year}}}%
-
-\newcommand*{\letterdatelong}{% Modified for 0.9
-  \iftoggle{cms@switchdates}% This one for users
-  {\iffieldundef{year}% Previous two for internal use
+\newcommand*{\cms@datelong}[1]{% Modified for 17th ed.
+  \begingroup
+  \protected\def\mkbibdatelong##1##2##3{%
+    \iffieldundef{##3}%
     {}%
-    {\iffieldundef{month}%
-      {\printfield{year}}%
-      {\printfield[letterday]{day}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-        \printfield{year}}}}%
-  {\iffieldundef{origyear}%
+    {\iftoggle{cms@ukord}%
+      {\mkbibordinal{\thefield{##3}}}%
+      {\stripzeros{\thefield{##3}}}%
+      \iffieldundef{##2}{}{\nobreakspace}}%
+    \iffieldundef{##2}%
     {}%
-    {\iffieldundef{origmonth}%
-      {\printfield{origyear}}%
-      {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-        \printfield{origyear}}}}}%
+    {\mkbibmonth{\thefield{##2}}%
+      \iffieldundef{##1}{}{\space}}%
+    \iffieldbibstring{##1}%
+    {\bibstring{\thefield{##1}}}%
+    {\cmsdateeraprintpre{##1}\stripzeros{\thefield{##1}}}}%
+  \cms@mkbibrangetrunc{long}{#1}%
+  \endgroup}%
+
+\newrobustcmd*{\letterdatelong}{% For users: 17th ed.
+  \ifboolexpr{%
+    test {\ifdefstring{\blx@languagename}{american}}%
+    or
+    test {\ifdefstring{\blx@languagename}{english}}% i.e., no babel
+  }%
+  {\iftoggle{cms@switchdates}%
+    {\cms@datelong{}}%
+    {\cms@datelong{orig}}}%
+  {\iftoggle{cms@switchdates}%
+    {\printdate}%
+    {\printorigdate}}}%
 
 \newbibmacro*{cjournal+ser+vol+num}{%
   \usebibmacro{journal+sub}%
@@ -5871,10 +8321,7 @@
       \newcunit}%\setunit*{\addspace}?
   \printfield[jourvol]{volume}%
   \setunit{\addcomma\addspace}% need * here?
-  \printfield[journum]{number}%
-  \setunit{\addcomma\addspace}%
-  \printfield{eid}%
-  \newunit}%
+  \printfield[journum]{number}}% Moved eid for 17th ed.
 
 \newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
   \ifboolexpr{% article subtype
@@ -5908,10 +8355,7 @@
       \newcunit}%\setunit*{\addspace}?
   \printfield[jourvol]{volume}%
   \setunit{\addcomma\addspace}% need * here?
-  \printfield[journum]{number}%
-  \setunit{\addcomma\addspace}%
-  \printfield{eid}%
-  \newunit}
+  \printfield[journum]{number}}% Move eid field for 17th ed.
 
 \newbibmacro*{journal+sub}{%
   \iffieldundef{journaltitle}%
@@ -5944,8 +8388,15 @@
       togl {cms@url}%
       and
       not test {\iffieldundef{urlyear}}%
+    }%
+    {\printurldate%
+      \ifboolexpr{% 17th ed.
+        togl {cms@urltime}%
+        and
+        not test {\iffieldundef{urlhour}}%
       }%
-    {\printurldate}% Date fix
+      {\newcunit\printurltime}%
+      {}}% Date fix
     {}%
     \newcunit\newblock
     \iftoggle{cms@doionly}%
@@ -5983,17 +8434,29 @@
   \setunit*{\addcomma\addspace}%
   \printfield{pages}}
 
-\newbibmacro*{mag+news+date}{% 16th ed.
+\newbibmacro*{mag+news+date}{% 17th ed.
   \iftoggle{cms@fullnote}%
-  {\usebibmacro{mag+date+issue}}%
+  {\usebibmacro{cmag+date+issue}}%
   {\ifnameundef{author}%
-    {\usebibmacro{date+issue}}%
+    {\iffieldundef{maintitle}%
+      {\newunit\newblock}% Punctuation differs after title and jtitle
+      {\printtext[maintitle]{%
+          \printfield[mtnoformat]{maintitle}%
+          \setunit{\subtitlepunct}%
+          \printfield[smtnoformat]{mainsubtitle}}%
+        \setunit{\ctitleaddonpunct}%
+        \printfield{maintitleaddon}%
+        \newcunit\newblock}%
+      \printfield{usera}%
+      \setunit*{\addcomma\addspace}\newblock%
+      \usebibmacro{date+issue}}%
     {\usebibmacro{mag+date+issue}}}}
 
 \newbibmacro*{date+issue}{%
   \iffieldundef{issue}%
   {\iffieldundef{number}%
-    {\usebibmacro{date}}%
+    {\usebibmacro{date}%
+      \usebibmacro{time+stamp}}% 17th ed.
     {\iftoggle{cms@numbermonth}% For exclusion of month
       {\usebibmacro{date}}%
       {\usebibmacro{cmsyear}}%
@@ -6003,10 +8466,37 @@
     \setunit{\addspace}%
     \usebibmacro{cmsyear}}}
 
+\newbibmacro*{cmag+date+issue}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \iffieldundef{maintitle}%
+  {}%
+  {\printtext[maintitle]{%
+      \printfield[mtnoformat]{maintitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[smtnoformat]{mainsubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{maintitleaddon}}
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
 \newbibmacro*{mag+date+issue}{%
   \usebibmacro{journal+sub}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
+  \newunit\newblock
+  \iffieldundef{maintitle}%
+  {}%
+  {\printtext[maintitle]{%
+      \printfield[mtnoformat]{maintitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[smtnoformat]{mainsubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{maintitleaddon}}
   \newcunit\newblock
   \printfield{usera}% For network ID and possible section of newspaper.
   \newcunit\newblock
@@ -6036,6 +8526,15 @@
       \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
+  \iftoggle{cms@fullnote}{\newcunit}{\newunit}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\printtext[maintitle]{%
+      \printfield[mtnoformat]{maintitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[smtnoformat]{mainsubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{maintitleaddon}}
   \newcunit\newblock
   \printfield{usera}% For network ID and possible section of newspaper.
   \newcunit\newblock
@@ -6069,6 +8568,7 @@
 
 \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
+  \newcunit% MT Fix
   \iffieldundef{maintitle}%
   {}%
   {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
@@ -6116,37 +8616,41 @@
   \iftoggle{cms@fullnote}%
   {\global\togglefalse{cms@shortnote}%
     \global\togglefalse{cms@fullnote}}%
-  {\iftoggle{cms@printshhand}%
-    {\iffieldundef{postnote}%
-      {\iffieldundef{shorthand}%
-        {\global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}%
-        {\setunit{\shorthandpunct}%
-          \usebibmacro{cms:shorthandintro}%
-          \global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}}%
-      {\iffieldundef{shorthand}%
-        {\postnotewrapper%delim%
-          \usebibmacro{semel:postnote}%
-          \global\togglefalse{cms@printshhand}%
+  {\IfBeginWith{\thefield{entrytype}}{mv}%
+    {\usebibmacro{crossref:volume+postnote}}%
+    {\iftoggle{cms@printshhand}%
+      {\iffieldundef{postnote}%
+        {\iffieldundef{shorthand}%
+          {\global\togglefalse{cms@printshhand}%
+            \global\togglefalse{cms@shortnote}%
+            \global\togglefalse{cms@fullnote}}%
+          {\setunit{\shorthandpunct}%
+            \usebibmacro{cms:shorthandintro}%
+            \global\togglefalse{cms@printshhand}%
+            \global\togglefalse{cms@shortnote}%
+            \global\togglefalse{cms@fullnote}}}%
+        {\iffieldundef{shorthand}%
+          {\postnotewrapper%delim%
+            \usebibmacro{semel:postnote}%
+            \global\togglefalse{cms@printshhand}%
+            \global\togglefalse{cms@shortnote}%
+            \global\togglefalse{cms@fullnote}}%
+          {\postnotewrapper%delim%
+            \usebibmacro{semel:postnote}%
+            \setunit{\shorthandpunct}%
+            \usebibmacro{cms:shorthandintro}%
+            \global\togglefalse{cms@printshhand}%
+            \global\togglefalse{cms@shortnote}%
+            \global\togglefalse{cms@fullnote}}}}%
+      {\iffieldundef{postnote}%
+        {\usebibmacro{print+noteref}%
           \global\togglefalse{cms@shortnote}%
           \global\togglefalse{cms@fullnote}}%
         {\postnotewrapper%delim%
           \usebibmacro{semel:postnote}%
-          \setunit{\shorthandpunct}%
-          \usebibmacro{cms:shorthandintro}%
-          \global\togglefalse{cms@printshhand}%
+          \usebibmacro{print+noteref}%
           \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}}}%
-    {\iffieldundef{postnote}%
-      {\global\togglefalse{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}}%
-      {\postnotewrapper%delim%
-        \usebibmacro{semel:postnote}%
-        \global\togglefalse{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}}}}}%
+          \global\togglefalse{cms@fullnote}}}}}}%
 
 \newbibmacro*{fullpostnote}{%
   \iffieldundef{postnote}%
@@ -6160,6 +8664,22 @@
   {\postnotewrapper%delim% Don't need \ifbibliography test w/ following
     \usebibmacro{semel:postnote}}}
 
+\newbibmacro*{eid+fullpostnote}{%
+  \iffieldundef{postnote}%
+  {\iffieldundef{chapter}%
+    {\iffieldundef{pages}%
+      {\iffieldundef{eid}%
+        {}%
+        {\postnotedelim%
+          \printfield{eid}%
+          \clearfield{eid}}}%
+      {\postnotedelim%
+        \printfield{pages}}}%
+    {\postnotedelim%
+      \printfield{chapter}}}%
+  {\postnotewrapper%
+    \usebibmacro{semel:postnote}}}
+
 \newbibmacro*{juridpostnote}{%
   \iftoggle{cms@fullnote}%
   {\iffieldundef{issue}%
@@ -6289,6 +8809,9 @@
       \printfield{volumes}}}}
 
 \newbibmacro*{crossref:volume+postnote}{%
+  \IfBeginWith{\thefield{entrytype}}{mv}%
+  {\usebibmacro{extract+mt+vol}}%
+  {}%
   \ifcsdef{cbx@incollpgn}%
   {\restorefield{pagination}{\cbx@incollpgn}}%
   {}%
@@ -6395,7 +8918,8 @@
         {\ifcsdef{cbx@incollpages}%
           {\restorefield{pages}{\cbx@incollpages}%
             \usebibmacro{fullpostnote}}%
-          {\usebibmacro{fullpostnote}}}}}}}%
+          {\usebibmacro{fullpostnote}}}}}}%
+  \usebibmacro{print+noteref}}%
 
 \newbibmacro*{pages+cref+print}{% Reusable chunk for above
   \iffieldundef{part}%
@@ -6442,6 +8966,12 @@
     \usebibmacro{semel:postnote}}}
 
 \newbibmacro*{xrefprenote}{%
+  \ifboolexpr{% Kludgy fix for spurious idem
+    test {\ifdefvoid{\blx@idemtracker}}%
+    or
+    test {\ifbibliography}%
+  }%
+  {}{\blx@idemtracker}%
   \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}%
   \iffieldundef{pages}{}{\savefield{pages}{\cbx@incollpages}}%
   \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
@@ -6471,23 +9001,10 @@
   \global\let\cbx@incollpgn\undefined%
   \global\let\cbx@incollbkpgn\undefined}%
 
-\newbibmacro*{hlprenote}{% Removes spurious comma after prenote in
-  \iffieldundef{prenote}%  \headlessfullnote citations.
-    {}%
-    {\printfield{prenote}%
-     \nopunct}}% Do we need \unspace here?
-
-\newbibmacro*{hlcprenote}{% As previous, but for generalized \headlesscite
-  \iffieldundef{prenote}% command, rather than \headlessfullcite.
-    {\bibsentence}% Needed for Ibid to be capitalized.
-    {\printfield{prenote}%
-      \ifboolexpr{%
-        test {\ifciteseen}%
-        or
-        togl {cms@allshort}%
-      }%
-      {\addspace}%
-      {\nopunct}}}% Do we need \unspace here?
+\newbibmacro*{hlpunct}{%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\newcunit\newblock}}
 
 \newbibmacro*{journalprenote}{%
   \iffieldundef{prenote}%
@@ -6587,6 +9104,29 @@
   \noinherit{indexsorttitle}
 }
 
+\DeclareDataInheritance{mvcollection}{book}{% MT revision
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\AtEndPreamble{%
+  \iftoggle{cms@blogurl}% 17th ed. blogs w/ comments
+  {\DeclareDataInheritance{article}{review,suppperiodical}{%
+      \inherit{url}{url}%
+    }}{}%
+  \@ifpackageloaded{endnotes}%
+  {\patchcmd\theendnotes
+    {\enoteformat}
+    {\toggletrue{cms@endnote}\enoteformat}
+    {}
+    {\blx@err@patch{'endnotes' package}}}%
+  {}}%
+
 \DeclareDataInheritance{*}{*}{%
   \noinherit{namea}
   \noinherit{nameb}
@@ -6597,6 +9137,9 @@
   \noinherit{urlyear}
   \noinherit{urlmonth}
   \noinherit{urlday}
+  \noinherit{urlseason}
+  \noinherit{urlhour}
+  \noinherit{urlminute}
   \noinherit{doi}
   \noinherit{eprint}
   \noinherit{eprinttype}
@@ -6607,15 +9150,19 @@
   \noinherit{year}
   \noinherit{month}
   \noinherit{day}
+  \noinherit{season}
   \noinherit{endyear}
   \noinherit{endmonth}
   \noinherit{endday}
+  \noinherit{endseason}
   \noinherit{origyear}
   \noinherit{origmonth}
   \noinherit{origday}
+  \noinherit{origseason}
   \noinherit{origendyear}
   \noinherit{origendmonth}
-  \noinherit{origendday}}
+  \noinherit{origendday}
+  \noinherit{origendseason}}
 
 \DeclareSortingTemplate{cms}{% Updated for biblatex > 3.7
   \sort{
@@ -6651,12 +9198,22 @@
   }
 }
 
+\DeclareSortExclusion{misc,online}{organization}
+\DeclareSortExclusion{inreference,mvreference,reference}{%
+  author,editor,namea,nameb,namec,translator}
+
 \DeclareSortingTemplate{shortjournal}{%
   \sort{
     \field{shortjournal}
   }
 }
 
+\DeclareSortingTemplate{shortseries}{%
+  \sort{
+    \field{shortseries}
+  }
+}
+
 \newbibmacro*{compilestrg}{%
   \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}%
   {\bibstring{compilers}}%
@@ -6715,9 +9272,11 @@
           {\bibstring{editortranslator}%
             \clearname{translator}}%
           {\bibstring{editor}}}}}}%
-  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
-    {\bibstring{\thefield{editortype}s}}%
-    {\bibstring{\thefield{editortype}}}}%
+  {\ifbibxstring{\thefield{editortype}}%
+    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+      {\bibstring{\thefield{editortype}s}}%
+      {\bibstring{\thefield{editortype}}}}%
+    {\printtext[note]{\thefield{editortype}}}}%
   \clearname{editor}}%
 
 \newbibmacro*{parteditstrg}{%
@@ -6748,9 +9307,11 @@
           {\bibstring{editortranslator}%
             \clearname{nameb}}%
           {\bibstring{editor}}}}}}%
-  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
-    {\bibstring{\thefield{nameatype}s}}%
-    {\bibstring{\thefield{nameatype}}}}%
+  {\ifbibxstring{\thefield{nameatype}}%
+    {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+      {\bibstring{\thefield{nameatype}s}}%
+      {\bibstring{\thefield{nameatype}}}}%
+    {\printtext[note]{\thefield{nameatype}}}}%
   \clearname{namea}}%
 
 \newbibmacro*{clearorigin}{%
@@ -6792,17 +9353,22 @@
     \ifentrytype{proceedings}\OR\ifentrytype{reference}\OR%
     \ifentrytype{suppbook}\OR\ifentrytype{suppcollection}\)\OR%
     \(\(\ifentrytype{audio}\OR\ifentrytype{music}\OR%
-    \ifentrytype{video}\)\AND\iffieldundef{booktitle}\)}%
+    \ifentrytype{video}\)\AND\(\iffieldundef{booktitle}\AND%
+    \iffieldundef{entrysubtype}\)\)}% Song w/o album?
   {}%
   {\clearfield{title}%
     \clearfield{subtitle}%
     \clearfield{titleaddon}%
     \clearfield{usere}%
-    \clearlist{language}}%
+    \clearlist{language}%
+    \ifentrytype{music}%
+    {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
+      \clearfield{eventmonth}}%
+    {}}%
   \ifentrytype{letter}%
   {\iftoggle{cms@switchdates}%
-    {\clearfield{year}\clearfield{month}}%
-    {\clearfield{origyear}\clearfield{origmonth}}%
+    {\clearfield{year}\clearfield{month}\clearfield{season}}%
+    {\clearfield{origyear}\clearfield{origmonth}\clearfield{origseason}}%
     \clearfield{origlocation}}%
   {}%
   \clearfield{reprinttitle}%
@@ -6810,40 +9376,168 @@
 
 %%%% Related macros from biblatex.def %%%%
 
+\renewcommand*{\begrelateddelim}{%
+  \ifcitation{\newcunitpunct}%
+  {\ifboolexpr{%
+      togl {cms@fullnote}%
+      or
+      togl {cms@shortnote}%
+    }%
+    {\newcunitpunct}%
+    {\newunitpunct}}}%
+
+\newcommand*{\begrelateddelimreviewof}{%
+  \ifcitation{\newcunitpunct}%
+  {\ifboolexpr{%
+      togl {cms@fullnote}%
+      or
+      togl {cms@shortnote}%
+    }%
+    {\newcunitpunct}%
+    {\newunitpunct}}}
+
 \newbibmacro*{related:reviewof}[1]{%
   \iftoggle{cms@shortnote}%
-  {\entrydata{#1}{%
+  {\entrydata*{#1}{%
+      \cmsrelhyper{\printfield[citetitle]{labeltitle}}}}%
+  {\entrydata*{#1}{%
+      \printtext[cmsdefrelhypertarget]{%
+        \let\newunit\newcunit%
+        \iffieldundef{title}%
+        {}%
+        {\printtext[title]{%
+            \printfield[tnoformat]{title}%
+            \setunit{\subtitlepunct}%
+            \printfield[stnoformat]{subtitle}}}%
+        \newcunit%
+        \ifnameundef{author}%
+        {\newcunit%
+          \ifbibliography%
+          {\usebibmacro{byeditor+others}}%
+          {\usebibmacro{cbyeditor+others}}}%
+        {\bibstring{byauthor}\addspace%
+          \printnames[byauthor]{author}%
+          \ifbibliography%
+          {\newcunit\usebibmacro{byeditor+others}}%
+          {\newcunit\usebibmacro{cbyeditor+others}}}%
+        \setunit{\ctitleaddonpunct}%
+        \printfield{titleaddon}}}}}%
+
+\newbibmacro*{related:commenton}[1]{%
+  \iftoggle{cms@shortnote}%
+  {\entrydata*{#1}{%
+      \iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{labelname}%
+        \bibrightbracket\classicpunct}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\classicpunct}%
+        {\cmsrelnamehyper{\printnames{labelname}}%
+          \isdot\classicpunct}}%
+      \usebibmacro{cms+relextra+test}}}%
+  {\ifbibliography%
+    {\entrydata*{#1}{%
+        \ifentryinbib{\strfield{clonesourcekey}}%
+        {\iffieldequalstr{authortype}{anon}%
+          {\bibleftbracket\printnames{labelname}%
+            \bibrightbracket\classicpunct}%
+          {\iffieldequalstr{authortype}{anon?}%
+            {\bibleftbracket\printnames{labelname}?%
+              \bibrightbracket\classicpunct}%
+            {\printnames{labelname}%
+              \isdot\classicpunct}}%
+          \usebibmacro{cms+relextra+test}}%
+        {\usebibmacro{at+every+item}\toggletrue{cms@fullnote}%
+          \iffieldundef{savedyear}{}{\clearfield{year}}%
+          \iffieldundef{savedmonth}{}{\clearfield{month}}%
+          \iffieldundef{savedseason}{}{\clearfield{season}}%
+          \iffieldundef{savedurl}{}{\clearfield{url}}%
+          \iffieldundef{savedaddendum}{}{\clearfield{addendum}}%
+          \usebibmacro{bib:related:full}}}}%
+    {\entrydata*{#1}{%
+        \ifentryseen{\thefield{clonesourcekey}}%
+        {\iffieldequalstr{authortype}{anon}%
+          {\bibleftbracket\printnames{labelname}%
+            \bibrightbracket\classicpunct}%
+          {\iffieldequalstr{authortype}{anon?}%
+            {\bibleftbracket\printnames{labelname}?%
+              \bibrightbracket\classicpunct}%
+            {\cmsrelnamehyper{\printnames{labelname}}%
+              \isdot\classicpunct}}%
+          \usebibmacro{cms+relextra+test}}%
+        {\usebibmacro{at+every+item}%
+          \iffieldundef{savedurl}{}{\clearfield{url}}%
+          \iffieldundef{savedaddendum}{}{\clearfield{addendum}}%
+          \listcsxadd{blx@bsee@\the\c@refsection}{\strfield{clonesourcekey}}%
+          \usebibmacro{cite:related:full}}}}}}
+
+% Used inside previous to allow chains of relatedtype "commenton"
+% entries to mimic online thread structure.  In particular it stops
+% the printing of auto-generated title fields.
+
+\newbibmacro*{cms+relextra+test}{%
+  \ifboolexpr{%
+    test {\iffieldequalstr{relatedtype}{commenton}}%
+    and
+    (
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    or
+    (
+    test {\ifentrytype{online}}%
+    and
+    test {\IfBeginWith{\thefield{title}}{CCCCCC}}%
+    ))
+  }%
+  {\entrydata{\thefield{clonesourcekey}}{%
       \ifboolexpr{%
-        togl {cms@allshort}%
-        or
-        test {\ifbibliography}%
+        test {\iffieldundef{extratitle}}%
+        and
+        test {\iffieldundef{extraname}}%
       }%
-      {\printtext[bibhyperref]{%
-          \printfield[citetitle]{labeltitle}}}%
-      {\printtext[cmshyperlink]{%
-          \printfield[citetitle]{labeltitle}}}}}%
-  {\entrydata*{#1}{%
-      \let\newunit\newcunit%
-      % \bibstring{reviewof}%
-      \iffieldundef{title}%
       {}%
-      {\printtext[title]{%
-          \printfield[tnoformat]{title}%
-          \setunit{\subtitlepunct}%
-          \printfield[stnoformat]{subtitle}}}%
-      \newcunit%
-      \ifnameundef{author}%
-      {\newcunit%
-        \ifbibliography%
-        {\usebibmacro{byeditor+others}}%
-        {\usebibmacro{cbyeditor+others}}}%
-      {\bibstring{by}\addspace%
-        \printnames[byauthor]{author}%
-        \ifbibliography%
-        {\newcunit\usebibmacro{byeditor+others}}%
-        {\newcunit\usebibmacro{cbyeditor+others}}}%
-      \setunit{\ctitleaddonpunct}%
-      \printfield{titleaddon}}}}%
+      {\ifcsundef{cms@xfield}%
+        {\ifentrytype{online}%
+          {\setunit{\addspace}%
+            \printtext[parens]{%
+              \printdate%
+              \iffieldundef{hour}%
+              {}%
+              {\newcunit\printtime}}}%
+          {\setunit{\addspace}%
+            \printtext[parens]{%
+              \printeventdate%
+              \iffieldundef{eventhour}%
+              {}%
+              {\newcunit\printeventtime}}}}%
+        {\setunit{\shortextrapunct}%
+          \usebibmacro{shortnote+extrafield}}}}}%
+  {\cmsrelhyper{\printfield[citetitle]{labeltitle}}}}
+
+\newrobustcmd*{\cmsrelnamehyper}[1]{%
+  \ifhyperref%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{relatedtype}{commenton}}%
+      and
+      (
+      test {\ifentrytype{review}}%
+      or
+      test {\ifentrytype{suppperiodical}}%
+      or
+      (
+      test {\ifentrytype{online}}%
+      and
+      test {\IfBeginWith{\thefield{title}}{CCCCCC}}%
+      ))
+    }%
+    {\iffieldequalstr{savedrelatedtype}{commenton}%
+      {\iftoggle{cms@allshort}%
+        {#1}%
+        {\bibhyperlink{\strfield{clonesourcekey}}{#1}}}%
+      {\cmsrelhyper{#1}}}%
+    {#1}}%
+  {#1}}
 
 \renewbibmacro*{related:origpubas}[1]{%
   \entrydata*{#1}{%
@@ -6873,23 +9567,187 @@
 
 \renewbibmacro*{related:default}[1]{%
   \entrydata*{#1}{%
-    \usedriver%
+    \printtext[cmsdefrelhypertarget]{%
+      \usedriver%
       {\ifnameundef{savedauthor}%
-         {\ifnameundef{savededitor}%
+        {\ifnameundef{savededitor}%
+          {}%
+          {\ifnamesequal{editor}{savededitor}%
+            {\iftoggle{cms@headlessnote}%
+              {}%
+              {\clearname{editor}}}%
+            {}}}%
+        {\ifnamesequal{author}{savedauthor}%
+          {\iftoggle{cms@headlessnote}%
             {}%
+            {\clearname{author}}}%
+          {}}%
+        \usebibmacro{at+every+item}%
+        \renewbibmacro*{related:init}{}%
+        \DeclareNameAlias{sortname}{default}%
+        \renewbibmacro*{pageref}{}%
+        \toggletrue{cms@fullnote}%
+        \togglefalse{cms@shortnote}}%\nopunct
+      {cite:\thefield{entrytype}}}}}%
+
+\newbibmacro*{related:maintitle}[1]{%
+  \entrydata*{#1}{%
+    \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+      \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+    {\iffieldundef{volumes}{}{\savefield*{volumes}{\cms@mtvolumes}}%
+      \bibstring{in}\nopunct}%
+    {\ifcsdef{cms@mtvolumes}{\restorefield{savedvolumes}{\cms@mtvolumes}}{}%
+      \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+      {\ifthenelse{\iffieldundef{volumes}\AND\iffieldundef{savedvolumes}}%
+        {\bibsstring{thiscite}\nopunct}%
+        {\iffieldundef{volumes}%
+          {\printfield[volumes]{savedvolumes}}%
+          {\printfield{volumes}\clearfield{volumes}}%
+          \newcunit\bibsstring{thiscite}%
+          \nopunct}}%
+      {\iffieldundef{volume}%
+        {\printfield[xrefpart]{part}\usebibmacro{mt:ofvols}}%
+        {\iffieldundef{part}%
+          {\printfield{volume}\usebibmacro{mt:ofvols}}%
+          {\printfield{volume}\usebibmacro{mt:ofvols}\printfield{part}}}}%
+      \ifcsdef{cms@mtpages}{\restorefield{pages}{\cms@mtpages}}{}%
+      \ifcsdef{cms@mtpagination}{\restorefield{bookpagination}%
+        {\cms@mtpagination}}{}%
+      \ifcsdef{cms@mtchapter}{\restorefield{chapter}{\cms@mtchapter}}{}%
+      \ifcsdef{cms@mtauthor}%
+      {\savename*{author}{\cms@mtsecauthor}%
+        \ifcsequal{cms@mtauthor}{cms@mtsecauthor}%
+        {\clearname{author}}%
+        {}}%
+      {}%
+      \ifcsdef{cms@mteditor}%
+      {\savename*{editor}{\cms@mtseceditor}%
+        \ifcsequal{cms@mteditor}{cms@mtseceditor}%
+        {\clearname{editor}}%
+        {}}%
+      {}%
+      \ifcsdef{cms@mttranslator}%
+      {\savename*{translator}{\cms@mtsectranslator}%
+        \ifcsequal{cms@mttranslator}{cms@mtsectranslator}%
+        {\clearname{translator}}%
+        {}}%
+      {}%
+      \ifcsdef{cms@mtnamec}%
+      {\savename*{namec}{\cms@mtsecnamec}%
+        \ifcsequal{cms@mtnamec}{cms@mtsecnamec}%
+        {\clearname{namec}}%
+        {}}%
+      {}}%
+    \ifbibliography%
+    {\printtext[cmsdefrelhypertarget]{%
+        \usedriver%
+        {\ifnameundef{savedauthor}%
+          {\ifnameundef{savededitor}%
+            {\ifnameundef{savedtranslator}%
+              {\ifnameundef{savednamec}%
+                {}%
+                {\ifnamesequal{namec}{savednamec}%
+                  {\clearname{namec}}%
+                  {}}}%
+              {\ifnamesequal{translator}{savedtranslator}%
+                {\clearname{translator}}%
+                {}}}%
             {\ifnamesequal{editor}{savededitor}%
-               {\clearname{editor}}%
-               {}}}%
-         {\ifnamesequal{author}{savedauthor}%
+              {\clearname{editor}}%
+              {}}}%
+          {\ifnamesequal{author}{savedauthor}%
             {\clearname{author}}%
             {}}%
+          \clearfield{volume}\clearfield{part}%
+          \clearfield{maintitle}%\clearfield{volumes}%
+          \clearfield{crossref}\clearfield{xref}%
           \usebibmacro{at+every+item}%
           \renewbibmacro*{related:init}{}%
           \DeclareNameAlias{sortname}{default}%
           \renewbibmacro*{pageref}{}%
+          \renewbibmacro*{editor}{}%
+          \renewbibmacro*{author/editor}{}%
+          \clearfield{nameaddon}%
+          \toggletrue{cms@mtvolpunct}}%
+        {\thefield{entrytype}}}}%
+    {\printtext[cmsdefrelhypertarget]{%
+        \usedriver%
+        {\ifnameundef{savedauthor}%
+          {\ifnameundef{savededitor}%
+            {\ifnameundef{savedtranslator}%
+              {\ifnameundef{savednamec}%
+                {}%
+                {\ifnamesequal{namec}{savednamec}%
+                  {\clearname{namec}}%
+                  {}}}%
+              {\ifnamesequal{translator}{savedtranslator}%
+                {\clearname{translator}}%
+                {}}}%
+            {\ifnamesequal{editor}{savededitor}%
+              {\clearname{editor}}%
+              {}}}%
+          {\ifnamesequal{author}{savedauthor}%
+            {\clearname{author}}%
+            {}}%
+          \clearfield{volume}\clearfield{part}%
+          \clearfield{maintitle}%\clearfield{volumes}%
+          \clearfield{crossref}\clearfield{xref}%
+          \usebibmacro{at+every+item}%
+          \renewbibmacro*{related:init}{}%
+          \DeclareNameAlias{sortname}{default}%
+          \renewbibmacro*{pageref}{}%
+          \renewbibmacro*{editor}{}%
+          \renewbibmacro*{author/editor}{}%
+          \clearfield{nameaddon}%
           \toggletrue{cms@fullnote}%
           \togglefalse{cms@shortnote}}%
-      {cite:\thefield{entrytype}}}}%
+        {cite:\thefield{entrytype}}}}}}%
+
+\newbibmacro*{mt:ofvols}{% MT -- used by previous
+  \iftoggle{cms@hidevolumes}%
+  {\clearfield{volumes}}%
+  {\ifthenelse{\iffieldundef{volumes}\AND\iffieldundef{savedvolumes}}%
+    {}%
+    {\addspace\bibstring{of}\addspace%
+      \iffieldundef{volumes}%
+      {\printfield[default]{savedvolumes}}%
+      {\printfield[default]{volumes}\clearfield{volumes}}}}}%
+
+\newbibmacro*{extract+mt+vol}{% MT fix
+  \ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+    \iffieldequalstr{relatedtype}{maintitlenc}}%
+  {\setcounter{cms@reviewcount}{\value{instcount}}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\entrydata{\thefield{related}}{%
+        \iffieldundef{volume}{}{\savefield{volume}{\cms@mtvolume}}%
+        \iffieldundef{part}{}{\savefield{part}{\cms@mtpart}}}}%
+    {}%
+    \ifcsundef{cms@mtvolume}{}{\restorefield{volume}{\cms@mtvolume}}%
+    \ifcsundef{cms@mtpart}{}{\restorefield{part}{\cms@mtpart}}%
+    \csgundef{cms@mtvolume}\csgundef{cms@mtpart}}%
+  {}}
+
+\newbibmacro*{extract+clonekey+note}{%
+  \entrydata{\thefield{related}}{%
+    \ifboolexpr{%
+      test {\ifentryseen{\thefield{clonesourcekey}}}%
+      and
+      not togl {cms@citecrossref}%
+    }%
+    {\savefield{clonesourcekey}{\cms@shortmtkey}}%
+    {}}\iftoggle{cms@noterefs}{\addtocounter{instcount}{-1}}{}}%
+
+\newbibmacro*{extract+clonekey+bib}{%
+  \entrydata{\thefield{related}}{%
+    \ifboolexpr{%
+      test {\ifentryinbib{\strfield{clonesourcekey}}}%
+      and
+      not togl {cms@bibcrossref}%
+    }%
+    {\savefield{clonesourcekey}{\cms@shortmtkey}}%
+    {}}}%
+
+\letbibmacro*{related:maintitlenc}{related:maintitle}% MT fix
 
 \renewbibmacro*{related:multivolume}[1]{%
   \entrydata*{#1}{%
@@ -6962,6 +9820,11 @@
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibemph{#1}}
@@ -6975,6 +9838,11 @@
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{#1}%
   \endgroup
   \mkbibquote{#1}}
@@ -6988,6 +9856,11 @@
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1\addspace\bibstring{in}}%
@@ -7001,10 +9874,33 @@
     not test {\iffieldundef{langid}}%
   }%
   {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
   \lbx@inittitlehook{\bibstring{chapter}}%
   \endgroup
   \bibstring{chapter}~#1}%
 
+\DeclareFieldFormat{muschapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{track}}%
+  \endgroup
+  \bibstring{track}~#1}%
+
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
@@ -7035,17 +9931,17 @@
   {\iffieldundef{issuetitle}%
     {\iffieldundef{title}%
       {\iffieldundef{booktitle}%
-        {\iffieldundef{maintitle}%
-          {\iffieldundef{journaltitle}%
+        {\iffieldundef{journaltitle}% Switched order for 17th ed.
+          {\iffieldundef{maintitle}%
             {}%
-            {\DeclareFieldAlias{jtnoformat}{title:hook}%
-              \DeclareFieldAlias{sjtnoformat}{title}%
-              \DeclareFieldAlias{journaltitle}{default}%
-              \DeclareFieldAlias{shortjournal}{series}%
-              \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
-          {\DeclareFieldAlias{mtnoformat}{title:hook}%
-            \DeclareFieldAlias{smtnoformat}{title}%
-            \DeclareFieldAlias{maintitle}{default}}}%
+            {\DeclareFieldAlias{mtnoformat}{title:hook}%
+              \DeclareFieldAlias{smtnoformat}{title}%
+              \DeclareFieldAlias{maintitle}{default}}}%
+          {\DeclareFieldAlias{jtnoformat}{title:hook}%
+            \DeclareFieldAlias{sjtnoformat}{title}%
+            \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
         {\DeclareFieldAlias{btnoformat}{title:hook}%
           \DeclareFieldAlias{sbtnoformat}{title}%
           \DeclareFieldAlias{booktitle}{default}}}%
@@ -7063,7 +9959,9 @@
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%
-      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\ifentrytype{music}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
         \DeclareFieldAlias[video]{title}{default}%
@@ -7072,7 +9970,7 @@
     {\DeclareFieldAlias{chapter}{chapter:hook}}}}%
 
 \newbibmacro*{cite:origfull}{%
-  \printtext[cmshypertarget]{%
+  \printtext[cmsdefrelhypertarget]{%
     \usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \clearname{author}\clearfield{userf}\clearfield{shorthand}%
@@ -7081,7 +9979,7 @@
     {cite:\thefield{entrytype}}}}
 
 \newbibmacro*{cite:origpubl}{%
-  \printtext[cmshypertarget]{%
+  \printtext[cmsdefrelhypertarget]{%
     \usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}\clearfield{shorthand}%
@@ -7090,10 +9988,45 @@
       \usebibmacro{cms:titlehook}}%
     {cite:\thefield{entrytype}}}}
 
+\newbibmacro*{cite:related:full}{%
+  \printtext[cmsdefrelhypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\frenchspacing}%
+    {cite:\thefield{entrytype}}}}%
+
+\newbibmacro*{bib:related:full}{%
+  \printtext[cmsdefrelhypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\frenchspacing}%
+    {\thefield{entrytype}}}}%
+
+\DeclareFieldFormat{cmsdefrelhypertarget}{%
+  \ifhyperref%
+  {\ifbibliography%
+    {\ifentryinbib{\strfield{clonesourcekey}}%
+      {#1}%
+      {\hypertarget{cite.\the\c@refsection @\thefield{clonesourcekey}}{#1}}}%
+    {\bibhypertarget{\thefield{clonesourcekey}}{#1}}}%
+  {#1}}
+
+\newrobustcmd*{\cmsrelhyper}[1]{%
+  \ifhyperref%
+  {\ifbibliography%
+    {\ifentryinbib{\strfield{clonesourcekey}}%
+      {\bibhyperref[\strfield{clonesourcekey}]{#1}}%
+      {#1}}%
+    {\iftoggle{cms@allshort}%
+      {\IfSubStr{\thefield{savedoptions}}{skipbib}%
+        {\bibhyperref[\strfield{clonesourcekey}]{#1}}%%
+        {\bibhyperref[\thefield{savedentrykey}]{#1}}}%
+      {\iftoggle{cms@fullnote}%
+        {\ifentryseen{\thefield{clonesourcekey}}%
+          {\bibhyperlink{\strfield{clonesourcekey}}{#1}}%
+          {#1}}%
+        {\bibhyperlink{\thefield{savedentrykey}}{#1}}}}}%
+  {#1}}%
+
 \newbibmacro*{at+every+item}{%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
   \ifboolexpr{%
     test {\iffieldundef{origyear}}%
     or
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
new file mode 100644
index 00000000000..383cc3cd187
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
@@ -0,0 +1,3999 @@
+% 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-notes16.bbx}[2020/04/20 v 3.14 biblatex
+bibliography style]
+
+%%%% Initialize and format bibliography and los %%%%
+
+\providetoggle{cms@citejtabb}% Here for Sourcemap declaration
+\providetoggle{cms@bibjtabb}%
+
+\DeclareFieldFormat{shorthandwidth}{#1}
+
+\DeclareFieldFormat{shortjournalwidth}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\textbf{#1}\isdot}%
+  {\mkbibemph{\textbf{#1}}\isdot}}%
+
+\newlength{\lositemsep}
+
+\defbibenvironment{bibliography}% New for 0.9a
+  {\list
+     {}
+     {\setlength{\leftmargin}{\bibhang}%
+      \setlength{\itemindent}{-\leftmargin}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shorthand}%
+  {\list
+    {\printfield[shorthandwidth]{shorthand}}%
+    {\setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{losnotes}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\footnotesize%
+      \setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{losendnotes}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\enotesize%
+      \setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}% Kludges for endnotes
+  {\item}
+
+\defbibenvironment{shortjournal}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.7\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{sjnotes}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\footnotesize%
+      \setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{sjendnotes}%
+  {\list
+    {\printfield[shortjournalwidth]{shortjournal}}%
+    {\enotesize%
+      \setlength{\labelwidth}{\shortjournalwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{.3\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\lositemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist\nopunct\vspace{-\baselineskip}}
+  {\item}
+
+\defbibcheck{shortjournal}{% Only one list
+  \ifthenelse{\iffieldundef{shortjournal}\OR%
+    \iffieldsequal{journaltitle}{shortjournal}\OR%
+    \(\iffieldundef{journaltitle}\AND\(\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}\OR\ifentrytype{jurisdiction}\)\)}%
+  {\skipentry}%
+  {\ifcsdef{\strfield{shortjournal}}%
+    {\skipentry}%
+    {\savefieldcs{shortjournal}%
+      {\strfield{shortjournal}}}}}%
+
+% \defbibcheck{shortjournal}{% Multiple lists
+%   \ifcsdef{cms@shjour}%
+%   {\iffieldequals{shortjournal}{\cms@shjour}%
+%     {\skipentry}%
+%     {\savefield{shortjournal}{\cms@shjour}}}%
+%   {\savefield{shortjournal}{\cms@shjour}}}
+
+\AtBeginBibliography{%
+  \togglefalse{cms@headlessnote}%
+  \togglefalse{cms@shortnote}%
+  \togglefalse{cms@fullnote}%
+  \togglefalse{cms@allshort}%
+  }%
+
+\AtEveryBibitem{%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}%
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    test {\iffieldundef{year}}%
+    or
+    not test {\iffieldint{year}}%
+    or
+    not test {\iffieldint{origyear}}%
+    or
+    togl {cms@switchdates}%
+  }%
+  {}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
+
+\AtEveryLositem{%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}%
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    test {\iffieldundef{year}}%
+    or
+    not test {\iffieldint{year}}%
+    or
+    not test {\iffieldint{origyear}}%
+    or
+    togl {cms@switchdates}%
+  }%
+  {}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
+
+\AtEveryBiblistitem{shortjournal}{%
+  \global\csundef{@cmsst}%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\clearlist{location}}%
+  {}}%
+
+\InitializeBibliographyStyle{%
+  \let\bbx@lasthash\undefined}
+
+%%%% Bibliography-specific bibstrings %%%%
+
+%% Now in *.lbx %%
+
+%%%% Author, Editor, Translator, and Compiler  Macros %%%%
+
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+  {\usebibmacro{name:delim}{#3#1}%
+    \usebibmacro{name:hook}{#3#1}%
+    \ifblank{#3}{}{%
+      \ifcapital
+      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+      {\mkbibnameprefix{#3}\isdot}%
+      \ifpunctmark{'}{}{\addhighpenspace}}%
+    \mkbibnamelast{#1}\isdot
+    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
+  {\usebibmacro{name:delim}{#1}%
+    \usebibmacro{name:hook}{#1}%
+    \mkbibnamelast{#1}\isdot%
+    \ifblank{#2#3#4}{}{\addcomma}%
+    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
+\renewbibmacro*{name:first-last}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifpunctmark{'}%
+    {}%
+    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+  \mkbibnamelast{#1}\isdot
+  \ifblank{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
+        \ifboolexpr{%
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+        }%
+        {\addcomma}%
+        {}}}%
+    {\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}%
+     \ifdefvoid{#3}{}{%
+       \ifcapital
+         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+         {\mkbibnameprefix{#3}\isdot}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+     \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
+    {\usebibmacro{name:delim}{#1}%
+      \usebibmacro{name:hook}{#1}%
+      \mkbibnamefamily{#1}\isdot
+      \ifboolexpr{%
+        test {\ifdefvoid{#2}}%
+        and
+        test {\ifdefvoid{#3}}%
+      }%
+      {}{\revsdnamepunct}%
+      \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+      \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+      \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}%
+
+\renewbibmacro*{name:given-family}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
+  \ifdefvoid{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifprefchar
+      {}%
+      {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
+  \mkbibnamefamily{#1}\isdot
+  \ifdefvoid{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+      {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot%
+        \ifboolexpr{% Test needed in notes
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
+        }%
+        {\revsdnamepunct}%
+        {}}}%
+    {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
+
+\renewbibmacro*{author/editor}{%
+  \ifboolexpr{%
+    test {\ifuseauthor}%
+    or
+    togl {cms@headlessnote}
+  }%
+  {\usebibmacro{author}}%
+  {\ifusenamea%
+    {\usebibmacro{pickeditor}}%
+    {\ifuseeditor%
+      {\usebibmacro{moreeditor}}%
+      {\ifusenameb%
+        {\usebibmacro{picktranslator}}%
+        {\ifusetranslator%
+          {\usebibmacro{moretranslator}}%
+          {\ifusenamec%
+            {\usebibmacro{compiler}}%
+            {\let\bbx@lasthash\undefined}}}}}}}%
+
+\renewbibmacro*{author}{%
+  \iftoggle{cms@headlessnote}%
+  {\usebibmacro{justauthor}}%
+  {\usebibmacro{moreauthor}}}
+
+\newbibmacro*{justauthor}{%
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}}%\addperiod\addspace
+      {\printtext{\bibnamedash}%
+        \ifentrytype{customc}%
+        {\newunit}%
+        {\setunit{\addspace}}\printfield{nameaddon}}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{author}\bibrightbracket%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        {\printnames{author}%
+          \ifentrytype{customc}%
+          {\ifbibliography{\newunit}{\newcunit}}%
+          {\setunit{\addspace}}%
+          \printfield{nameaddon}%
+          \savefield{fullhash}{\bbx@lasthash}}}}}}
+
+\newbibmacro*{moreauthor}{%
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\usebibmacro{pickeditor}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}}%\addperiod\addspace
+      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{author}\bibrightbracket%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        {\printnames{author}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}%
+          \savefield{fullhash}{\bbx@lasthash}}}}}}
+
+\newbibmacro*{pickeditor}{%
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+  {\usebibmacro{moreeditor}}%
+  {\usebibmacro{parteditor}}}
+
+\newbibmacro*{moreeditor}{%
+  \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+  {\usebibmacro{picktranslator}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\editordelim}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\editordelim}}%
+    {\printnames{editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\editordelim%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{editstrg}}}
+
+\renewbibmacro*{editor}{%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+    {\ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+      {\usebibmacro{picktranslator}}%
+      {\ifboolexpr{%
+          test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\iffieldundef{nameaddon}%
+          {\printtext{\bibnamedash}\editordelim}%
+          {\printtext{\bibnamedash}\setunit{\addspace}%
+            \printfield{nameaddon}\editordelim}}%
+        {\printnames{editor}%
+          \setunit{\addspace}%
+          \printfield{nameaddon}\editordelim%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        \usebibmacro{editstrg}}}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+        and
+        not test {\iffirstonpage}%
+        and
+        togl {cms@namedash}%
+      }%
+      {\iffieldundef{nameaddon}%
+        {\printtext{\bibnamedash}\nameadelim}%
+        {\printtext{\bibnamedash}\setunit{\addspace}%
+          \printfield{nameaddon}\nameadelim}}%
+      {\printnames[sortname]{namea}%
+        \setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim%
+        \savefield{fullhash}{\bbx@lasthash}}%
+      \usebibmacro{parteditstrg}}}}%
+
+\newbibmacro*{parteditor}{%
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+  {\usebibmacro{picktranslator}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\nameadelim}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\nameadelim}}%
+    {\printnames[sortname]{namea}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\nameadelim%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parteditstrg}}}
+
+\newbibmacro*{picktranslator}{%
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
+  {\usebibmacro{moretranslator}}%
+  {\usebibmacro{parttranslator}}}
+
+\newbibmacro*{moretranslator}{%
+  \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}%
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{translator}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{transstrg}}}
+
+\newbibmacro*{parttranslator}{%
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
+  {\usebibmacro{compiler}}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{nameb}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parttransstrg}}}
+
+\newbibmacro*{compiler}{%
+  \ifthenelse{\ifnameundef{namec}\OR\NOT\ifusenamec}%
+  {\let\bbx@lasthash\undefined}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\iffieldundef{nameaddon}%
+      {\printtext{\bibnamedash}\newcunit}%
+      {\printtext{\bibnamedash}\setunit{\addspace}%
+        \printfield{nameaddon}\newcunit}}%
+    {\printnames[sortname]{namec}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}\newcunit%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{compilestrg}}}
+
+\renewcommand*{\revsdnamedelim}{\addcomma}
+
+\DeclareNameAlias{author}{sortname}% Needed in 0.9
+\DeclareNameAlias{editor}{sortname}
+\DeclareNameAlias{translator}{sortname}
+
+%%%% Drivers for Bibliography entries and Shorthands %%%%
+
+\DeclareBibliographyDriver{shorthand}{%
+  \iftoggle{cms@fullshhand}%
+  {\usedriver{\frenchspacing}%
+    {\thefield{entrytype}}%
+    \finentry}%
+  {\ifnameundef{labelname}%
+    {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+        \ifentrytype{periodical}}%
+      {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+          \newcunit}}%
+      {\ifentrytype{manual}%
+        {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+        {}}}%
+    {\usebibmacro{author/editor}%
+      \setunit{\addcomma\addspace}}%
+    \printfield[lostitle]{title}%
+    \finentry}}
+
+\DeclareBibliographyDriver{shortjournal}{%
+  \iffieldundef{journaltitle}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\printtext[journaltitle]{%
+      \printfield[jtnoformat]{journaltitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sjtnoformat]{journalsubtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  \finentry}%
+
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=shorttitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map{
+      \pertype{jurisdiction}
+      \pertype{legal}
+      \pertype{legislation}
+      \step[fieldsource=journaltitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{\\adddot},%
+      replace=\regexp{\\ADDDOT}]
+      \step[fieldsource=shortjournal, match=\regexp{[a-z]}, final]
+      \step[fieldset=shortjournal, fieldvalue=\addnbspace, append]
+    }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{\\ADDDOT},%
+      replace=\regexp{\\adddot}]
+      }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=title, match=\regexp{Const}, final]
+      \step[fieldset=entrysubtype, fieldvalue=constitution]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=entrysubtype, match=\regexp{canada}, final]
+      \step[fieldsource=bookpagination, match={section},
+      replace={canadasection}]
+      \step[fieldsource=pagination, match={section},
+      replace={canadasection}]
+    }
+    \map{
+      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldset=year, origfieldval, final]
+      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      replace=\regexp{\\bibstring\{$1\}}]%$
+    }
+    \map{
+      \pertype{article}
+      \pertype{periodical}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=entrysubtype, match={newspaper},
+      replace={magazine}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=subtitle, final]
+      \step[fieldsource=title,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=title, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=booksubtitle, final]
+      \step[fieldsource=booktitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=booktitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=issuesubtitle, final]
+      \step[fieldsource=issuetitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=issuetitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=journalsubtitle, final]
+      \step[fieldsource=journaltitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=journaltitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=mainsubtitle, final]
+      \step[fieldsource=maintitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+  }
+}%
+
+\DeclareBibliographyDriver{article}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{mag+news+author}%
+  \newunit\newblock
+  \usebibmacro{mag+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{mag+news+date}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+  {\usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{mag+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
+  \usebibmacro{journal+issue+year+pages}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{artwork}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit%\setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \printfield{ismn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \newunit\newblock
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newcunit\newblock
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
+  \printfield{chapter}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%cmsorigdate%\printorigdate
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newcunit
+  \printlist[][-\value{listtotal}]{lista}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newunit}%
+    {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{bookinbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{howpubl+loc+year}%
+  \newunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{justauthor}%
+  \iffieldundef{nameaddon}%
+  {\newunit}%
+  {\setunit{\addspace}}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{image}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit%\setunit{\addcomma\addspace}%
+  \usebibmacro{date}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }%
+  {\setunit{\addperiod\addspace}%
+  \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\newunit}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }%
+  {\newunit\newblock
+  \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }%
+  {\setunit{\addperiod\addspace}%
+  \usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{inreference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}% need asterisk?
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newcunit\newblock
+  \printlist[][-\value{listtotal}]{lista}%
+  \newcunit\newblock%setunit{\addspace}% 16th ed
+  \ifnameundef{author}%
+  {}%
+  {\printtext{% 16th ed
+      \bibstring{by}%
+      \addspace%
+      \printnames[byauthor]{author}}}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{jurisdiction}{cite:jurisdiction}
+
+\DeclareBibliographyAlias{legal}{cite:legal}
+
+\DeclareBibliographyAlias{legislation}{cite:legislation}
+
+\DeclareBibliographyDriver{letter}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \printtext[title]{%
+    \printfield[noformat]{title}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{letter+date}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%\bibsentence
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }%
+  {\usebibmacro{chapincoll}%
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\newunit}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\newunit}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{bibauthor+org}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock
+  \usebibmacro{edition}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock%
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{italtitle+stitle}}%
+  {\printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newcunit\newblock%
+    \usebibmacro{unpubl+letter+date}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \iffieldundef{entrysubtype}%
+  {\newcunit\newblock
+    \usebibmacro{date}}%
+  {}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\newunit}% Fix customc?
+  {\newcunit}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock%
+  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \newunit\newblock
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newunit
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{pubstate}% 16th ed.
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printlist{organization}% Rearranged for 16th ed.
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \iffieldundef{urlyear}%
+  {}%
+  {\printurldate}% Date fix
+  \newunit\newblock
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
+  \newunit\newblock
+  \usebibmacro{eprint}%
+  \newunit\newblock
+  \printfield{url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author+holder}% + holder?
+  \newunit\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addperiod\addspace}%
+  \printfield{note}%
+  \setunit{\addperiod\addspace}%
+  \printfield{type}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}%
+    {}%
+    {\setunit*{\addspace}%
+     \printtext[parens]{%
+       \printlist[][-\value{listtotal}]{location}}}%
+  \newcunit\newblock
+  \printfield{version}%
+  \iffieldundef{origyear}%
+  {\iffieldundef{year}%
+    {}%
+    {\bibstring{patentfiled}\setunit{\addspace}% Issued -> filed
+      \printdate}}%
+  {\bibstring{patentfiled}\setunit{\addspace}%
+    \usebibmacro{cmsorigdate}%
+    \setunit{\finalandcomma\addspace\bibstring{and}%
+      \addspace\bibstring{patentissued}\addspace}%
+    \usebibmacro{date}}%
+  \newcunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{periodical+date+issue}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
+  \usebibmacro{periodical+issue+year+pages}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{org+publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}%
+{\ifboolexpr{% Changed for 16th ed.
+    test {\ifterm}%
+    or
+    test {\ifpunctmark{*}}%
+  }%
+  {\setunit{\addspace\bibsentence}}%
+  {\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{reference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{italtitle+stitle}%
+  \newunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \setunit*{\addperiod\addspace}% need asterisk?
+  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newcunit\newblock
+  \printfield{chapter}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\usebibmacro{title+stitle}}%
+  {\usebibmacro{italtitle+stitle}}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \newcunit
+  \printfield{series}%
+  \setunit{\addnbspace}%
+  \printfield{number}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{inst+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{review}{%
+  \usebibmacro{bibindex}%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{mag+news+author}}%
+  {\usebibmacro{author/editor}}%
+  \newunit\newblock
+  \printeventdate% 16th ed.
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock%
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock%
+  \usebibmacro{issuetitle}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{byeditor+others}%
+  \usebibmacro{editorpunct}%\newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{mag+news+date}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}}%
+  {\usebibmacro{journal+issue+year+pages}}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{suppbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author}%
+  \newunit\newblock
+  \usebibmacro{inforaft}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newunit
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \newcunit\newblock
+  \usebibmacro{chap+pag}%
+  \newunit\newblock
+  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \newcunit%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
+  \newunit
+  \usebibmacro{volume+or+volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{suppcollection}{suppbook}
+
+\DeclareBibliographyAlias{suppperiodical}{review}
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}%\newblock%
+  \usebibmacro{language+transtitle}%
+  \newunit% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \printfield{note}%
+  \setunit{\addperiod\addspace}\newblock%
+  \usebibmacro{type+inst+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
+  \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \printfield{eventtitle}%
+  \setunit*{\ctitleaddonpunct}\newblock%
+  \printfield{eventtitleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
+  \printlist{location}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iffieldundef{eventyear}%
+  {\usebibmacro{date}}%
+  {\printeventdate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \printtext[title]{%
+    \printfield[noformat]{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}}%
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \setunit{\addperiod\addspace}% 16th ed.
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}%
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
+  \newcunit\newblock
+  \usebibmacro{volume+pages}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{music+eventdate}%
+  \newunit\newblock
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{type}% 16th ed.
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
+%%%% Other Formatting Macros %%%%
+
+\newbibmacro*{bib+doi+url}{% 16th ed.
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{urlyear}}%
+    }%
+  {\printurldate}% Date fix
+  {}%
+  \iffieldundef{addendum}% Punctuation fixes in 0.9.9c
+  {\newunit\newblock}%
+  {\newcunit\newblock}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \setunit*{\addperiod\addspace}\newblock%
+      \clearfield{url}}}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
+    {\printfield{doi}%
+      \setunit*{\addperiod\addspace}\newblock}%
+    {}}%
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
+  {\usebibmacro{eprint}%
+    \setunit*{\addperiod\addspace}\newblock}%
+  {}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
+  {\printfield{url}}%
+  {}}%
+
+\newbibmacro{bib:xref+date}{% Experiment for xrefs
+  \ifboolexpr{%
+    togl {cms@omitxrefdate}%
+    or
+    togl {cms@bookbibxref}%
+    or
+    test {\iffieldundef{crossref}}%
+    or
+    test {\iffieldundef{maintitle}}%
+    or
+    ((
+    test {\iffieldundef{year}}%
+    or
+    togl {cms@switchdates}%
+    )
+    and
+    (test {\iffieldundef{origyear}}%
+    or
+    not togl {cms@switchdates}%
+    ))
+  }%
+  {\ifboolexpr{%
+      togl {cms@omitxrefdate}%
+      or
+      togl {cms@bookbibxref}%
+      or
+      test {\iffieldundef{xref}}%
+      or
+      test {\iffieldundef{maintitle}}%
+      or
+      ((
+      test {\iffieldundef{year}}%
+      or
+      togl {cms@switchdates}%
+      )
+      and
+      (test {\iffieldundef{origyear}}%
+      or
+      not togl {cms@switchdates}%
+      ))
+    }%
+    {}%
+    {\printtext[parens]{\usebibmacro{date}}}}%
+  {\printtext[parens]{\usebibmacro{date}}}}
+
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+  \ifboolexpr{%
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}%
+    {\iffieldundef{part}%
+      {\iffieldundef{pages}%
+        {\printfield{volume}}% Still print this w/o part or pages???
+        {\ifthenelse{\iffieldnums{pages}\AND%
+            \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+          {\printfield[default]{volume}%
+            \postvolpunct%
+            \printfield{pages}}%
+          {\printfield{volume}%
+            \addcomma\addspace%
+            \printfield{pages}}}}%
+      {\printfield{volume}%
+        \printfield{part}%
+        \newcunit%
+        \printfield{pages}}}}%
+  {\ifboolexpr{%
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {\printfield{pages}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}}}%
+
+\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\usebibmacro{cms-in:}% 16th ed (Also 15th?)
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}
+
+\newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+      \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% ???
+    {\usebibmacro{cms-in:}% 16th ed (also 15th?)
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}% InIn fix
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[noformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}
+
+\newbibmacro*{journal+issue+year+pages}{%
+  \usebibmacro{cjournal+ser+vol+num}%
+  \ifboolexpr{% 16th ed.
+    test {\iffieldundef{issue}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    not togl {cms@switchdates}%
+  }%
+  {\iffieldundef{number}%
+    {\iffieldundef{bookpagination}%
+      {\setunit{\postvolpunct}}%
+      {\setunit{\addcolon\addspace}}%
+      \printfield{pages}}%
+    {\newcunit\printfield{pages}}}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+    {\newcunit%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}%
+      \newcunit\printfield{pages}}%
+    {\setunit{\addspace}%
+    \printtext[parens]{%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}%
+    \setunit{\addcolon\addspace}%
+    \printfield{pages}}}}
+
+\newbibmacro*{periodical+issue+year+pages}{%
+  \usebibmacro{cperiodical+ser+vol+num}%
+  \ifboolexpr{% 16th ed.
+    test {\iffieldundef{issue}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    not togl {cms@switchdates}%
+  }%
+  {\iffieldundef{number}%
+    {\iffieldundef{bookpagination}%
+      {\setunit{\postvolpunct}}%
+      {\setunit{\addcolon\addspace}}%
+      \printfield{pages}}%
+    {\newcunit\printfield{pages}}}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+    {\newcunit%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}%
+      \newcunit\printfield{pages}}%
+    {\setunit{\addspace}%
+    \printtext[parens]{%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}%
+    \setunit{\addcolon\addspace}%
+    \printfield{pages}}}}
+
+\newbibmacro*{bycompiler}{%
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{bycompiler}\addspace%
+     \printnames[bycompiler]{namec}}}
+
+\renewbibmacro*{byeditor}{%
+  \ifnameundef{editor}%
+    {}%
+    {\usebibmacro{bytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{byeditorx}}
+
+\renewbibmacro*{byeditorx}{%
+  \ifnameundef{editora}%
+    {}%
+    {\usebibmacro{bytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \usebibmacro{editorpunct}}%
+  \ifnameundef{editorb}%
+    {}%
+    {\usebibmacro{bytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \usebibmacro{editorpunct}}%
+  \ifnameundef{editorc}%
+    {}%
+    {\usebibmacro{bytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \usebibmacro{editorpunct}}}
+
+\renewbibmacro*{byeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND
+    \(\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}\)}%
+    {\def\@tempa{byeditor}%
+     \ifnamesequal{editor}{translator}%
+       {\edef\@tempa{\@tempa tr}%
+        \clearname{translator}}%
+       {}%
+       \ifnamesequal{editor}{namec}%
+       {\edef\@tempa{\@tempa cp}%
+         \clearname{namec}}%
+       {}%
+     \ifnamesequal{editor}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{editor}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{editor}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{editor}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{editor}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \clearname{editor}%
+     \usebibmacro{editorpunct}%
+     \usebibmacro{byeditorx}}%
+   {\usebibmacro{byeditor}}%
+  \usebibmacro{bytranslator+others}}
+
+\renewbibmacro*{bytranslator+others}{%
+  \ifnameundef{translator}%
+    {}%
+    {\def\@tempa{bytranslator}%
+      \ifnamesequal{translator}{namec}%
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}%
+      {}%
+     \ifnamesequal{translator}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{translator}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\addspace%
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{bycompiler+others}}
+
+\newbibmacro*{bycompiler+others}{%
+  \ifnameundef{namec}%
+    {}%
+    {\def\@tempa{bycompiler}%
+     \ifnamesequal{namec}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{namec}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\addspace%
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \usebibmacro{editorpunct}}%
+  \usebibmacro{byothers}}%
+
+\newbibmacro*{byothers}{% Changed for 0.9
+  \usebibmacro{bytranslator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{bycompiler}%
+  \usebibmacro{editorpunct}%
+%  \usebibmacro{byredactor}%
+%  \usebibmacro{editorpunct}%
+  \usebibmacro{withcommentator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withannotator}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withintroduction}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withforeword}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{withafterword}}
+
+%%%% New date macros enabling special handling of seasons, decades,
+%%%% centuries, date eras, and uncertain dates (circa and ?), along
+%%%% with CMS compression of year ranges.
+
+\newcount\cms@tempcnta
+\newcount\cms@tempcntb
+
+\protected\def\cmsunspecified#1#2{%
+  \ifboolexpr{%
+    test {\iffieldundef{#2dateunspecified}}%
+    or
+    togl {cms@alwaysrange}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{#2endyear}}%
+      or
+      test {\iffieldequalstr{#2dateera}{bce}}%
+      or
+      not togl {cms@compyears}%
+      or
+      not test {\iffieldnum{#2year}}%
+      or
+      not test {\iffieldnum{#2endyear}}%
+      or
+      not test {\if@cms@onlyyears{#2}}%
+    }%
+    {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2year}}%
+    {\cmscompcenturies{#2}%
+      \ifboolexpr{%
+        (
+        test {\if@cms@bracket}%
+        and
+        not test {\if@cms@endbracket}
+        )
+        or
+        (
+        not test {\if@cms@bracket}%
+        and
+        test {\if@cms@endbracket}%
+        )
+        or
+        (
+        test {\if@cms@endcirca}%
+        and
+        not test {\if@cms@circa}%
+        )
+        or
+        not test {\ifnumequal{\cms@tempcnta}{\cms@tempcntb}}%
+      }%
+      {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+      {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}}}%
+  {\ifboolexpr{%
+      test {\iffieldequalstr{#2dateunspecified}{yearindecade}}%
+      and
+      test {\ifbibstring{decade}}%
+      and
+      not togl {cms@decaderange}%
+    }%
+    {\cmsmkdecade{#1}{#2}}%
+    {\ifboolexpr{%
+        test {\iffieldequalstr{#2dateunspecified}{yearincentury}}%
+        and
+        test {\ifbibstring{century}}%
+        and
+        not togl {cms@centuryrange}%
+      }%
+      {\cmsmkcentury{#2}}%
+      {\iftoggle{cms@compyears}%
+        {\cmsdateeraprintpre{#2year}\cmscompressyears{#2}%
+          \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}}}}}%
+
+\protected\def\cmscompressyears#1{%
+  \def\cms@tempa{\thefield{#1year}--\thefield{#1endyear}}%
+  \edef\cms@tempb{\mkcomprange{\csuse{cms@tempa}}}%
+  \cms@tempb}%
+
+\def\cmscompcenturies#1{%
+  \cms@tempcnta=\thefield{#1year}%
+  \divide\cms@tempcnta100
+  \cms@tempcntb=\thefield{#1endyear}%
+  \divide\cms@tempcntb100}
+
+\protected\def\cmsformatextra{}% Author-date requires these
+
+\protected\def\cmsformatendextra{}%
+
+\newbibmacro*{cmsextradate}{}%
+
+\newbibmacro*{cmsparensextradate}{}%
+
+\protected\def\cmsdateeraprintpre#1{% AD/BC order depends on language
+  \ifdefstring\blx@dateera{astronomical}%
+  {\iffieldnum{#1}%
+    {\begingroup%
+      \let\blx@tempa\@empty%
+      \blx@ifstrendswith{#1}{endyear}%
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+        \def\blx@tempa{end}}%
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifnumless{0-\thefield{#1}}{0}%
+        {\printtext{\csuse{bibdateera\blx@tempa prefix}}}%
+        {}}%
+      {}%
+      \endgroup}%
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      test {\if@cms@adfirst}%
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}{}{\global\toggletrue{cms@bc}}}%
+        {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+          {\ifdefstring\blx@tempa{end}%
+            {\iftoggle{cms@bc}%
+              {\printtext{%
+                  \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+                \global\togglefalse{cms@bc}}%
+              {}}%
+            {\printtext{%
+                \bibsstring{\blx@dateera@ce}\printdelim{dateaddelim}}%
+              \global\togglefalse{cms@bc}}}%
+          {}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\protected\def\cmsdateeraprint#1{% AD/BC order depends on language
+  \ifboolexpr{%
+    test {\ifdefstring\blx@dateera{christian}}%
+    and
+    test {\if@cms@adfirst}%
+  }%
+  {\iffieldnum{#1}
+    {\begingroup
+      \let\blx@tempa\@empty
+      \blx@ifstrendswith{#1}{endyear}
+      {\blx@stripfromendinto{#1}{endyear}\blx@datetype
+        \def\blx@tempa{end}}
+      {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+      \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+      {\ifdefstring\blx@tempa{end}%
+        {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+          \printtext{\printdelim{dateeradelim}\midsentence%
+            \bibsstring{\blx@dateera@bce}}\relax%
+          \fi}%
+        {\csuse{if\blx@datetype enddateera}{bce}%
+          {}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}\relax%
+            \fi}}}%
+      {}%
+      \endgroup}
+    {}}%
+  {\ifboolexpr{%
+      test {\ifdefstring\blx@dateera{secular}}%
+      or
+      (
+      test {\ifdefstring\blx@dateera{christian}}%
+      and
+      not test {\if@cms@adfirst}%
+      )
+    }%
+    {\iffieldnum{#1}%
+      {\begingroup%
+        \let\blx@tempa\@empty%
+        \blx@ifstrendswith{#1}{endyear}%
+        {\blx@stripfromendinto{#1}{endyear}\blx@datetype%
+          \def\blx@tempa{end}}%
+        {\blx@stripfromendinto{#1}{year}\blx@datetype}%
+        \csuse{if\blx@datetype\blx@tempa dateera}{bce}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+            \printtext{\printdelim{dateeradelim}\midsentence%
+              \bibsstring{\blx@dateera@bce}}\relax%
+            \fi}%
+          {\csuse{if\blx@datetype enddateera}{bce}%
+            {}%
+            {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto%
+              \printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@bce}}\relax%
+              \fi}}}%
+        {\ifdefstring\blx@tempa{end}%
+          {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+            {\printtext{\printdelim{dateeradelim}\midsentence%
+                \bibsstring{\blx@dateera@ce}}}%
+            {}}%
+          {\csuse{if\blx@datetype enddateera}{ce}%
+            {}%
+            {\ifnumless{\thefield{#1}}\blx@dateeraauto%
+              {\printtext{\printdelim{dateeradelim}\midsentence%
+                  \bibsstring{\blx@dateera@ce}}}%
+              {}}}}%
+        \endgroup}%
+      {}}%
+    {}}}
+
+\newrobustcmd*{\cms@datebrackets}{%
+  \iftoggle{cms@nodatebrackets}%
+  {\global\boolfalse{cms:bracket}%
+    \ifboolexpr{%
+      test {\if@cms@bracket}%
+      and
+      togl {cms@nodates}%
+      and
+      not bool {cms:nd}%
+    }%
+    {\booltrue{cms:nd}\bibstring{nodate}\addcomma\addspace}%
+    {\boolfalse{cms:nd}}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@yearbrackets}{%
+  \iftoggle{cms@noyearbrackets}%
+  {\global\boolfalse{cms:bracket}%
+    \ifboolexpr{%
+      test {\if@cms@bracket}%
+      and
+      togl {cms@nodates}%
+      and
+      not bool {cms:nd}
+    }%
+    {\booltrue{cms:nd}\bibstring{nodate}\addcomma\addspace}%
+    {\boolfalse{cms:nd}}}%
+  {\global\booltrue{cms:bracket}%
+    \bibopenbracket}}%
+
+\newrobustcmd*{\cms@mkbibrangetrunc}[2]{% DATE FIX
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2day}}%
+          {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+            {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+              \clearfield{#2endyear}}% Clear up inheritance problem ???
+            {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkbibrangefull}[2]{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+        \ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\newrobustcmd*{\cms@mkyearrangeextra}[3][]{%
+  \begingroup
+  \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}%
+  \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}%
+  \blx@metadateinfo{#3}%
+  \iffieldundef{#3year}
+  {\blx@nounit}%
+  {\printtext{%
+      \if@cms@bracket%
+      {\cms@yearbrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \ifdateyearsequal{#3}{#3end}%
+      {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3endyear}%
+        \clearfield{#3endyear}}%
+      {\ifblank{#1}%
+        {\cmsunspecified{#2}{#3}}%
+        {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#3endyear}
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
+      {\iffieldequalstr{#3endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@yearbrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \csuse{mkbibdate#2}{#3endyear}{}{}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#3endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#3endyear}}}%
+          {\if@cms@enduncertain%
+            {\bibdateuncertain}%
+            {}%
+            \cmsdateeraprint{#3endyear}}}}}}%
+  \endgroup}%
+
+\def\if@cms@adfirst{%
+  \ifboolexpr{%
+    test {\ifdefstring\blx@languagename{american}}%
+    or
+    test {\ifdefstring\blx@languagename{british}}%
+    or
+    test {\ifdefstring\blx@languagename{canadian}}%
+    or
+    test {\ifdefstring\blx@languagename{english}}%
+    or
+    test {\ifdefstring\blx@languagename{UKenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{USenglish}}%
+    or
+    test {\ifdefstring\blx@languagename{australian}}%
+    or
+    test {\ifdefstring\blx@languagename{newzealand}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@bracket{%
+  \ifboolexpr{%
+    (
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endbracket{%
+  \ifboolexpr{%
+    (
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+    )
+    or
+    (
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@circa{%
+  \ifboolexpr{%
+    test {\ifdatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@uncertain{%
+  \ifboolexpr{%
+    test {\ifdateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@endcirca{%
+  \ifboolexpr{%
+    test {\ifenddatecirca}%
+    and
+    togl {blx@datecirca}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@enduncertain{%
+  \ifboolexpr{%
+    test {\ifenddateuncertain}%
+    and
+    togl {blx@dateuncertain}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+\def\if@cms@onlyyears#1{%
+  \ifboolexpr{%
+    test {\iffieldundef{#1month}}%
+    and
+    test {\iffieldundef{#1endmonth}}%
+    and
+    test {\iffieldundef{#1day}}%
+    and
+    test {\iffieldundef{#1endday}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}
+
+%%%% Related functionality from standard.bbx %%%%
+
+\newcounter{bbx:relatedcount}
+\newcounter{bbx:relatedtotal}
+
+\newbibmacro*{related:init}{%
+  \csundef{bbx:relatedloop}}
+
+\newbibmacro*{begrelated}{\ifcsdef{bbx@lasthash}%
+  {\let\cms@related@hash\bbx@lasthash}{}}%
+\newbibmacro*{endrelated}{\ifcsdef{cms@related@hash}%
+  {\global\let\bbx@lasthash\cms@related@hash%
+    \let\cms@related@hash\undefined}{}}%
+\newbibmacro*{begrelatedloop}{}
+\newbibmacro*{endrelatedloop}{}
+
+\def\ifrelatedloop{%
+  \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}%
+    or test {\xifinlistcs{\strfield{clonesourcekey}}{bbx:relatedloop}} }}
+
+\newbibmacro*{related}{%
+  \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }%
+    {}%
+    {\ifcsundef{begrelateddelim\strfield{relatedtype}}%
+       {\printunit{\begrelateddelim}}%
+       {\printunit{\csuse{begrelateddelim\strfield{relatedtype}}}}%
+     \usebibmacro{begrelated}%
+     \def\bbx@tempa{}%
+     \setcounter{bbx:relatedtotal}{0}%
+     \def\do##1{%
+       \entrydata{##1}{%
+         \ifrelatedloop%
+           {}%
+           {\stepcounter{bbx:relatedtotal}%
+            \gappto{\bbx@tempa}{##1,}}}}%
+     \docsvfield{related}%
+     \restorefield{related}{\bbx@tempa}%
+     \ifnumgreater{\value{bbx:relatedtotal}}{0}%
+       {\listcsxadd{bbx:relatedloop}{\strfield{entrykey}}%
+        \iffieldundef{clonesourcekey}%
+          {}%
+          {\listcsxadd{bbx:relatedloop}{\strfield{clonesourcekey}}}%
+        \setcounter{bbx:relatedcount}{0}%
+        \def\do{%
+          \stepcounter{bbx:relatedcount}%
+          \ifnumgreater{\value{bbx:relatedcount}}{1}%
+            {\ifcsundef{relateddelim\strfield{relatedtype}}%
+              {\printunit{\relateddelim}}%
+              {\expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter\printunit
+                \expandafter\expandafter\expandafter\expandafter\expandafter
+                \expandafter\expandafter{%
+                  \csuse{relateddelim\strfield{relatedtype}}}}}%
+            {}}%
+        \ifbibmacroundef{related:\strfield{relatedtype}}%
+          {\appto{\do}{\usebibmacro{related:default}}}%
+          {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
+        \iffieldformatundef{related:\strfield{relatedtype}}%
+          {\def\bbx@tempa{related}}%
+          {\def\bbx@tempa{related:\strfield{relatedtype}}}%
+        \iffieldformatundef{relatedstring:\strfield{relatedtype}}%
+          {\def\bbx@tempb{relatedstring:default}}%
+          {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
+        \printtext[\bbx@tempa]{%
+          \usebibmacro{begrelatedloop}%
+          \iffieldundef{relatedstring}%
+            {\ifboolexpr{%
+               test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}%
+               and
+               test {\ifbibxstring{\thefield{relatedtype}s}}%
+             }%
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+               {\iffieldbibstring{relatedtype}%
+                  {\printtext[\bbx@tempb]{%
+                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                  {}}}%
+            {\iffieldbibstring{relatedstring}%
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+               {\printfield[\bbx@tempb]{relatedstring}}}%
+          \docsvfield{related}%
+          \usebibmacro{endrelatedloop}}}%
+       {}%
+     \usebibmacro{endrelated}}}%
+
+%%% List of all CMS bibliography strings %%%
+
+\NewBibliographyString{%
+   afterwordto,%
+   broadcast,%
+   by,%
+   bychoreographer,%
+   bycompileraf,%
+   bycompileran,%
+   bycompileranaf,%
+   bycompileranfo,%
+   bycompileranin,%
+   bycompilerco,%
+   bycompilercoaf,%
+   bycompilercofo,%
+   bycompilercoin,%
+   bycompilerfo,%
+   bycompilerin,%
+   byconductor,%
+   bydirector,%
+   byeditoralt,%
+   byeditorcp,%
+   byeditorcpaf,%
+   byeditorcpan,%
+   byeditorcpanaf,%
+   byeditorcpanfo,%
+   byeditorcpanin,%
+   byeditorcpco,%
+   byeditorcpcoaf,%
+   byeditorcpcofo,%
+   byeditorcpcoin,%
+   byeditorcpfo,%
+   byeditorcpin,%
+   byeditortrcp,%
+   byeditortrcpaf,%
+   byeditortrcpan,%
+   byeditortrcpanaf,%
+   byeditortrcpanfo,%
+   byeditortrcpanin,%
+   byeditortrcpco,%
+   byeditortrcpcoaf,%
+   byeditortrcpcofo,%
+   byeditortrcpcoin,%
+   byeditortrcpfo,%
+   byeditortrcpin,%
+   bynone,%
+   byproducer,%
+   bytranslatorcp,%
+   bytranslatorcpaf,%
+   bytranslatorcpan,%
+   bytranslatorcpanaf,%
+   bytranslatorcpanfo,%
+   bytranslatorcpanin,%
+   bytranslatorcpco,%
+   bytranslatorcpcoaf,%
+   bytranslatorcpcofo,%
+   bytranslatorcpcoin,%
+   bytranslatorcpfo,%
+   bytranslatorcpin,%
+   canadasection,%
+   canadasections,%
+   cbyannotator,%
+   cbyauthor,%
+   cbychoreographer,%
+   cbycollaborator,%
+   cbycommentator,%
+   cbycompiler,%
+   cbycompileraf,%
+   cbycompileran,%
+   cbycompileranaf,%
+   cbycompileranfo,%
+   cbycompileranin,%
+   cbycompilerco,%
+   cbycompilercoaf,%
+   cbycompilercofo,%
+   cbycompilercoin,%
+   cbycompilerfo,%
+   cbycompilerin,%
+   cbyconductor,%
+   cbycontinuator,%
+   cbydirector,%
+   cbyeditor,%
+   cbyeditoraf,%
+   cbyeditoralt,%
+   cbyeditoran,%
+   cbyeditoranaf,%
+   cbyeditoranfo,%
+   cbyeditoranin,%
+   cbyeditorco,%
+   cbyeditorcoaf,%
+   cbyeditorcofo,%
+   cbyeditorcoin,%
+   cbyeditorcp,%
+   cbyeditorcpaf,%
+   cbyeditorcpan,%
+   cbyeditorcpanaf,%
+   cbyeditorcpanfo,%
+   cbyeditorcpanin,%
+   cbyeditorcpco,%
+   cbyeditorcpcoaf,%
+   cbyeditorcpcofo,%
+   cbyeditorcpcoin,%
+   cbyeditorcpfo,%
+   cbyeditorcpin,%
+   cbyeditorfo,%
+   cbyeditorin,%
+   cbyeditortr,%
+   cbyeditortraf,%
+   cbyeditortran,%
+   cbyeditortranaf,%
+   cbyeditortranfo,%
+   cbyeditortranin,%
+   cbyeditortrco,%
+   cbyeditortrcoaf,%
+   cbyeditortrcofo,%
+   cbyeditortrcoin,%
+   cbyeditortrcp,%
+   cbyeditortrcpaf,%
+   cbyeditortrcpan,%
+   cbyeditortrcpanaf,%
+   cbyeditortrcpanfo,%
+   cbyeditortrcpanin,%
+   cbyeditortrcpco,%
+   cbyeditortrcpcoaf,%
+   cbyeditortrcpcofo,%
+   cbyeditortrcpcoin,%
+   cbyeditortrcpfo,%
+   cbyeditortrcpin,%
+   cbyeditortrfo,%
+   cbyeditortrin,%
+   cbyfounder,%
+   cbynone,%
+   cbyorganizer,%
+   cbyproducer,%
+   cbyredactor,%
+   cbytranslator,%
+   cbytranslatoraf,%
+   cbytranslatoran,%
+   cbytranslatoranaf,%
+   cbytranslatoranfo,%
+   cbytranslatoranin,%
+   cbytranslatorco,%
+   cbytranslatorcoaf,%
+   cbytranslatorcofo,%
+   cbytranslatorcoin,%
+   cbytranslatorcp,%
+   cbytranslatorcpaf,%
+   cbytranslatorcpan,%
+   cbytranslatorcpanaf,%
+   cbytranslatorcpanfo,%
+   cbytranslatorcpanin,%
+   cbytranslatorcpco,%
+   cbytranslatorcpcoaf,%
+   cbytranslatorcpcofo,%
+   cbytranslatorcpcoin,%
+   cbytranslatorcpfo,%
+   cbytranslatorcpin,%
+   cbytranslatorfo,%
+   cbytranslatorin,%
+   century,%
+   cfromamerican,%
+   cfrombrazilian,%
+   cfrombulgarian,%
+   cfromcatalan,%
+   cfromcroatian,%
+   cfromczech,%
+   cfromdanish,%
+   cfromdutch,%
+   cfromenglish,%
+   cfromestonian,%
+   cfromfinnish,%
+   cfromfrench,%
+   cfromgalician,%
+   cfromgerman,%
+   cfromgreek,%
+   cfromitalian,%
+   cfromjapanese,%
+   cfromlatin,%
+   cfromnorwegian,%
+   cfrompolish,%
+   cfromportuguese,%
+   cfromrussian,%
+   cfromslovak,%
+   cfromslovene,%
+   cfromspanish,%
+   cfromswedish,%
+   cfromukrainian,%
+   choreographer,%
+   choreographers,%
+   commenton,%
+   conductor,%
+   conductors,%
+   decade,%
+   director,%
+   directors,%
+   discrecorded,%
+   edamerican,%
+   edbrazilian,%
+   edbulgarian,%
+   edcatalan,%
+   edcroatian,%
+   edczech,%
+   eddanish,%
+   eddutch,%
+   edenglish,%
+   edestonian,%
+   edfinnish,%
+   edfrench,%
+   edgalician,%
+   edgerman,%
+   edgreek,%
+   editalian,%
+   editorcompiler,%
+   editorcompilers,%
+   editortranscompiler,%
+   editortranscompilers,%
+   editortranslator,%
+   editortranslators,%
+   edjapanese,%
+   edlatin,%
+   ednorwegian,%
+   edpolish,%
+   edportuguese,%
+   edrussian,%
+   edslovak,%
+   edslovene,%
+   edspanish,%
+   edswedish,%
+   edukrainian,%
+   forewordto,%
+   hereinafter,%
+   inlang,%
+   introductionto,%
+   none,%
+   nones,%
+   note,%
+   numbers,%
+   of,%
+   on,%
+   origedition,%
+   origpub,%
+   origpublin,%
+   origpubyear,%
+   origpubyearalt,%
+   origreleaseyear,%
+   origshownyear,%
+   partvolume,%
+   patentfiled,%
+   patentissued,%
+   preface,%
+   printed,%
+   producer,%
+   producers,%
+   pseudonym,%
+   review,%
+   revisededition,%
+   selfpublished,%
+   songrecorded,%
+   subsection,%
+   subsections,%
+   subverbis,%
+   subverbo,%
+   supranote,%
+   track,%
+   transcompiler,%
+   transcompilers%
+ }%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
new file mode 100644
index 00000000000..bf8060da7fe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
@@ -0,0 +1,7184 @@
+% 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-notes16.cbx}[2020/04/20 v 3.14 biblatex citation style]
+
+%%%% Biblatex initialization + Chicago options + Toggles %%%%
+
+\newbool{cms:bracket}% Date-handling booleans
+\newbool{cms:extraparens}
+\newbool{cms:comma}
+\newbool{cms:nd}
+
+\providecommand*{\mkibid}[1]{#1}
+
+\providetoggle{cms@oneyear}% Needed for author-date
+\providetoggle{cms@reprint}% ditto
+\providetoggle{cms@switchdates}% ditto
+
+\providetoggle{cms@jrcomma}% For comma before Jr./Sr.
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@urltime}% 17th ed.
+\providetoggle{cms@doi}
+\providetoggle{cms@doionly}
+\providetoggle{cms@eprint}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+\providetoggle{cms@hidevolumes}% Modify volume fix
+\providetoggle{cms@bookseries}
+\providetoggle{cms@notefield}
+\providetoggle{cms@addendum}
+\providetoggle{cms@comprange}
+\providetoggle{cms@compyears}
+\providetoggle{cms@modpostnote}
+\providetoggle{cms@url@innotes}
+\providetoggle{cms@ukord}
+
+\providetoggle{cms@bc}% Attempt to provide correct dateera handling
+\providetoggle{cms@alwaysrange}% Turns off decade and century handling
+\providetoggle{cms@decaderange}% Only turns off decade handling
+\providetoggle{cms@centuryrange}% Only turns off century handling
+\providetoggle{cms@nodatebrackets}% For brackets in uncertain & circa
+\providetoggle{cms@noyearbrackets}%
+\providetoggle{cms@nodates}%
+
+\providetoggle{cms@strict}
+\providetoggle{cms@headlessnote}
+\providetoggle{cms@origcite}
+\providetoggle{cms@fullnote}
+\providetoggle{cms@shortnote}
+\providetoggle{cms@allshort}
+\providetoggle{cms@noibid}
+\providetoggle{cms@noidem}
+\providetoggle{cms@namedash}
+\providetoggle{cms@usecompiler}
+\providetoggle{cms@shorthandibid}
+\providetoggle{cms@printshhand}
+\providetoggle{cms@fullshhand}
+\providetoggle{cms@inheritshhand}
+\providetoggle{cms@firstshort}
+\providetoggle{cms@origpublished}
+\providetoggle{cms@loccit}
+\providetoggle{cms@annotation}
+\providetoggle{cms@postposit}
+\providetoggle{cms@legalnotes}% For legal types
+\providetoggle{cms@supranotes}% Ditto
+\providetoggle{cms@noneshort}% Ditto
+\providetoggle{cms@vol}
+\providetoggle{cms@postvol}
+\providetoggle{cms@usedvol}
+\providetoggle{cms@citecrossref}
+\providetoggle{cms@bibcrossref}
+\providetoggle{cms@bookcitexref}
+\providetoggle{cms@bookbibxref}
+\providetoggle{cms@xrefvol}
+\providetoggle{cms@xrefpart}
+\providetoggle{cms@omitxrefdate}
+\providetoggle{cms@xrefurl}
+\providetoggle{cms@related}
+\providetoggle{cms@citerel}
+\providetoggle{cms@gencite}
+\providetoggle{cms@genallnames}
+
+\AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
+  \global\togglefalse{cms@loccit}%
+  \global\csundef{@cmsst}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}%
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    test {\iffieldundef{year}}%
+    or
+    not test {\iffieldint{year}}%
+    or
+    not test {\iffieldint{origyear}}%
+    or
+    togl {cms@switchdates}%
+  }%
+  {}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
+
+\protected\def\cms@warning@noline#1{%
+  \begingroup
+  \blx@safe@actives
+  \PackageWarningNoLine{biblatex-chicago}{#1}%
+  \endgroup}
+
+%% These are options for extended date attributes
+
+\DeclareBiblatexOption{global,entry}[boolean]{alwaysrange}[true]{%
+  \settoggle{cms@alwaysrange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{decaderange}[true]{%
+  \settoggle{cms@decaderange}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{centuryrange}[true]{%
+  \settoggle{cms@centuryrange}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodatebrackets}[true]{%
+  \settoggle{cms@nodatebrackets}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{noyearbrackets}[true]{%
+  \settoggle{cms@noyearbrackets}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}
+
+\DeclareBibliographyOption{annotation}[true]{%
+  \global\toggletrue{cms@annotation}}
+
+\DeclareBibliographyOption[boolean]{noibid}[true]{%
+  \global\toggletrue{cms@noibid}}
+
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
+  \settoggle{cms@namedash}{#1}}
+
+\DeclareBibliographyOption[boolean]{short}[true]{%
+  \global\settoggle{cms@allshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{legalnotes}[true]{%
+  \global\settoggle{cms@legalnotes}{#1}}
+
+\DeclareBiblatexOption{global,entry}[boolean]{supranotes}[true]{%
+  \settoggle{cms@supranotes}{#1}}
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{noneshort}[true]{%
+  \settoggle{cms@noneshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{shorthandibid}[true]{%
+  \global\toggletrue{cms@shorthandibid}}
+
+\DeclareBibliographyOption[boolean]{shorthandfull}[true]{%
+  \settoggle{cms@fullshhand}{#1}}
+
+\DeclareBibliographyOption[boolean]{inheritshorthand}[true]{%
+  \settoggle{cms@inheritshhand}{#1}%
+  \iftoggle{cms@inheritshhand}%
+  {\DeclareDataInheritance{*}{*}{%
+  \inherit{shorthand}{shorthand}
+  \inherit{shorthandintro}{shorthandintro}
+  }}%
+  {}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{shorthandfirst}[true]{%
+  \settoggle{cms@firstshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{compresspages}[true]{%
+  \global\settoggle{cms@comprange}{#1}}%
+
+\DeclareBibliographyOption[boolean]{compressyears}[true]{%
+  \global\settoggle{cms@compyears}{#1}}%
+
+\DeclareBibliographyOption[string]{postnotepunct}[true]{%
+  \ifcsdef{cms@opt@ppunct@#1}%
+  {\csuse{cms@opt@ppunct@#1}}%
+  {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+  \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
+  \settoggle{blx@usenamec}{#1}}
+
+\DeclareBiblatexOption{global,entry}[boolean]{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareBiblatexOption{global,entry}[boolean]{delayvolume}[true]{%
+  \settoggle{cms@postvol}{#1}}
+
+\DeclareBiblatexOption{global,entry}[string]{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}%
+  {\blx@err@invopt{longcrossref=#1}{}}}%
+\def\cms@opt@lxref@none{%
+  \togglefalse{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}%
+  \togglefalse{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}%
+\def\cms@opt@lxref@true{%
+  \toggletrue{cms@citecrossref}%
+  \toggletrue{cms@bibcrossref}}%
+\def\cms@opt@lxref@false{%
+  \togglefalse{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}}%
+\def\cms@opt@lxref@notes{%
+  \toggletrue{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}}%
+\def\cms@opt@lxref@bib{%
+  \togglefalse{cms@citecrossref}%
+  \toggletrue{cms@bibcrossref}}%
+
+\DeclareBiblatexOption{global,entry}[string]{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}%
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+\def\cms@opt@bklxref@true{%
+  \toggletrue{cms@bookcitexref}%
+  \toggletrue{cms@bookbibxref}}%
+\def\cms@opt@bklxref@false{%
+  \togglefalse{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}%
+\def\cms@opt@bklxref@notes{%
+  \toggletrue{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}%
+\def\cms@opt@bklxref@bib{%
+  \togglefalse{cms@bookcitexref}%
+  \toggletrue{cms@bookbibxref}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{omitxrefdate}[true]{%
+  \settoggle{cms@omitxrefdate}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[boolean]{xrefurl}[true]{%
+  \settoggle{cms@xrefurl}{#1}}%
+
+\DeclareBiblatexOption{global,entry}[string]{journalabbrev}[false]{%
+  \ifcsdef{cms@opt@jtabb@#1}%
+  {\csuse{cms@opt@jtabb@#1}}%
+  {\csuse{cms@opt@jtabb@false}\cms@warning@noline%
+    {'journalabbrev=#1' isn't a valid option.\MessageBreak
+      The default - 'false' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms@opt@jtabb@true{%
+  \toggletrue{cms@citejtabb}%
+  \toggletrue{cms@bibjtabb}}%
+\def\cms@opt@jtabb@false{%
+  \togglefalse{cms@citejtabb}%
+  \togglefalse{cms@bibjtabb}}%
+\def\cms@opt@jtabb@notes{%
+  \toggletrue{cms@citejtabb}%
+  \togglefalse{cms@bibjtabb}}%
+\def\cms@opt@jtabb@bib{%
+  \togglefalse{cms@citejtabb}%
+  \toggletrue{cms@bibjtabb}}%
+
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+  \settoggle{cms@ukord}{#1}}%
+
+% The field-exclusion options %
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlnotes}[true]{%
+  \settoggle{cms@url@innotes}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{urlstamp}[true]{%
+  \settoggle{cms@urltime}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{url}[true]{%
+  \settoggle{cms@url}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[string]{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}%
+  {\blx@err@invopt{doi=#1}{}}}%
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}%
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}%
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@urltime}{#1}% 17th ed.
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@eprint}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{addendum}[true]{%
+  \settoggle{cms@addendum}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{bookseries}[true]{%
+  \settoggle{cms@bookseries}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[boolean]{notefield}[true]{%
+  \settoggle{cms@notefield}{#1}}%
+\DeclareBibliographyOption{completenotes}[true]{%
+  \settoggle{cms@addendum}{#1}%
+  \settoggle{cms@bookseries}{#1}%
+  \settoggle{cms@notefield}{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{related}[bib]{%
+  \ifcsdef{cms@opt@rel@#1}%
+  {\csuse{cms@opt@rel@#1}}%
+  {\csuse{cms@opt@rel@bib}\cms@warning@noline%
+    {'related=#1' is not a valid option.\MessageBreak
+      The default - 'bib' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms@opt@rel@true{%
+  \settoggle{cms@citerel}{true}%
+  \settoggle{cms@related}{true}}%
+\def\cms@opt@rel@false{%
+  \settoggle{cms@citerel}{false}%
+  \settoggle{cms@related}{false}}%
+\def\cms@opt@rel@bib{%
+  \settoggle{cms@citerel}{false}%
+  \settoggle{cms@related}{true}}%
+\def\cms@opt@rel@notes{%
+  \settoggle{cms@citerel}{true}%
+  \settoggle{cms@related}{false}}%
+
+% Adding a disambiguating field to short notes otherwise identical %
+
+\DeclareBiblatexOption{global,type,entry}[string]{shortextrafield}{%
+  \def\cms@xfield{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{shortextraformat}{%
+  \def\cms@xformat{#1}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{shortextrapunct}[comma]{%
+  \ifcsdef{cms@opt@shxp@#1}%
+    {\csuse{cms@opt@shxp@#1}}%
+    {\csuse{cms@opt@shxp@comma}\cms@warning@noline%
+      {'shortextrapunct=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@shxp@none{%
+  \let\shortextrapunct\@empty}%
+\def\cms@opt@shxp@comma{%
+  \def\shortextrapunct{\addcomma\addspace}}%
+\def\cms@opt@shxp@colon{%
+  \def\shortextrapunct{\addcolon\addspace}}%
+\def\cms@opt@shxp@space{%
+  \def\shortextrapunct{\addspace}}%
+\def\cms@opt@shxp@semicolon{%
+  \def\shortextrapunct{\addsemicolon\addspace}}%
+\def\cms@opt@shxp@period{%
+  \def\shortextrapunct{\addperiod\addspace}}%
+
+% Controlling punctuation before titleaddon fields %
+
+\DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
+  \ifcsdef{cms@opt@ptao@#1}%
+    {\csuse{cms@opt@ptao@#1}}%
+    {\csuse{cms@opt@ptao@period}\cms@warning@noline%
+      {'ptitleaddon=#1' is not a valid option.\MessageBreak
+        The default - 'period' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@ptao@none{%
+  \let\ptitleaddonpunct\@empty}%
+\def\cms@opt@ptao@comma{%
+  \def\ptitleaddonpunct{\addcomma\addspace}}%
+\def\cms@opt@ptao@colon{%
+  \def\ptitleaddonpunct{\addcolon\addspace}}%
+\def\cms@opt@ptao@space{%
+  \def\ptitleaddonpunct{\addspace}}%
+\def\cms@opt@ptao@semicolon{%
+  \def\ptitleaddonpunct{\addsemicolon\addspace}}%
+\def\cms@opt@ptao@period{%
+  \def\ptitleaddonpunct{\addperiod\addspace}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
+  \ifcsdef{cms@opt@ctao@#1}%
+    {\csuse{cms@opt@ctao@#1}}%
+    {\csuse{cms@opt@ctao@comma}\cms@warning@noline%
+      {'ctitleaddon=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@ctao@none{%
+  \let\ctitleaddonpunct\@empty}%
+\def\cms@opt@ctao@comma{%
+  \def\ctitleaddonpunct{\addcomma\addspace}}%
+\def\cms@opt@ctao@colon{%
+  \def\ctitleaddonpunct{\addcolon\addspace}}%
+\def\cms@opt@ctao@space{%
+  \def\ctitleaddonpunct{\addspace}}%
+\def\cms@opt@ctao@semicolon{%
+  \def\ctitleaddonpunct{\addsemicolon\addspace}}%
+\def\cms@opt@ctao@period{%
+  \def\ctitleaddonpunct{\addperiod\addspace}}%
+
+% Controlling punctuation before shorthand in notes %
+
+\DeclareBiblatexOption{global,type,entry}[string]{shorthandpunct}[space]{%
+  \ifcsdef{cms@opt@shp@#1}%
+    {\csuse{cms@opt@shp@#1}}%
+    {\csuse{cms@opt@shp@space}\cms@warning@noline%
+      {'shorthandpunct=#1' isn't a valid option.\MessageBreak
+        The default - 'space' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@shp@none{%
+  \let\shorthandpunct\@empty}%
+\def\cms@opt@shp@comma{%
+  \def\shorthandpunct{\addcomma\addspace}}%
+\def\cms@opt@shp@colon{%
+  \def\shorthandpunct{\addcolon\addspace}}%
+\def\cms@opt@shp@space{%
+  \def\shorthandpunct{\addspace}}%
+\def\cms@opt@shp@semicolon{%
+  \def\shorthandpunct{\addsemicolon\addspace}}%
+\def\cms@opt@shp@period{%
+  \def\shorthandpunct{\addperiod\addspace}}%
+\def\cms@opt@shp@emdash{%
+  \def\shorthandpunct{\addthinspace\textemdash\addthinspace}}%
+\def\cms@opt@shp@endash{%
+  \def\shorthandpunct{\addspace\textendash\addspace}}%
+
+\ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
+  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes,%
+  legalnotes,supranotes,shortextrapunct,dashed}
+
+\iftoggle{cms@legalnotes}%
+{\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
+{}%
+
+% For author-date compatibility %
+
+\DeclareEntryOption[boolean]{switchdates}[true]{%
+  \settoggle{cms@switchdates}{#1}}%
+
+\DeclareEntryOption{cmsdate}{}%
+
+\DeclareBibliographyOption{cmsdate}{}%
+
+\DeclareBibliographyOption[boolean]{strict}[true]{%
+  \settoggle{cms@strict}{#1}%
+  \iftoggle{cms@strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split@prev{0}
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split@prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split@prev{\the\insertpenalties}%
+    }}%
+  {}}
+
+
+\protected\def\blx@newcunit{%
+  \iftoggle{blx@keepunit}%
+  {}%
+  {\global\let\blx@unitpunct\newcunitpunct
+    \global\toggletrue{blx@unit}}}%
+
+\appto\blx@blxinit{%
+  \let\newcunit\blx@newcunit}
+
+\newcommand*{\newcunitpunct}{\addcomma\addspace}
+
+\def\mkbibcurdinal#1{%
+  \@tempcnta0#1 \the\@tempcnta}%
+
+\@ifpackagelater{biblatex}{2010/08/28}
+{}%
+{\PackageError{biblatex}
+  {Outdated 'biblatex' package}
+  {The Chicago style requires biblatex v0.9 or later.\MessageBreak
+    You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+    This is a fatal error. I'm aborting now.}%
+  \endinput}
+
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+  \DeclarePunctuationPairs{comma}{*!?}}
+
+%%%% Initialize and define bibstrings %%%%
+
+\DefineBibliographyStrings{english}{%
+  citedas = {hereafter cited as},}
+
+%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
+
+%%%% Cite macros for use by the citation commands %%%%
+
+\newbibmacro*{cite:init}{%
+  \global\let\cbx@lastkey\undefined}
+
+\newbibmacro*{cite:save}{%
+  \savefield{entrykey}{\cbx@lastkey}%
+  \ifthenelse{\ifentrytype{inreference}\OR\ifentrytype{reference}\OR%
+    \ifentrytype{mvreference}}%
+  {\global\toggletrue{cms@noidem}}%
+  {\global\togglefalse{cms@noidem}}}%
+
+\newbibmacro*{cite}{%
+  \ifboolexpr{%
+    test {\ifciteseen}%
+    and
+    (
+    not togl {cms@noneshort}% Intended for Bluebook citations
+    or
+    (
+    test {\ifciteibid}%
+    and
+    not test {\iffirstonpage}%
+    and
+    not togl {cms@noibid}%
+    )
+    )
+  }%
+    {\ifboolexpr{%
+        test {\iffieldundef{shorthand}}%
+        or
+        (
+        togl {blx@skipbiblist}%
+        and
+        togl {cms@inheritshhand}%
+        and
+        not test {\iffieldundef{crossref}}%
+        )
+      }%
+       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+         {\usebibmacro{cite:ibid}%
+           \usebibmacro{cite:save}}%
+          {\global\toggletrue{cms@shortnote}%
+            \global\togglefalse{cms@fullnote}%
+            \usebibmacro{cite:short}%
+           \usebibmacro{cite:save}}}%
+       {\iftoggle{cms@shorthandibid}%
+         {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+           {\usebibmacro{cite:ibid}%
+             \usebibmacro{cite:save}}%
+           {\usebibmacro{cite:shorthand}%
+             \usebibmacro{cite:save}%
+             \global\toggletrue{cms@noidem}}}%
+         {\usebibmacro{cite:shorthand}%
+           \usebibmacro{cite:save}%
+           \global\toggletrue{cms@noidem}}}}%
+     {\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{footcite:save}% FIXME!!
+           \usebibmacro{cite:full}%
+           \usebibmacro{cite:save}}}}}%
+
+\newbibmacro*{cite:full}{%
+  \printtext[bibhypertarget]{%
+    \usedriver
+      {\DeclareNameAlias{sortname}{default}\frenchspacing}%
+      {cite:\thefield{entrytype}}}}%
+
+\newbibmacro*{cite:short}{%
+  \ifentrytype{jurisdiction}%
+  {\usebibmacro{cite:short:jurisdiction}}%
+  {\ifentrytype{legal}%
+    {\usebibmacro{cite:short:legal}}%
+    {\ifentrytype{legislation}%
+      {\usebibmacro{cite:short:legislation}}%
+      {\usebibmacro{cite:short:cms}}}}}%
+
+\newbibmacro*{cite:short:cms}{% was cite:short
+  \usebibmacro{allshort+firstcite+xref}%
+  \ifthenelse{\ifnameundef{labelname}\OR%
+    \ifentrytype{inreference}\OR%
+    \ifentrytype{reference}\OR%
+    \ifentrytype{mvreference}}%
+  {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+      \ifentrytype{periodical}}% Simplify .bib creation
+    {\ifuseauthor%
+      {\ifboolexpr{%
+          not test {\iffieldundef{shortjournal}}%
+          and
+          ((
+          test {\ifcitation}%
+          and
+          togl {cms@citejtabb}%
+          )
+          or
+          (
+          test {\ifbibliography}%
+          and
+          togl {cms@bibjtabb}%
+          ))
+        }%
+        {\printfield[shortjournal]{shortjournal}\newcunit}%
+        {\printfield[journaltitle]{journaltitle}\newcunit}}%
+      {}}%
+    {\ifentrytype{manual}%
+      {\printlist{organization}\isdot\newcunit}%
+      {}}}%
+  {\ifboolexpr{%
+      test {\ifciteidem}%
+      and
+      not test {\ifbibliography}%
+      and
+      not test {\iffirstonpage}%
+      and
+      not togl {cms@noidem}%
+      and
+      not togl {cms@headlessnote}%
+    }%
+    {\bibstring[\mkibid]{idem\thefield{gender}}%
+      \classicpunct}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{labelname}%
+        \bibrightbracket\classicpunct}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\classicpunct}%
+        {\printnames{labelname}%\usebibmacro{choose+labelname}%
+          \isdot\classicpunct}}}}%
+  \ifboolexpr{%
+    (
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    )
+    and
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    togl {cms@citerel}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\ifboolexpr{%
+      togl {cms@allshort}%
+      or
+      test {\ifbibliography}%
+    }%
+    {\printtext[bibhyperref]{%
+        \printfield[citetitle]{labeltitle}}}%
+    {\printtext[cmshyperlink]{%
+        \printfield[citetitle]{labeltitle}}}%
+    \ifboolexpr{%
+      test {\iffieldundef{extratitle}}%
+      or
+      test {\ifcsundef{cms@xfield}}%
+    }%
+    {}%
+    {\setunit{\shortextrapunct}%
+      \usebibmacro{shortnote+extrafield}}}}%:\thefield{entrytype}?
+
+\newbibmacro*{shortnote+extrafield}{% Disambiguate otherwise identical
+  \iffieldundef{\csuse{cms@xfield}}% short notes
+  {\iflistundef{\csuse{cms@xfield}}%
+    {\ifnameundef{\csuse{cms@xfield}}%
+      {\cms@xtime}% See below; stops spurious parentheses appearing
+      {\printtext[\csuse{cms@xformat}]{%
+          \printnames[default]{\csuse{cms@xfield}}}}}%
+    {\printtext[\csuse{cms@xformat}]{%
+        \printlist{\csuse{cms@xfield}}}}}%
+  {\ifboolexpr{%
+      test {\ifcsstring{cms@xfield}{month}}%
+      or
+      test {\ifcsstring{cms@xfield}{origmonth}}%
+      or
+      test {\ifcsstring{cms@xfield}{eventmonth}}%
+      or
+      test {\ifcsstring{cms@xfield}{urlmonth}}%
+    }%
+    {\printtext[\csuse{cms@xformat}]{%
+        \mkbibmonth{\thefield{\csuse{cms@xfield}}}}}%
+    {\ifboolexpr{%
+        test {\ifcsstring{cms@xfield}{day}}%
+        or
+        test {\ifcsstring{cms@xfield}{origday}}%
+        or
+        test {\ifcsstring{cms@xfield}{eventday}}%
+        or
+        test {\ifcsstring{cms@xfield}{urlday}}%
+      }%
+      {\printtext[\csuse{cms@xformat}]{%
+          \printfield[letterday]{\csuse{cms@xfield}}}}%
+      {\ifboolexpr{%
+          test {\ifcsstring{cms@xfield}{season}}%
+          or
+          test {\ifcsstring{cms@xfield}{origseason}}%
+          or
+          test {\ifcsstring{cms@xfield}{eventseason}}%
+          or
+          test {\ifcsstring{cms@xfield}{urlseason}}%
+        }%
+        {\printtext[\csuse{cms@xformat}]{%
+            \mkbibseason{\thefield{\csuse{cms@xfield}}}}}%
+        {\IfSubStr{\cms@xfield}{year}%
+          {\StrCut{\cms@xfield}{year}\cms@yeartype\cms@tempnull%
+            \iffieldundef{\csuse{cms@yeartype}year}%
+            {}%
+            {\printtext[\csuse{cms@xformat}]{%
+                \csuse{print\cms@yeartype dateextra}}}}%
+          {\printtext[\csuse{cms@xformat}]{%
+              \printfield{\csuse{cms@xfield}}}}}}}}}%
+
+\newrobustcmd*{\cms@xtime}{% Tests for presence of field before printing
+  \IfSubStr{\cms@xfield}{time}%
+  {\StrCut{\cms@xfield}{time}\cms@timetype\cms@tempnull%
+    \iffieldundef{\csuse{cms@timetype}hour}%
+    {}%
+    {\printtext[\csuse{cms@xformat}]{%
+        \csuse{print\cms@timetype date}%
+        \newcunit\csuse{print\cms@timetype time}}}}%
+  {\IfSubStr{\cms@xfield}{date}%
+    {\StrCut{\cms@xfield}{date}\cms@datetype\cms@tempnull%
+      \ifthenelse{\iffieldundef{\csuse{cms@datetype}year}\AND%
+        \iffieldundef{\csuse{cms@datetype}month}\AND%
+        \iffieldundef{\csuse{cms@datetype}season}}%
+      {}%
+      {\printtext[\csuse{cms@xformat}]{%
+          \csuse{print\cms@datetype date}}}}%
+    {}}}
+
+\newbibmacro*{footcite:save}{%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
+    \label{cbx@\the\value{instcount}}}%
+  {}}%
+
+\newbibmacro*{cite:short:jurisdiction}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \iffieldundef{issue}%
+  {\printfield[jurisdictionser]{series}}%
+  {\setunit{\addspace}%
+    \printfield{issue}}% Better ideas?
+  % \newcunit%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legal}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \printfield[legalser]{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  % \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legislation}{%
+  \iffieldequalstr{entrysubtype}{constitution}%
+  {\usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}}%
+  {\iffieldequalstr{labeltitlesource}{shorttitle}%
+    {\ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}%
+    {\ifboolexpr{%
+        test {\iffieldundef{shortjournal}}%
+        or
+        (
+        not test {\iffieldundef{volume}}%
+        and
+        not test {\iffieldint{volume}}%
+        )
+      }%
+      {\ifboolexpr{%
+          test {\iffieldundef{entrysubtype}}%
+          and
+          not test {\iflistundef{location}}
+        }%
+        {\printlist{location}%
+          \setunit{\addspace}}%
+        {}%
+        \ifboolexpr{%
+          togl {cms@allshort}%
+          or
+          test {\ifbibliography}%
+        }%
+        {\printtext[bibhyperref]{%
+            \printfield[citetitle]{labeltitle}}}%
+        {\printtext[cmshyperlink]{%
+            \printfield[citetitle]{labeltitle}}}%
+        \setunit{\addspace}%
+        \printfield[juridnum]{number}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}}%
+      {\printfield{note}%
+        \newcunit%
+        \printfield[jourvol]{volume}%
+        \setunit*{\addnbspace}%
+        \iffieldundef{shortjournal}% Test eliminates spurious comma
+        {}%
+        {\printtext[shortjournal]{%
+            \printfield[jtsnoformat]{shortjournal}}}%
+        \printfield[legislationser]{series}%
+        \setunit{\addspace}%
+        \printfield{issue}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}%
+      }}}%
+  \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:shorthand}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}}%
+  {\usebibmacro{cite:shorthand:legal}}%
+  {\usebibmacro{cite:shorthand:cms}}}
+
+\newbibmacro*{cite:shorthand:cms}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield{shorthand}}}}
+
+\newbibmacro*{cite:shorthand:legal}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield{shorthand}}}%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+      \newcunit}}% ??
+  {}}%
+
+\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
+  \iffieldundef{shorthand}%
+  {}%
+  {\iffieldundef{shorthandintro}%
+    {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+        \ifentrytype{legislation}}%
+      {\printtext[brackets]{%
+        \bibstring{hereinafter}\addspace%
+        \printfield{shorthand}}}%
+      {\printtext[parens]{%
+        \bibstring{citedas}\addspace%
+        \printfield{shorthand}}}}%
+    {%\addspace%\setunit{\addspace}% Ditto
+      \printfield{shorthandintro}}}}
+
+\newbibmacro*{choose:ibidstring}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}}%
+  {\bibsstring[\mkbibemph]{ibidem}}%
+  {\bibstring[\mkibid]{ibidem}}}
+
+\newbibmacro*{cite:ibid}{%
+  \ifboolexpr{%
+    togl {cms@noibid}%
+    or
+    test {\ifbibliography}% Needed for inheritshorthand option
+  }%
+  {\global\toggletrue{cms@shortnote}%
+    \global\togglefalse{cms@fullnote}%
+    \usebibmacro{cite:short}%
+    \usebibmacro{cite:save}}%
+  {\iftoggle{cms@allshort}%
+    {\printtext[bibhyperref]{%
+        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
+    {\printtext[cmshyperlink]{%
+        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
+    \ifboolexpr{%
+      test {\ifloccit}%
+      or
+      (
+      test {\ifciteibid}%
+      and
+      test {\iffieldequalcs{postnote}{cms@pnsaved}}%
+      and
+      not test {\ifdefvoid{\blx@loccittracker}}% Package option=false
+      )
+    }%
+    {\global\toggletrue{cms@loccit}}%
+    {}}}%
+
+\newbibmacro*{cite:journal}{%
+  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+  {\iffieldundef{prenote}%
+    {\bibsentence\usebibmacro{cite:ibid}}%
+    {\usebibmacro{cite:ibid}}%
+    \usebibmacro{cite:save}}%
+  {\iffieldundef{journaltitle}%
+    {\usebibmacro{cite:short}%
+      \usebibmacro{cite:save}}%
+    {\ifboolexpr{%
+      test {\ifciteidem}%
+      and
+      not test {\ifbibliography}%
+      and
+      not test {\iffirstonpage}%
+      and
+      not togl {cms@noidem}%
+    }%
+    {\iffieldundef{prenote}%
+      {\bibsentence\bibstring[\mkibid]{idem\thefield{gender}}%
+        \newcunit}%
+      {\bibstring[\mkibid]{idem\thefield{gender}}%
+        \newcunit}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{labelname}%
+        \bibrightbracket\newcunit}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\newcunit}%
+        {\printnames{labelname}%
+          \isdot\newcunit}}}%
+    \iftoggle{cms@allshort}%
+    {\ifboolexpr{%
+        not test {\iffieldundef{shortjournal}}%
+        and
+        ((
+        test {\ifcitation}%
+        and
+        togl {cms@citejtabb}%
+        )
+        or
+        (
+        test {\ifbibliography}%
+        and
+        togl {cms@bibjtabb}%
+        ))
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[shortjournal]{shortjournal}}}%
+      {\printtext[bibhyperref]{%
+          \printfield[journaltitle]{journaltitle}}}}%
+    {\ifboolexpr{%
+        not test {\iffieldundef{shortjournal}}%
+        and
+        ((
+        test {\ifcitation}%
+        and
+        togl {cms@citejtabb}%
+        )
+        or
+        (
+        test {\ifbibliography}%
+        and
+        togl {cms@bibjtabb}%
+        ))
+      }%
+      {\printtext[bibhyperlink]{%
+          \printfield[shortjournal]{shortjournal}}}%
+      {\printtext[bibhyperlink]{%
+          \printfield[journaltitle]{journaltitle}}}}%
+    \iffieldundef{volume}%
+    {\iffieldundef{number}%
+      {\iffieldundef{issue}%
+        {\newcunit%
+          \usebibmacro{number+or+month}}%
+        {\newcunit%
+          \printfield{issue}%
+          \setunit{\addspace}%
+          \usebibmacro{cmsyear}}}%
+      {\newcunit%
+        \printfield[journum]{number}}}%
+    {\toggletrue{cms@fullnote}%
+      \togglefalse{cms@shortnote}%
+      \setunit{\addspace}%
+      \printfield[jourvol]{volume}%
+      \ifthenelse{\iffieldundef{pagination}\AND%
+        \iffieldundef{bookpagination}}%
+      {\setunit{\postvolpunct}}%
+      {\setunit{\addcolon\addspace}}}}}}%
+
+%% Macros from verbose.cbx %%
+
+\newbibmacro*{textcite}{%
+  \ifnameundef{labelname}%
+  {\printfield[citetitle]{labeltitle}}%
+  {\printnames{labelname}}%
+  \ifboolexpr{%
+    togl {cms@gencite}%
+    and
+    (
+    test {\iflastcitekey}%
+    or
+    togl {cms@genallnames}%
+    )
+  }%
+  {\thegen}%
+  {}}%
+
+\newbibmacro*{textcite:init}{%
+  \citetrackerfalse%
+  \pagetrackerfalse%
+  \iffirstcitekey
+    {\global\undef\cbx@lasthash}%
+    {}}%
+
+\newbibmacro*{textcite:count}{%
+  \stepcounter{textcitetotal}%
+  \ifnumgreater{\value{uniquelist}}{\value{maxnames}}%
+    {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}}%
+       {\setcounter{textcitemaxnames}{\value{uniquelist}}}%
+       {}}%
+    {\ifnumless{\value{labelname}}{\value{maxnames}}%
+       {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}%
+          {\setcounter{textcitemaxnames}{\value{labelname}}}%
+          {}}%
+       {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}}%
+          {\setcounter{textcitemaxnames}{\value{maxnames}}}%
+          {}}}}%
+
+%%%% Citation Commands, internal and external %%%%
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\cmsnoopcite}%
+{}{}{}{}%
+
+\DeclareCiteCommand{\bibxrefcite}
+  {\usebibmacro{backref+check}}% So cites in biblio don't turn up
+  {\usebibmacro{cms-in:}%        in backref list
+    \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \(\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
+      \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\)}%
+    {\clearname{author}%
+      \clearname{shortauthor}%
+      \clearname{labelname}}%
+    {}%
+    \toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \ifboolexpr{%
+      togl {cms@inheritshhand}%
+      and
+      not test {\iffieldundef{shorthand}}%
+    }%
+    {\usebibmacro{cite}}%
+    {\usebibmacro{cite:short}}}% Would {cite} be better?
+  {}%
+  {\usebibmacro{crossref:volume+postnote}}% Volume fix
+
+\DeclareCiteCommand{\bookbibxrefcite}
+  {\usebibmacro{backref+check}}% So cites in biblio don't turn up
+  {\iffieldequals{fullhash}{\bbx@lasthash}% in backref list
+    {\ifthenelse{\ifentrytype{collection}\OR%
+        \ifentrytype{proceedings}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}}%
+      {\clearname{editor}%
+        \clearname{shorteditor}%
+        \clearname{labelname}}%
+      {\clearname{author}%
+        \clearname{shortauthor}%
+        \clearname{labelname}}}%
+    {}%
+    \toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \usebibmacro{bibxref-in:}%
+    \ifboolexpr{%
+      togl {cms@inheritshhand}%
+      and
+      not test {\iffieldundef{shorthand}}%
+    }%
+    {\usebibmacro{cite}}%
+    {\usebibmacro{cite:short}}}%
+  {}%
+  {\usebibmacro{crossref:volume+postnote}}% Volume fix
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \blx@ibidreset
+    \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\smartcite}
+  [\iffootnote{}{\mkbibfootnote}]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}{\mkbibfootnote}]%
+{\smartcite}{\multicitedelim}
+
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\origfullcite}
+  {\usebibmacro{backref+check}%
+    \ifhyperref%
+    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
+    {}%
+    \nopunct}%\unspace% Put \nopunct and \unspace here for 0.8e.
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearorigin}\clearfield{userf}\clearfield{shorthand}%
+      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+      \frenchspacing}%
+    {cite:\thefield{entrytype}}%
+    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
+  {\multicitedelim}%
+  {\finentry}% Helps with annotated bibliographies (?)
+
+\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
+  {\usebibmacro{backref+check}%
+    \ifhyperref%
+    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
+    {}%
+    \nopunct%
+    \ifboolexpr{%
+      togl {cms@otherlang}%
+      and
+      not test {\iffieldundef{langid}}%
+    }%
+    {\addspace}{\unspace}}%\unspace Put \nopunct and \unspace here for 0.8e.
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}\clearfield{shorthand}%
+      \usebibmacro{cms:titlehook}%
+      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+      \toggletrue{cms@origpublished}\frenchspacing}%
+    {cite:\thefield{entrytype}}%
+    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
+  {\multicitedelim}%
+  {\finentry}
+
+\DeclareCiteCommand{\headlessfullcite}
+  {\usebibmacro{prenote}}%
+  {\printtext[bibhypertarget]{%
+      \usedriver
+      {\DeclareNameAlias{sortname}{default}\usebibmacro{cite:save}%
+        \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+        \usebibmacro{clear+labelname}\global\toggletrue{cms@noidem}}%
+      {cite:\thefield{entrytype}}}}%
+  {\multicitedelim}%
+  {}%\usebibmacro{finentry}}
+
+\DeclareCiteCommand{\headlesscite}
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@headlessnote}%
+    \usebibmacro{clear+labelname}%
+    \clearname{labelname}%
+    \usebibmacro{cite}%
+    \global\toggletrue{cms@noidem}}%
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\headlessparencite}[\mkbibparens]
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@headlessnote}%
+    \usebibmacro{clear+labelname}%
+    \clearname{labelname}%
+    \usebibmacro{cite}%
+    \global\toggletrue{cms@noidem}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\headlessparenshortcite}[\mkbibparens]
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \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}}
+
+\DeclareCiteCommand{\surnamecite}
+  {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}}
+  {\usebibmacro{citeindex}%
+    \ifboolexpr{%
+      (
+      test {\ifciteseen}%
+      or
+      togl {cms@allshort}%
+      )
+      and
+      not togl {cms@noneshort}%
+    }%
+    {\usebibmacro{cite:short}}
+    {\renewbibmacro*{author/editor}{\usebibmacro{choose+surname}}%
+      \renewbibmacro*{editor}{\usebibmacro{choose+surname}}%
+      \renewbibmacro*{author}{\usebibmacro{choose+surname}}%
+      \usebibmacro{cite}}}%
+  {\multicitedelim}%
+  {\usebibmacro{cite:postnote}}
+
+\DeclareMultiCiteCommand{\surnamecites}{surnamecite}{\multicitedelim}
+
+\DeclareCiteCommand{\shortcite}
+  {\usebibmacro{prenote}}
+  {\toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \usebibmacro{citeindex}%
+    \usebibmacro{cite:short}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\shorthandcite}
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \iftoggle{cms@shorthandibid}%
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+      {\usebibmacro{cite:ibid}%
+        \usebibmacro{cite:save}}%
+      {\usebibmacro{cite:shorthand}%
+        \usebibmacro{cite:save}%
+        \global\toggletrue{cms@noidem}}}%
+    {\usebibmacro{cite:shorthand}%
+      \usebibmacro{cite:save}%
+      \global\toggletrue{cms@noidem}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citejournal}% Name?
+  {\usebibmacro{prenote}}
+  {\toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \clearfield{pages}%
+    \usebibmacro{citeindex}%
+    \usebibmacro{cite:journal}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {\iftoggle{cms@loccit}%
+    {}%
+    {\usebibmacro{fullpostnote}}}
+
+\DeclareCiteCommand{\citeauthor}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \ifciteindex
+     {\indexnames{labelname}}
+     {}%
+   \printnames{labelname}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\newrobustcmd*{\Headlesscite}{\bibsentence\headlesscite}
+
+\newrobustcmd*{\Headlesscites}{\bibsentence\headlesscites}
+
+\DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlesscites}{headlesscite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlessfullcites}{headlessfullcite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlessparencites}[\mkbibparens]%
+{headlessparencite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlessparenshortcites}[\mkbibparens]%
+{headlessparenshortcite}{\multicitedelim}
+
+%% Textcite commands adapted from verbose.cbx %%
+
+\DeclareCiteCommand{\cbx@textcite}
+  {\usebibmacro{textcite:init}}
+  {\iffieldequals{namehash}{\cbx@lasthash}
+     {}%
+     {\iffirstcitekey
+        {}%
+        {\textcitedelim}%
+      \stepcounter{textcitecount}%
+      \usebibmacro{textcite}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\cms@textcite@i]
+  {\usebibmacro{textcite:init}%
+   \gdef\cbx@savedkeys{}%
+   \DeferNextCitekeyHook}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
+     {\protected@xappto\cbx@footcite@args{%
+        (\thefield{multiprenote})(\thefield{multipostnote})}}%
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}%
+     {}%
+     {\usebibmacro{textcite:count}%
+      \savefield{namehash}{\cbx@lasthash}}%
+   \ifnumequal{\value{citecount}}{\value{citetotal}}%
+     {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+      \protected@xappto\cbx@footcite@args{%
+        [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+      \iflastcitekey
+        {\iffootnote
+          {\protected@xappto\cbx@textcite@args{\nopunct}%
+            \protected@xappto\cbx@footcite@args{\thefield{postpunct}}}%
+          {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch
+            \protected@xappto\cbx@footcite@args{\nopunct}}}% these two?
+        {}}
+     {}}
+  {}
+  {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \setcounter{textcitemaxnames}{0}%
+  \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+  \cbx@textcite@args\empty\cbx@footcite@args\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+  [\cbx@textcites@init\cbx@textcites\cms@textcites@i]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+  \UseNextMultiCiteHook%
+  \AtNextMultiCite{%
+    \renewbibmacro{multiprenote}{}%
+    \renewbibmacro{multipostnote}{}}}{}{}
+
+\renewcommand*{\textcitedelim}{%
+  \iffinalcitedelim%
+  {\ifnumgreater{\value{textcitetotal}}{2}%
+    {\addcomma}%
+    {}%
+    \addspace\bibstring{and}}%
+  {\addcomma}%
+  \addspace}%
+
+\newrobustcmd{\cms@textcite@i}{%
+  \iffootnote{\foottextcite}{\footcite}}
+
+\newrobustcmd{\cms@textcites@i}{%
+  \iffootnote{\foottextcites}{\footcites}}
+
+\newcommand{\foottextcite}{\addspace\headlessparenshortcite}
+
+\newcommand{\foottextcites}{\addspace\headlessparenshortcites}
+
+%%% The \gentextcite commands - \textcite in the genitive case %%%
+
+\DeclareCiteCommand{\cms@gentextcite@i}
+  {\usebibmacro{textcite:init}%
+    \toggletrue{cms@gencite}}%
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+     {}%
+     {\iffirstcitekey
+        {}%
+        {\textcitedelim}%
+      \stepcounter{textcitecount}%
+      \usebibmacro{textcite}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {\togglefalse{cms@gencite}}%
+
+\DeclareCiteCommand{\cms@gentextcite}[\cbx@textcite@init\cms@gentextcite@i\cms@textcite@i]
+  {\usebibmacro{textcite:init}%
+   \gdef\cbx@savedkeys{}%
+   \DeferNextCitekeyHook}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
+     {\protected@xappto\cbx@footcite@args{%
+        (\thefield{multiprenote})(\thefield{multipostnote})}}%
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}%
+     {}%
+     {\usebibmacro{textcite:count}%
+      \savefield{namehash}{\cbx@lasthash}}%
+   \ifnumequal{\value{citecount}}{\value{citetotal}}%
+     {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+      \protected@xappto\cbx@footcite@args{%
+        [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+      \iflastcitekey
+        {\iffootnote
+          {\protected@xappto\cbx@textcite@args{\nopunct}%
+            \protected@xappto\cbx@footcite@args{\thefield{postpunct}}}%
+          {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch
+            \protected@xappto\cbx@footcite@args{\nopunct}}}% these two?
+        {}}
+     {}}
+  {}
+  {}
+
+\DeclareMultiCiteCommand{\cms@gentextcite@is}{\cms@gentextcite@i}{}
+\DeclareMultiCiteCommand{\cms@gentextcites}
+  [\cbx@textcites@init\cms@gentextcite@is\cms@textcites@i]{\cms@gentextcite}{}
+
+\newrobustcmd*{\gentextcite}[1][]{%
+  \@ifnextchar[%]
+  {\gencite@i[#1]}%
+  {\gencite@i[][#1]}}%
+
+\def\gencite@i[#1][#2]{%
+  \@ifnextchar[%]
+  {\gencite@ii[#1][#2]}%
+  {\gencite@ii[][#1][#2]}}%
+
+\def\gencite@ii[#1][#2][#3]#4{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \gencite@iii[#2][#3]{#4}}%
+
+\def\gencite@iii#1{\cms@gentextcite#1}
+
+\newrobustcmd*{\gentextcites}[1][]{%
+  \@ifnextchar(%)
+  {\gencites@iv[#1]}%
+  {\@ifnextchar[%]
+    {\gencites@i[#1]}%
+    {\gencites@i[][#1]}}}%
+
+\def\gencites@i[#1][#2]{%
+  \@ifnextchar[%]
+  {\gencites@ii[#1][#2]}%
+  {\gencites@ii[][#1][#2]}}%
+
+\def\gencites@ii[#1][#2][#3]#4{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \gencites@iii[#2][#3]{#4}}%
+
+\def\gencites@iii#1{\cms@gentextcites#1}%
+
+\def\gencites@iv[#1]#2{%
+  \ifblank{#1}{\def\thegen{'s}}{\def\thegen{#1}}%
+  \cms@gentextcites#2}%
+
+\newrobustcmd*{\Gentextcite}{\bibsentence\gentextcite}
+\newrobustcmd*{\Gentextcites}{\bibsentence\gentextcites}
+
+%%% End code for \gentextcite %%%
+
+%%%% Drivers for the Long Note Format %%%%
+
+\DeclareBibliographyDriver{cite:article}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{cmag+news+author}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{cmag+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%\newblock%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{mag+news+date}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
+    }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+  {\usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{cmag+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cjournal+issue+year+pages}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    not test {\iffieldundef{related}}%
+    }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:artwork}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \newcunit
+  \printfield{type}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \newcunit\newblock
+    \printfield{ismn}}%
+  {}%
+  \newcunit\newblock%
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{cite:xref+date}%
+  \newcunit
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \newcunit\newblock
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \printlist[][-\value{listtotal}]{lista}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:bookinbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{cite:xref+date}%
+  \newcunit\newblock
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \setunit*{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+  {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+  \usebibmacro{howpubl+loc+year}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \newcunit\newblock
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}% This seems to work. Only with Vol?
+    {\ifbibliography%
+      {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+    {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newcunit\newblock
+  \printfield{nameaddon}%
+  \setunit*{\addspace}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:image}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit%\setunit{\addcomma\addspace}%
+  \usebibmacro{date}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \setunit{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }%
+  {\usebibmacro{chapincoll}%
+  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}%
+  \usebibmacro{cite:xref+finentry}}%
+{\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \usebibmacro{xrefprenote}% Volume fix
+      \usebibmacro{xrefchapincoll}%
+      \bibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \setunit{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }%
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \usebibmacro{caddendum}%
+      \usebibmacro{volfullpostnote}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+finentry}}%
+    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \usebibmacro{xrefprenote}% Volume fix
+      \usebibmacro{xrefchapincoll}%
+      \bibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \setunit{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }%
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit\newblock
+      \usebibmacro{cbyeditor+others}%
+      \newcunit\newblock
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \setunit{\addspace}\newblock%
+      \printtext[parens]{%
+        \usebibmacro{org+publ+loc+year}}%
+      \usebibmacro{caddendum}%
+      \usebibmacro{volfullpostnote}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+finentry}}%
+    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \usebibmacro{xrefprenote}% Volume fix
+      \usebibmacro{xrefchapincoll}%
+      \bibxrefcite{\thefield{xref}}%
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:inreference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{inreffullpostnote}%
+  \newcunit\newblock%setunit{\addspace}% 16th ed
+  \ifnameundef{author}%
+  {}%
+  {\printtext{% 16th ed
+      \bibstring{by}%
+      \addspace%
+      \printnames{author}}}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:jurisdiction}{%
+  \iffieldequalstr{entrysubtype}{square}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext[brackets]{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \iffieldundef{issue}%
+    {\printfield[jurisdictionser]{series}}%
+    {\setunit{\addspace}%
+      \printfield{issue}}% Better ideas?
+    \usebibmacro{juridpostnote}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\shorthandpunct}%
+    \usebibmacro{cms:shorthandintro}% Moved before addendum
+    \setunit{\addspace}\newblock
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{round}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit*{\addspace}%
+      \printfield[jourvol]{volume}%
+      \setunit{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \setunit{\addspace}%
+      \printlist{origpublisher}% Extra reporters, same pagination
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printlist{origlocation}% Extra reporters, different pagination
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+        \printlist{location}%
+        \setunit*{\addspace}%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{cite:legal}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{clegis+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield[juridnum]{number}%
+  \newcunit%
+  \iffieldundef{year}%
+  {}%
+  {\printtext{%
+    \begingroup% Better ideas?
+    \let\abx@bibmonth\blx@imc@bibsstring%
+    \usebibmacro{date}\endgroup}}%
+  \newcunit%\setunit*{\addspace}%
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}%
+  {}%
+  {\printtext[shortjournal]{%
+    \printfield[jtsnoformat]{shortjournal}}}%
+  \setunit{\addspace}%
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \newcunit%
+  \printfield{part}%
+  \newcunit%
+  \printfield{chapter}%
+  \usebibmacro{juridpostnote}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addspace}%
+  \printlist{location}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}% Moved before addendum
+  \setunit{\addspace}\newblock%
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:legislation}{%
+  \iffieldequalstr{entrysubtype}{uk}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{author/editor}%
+    \usebibmacro{hlpunct}%\newcunit\newblock
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}% Needed here?
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \newcunit%\setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit*{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \setunit{\addspace}%
+    \printfield{series}%
+    \setunit{\addspace}%
+    \printfield{issue}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}%
+    \usebibmacro{juridpostnote}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\shorthandpunct}%
+    \usebibmacro{cms:shorthandintro}% Moved before addendum
+    \setunit{\addspace}\newblock%
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@citerel}%
+      and
+      not test {\iffieldundef{related}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \usebibmacro{hlpunct}%\newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}% Needed here?
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \setunit{\addspace}%
+      \printfield[hansardser]{series}%
+      \setunit{\addspace}%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \usebibmacro{hlpunct}%\newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addspace}% FIXME?
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}% Needed here?
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \newcunit%
+      \printfield{series}%
+      \setunit{\addspace}%
+      \printfield{issue}%
+      \newcunit%
+      \printfield{part}%
+      \newcunit%
+      \printfield{chapter}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iffieldundef{usera}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+          \printlist{location}%
+          \setunit*{\addspace}%
+          \printfield{usera}%
+          \setunit*{\addspace}%
+          \begingroup% Better ideas?
+          \let\abx@bibmonth\blx@imc@bibsstring%
+          \usebibmacro{date}\endgroup}}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{cite:letter}{%
+  \usebibmacro{bibindex}%
+  \savefield{fullhash}{\bbx@lasthash}%
+  \printtext[title]{%
+    \printfield[noformat]{title}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{letter+date}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newcunit\newblock%
+  \usebibmacro{cpart+editor+translator}%
+  \setunit*{\addcomma\addspace}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }%
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \usebibmacro{volume+or+volumes}%
+      \newcunit\newblock
+      \usebibmacro{cser+num}%
+      \newcunit\newblock
+      \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \usebibmacro{cpubletter+loc+year}%
+      \usebibmacro{caddendum}%
+      \usebibmacro{volfullpostnote}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \ifboolexpr{%
+        togl {cms@citerel}%
+        and
+        not test {\iffieldundef{related}}%
+      }%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+finentry}}%
+    {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+      \usebibmacro{xrefprenote}% Volume fix
+      \usebibmacro{xrefchapincoll}%
+      \bibxrefcite{\thefield{xref}}%
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed.
+    \usebibmacro{xrefprenote}% Volume fix
+    \usebibmacro{xrefchapincoll}%
+    \bibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author+org}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit
+  \usebibmacro{edition}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+  \usebibmacro{org+publ+loc+year}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{citaltitle+stitle}}%
+  {\printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \newcunit%
+    \usebibmacro{unpubl+letter+date}}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \printfield{howpublished}%
+  \newcunit\newblock
+  \printfield{type}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newcunit\newblock
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \iffieldundef{entrysubtype}%
+  {\newcunit\newblock
+    \usebibmacro{date}}%
+  {}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit\newblock
+  \usebibmacro{music+eventdate}%
+  \newcunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{addspace}}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+  \newcunit\newblock
+  \printlist{publisher}%
+  \newcunit\newblock
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \newcunit\newblock
+  \usebibmacro{date}%
+  \newcunit
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \printfield{type}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \usebibmacro{pubstate}% 16th ed.
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{cite:mvbook}{cite:book}
+
+\DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
+
+\DeclareBibliographyAlias{cite:mvproceedings}{cite:proceedings}
+
+\DeclareBibliographyAlias{cite:mvreference}{cite:reference}
+
+\DeclareBibliographyDriver{cite:online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \printlist{organization}% Rearranged for 16th ed.
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cnotefield}%
+  \setunit{\addcomma\addspace}
+  \usebibmacro{date}%
+  \usebibmacro{fullpostnote}%
+  \setunit{\addcomma\addspace}%
+  \iffieldundef{urlyear}%
+  {}%
+  {\printurldate}% Date fix
+  \newcunit\newblock
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
+  \newcunit\newblock
+  \usebibmacro{eprint}%
+  \newcunit\newblock
+  \printfield{url}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author+holder}% +holder?
+  \newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}%
+  \printtext[parens]{%
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}%
+    {}%
+    {\setunit*{\addspace}%
+     \printtext[parens]{%
+       \printlist[][-\value{listtotal}]{location}}}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit
+  \iffieldundef{origyear}%
+  {\iffieldundef{year}%
+    {}%
+    {\bibstring{patentfiled}\setunit{\addspace}% Changed to filed
+      \printdate}}%
+  {\bibstring{patentfiled}\setunit{\addspace}%
+    \usebibmacro{cmsorigdate}%
+    \setunit{\finalandcomma\addspace\bibstring{and}%
+      \addspace\bibstring{patentissued}\addspace}%
+  \usebibmacro{date}}%
+  \usebibmacro{caddendum}}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:periodical}{%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%\newblock%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{periodical+date+issue}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}%
+  {\usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{issuetitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cperiodical+issue+year+pages}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
+  \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }%
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit\newblock
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+  \usebibmacro{org+publ+loc+year}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifpunctmark{.}% This seems to work.
+      {\ifbibliography%
+        {\setunit{\bibsentence}}{\addspace\bibsentence}}%
+      {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!?
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
+
+\DeclareBibliographyDriver{cite:reference}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit\newblock
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\usebibmacro{ctitle+stitle}}%
+  {\usebibmacro{citaltitle+stitle}}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit%
+  \printfield{type}%
+  \newcunit
+  \printfield{series}%
+  \setunit{\addnbspace}%
+  \printfield{number}%
+  \newcunit%
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{% 
+  \usebibmacro{inst+loc+year}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:review}{%
+  \usebibmacro{bibindex}%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{cmag+news+author}}%
+  {\usebibmacro{author/editor}}%
+  \newcunit\newblock
+  \printeventdate% 16th ed.
+  \setunit{\addspace}%
+  \printfield{nameaddon}% 16th ed.
+  \newcunit\newblock
+  \ifboolexpr{%
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    togl {cms@citerel}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%\newblock%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addcomma\addspace}%
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {\usebibmacro{mag+news+date}}%
+  {\usebibmacro{cjournal+issue+year+pages}}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:suppbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author}%
+  \usebibmacro{hlpunct}%\newcunit\newblock
+  \usebibmacro{inforaft}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit
+  \iffieldundef{maintitle}%
+  {\iffieldundef{edition}%
+    {}%
+    {\usebibmacro{edition}}}%
+  {}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \newcunit\newblock
+  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{cbyeditor+others}%
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \clearfield{pages}% ?? For 16th ed.
+  \usebibmacro{caddendum}%
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyAlias{cite:suppcollection}{cite:suppbook}
+
+\DeclareBibliographyAlias{cite:suppperiodical}{cite:review}
+
+\DeclareBibliographyDriver{cite:thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cnotefield}%
+  \setunit{\addspace}%
+  \printtext[parens]{%
+  \usebibmacro{type+inst+year}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \newcunit\newblock%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addspace}\newblock%
+  \printtext[parens]{%
+    \printfield{howpublished}%
+    \newcunit\newblock
+    \usebibmacro{cnotefield}%
+    \newcunit\newblock
+    \printfield{eventtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{eventtitleaddon}%
+    \newcunit%
+    \printfield{venue}%
+    \newcunit%
+    \printlist{location}%
+    \newcunit\newblock
+    \iffieldundef{eventyear}%
+    {\usebibmacro{date}}%
+    {\printeventdate}}%
+  \usebibmacro{caddendum}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \usebibmacro{hlpunct}%
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \usebibmacro{volume+or+volumes}%
+  \newcunit\newblock
+  \usebibmacro{cser+num}%
+  \newcunit\newblock
+  \usebibmacro{music+eventdate}%
+  \newcunit\newblock
+  \usebibmacro{cnotefield}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \newcunit\newblock
+  \printfield{type}% Order of this and next?
+  \usebibmacro{volfullpostnote}%
+  \newcunit\newblock
+  \usebibmacro{caddendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldundef{related}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+%%%% List Formats %%%%
+
+\DeclareListFormat{language}{%
+  \ifthenelse{\value{listcount}=1}%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
+    \ifbibstring{#1}%
+    {\bibstring{#1}}%
+    {\ifbibstring{lang#1}%
+      {\bibstring{lang#1}}%
+      {#1}}%
+    \ifthenelse{\value{listtotal}=1}%
+    {\bibrightbracket}%
+    {}}%
+  {\ifthenelse{\value{listcount}=\value{listtotal}}%
+    {\multilangdelim%
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
+        {#1}}%
+      \bibrightbracket}%
+    {\multilangdelim%
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
+        {#1}}}}%
+  \usebibmacro{langlist:andothers}}
+
+\DeclareListFormat{publisher}{%
+  \ifthenelse{\value{listtotal}<2}%
+  {#1\isdot}%
+  {\ifthenelse{\value{listcount}=1}%
+    {#1}%
+    {\multipubsdelim #1\isdot}}}
+
+\DeclareListFormat[jurisdiction]{location}{%
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{list:delim}{#1}%
+    #1\isdot%
+    \usebibmacro{list:andothers}}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\mkbibparens{#1}\addspace}%
+    {\mkbibparens{#1\isdot}}}}%
+
+\DeclareListFormat[jurisdiction]{origlocation}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {#1\isdot\addcomma\addspace}%
+  {#1\isdot}}
+
+\DeclareListFormat[jurisdiction]{origpublisher}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {\mkbibparens{#1}\addspace}%
+  {\mkbibparens{#1\isdot}}}
+
+\DeclareListFormat{periodplace}{\mkbibparens{#1}}
+
+\DeclareListFormat{lista}{% 
+  \ifthenelse{\value{listtotal}<2}%
+  {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
+  {\ifthenelse{\value{listcount}=1}%
+    {\bibsstring{subverbis}\addspace\mkbibquote{#1\isdot}\addcomma}%
+    {\ifthenelse{\value{listcount}<\value{listtotal}}%
+      {\addspace\mkbibquote{#1\isdot}\addcomma}%
+      {\addspace\mkbibquote{#1\isdot}}}}}
+
+%%%% Field Formats -- Title, Citetitle, Lostitle %%%%
+
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{citetitle}{%
+  \iffieldundef{title}%
+  {#1\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{lostitle}{%
+  \iffieldundef{title}%
+  {#1\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[artwork,image]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[artwork,image]{citetitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[artwork,image]{lostitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[letter,patent]{title}{#1\isdot}
+
+\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
+
+%% comprange code moved to .sty
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\mkcomprange{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {#1}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat[inreference]{postnote}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\newrobustcmd*{\mkjuridprefix}[1]{%
+  \ifboolexpr{% FIXME: Is this always right?
+    test {\iftoggle{cms@fullnote}}%
+    and
+    test {\ifentrytype{jurisdiction}}%
+    }%
+  {\iffieldundef{issue}%
+    {#1}%
+    {\printtext{at}\addspace *#1}}%
+  {\iffieldundef{issue}%
+    {\printtext{at}\addspace #1}% FIXME: Make it a bibstring?
+    {\ifentrytype{jurisdiction}%
+      {\printtext{at}\addspace *#1}%
+      {\printtext{at}\addspace #1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{pagination}%
+    {\mkcomprange[\mkjuridprefix]{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\mkjuridprefix{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat{pages}{%
+  \ifboolexpr{%
+    togl {cms@comprange}%
+    and
+    test {\ifpages{#1}}%
+  }%
+  {\iffieldundef{bookpagination}%
+    {\mkcomprange{#1}\isdot}%
+    {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+  {\iffieldundef{bookpagination}%
+    {#1\isdot}%
+    {\mkpageprefix[bookpagination]{#1}}}}%
+
+\DeclareListFormat{edlang}{% Required for feminine forms in some
+  \usebibmacro{list:delim}{% languages
+    \ifbibstring{#1}%
+    {\bibxstring{#1}}%
+    {\ifbibstring{ed#1}%
+      {\bibxstring{ed#1}}%
+      {\ifcapital{\MakeCapital{#1}}{#1}}}}%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifbibstring{ed#1}%
+    {\bibstring{ed#1}}%
+    {\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \usebibmacro{list:andothers}}
+
+\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[suppbook,suppcollection]{citetitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
+
+\DeclareFieldFormat[customc]{citetitle}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {\printfield{nameaddon}\addspace #1}}
+
+\DeclareFieldFormat[misc]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldFormat[misc]{citetitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldFormat[misc]{lostitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{#1}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldFormat[review,suppperiodical]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldFormat[review,suppperiodical]{citetitle}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldFormat[review,suppperiodical]{lostitle}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[audio,music,video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[audio,music,video]{citetitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[audio,music,video]{lostitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{title}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[jurisdiction,legal]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+%%%% Other Field Formats %%%%
+
+\DeclareNumChars*{:}% For proper ibidem with multi-volume works.
+
+\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
+
+\DeclareFieldFormat{note}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}%
+
+\DeclareFieldFormat
+[audio,manual,music,patent,report,suppbook,suppcollection,thesis,video]
+{type}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifcapital%
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat[artwork,image]{type}{%
+  \ifcapital%
+  {\MakeCapital{#1}}%
+  {#1}}
+
+\DeclareFieldFormat{url}{\url{#1}}
+
+\DeclareFieldFormat{doi}{%
+  \textrm{doi}\addcolon
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+\DeclareFieldFormat[music]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{urldate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{urlseen}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+  {\bibstring{urlseen}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+    \OR\NOT\iffieldundef{origyear}}%
+  {\bibstring{urlseen}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{discrecorded}\addspace #1}% Can now match gender
+    {\printfield{userd}\addspace #1}}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{songrecorded}\addspace #1}% Can now match gender
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{broadcast}\addspace #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
+\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+
+\DeclareFieldFormat[review,suppperiodical]{nameaddon}{#1\bibsentence}
+
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}
+
+\DeclareFieldFormat{edition}{% New in 0.8
+  \ifinteger{#1}
+  {\mkbibordedition{#1}~\bibstring{edition}}%
+  {\ifcapital
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat{year}{% To cope with abbreviation n.d.
+  \iftoggle{cms@fullnote}%
+  {#1\bibsentence}%
+  {#1\isdot}}% (?)
+
+\DeclareFieldFormat[misc]{year}{#1\isdot}
+
+\DeclareFieldFormat[article]{year}{% To cope with abbreviation n.d.
+  \iffieldequalstr{entrysubtype}{magazine}%
+  {#1\isdot}
+  {#1\bibsentence}}
+
+\DeclareFieldAlias[review]{year}[article]{year}
+
+\DeclareFieldAlias[periodical]{year}[article]{year}
+
+\DeclareFieldAlias[suppperiodical]{year}[article]{year}
+
+\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
+
+\DeclareFieldFormat{titleaddon}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+
+\DeclareFieldAlias{booktitleaddon}{titleaddon}
+
+\DeclareFieldAlias{maintitleaddon}{titleaddon}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{journaltitle}{%
+  \iffieldundef{shortjournal}%
+  {#1\isdot}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{shortjournal}{#1\isdot}
+
+\DeclareFieldFormat{journaltitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{issuetitle}{\mkbibquote{#1\isdot}}
+
+\DeclareFieldFormat{shortjournal}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{shorttitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{jourser}{%
+  \ifinteger{#1}%
+  {\mkbibordseries{#1}%
+    \addnbspace%
+    \bibstring{jourser}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
+
+\DeclareFieldFormat{jurisdictionser}{%
+  \ifinteger{#1}%
+  {\mkjuridordinal{#1}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
+
+\DeclareFieldFormat{legislationser}{%
+  \iffieldequalstr{entrysubtype}{hansard}%
+  {\ifinteger{#1}%
+    {\addspace\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+    {\ifbibstring{#1}%
+      {\addspace\mkbibparens{\bibstring{#1}}}%
+      {\addspace\mkbibparens{#1}}}}%
+  {\iffieldequalstr{entrysubtype}{uk}%
+    {\addspace #1\isdot}%
+    {\addcomma\addspace #1\isdot}}}%
+
+\DeclareFieldFormat{legalser}{\addspace #1\isdot}%
+
+\DeclareFieldFormat{hansardser}{%
+  \ifinteger{#1}%
+  {\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+  {\ifbibstring{#1}{\mkbibparens{\bibstring{#1}}}{\mkbibparens{#1}}}}%
+
+\DeclareFieldFormat{journum}{% Revised for 0.9.5
+  \ifboolexpr{%
+    test {\ifnumerals{#1}}%
+    and
+    not test {\ifnumeral{#1}}%
+  }%
+  {\bibstring{numbers}\addspace #1}%
+  {\bibstring{number}\addspace #1}}%
+
+\DeclareFieldFormat{juridnum}{\bibcpstring{number}\addspace #1}%
+
+\DeclareFieldFormat{jourvol}{#1}
+
+\DeclareFieldFormat{sernum}{%
+  \ifnumeral{#1}%
+  {\addnbspace #1}%
+  {\addcomma\addspace #1}}
+
+\DeclareFieldFormat{series}{#1\isdot}
+
+\DeclareFieldFormat{addendum}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
+  \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
+
+% This works better here than in the entrytail macro -- userf use is
+% no longer a problem, though the page breaking still isn't ideal.
+
+\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+
+\DeclareFieldFormat{part}{% xref revision ???
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat{xrefpart}{% xref revision ???
+  \ifnumerals{#1}%
+  {\bibstring{partvolume}~#1}%
+  {\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat[legal,legislation]{part}{%
+  \ifnumerals{#1}%
+  {\bibsstring{part}~#1}%
+  {#1\isdot}}%
+
+\DeclareFieldFormat[legal,legislation]{chapter}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
+    \iffieldequalstr{entrysubtype}{hansard}}%
+  {c\adddotspace #1}%
+  {ch\adddotspace #1}}%
+
+%% This tries to get hyperlinks from shortened cross-ref'd notes to %%
+%% long notes working properly.  Used in short and shorthand cites. %%
+
+\DeclareFieldFormat{cmshyperlink}{%
+  \iffieldundef{crossref}%
+  {\iffieldundef{xref}%
+    {\bibhyperlink{\thefield{entrykey}}{#1}}%
+    {\ifboolexpr{((
+        test {\ifentrytype{book}}%
+        or
+        test {\ifentrytype{bookinbook}}%
+        or
+        test {\ifentrytype{collection}}%
+        or
+        test {\ifentrytype{proceedings}}%
+        )
+        and
+        not togl {cms@bookcitexref}%
+        )
+        or
+        ((
+        test {\ifentrytype{inbook}}%
+        or
+        test {\ifentrytype{letter}}%
+        or
+        test {\ifentrytype{incollection}}%
+        or
+        test {\ifentrytype{inproceedings}}%
+        )
+        and
+        not togl {cms@citecrossref}%
+        )
+      }%
+      {\bibhyperlink{\thefield{xref}}{#1}}%
+      {\bibhyperlink{\thefield{entrykey}}{#1}}}}%
+  {\ifboolexpr{((
+        test {\ifentrytype{book}}%
+        or
+        test {\ifentrytype{bookinbook}}%
+        or
+        test {\ifentrytype{collection}}%
+        or
+        test {\ifentrytype{proceedings}}%
+        )
+        and
+        not togl {cms@bookcitexref}%
+        )
+        or
+        ((
+        test {\ifentrytype{inbook}}%
+        or
+        test {\ifentrytype{letter}}%
+        or
+        test {\ifentrytype{incollection}}%
+        or
+        test {\ifentrytype{inproceedings}}%
+        )
+        and
+        not togl {cms@citecrossref}%
+        )
+      }%
+      {\bibhyperlink{\thefield{crossref}}{#1}}%
+      {\bibhyperlink{\thefield{entrykey}}{#1}}}}
+
+\DeclareFieldAlias[review]{volume}[article]{volume}
+
+\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
+
+%%%% Related field formats from biblatex.def %%%%
+
+\DeclareFieldFormat{related:origpubas}{#1}% This and next remove parens
+
+\DeclareFieldFormat{related:origpubin}{#1}
+
+\DeclareFieldFormat{relatedstring:default}{% For notes + bib
+  \ifboolexpr{%
+    test {\iffieldundef{relatedstring}}%
+    or
+    test {\iffieldbibstring{relatedstring}}%
+  }%
+  {#1}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}%
+  \ifentrytype{jurisdiction}%
+  {\newcunit}%
+  {\printunit{\relatedpunct}}}%
+
+\DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
+  \ifboolexpr{%
+    test {\iffieldundef{relatedstring}}%
+    or
+    test {\iffieldbibstring{relatedstring}}%
+  }%
+  {#1}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}%
+  \addspace}%
+
+%%%% Commands, for users and internal %%%%
+
+\newcommand*{\cbytypeeditor}{%
+  \iffieldundef{editortype}%
+    {\bibstring{cbytypeeditor}}%
+    {\bibstring{cbytype\thefield{editortype}}}}%
+
+\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
+
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
+\renewcommand*{\subtitlepunct}{% Follows CMS16 spec.
+  \ifboolexpr{%
+    test {\ifterm}%
+    and
+    not test {\ifcsdef{@cmsst}}%
+  }%
+  {\addspace}%
+  {\addcolon\addspace%
+    \global\csundef{@cmsst}}%
+}
+
+\newcommand{\custpunct}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldequalstr{type}{plain}%
+    {}%
+    {\addcomma}}%
+  {\iftoggle{cms@shortnote}%
+    {\iffieldundef{postnote}%
+      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
+        {}%
+        {\addperiod}}%
+      {\addcomma}}%
+    {\addperiod}}}
+
+\newcommand{\custpunctb}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldequalstr{userb}{plain}%
+    {}%
+    {\addcomma}}%
+  {\iftoggle{cms@shortnote}%
+    {\iffieldundef{postnote}%
+      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
+        {}%
+        {\addperiod}}%
+      {\addcomma}}%
+    {\addperiod}}}
+
+\newcommand{\classicpunct}{% 16th ed.
+  \ifthenelse{\(\iffieldequalstr{entrysubtype}{classical}\AND%
+    \iffieldundef{labeltitle}\)\OR
+    \ifentrytype{letter}}%
+  {\setunit*{\addspace}}%
+  {\setunit*{\addcomma\addspace}}}
+
+\newcommand*{\reprintpunct}{%
+  \iftoggle{cms@fullnote}%
+  {\setunit*{\addsemicolon\addspace}}%
+  {\setunit*{\addperiod\addspace}}}
+
+\newcommand*{\encypunct}{% for named entries in an encyclopedia
+  \iftoggle{cms@fullnote}%
+  {\ifentrytype{book}%
+    {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
+        \iffieldundef{isbn}\AND\iffieldundef{url}}%
+      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
+        {}%
+        {\addperiod}}%
+      {\addcomma}}%
+    {\ifnameundef{author}%
+      {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
+          \iffieldundef{isbn}\AND\iffieldundef{url}}%
+        {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
+          {}%
+          {\addperiod}}%
+        {\addcomma}}%
+      {}}}%
+  {\ifentrytype{book}%
+    {\addperiod}%
+    {\ifnameundef{author}%
+      {\addperiod}%
+      {}}}}%
+
+\newcommand*{\postvolpunct}{\addcolon}% For vol:page customization
+
+\newcommand*{\parttrans}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbytranslator}\addspace}%
+  {\bibstring{bytranslator}\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}%
+  {\bibstring{cbycompiler}\addspace}%
+  {\bibstring{bycompiler}\addspace}}%
+
+\newcommand*{\parteditandcomp}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbyeditorcp}\addspace}%
+  {\bibstring{byeditorcp}\addspace}}%
+
+\newcommand*{\parttransandcomp}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbytranslatorcp}\addspace}%
+  {\bibstring{bytranslatorcp}\addspace}}%
+
+\newcommand*{\partedittransandcomp}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbyeditortrcp}\addspace}%
+  {\bibstring{byeditortrcp}\addspace}}%
+
+\newcommand*{\parteditandtrans}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbyeditortr}\addspace}%
+  {\bibstring{byeditortr}\addspace}}%
+
+\newcommand*{\reprint}{%
+  \iftoggle{cms@fullnote}%
+  {\bibsstring{reprint}}%
+  {\bibstring{reprint}}}%
+
+\newcommand*{\multipubsdelim}{\addnbspace/\addspace}
+
+\newcommand*{\multilocsdelim}{%
+  \ifthenelse{\value{listcount}<\value{liststop}}%
+    {\ifthenelse{\numexpr\value{listcount}+1<\value{liststop}}%
+       {\addcomma\addspace}%
+       {\ifthenelse{\value{liststop}>2}%
+         {\addcomma\addspace\bibstring{and}\addspace}%
+         {\addspace\bibstring{and}\addspace}}}%
+       {}}%
+
+\newcommand*{\multilangdelim}{%
+  \ifthenelse{\value{listtotal}<3}%
+  {\addspace\bibstring{and}\addspace}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\addcomma\addspace}%
+    {\addcomma\addspace\bibstring{and}\addspace}}}%
+
+\renewcommand*{\postnotedelim}{%
+  \ifboolexpr{%
+    test {\ifciteibid}%
+    and
+    (
+    test {\ifentrytype{jurisdiction}}%
+    or
+    test {\ifentrytype{legal}}%
+    or
+    test {\ifentrytype{legislation}}%
+    )
+  }%
+  {\addspace}%
+  {\iftoggle{cms@shortnote}%
+    {\iffieldequalstr{entrysubtype}{classical}%
+      {\DeclareNumChars*{abcdeABCDE:}% Makes classical
+        \iffieldpages{postnote}% test more accurate. See 17.253.
+        {\addspace}%
+        {\addcomma\addspace}\DeclareNumChars{.}}%
+      {\addcomma\addspace}}% 16th ed -- no more volumes test.
+    {\iftoggle{cms@fullnote}%
+      {\ifthenelse{\(\ifentrytype{article}\OR
+          \ifentrytype{review}\OR
+          \ifentrytype{periodical}\OR
+          \ifentrytype{suppperiodical}\)\AND\NOT
+          \iffieldequalstr{entrysubtype}{magazine}}%
+        {\addcolon\addspace}%
+        {\addcomma\addspace}}%
+      {\addcomma\addspace}}}}%
+
+\newcommand*{\postnotewrapper}{%
+  \iftoggle{cms@modpostnote}%
+  {\ifboolexpr{%
+      test {\iffieldstart{postnote}{,}}%
+      or
+      test {\iffieldstart{postnote}{\bibrangessep}}%
+    }%
+    {\addcomma}% w/ or w/o \addspace?
+    {\ifboolexpr{%
+        test {\iffieldstart{postnote}{;}}%
+        or
+        test {\iffieldstart{postnote}{:}}%
+        or
+        test {\iffieldstart{postnote}{.}}%
+      }%
+      {}{\postnotedelim}}}%
+  {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+  \begingroup%                     comp.text.tex
+  \edef\@tempa{%
+    \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+  \@tempa\@nil{\endgroup\ifblank{##1}}%
+  \savefield*{#1}{\@tempa}%
+  \expandafter\iffieldstart@i\detokenize
+  \expandafter\expandafter\expandafter{%
+    \expandafter\@tempa\detokenize{#2}}\@nil}
+
+\newcommand*{\editordelim}{%
+  \ifboolexpr{%
+    test {\iffieldequalstr{editortype}{none}}%
+    and
+    not togl {cms@fullnote}%
+  }%
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\newcommand*{\nameadelim}{%
+  \ifboolexpr{%
+    test {\iffieldequalstr{nameatype}{none}}%
+    and
+    not togl {cms@fullnote}%
+  }%
+  {\newunit}%\addperiod\addspace
+  {\newcunit}}%\addcomma\addspace
+
+\DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
+  \begingroup% final {by}.
+  \blx@bibstringnormal%
+  \usebibmacro{list:delim}{%
+    \ifbibstring{from#1}%
+      {\bibxlstring{cfrom#1}}%
+      {\ifbibstring{clang#1}%
+         {\bibxlstring{lang#1}}%
+         {#1}}}%
+  \ifbibstring{cfrom#1}%
+  {\ifboolexpr{%
+      test {\ifnumless{\value{listcount}}{\value{liststop}}}%
+      or
+      test {\ifmoreitems}%
+     }%
+     {\bibstring{from#1}}%
+     {\bibstring{cfrom#1}}}%
+    {\ifbibstring{lang#1}%
+       {\biblstring{lang#1}}%
+       {#1}}%
+ \usebibmacro{list:andotherlangs}%
+ \endgroup}
+
+\newbibmacro*{list:andotherlangs}{% Final {by} after {andmore}
+  \ifboolexpr{%
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+    and
+    test {\ifmoreitems}%
+  }%
+    {\ifnumgreater{\value{liststop}}{1}%
+       {\finalandcomma}%
+       {}%
+     \printdelim{andmoredelim}\bibstring{andmore}\addspace\bibstring{by}}%
+    {}}
+
+\newcommand*{\lbx@cfromlang}{% Because the cbytranslator string can't
+  \iffieldundef{userf}% have {by} in it unless there's an origlanguage.
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[cfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@fromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@lfromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@sfromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[sfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
+  \togglefalse{cms@switchdates}%
+  \ifbibliography
+    {\usebibmacro{entrytail}}%
+    {}%
+  \finentry}
+
+\newbibmacro*{book:xref+finentry}{% FIXME
+  \ifthenelse{\iffieldundef{crossref}\OR\ifbibliography}%
+  {\ifthenelse{\iffieldundef{xref}\OR\ifbibliography}%
+    {}%
+    {\iftoggle{cms@bookcitexref}%
+      {\cms@citetracker@xref}%
+      {\bibhypertarget{\thefield{xref}}%
+        {\cms@citetracker@xref}}}}%
+  {\iftoggle{cms@bookcitexref}%
+    {\cms@citetracker@crossref}%
+    {\bibhypertarget{\thefield{crossref}}%
+      {\cms@citetracker@crossref}}}}%
+
+\newbibmacro*{cite:xref+finentry}{% FIXME
+  \ifthenelse{\iffieldundef{crossref}\OR\ifbibliography}%
+  {\ifthenelse{\iffieldundef{xref}\OR\ifbibliography}%
+    {}%
+    {\iftoggle{cms@citecrossref}%
+      {\cms@citetracker@xref}%
+      {\bibhypertarget{\thefield{xref}}%
+        {\cms@citetracker@xref}}}}%
+  {\iftoggle{cms@citecrossref}%
+    {\cms@citetracker@crossref}%
+    {\bibhypertarget{\thefield{crossref}}%
+      {\cms@citetracker@crossref}}}}%
+
+\newbibmacro*{allshort+firstcite+xref}{%
+  \ifboolexpr{%
+    (
+    togl {cms@citecrossref}%
+    and
+    togl {cms@bookcitexref}% 
+    )
+    or
+    not togl {cms@allshort}%
+  }%
+  {}%
+  {\ifciteseen%
+    {}%
+    {\iffieldundef{crossref}%
+      {\iffieldundef{xref}%
+        {}%
+        {\cms@citetracker@xref}}%
+      {\cms@citetracker@crossref}}}}%
+
+\def\cms@citetracker@crossref{% cf. \blx@citetracker@global
+  \ifbool{citetracker}%
+    {\xifinlistcs\abx@field@crossref{blx@bsee@\the\c@refsection}%
+       {}%
+       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@crossref}}%
+    {}}%
+
+\def\cms@citetracker@xref{% cf. \blx@citetracker@global
+  \ifbool{citetracker}%
+    {\xifinlistcs\abx@field@xref{blx@bsee@\the\c@refsection}%
+       {}%
+       {\listcsxadd{blx@bsee@\the\c@refsection}\abx@field@xref}}%
+    {}}%
+
+
+\newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
+  \newunit\newblock
+  \iftoggle{cms@annotation}%
+    {\usebibmacro{annotation}%
+     \newunit\newblock}%
+    {}}%
+
+\newbibmacro*{author+holder}{%
+  \ifnameundef{author}%
+    {}%
+    {\printnames{author}%
+     \ifthenelse{\ifnameundef{holder}\OR%
+                 \ifnamesequal{author}{holder}}%
+       {}%
+       {\setunit{\addspace}%
+        \printtext[parens]{\printnames{holder}}}}}
+
+\renewbibmacro*{byauthor}{%
+  \ifthenelse{\ifuseauthor\OR%
+              \ifnameundef{author}}%
+    {}%
+    {\bibstring{by}\addspace%
+     \printnames[byauthor]{author}}}
+
+\newbibmacro*{byauthorpunct}{%
+  \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
+  {\addperiod\addspace}%
+  {\newcunit}}
+
+\renewbibmacro*{bybookauthor}{%
+  \ifnameundef{bookauthor}%
+    {}%
+    {\ifnamesequal{author}{bookauthor}%
+      {}%
+      {\bibstring{by}\addspace\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
+\newbibmacro*{editorpunct}{%
+  \ifthenelse{\(\iffieldundef{booktitle}\AND%
+    \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
+    \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
+    \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
+  {\ifentrytype{video}% Change for Video type?  Appears
+    {\newcunit\newblock}% to treat italicized title as booktitle in
+    {\newunit\newblock}}% available examples.  Added issuetitle 0.9.9c.
+  {\newcunit\newblock}}
+
+\newbibmacro*{edition}{%
+  \printfield{edition}%
+    \clearfield{edition}}%
+
+\newbibmacro*{inforaft}{%
+  \ifnameundef{introduction}%
+  {\ifnameundef{afterword}%
+    {\ifnameundef{foreword}%
+      {\printfield{type}}%
+      {\bibstring{forewordto}%
+        \clearname{foreword}}}% 16th ed.
+    {\bibstring{afterwordto}%
+      \clearname{afterword}}}%
+  {\bibstring{introductionto}%
+    \clearname{introduction}}}
+
+\newbibmacro*{langlist:andothers}{%
+  \ifthenelse{\value{listcount}=\value{liststop}\AND%
+              \ifmoreitems}%
+    {\ifnum\value{liststop}>1 \finalandcomma\fi%
+     \andmoredelim\bibstring{andmore}\bibrightbracket}%
+    {}}%
+
+\newbibmacro*{mag+news+author}{%
+  \ifnameundef{author}%
+  {\ifboolexpr{%
+      test {\iffieldequals{journaltitle}{\bbx@lasthash}}%
+      and
+      not test {\iffirstonpage}%
+      and
+      togl {cms@namedash}%
+    }%
+    {\printtext{\bibnamedash}}%
+    {\usebibmacro{journal+sub}%
+      \setunit*{\addspace}%
+      \printlist[periodplace]{location}%
+      \savefield{journaltitle}{\bbx@lasthash}}}%
+  {\ifuseauthor%
+    {\ifthenelse{\(\ifentrytype{review}\OR\ifentrytype{suppperiodical}\)%
+        \AND\NOT\iffieldundef{nameaddon}}%
+      {\savefield{nameaddon}{\cms@tempn}\clearfield{nameaddon}%
+        \usebibmacro{author}\restorefield{nameaddon}{\cms@tempn}}%
+      {\usebibmacro{author}}}%
+    {}}}%
+
+\newbibmacro*{cmag+news+author}{%
+  \ifnameundef{author}%
+  {}% 16th ed.
+  {\ifuseauthor%
+    {\ifthenelse{\(\ifentrytype{review}\OR\ifentrytype{suppperiodical}\)%
+        \AND\NOT\iffieldundef{nameaddon}}%
+      {\savefield{nameaddon}{\cms@tempn}\clearfield{nameaddon}%
+        \usebibmacro{author}\restorefield{nameaddon}{\cms@tempn}}%
+      {\usebibmacro{author}}}%
+    {}}}%
+
+\newbibmacro*{type+inst+year}{%
+  \printfield{type}%
+  \newcunit
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}}%  Instead of cmsyear
+
+\newbibmacro*{institution+organization}{%
+  \iflistundef{organization}%
+  {\iflistundef{institution}%
+    {}%
+    {\printlist{institution}}}%
+  {\printlist{organization}%
+    \newcunit%
+    \printlist{institution}}}
+
+\newbibmacro*{bibauthor+org}{%
+  \ifnameundef{author}%
+  {\ifnameundef{editor}%
+    {\iflistundef{organization}%
+      {}%
+      {\ifboolexpr{%
+          test {\iflistequals{organization}{\bbx@lasthash}}%
+          and
+          not test {\iffirstonpage}%
+          and
+          togl {cms@namedash}%
+        }%
+        {\printtext{\bibnamedash}}%
+        {\printlist{organization}%
+          \savelist{organization}{\bbx@lasthash}}}}%
+    {\usebibmacro{editor}}}%
+  {\usebibmacro{author/editor}}}
+
+\newbibmacro*{author+org}{%
+  \ifnameundef{author}%
+  {\ifnameundef{editor}%
+    {\iflistundef{organization}%
+      {}%
+      {\printlist{organization}}}%
+    {\usebibmacro{editor}}}%
+  {\usebibmacro{author/editor}}}
+
+\newbibmacro*{cbytypestrg}[2]{%
+  \iffieldundef{#1type}%
+    {\bibstring{cby#2}}%
+    {\bibstring{cby\thefield{#1type}}}}%
+
+\newbibmacro*{cbyeditor}{%
+  \ifnameundef{editor}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \newcunit}%
+  \usebibmacro{cbyeditorx}}
+
+\newbibmacro*{cbyeditorx}{%
+  \ifnameundef{editora}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \newcunit}%
+  \ifnameundef{editorb}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \newcunit}%
+  \ifnameundef{editorc}%
+    {}%
+    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \newcunit}}
+
+\newbibmacro*{cbytranslator}{%
+  \ifnameundef{translator}%
+  {}%
+  {\bibstring{cbytranslator}%
+    \addspace%
+    \printnames[bytranslator]{translator}}}
+
+\newbibmacro*{cbycompiler}{%
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{cbycompiler}\addspace%
+     \printnames[bycompiler]{namec}}}
+
+\newbibmacro*{cbyredactor}{%
+  \ifnameundef{redactor}%
+    {}%
+    {\bibstring{cbyredactor}\addspace%
+     \printnames[byredactor]{redactor}}}
+
+\newbibmacro*{cwithcommentator}{%
+  \ifnameundef{commentator}%
+    {}%
+    {\bibsstring{withcommentator}\addspace%
+     \printnames[withcommentator]{commentator}}}
+
+\newbibmacro*{cwithannotator}{%
+  \ifnameundef{annotator}%
+    {}%
+    {\bibsstring{withannotator}\addspace%
+     \printnames[withannotator]{annotator}}}
+
+\newbibmacro*{cwithintroduction}{%
+  \ifnameundef{introduction}%
+    {}%
+    {\bibstring{withintroduction}\addspace%
+     \printnames[withintroduction]{introduction}}}
+
+\newbibmacro*{cwithforeword}{%
+  \ifnameundef{foreword}%
+    {}%
+    {\bibstring{withforeword}\addspace%
+     \printnames[withforeword]{foreword}}}
+
+\newbibmacro*{cwithafterword}{%
+  \ifnameundef{afterword}%
+    {}%
+    {\bibstring{withafterword}\addspace%
+     \printnames[withafterword]{afterword}}}
+
+\newbibmacro*{cbyeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND%
+    \(\iffieldundef{editortype}\OR%
+    \iffieldequalstr{editortype}{editor}\)}%
+  {\def\@tempa{cbyeditor}%
+    \ifnamesequal{editor}{translator}%
+    {\edef\@tempa{\@tempa tr}%
+      \clearname{translator}}%
+    {}%
+    \ifnamesequal{editor}{namec}%
+    {\edef\@tempa{\@tempa cp}%
+      \clearname{namec}}%
+    {}%
+    \ifnamesequal{editor}{commentator}%
+    {\edef\@tempa{\@tempa co}%
+      \clearname{commentator}}%
+    {\ifnamesequal{editor}{annotator}%
+      {\edef\@tempa{\@tempa an}%
+        \clearname{annotator}}%
+      {}}%
+    \ifnamesequal{editor}{introduction}%
+    {\edef\@tempa{\@tempa in}%
+      \clearname{introduction}}%
+    {\ifnamesequal{editor}{foreword}%
+      {\edef\@tempa{\@tempa fo}%
+        \clearname{foreword}}%
+      {\ifnamesequal{editor}{afterword}%
+        {\edef\@tempa{\@tempa af}%
+          \clearname{afterword}}%
+        {}}}%
+    \bibstring{\@tempa}\addspace%
+    \printnames[byeditor]{editor}%
+    \clearname{editor}%
+    \newcunit%
+    \usebibmacro{cbyeditorx}}%
+  {\usebibmacro{cbyeditor}}%
+  \usebibmacro{cbytranslator+others}}
+
+\newbibmacro*{cbytranslator+others}{%
+  \ifnameundef{translator}%
+    {}%
+    {\def\@tempa{cbytranslator}%
+      \ifnamesequal{translator}{namec}%
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}%
+      {}%
+     \ifnamesequal{translator}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{translator}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\addspace%
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \newcunit}%
+  \usebibmacro{cbycompiler+others}}
+
+\newbibmacro*{cbycompiler+others}{%
+  \ifnameundef{namec}%
+    {}%
+    {\def\@tempa{cbycompiler}%
+     \ifnamesequal{namec}{commentator}%
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}%
+          {}}%
+     \ifnamesequal{namec}{introduction}%
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}%
+             {}}}%
+     \bibstring{\@tempa}\addspace%
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \newcunit}%
+  \usebibmacro{cbyothers}}
+
+\newbibmacro*{cbyothers}{%
+  \usebibmacro{cbytranslator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbycompiler}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbyredactor}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithcommentator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithannotator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithintroduction}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithforeword}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithafterword}}
+
+\newbibmacro*{part+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}%
+    {\bibstring{bytranslator}\addspace%
+      \printnames[bytranslator]{nameb}}}%
+  {\ifthenelse{\iffieldundef{nameatype}\OR%
+      \iffieldequalstr{nameatype}{editor}}%
+    {\ifnamesequal{namea}{nameb}%
+      {\bibstring{byeditortr}\addspace%
+        \printnames[byeditor]{namea}}%
+      {\bibstring{byeditor}\addspace%
+        \printnames[byeditor]{namea}%
+        \ifnameundef{nameb}%
+        {}%
+        {\newunit%
+          \bibstring{bytranslator}\addspace%
+          \printnames[bytranslator]{nameb}}}}%
+    {\usebibmacro{bytypestrg}{namea}{editor}%
+      \setunit{\addspace}%
+      \printnames[byeditor]{namea}%
+      \ifnameundef{nameb}%
+      {}%
+      {\newunit%
+        \bibstring{bytranslator}\addspace%
+        \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{cpart+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}%
+    {\bibstring{cbytranslator}\addspace%
+      \printnames[bytranslator]{nameb}}}%
+  {\ifthenelse{\iffieldundef{nameatype}\OR%
+      \iffieldequalstr{nameatype}{editor}}%
+    {\ifnamesequal{namea}{nameb}%
+      {\bibstring{cbyeditortr}\addspace%
+        \printnames[byeditor]{namea}}%
+      {\bibstring{cbyeditor}\addspace% Need this \space here?
+        \printnames[byeditor]{namea}%
+        \ifnameundef{nameb}%
+        {}%
+        {\newcunit%
+          \bibstring{cbytranslator}\addspace%
+          \printnames[bytranslator]{nameb}}}}%
+    {\usebibmacro{cbytypestrg}{namea}{editor}%
+      \setunit{\addspace}%
+      \printnames[byeditor]{namea}%
+      \ifnameundef{nameb}%
+      {}%
+      {\newcunit%
+        \bibstring{cbytranslator}\addspace%
+        \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
+  \iftoggle{cms@origpublished}%
+  {}% Removed the cms@crspace test -- fixed a bug I had introduced
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{bibxref-in:}{%
+  \iffieldundef{volume}%
+  {\ifcsdef{cbx@incollvol}%
+    {\restorefield{volume}{\cbx@incollvol}\toggletrue{cms@xrefvol}%
+      \ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}}%
+      {}%
+      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      {\printfield{volume}%
+        \clearfield{volume}%
+        \global\let\cbx@incollvol\undefined% Volume fix
+        \printfield{part}%
+        \clearfield{part}%
+        \global\let\cbx@incollpart\undefined% Volume fix
+        \setunit{\addspace}%
+        \bibstring{ofseries}%
+        \setunit{\addspace}}%
+      {\bibstring{in}\setunit{\addspace}}}%
+    {\iffieldundef{part}%
+      {\ifcsdef{cbx@incollpart}%
+        {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
+        {}}%
+      {}%
+      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      {\printfield[xrefpart]{part}%
+        \clearfield{part}%
+        \global\let\cbx@incollpart\undefined% Volume fix
+        \setunit{\addspace}%
+        \bibstring{ofseries}%
+        \setunit{\addspace}}%
+      {\bibstring{in}\setunit{\addspace}}}}%
+  {\iffieldundef{part}%
+    {\ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
+      {}}%
+    {}%
+    \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+      \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+    {\printfield{volume}%
+      \clearfield{volume}%
+      \global\let\cbx@incollvol\undefined% Volume fix
+      \printfield{part}%
+      \clearfield{part}%
+      \global\let\cbx@incollpart\undefined% Volume fix
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}}%
+    {\bibstring{in}\setunit{\addspace}}}}%
+
+\newbibmacro*{chapincoll}{%
+  \iffieldundef{chapter}%
+  {}%
+  {\printfield{chapter}\addspace%
+    \clearfield{chapter}}}%
+
+\newbibmacro*{xrefchapincoll}{%
+  \iffieldundef{chapter}%
+  {\printtext{\relax}}%
+  {\printfield{chapter}\addspace%
+    \clearfield{chapter}}}%
+
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {\ifboolexpr{%
+      test {\ifentrytype{music}}% 16th ed.
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not togl {cms@origpublished}%
+    }%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\printfield{chapter}\clearfield{chapter}%
+    \iffieldundef{booktitle}%
+    {}%
+    {\addspace\bibstring{of}\setunit{\addspace}}}}%
+
+\newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
+  \ifboolexpr{%
+    togl {cms@addendum}%
+    and
+    not test {\iffieldundef{addendum}}%
+  }%
+  {\newcunit\printfield{addendum}}%
+  {}}%
+
+\newbibmacro*{cnotefield}{%
+  \iftoggle{cms@notefield}%
+  {\printfield{note}}%
+  {}}%
+
+\newbibmacro*{cser+num}{%
+  \iftoggle{cms@bookseries}%
+  {\printfield{series}%
+    \printfield[sernum]{number}}%
+  {}}%
+
+\newbibmacro*{ser+num}{%
+  \printfield{series}%
+  \printfield[sernum]{number}}
+
+\newbibmacro*{music+origdate}{%
+  \iftoggle{cms@reprint}% 16th ed.
+  {}%
+  {\iffieldundef{origyear}%
+    {}%
+    {\usebibmacro{cmsorigdate}}}}% Date fix
+
+\newbibmacro*{music+eventdate}{%
+  \iffieldundef{eventyear}%
+  {}%
+  {\printeventdate}}% Date fix
+
+\newbibmacro*{ctitle+stitle}{% New test here for related entries.
+  \iffieldundef{title}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}}%
+%  \setunit{\addspace}}%
+%  \usebibmacro{language+transtitle}%
+%  \setunit*{\addcomma}\newblock}
+
+\newbibmacro*{citaltitle+stitle}{% New test, as above.
+  \iffieldundef{title}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newcunit\newblock}
+
+\newbibmacro*{title+stitle}{%
+  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+    \printfield[noformat]{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}}%
+%  \setunit{\addspace}}%
+%  \usebibmacro{language+transtitle}%
+%  \newunit\newblock}
+
+\newbibmacro*{italtitle+stitle}{%
+  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+    \printfield[noformat]{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\newbibmacro*{mag+news+title}{%
+  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+       \printfield[noformat]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[noformat]{subtitle}}%
+     \setunit{\ptitleaddonpunct}%
+     \ifboolexpr{%
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+       and
+       togl {cms@related}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
+     }%\newcunit\newblock}
+
+\newbibmacro*{cmag+news+title}{%
+  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+       \printfield[noformat]{title}%
+       \setunit{\subtitlepunct}%{\addcolon\addspace}%
+       \printfield[noformat]{subtitle}}%
+     \setunit{\ctitleaddonpunct}%
+     \ifboolexpr{%
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+       and
+       togl {cms@citerel}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
+     }%\newcunit\newblock}
+
+\newbibmacro*{clegis+news+title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
+    \iffieldundef{titleaddon}}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[noformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+  }}%\newcunit\newblock}
+
+\newbibmacro*{language+transtitle}{%
+  \iffieldundef{usere}%
+  {\printlist[][-\value{listtotal}]{language}}%
+  {\printfield{usere}}}
+
+\newbibmacro*{issuetitle}{%
+  \iffieldundef{issuetitle}%
+  {}%
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
+    {\usebibmacro{cms-in:}}% periodical entries
+    {}%
+    \printtext[issuetitle]{%
+      \printfield[itnoformat]{issuetitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sitnoformat]{issuesubtitle}}}}
+
+\newbibmacro*{btitle+bstitle}{%
+  \iffieldundef{booktitle}%
+  {}%
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {}%
+    {\usebibmacro{cms-in:}}%
+    \printtext[booktitle]{%
+      \printfield[btnoformat]{booktitle}%
+      \setunit{\subtitlepunct}%
+      \printfield[sbtnoformat]{booksubtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{booktitleaddon}%
+    \setunit*{\addcomma\addspace}}}
+
+\newbibmacro*{publ+loc+year}{% Revised for reprint
+  \ifboolexpr{%
+    togl {cms@reprint}%
+    and
+    not test {\ifentrytype{video}}%
+  }%
+  {\bibstring{reprint}%
+    \newcunit}%
+  {}%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}%
+}
+
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+  \printlist{origlocation}%
+  \iflistundef{origpublisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{origpublisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cmsorigdate}%
+}
+
+\newbibmacro*{howpubl+loc+year}{% Revised for reprint
+  \usebibmacro{cmsorigdate}%
+  \reprintpunct%
+  \iftoggle{cms@reprint}%
+  {\reprint\newcunit}%
+  {}%
+  \printlist{location}%
+  \iffieldundef{howpublished}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}%
+}
+
+\newbibmacro*{inst+loc+year}{% Revised for reprint
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+  \reprintpunct%
+  \iftoggle{cms@reprint}%
+  {\reprint\newcunit}%
+  {}%
+  \printlist{location}%
+  \iflistundef{institution}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{cpubl+loc+year}{% Revised for reprint
+  \ifboolexpr{%
+    test {\iflistundef{location}}%
+    and
+    test {\iflistundef{publisher}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    not togl {cms@reprint}%
+  }%
+  {}%
+  {\setunit{\addspace}%
+    \printtext[parens]{%
+      \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}%
+      \setunit*{\addsemicolon\addspace}%
+      \ifboolexpr{%
+        togl {cms@reprint}%
+        and
+        not test{\ifentrytype{video}}%
+      }%
+      {\bibsstring{reprint}%
+        \newcunit}%
+      {}%
+      \printlist{location}%
+      \iflistundef{publisher}%
+      {\setunit*{\addspace}}%
+      {\setunit*{\addcolon\addspace}}%
+      \printlist{publisher}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{date}}}}%
+
+\newbibmacro*{cpubletter+loc+year}{%
+  \ifboolexpr{%
+    test {\iflistundef{location}}%
+    and
+    test {\iflistundef{publisher}}%
+    and
+    test {\iffieldundef{year}}%
+  }%
+  {}%
+  {\setunit{\addspace}%
+    \printtext[parens]{%
+      \printlist{location}%
+      \iflistundef{publisher}%
+      {\setunit*{\addspace}}%
+      {\setunit*{\addcolon\addspace}}%
+      \printlist{publisher}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{date}}}}% Changed for 0.9
+
+\newbibmacro*{originally+published+as}{% Punctuation fix now in 
+  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+  {\iffieldundef{reprinttitle}%
+    {}%
+    {\usebibmacro{begrelated}%
+      \bibstring{reprintfrom}% ?
+      \origpublcite{\thefield{reprinttitle}}%
+      \usebibmacro{endrelated}%
+      \newunit}}%
+  {\usebibmacro{begrelated}%
+    \iflistundef{origlanguage}%
+    {\bibstring{origpub}%
+      \origfullcite{\thefield{userf}}%
+      \usebibmacro{endrelated}%
+      \newunit}%
+    {\iftoggle{cms@postposit}%
+      {\bibstring{origedition}%
+        \setunit{\addspace}%
+        \printlist[edlang]{origlanguage}%
+        \addcolon%
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
+        \newunit}%
+      {\printlist[edlang]{origlanguage}%
+        \setunit{\addspace}%
+        \bibstring{origedition}%
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
+        \newunit}}}}
+
+\newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
+  \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
+  \reprintpunct%
+  \iftoggle{cms@reprint}% Revised for reprint
+  {\reprint\newcunit}%
+  {}%
+  \printlist{location}%
+  \iflistundef{organization}%
+  {\iflistundef{publisher}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{organization}%
+  \setunit*{\addcomma\addspace}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}}
+
+\newbibmacro*{year+in+parens}{%
+  \iffieldundef{volume}%
+  {noformat}%
+  {parens}}
+
+\newbibmacro*{cjournal+issue+year+pages}{%
+  \usebibmacro{cjournal+ser+vol+num}%
+  \ifboolexpr{% 16th ed.
+    test {\iffieldundef{issue}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    not togl {cms@switchdates}%
+  }%
+  {\iffieldundef{number}%
+    {\ifthenelse{\iffieldundef{pagination}\AND%
+        \iffieldundef{bookpagination}}%
+      {\setunit{\postvolpunct}}%
+      {\setunit{\addcolon\addspace}}}%
+    {\addcomma\addspace}}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+    {\newcunit%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}%
+      \addcomma\addspace}%
+    {\setunit{\addspace}%
+    \printtext[parens]{% parens is the default here
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}}}}
+
+\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
+  \usebibmacro{cperiodical+ser+vol+num}% subtype article
+  \ifboolexpr{% 16th ed.
+    test {\iffieldundef{issue}}%
+    and
+    test {\iffieldundef{year}}%
+    and
+    not togl {cms@switchdates}%
+  }%
+  {\iffieldundef{number}%
+    {\ifthenelse{\iffieldundef{pagination}\AND%
+        \iffieldundef{bookpagination}}%
+      {\setunit{\postvolpunct}}%
+      {\setunit{\addcolon\addspace}}}%
+    {\addcomma\addspace}}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
+    {\newcunit%
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}%
+      \addcomma\addspace}%
+    {\setunit{\addspace}%
+    \printtext[parens]{% parens is the default here
+      \iffieldundef{issue}%
+      {\usebibmacro{number+or+month}}%
+      {\printfield{issue}%
+        \setunit{\addspace}%
+        \usebibmacro{cmsyear}}}}}}
+
+\newbibmacro*{letter+date}{% New for 0.9
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
+    {}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
+    {}%
+    {\cms@datelong{orig}}}}
+
+\newbibmacro*{unpubl+letter+date}{% For Misc entries
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND%
+      \iffieldundef{season}}%
+    {}%
+    {\cms@datelong{}}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}\AND%
+      \iffieldundef{origseason}}%
+    {\printdate}% For interviews and other dated non-letters.
+    {\cms@datelong{orig}}}}
+
+\newbibmacro*{pubstate}{%
+  \iftoggle{cms@reprint}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{year}%
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printdate}}}%
+    {\iffieldundef{origyear}%
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printorigdate}}}}%
+  {}}%
+
+\newbibmacro*{choosepubstring}{%
+  \ifthenelse{\ifentrytype{video}\OR%
+    \ifentrytype{music}}%
+  {\bibstring{origreleaseyear}}%
+  {\bibstring{origpubyearalt}}}%
+
+\renewbibmacro*{date}{% New for 0.9
+  \iftoggle{cms@switchdates}%
+  {\printorigdate}%
+  {\printdate}}
+
+\newbibmacro{cite:xref+date}{%
+  \ifboolexpr{%
+    togl {cms@omitxrefdate}%
+    or
+    togl {cms@bookcitexref}%
+    or
+    test {\iffieldundef{crossref}}%
+    or
+    test {\iffieldundef{maintitle}}%
+    or
+    ((
+    test {\iffieldundef{year}}%
+    or
+    togl {cms@switchdates}%
+    )
+    and
+    (test {\iffieldundef{origyear}}%
+    or
+    not togl {cms@switchdates}%
+    ))
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+  }%
+  {\ifboolexpr{%
+      togl {cms@omitxrefdate}%
+      or
+      togl {cms@bookcitexref}%
+      or
+      test {\iffieldundef{xref}}%
+      or
+      test {\iffieldundef{maintitle}}%
+      or
+      ((
+      test {\iffieldundef{year}}%
+      or
+      togl {cms@switchdates}%
+      )
+      and
+      (test {\iffieldundef{origyear}}%
+      or
+      not togl {cms@switchdates}%
+      ))
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+    }%
+    {}%
+    {\printtext[parens]{\usebibmacro{date}}}}%
+  {\printtext[parens]{\usebibmacro{date}}}}
+
+\newbibmacro*{cmsorigdate}{% New for 0.9
+  \iftoggle{cms@switchdates}%
+  {\printdate}%
+  {\printorigdate}}
+
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\printorigdateextra}% \printfield{origyear}
+  {\printdateextra}}% \printfield{year}
+
+\newbibmacro*{number+or+month}{%
+  \iffieldundef{number}%
+  {\usebibmacro{date}}%
+  {\iftoggle{cms@numbermonth}%
+    {\usebibmacro{date}}%
+    {\usebibmacro{cmsyear}}}}
+
+\newcommand*{\cms@datelong}[1]{% Modified for 17th ed.
+  \begingroup
+  \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}}}%
+    {\cmsdateeraprintpre{##1}\stripzeros{\thefield{##1}}}}%
+  \cms@mkbibrangetrunc{long}{#1}%
+  \endgroup}%
+
+\newrobustcmd*{\letterdatelong}{% For users: 17th ed.
+  \ifboolexpr{%
+    test {\ifdefstring{\blx@languagename}{american}}%
+    or
+    test {\ifdefstring{\blx@languagename}{english}}% i.e., no babel
+  }%
+  {\iftoggle{cms@switchdates}%
+    {\cms@datelong{}}%
+    {\cms@datelong{orig}}}%
+  {\iftoggle{cms@switchdates}%
+    {\printdate}%
+    {\printorigdate}}}%
+
+\newbibmacro*{cjournal+ser+vol+num}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}%
+    {}%
+    {\newcunit%
+      \printfield[jourser]{series}%
+      \newcunit}%\setunit*{\addspace}?
+  \printfield[jourvol]{volume}%
+  \setunit{\addcomma\addspace}% need * here?
+  \printfield[journum]{number}%
+  \setunit{\addcomma\addspace}%
+  \printfield{eid}%
+  \newunit}%
+
+\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
+  \ifboolexpr{% article subtype
+    not test {\iffieldundef{shorttitle}}%
+    and
+    ((
+    test {\ifcitation}%
+    and
+    togl {cms@citejtabb}%
+    )
+    or
+    (
+    test {\ifbibliography}%
+    and
+    togl {cms@bibjtabb}%
+    ))
+  }%
+  {\clearlist{location}\printtext[shorttitle]{%
+      \printfield[tnoformat]{shorttitle}}}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}%
+    {}%
+    {\newcunit%
+      \printfield[jourser]{series}%
+      \newcunit}%\setunit*{\addspace}?
+  \printfield[jourvol]{volume}%
+  \setunit{\addcomma\addspace}% need * here?
+  \printfield[journum]{number}%
+  \setunit{\addcomma\addspace}%
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{journal+sub}{%
+  \iffieldundef{journaltitle}%
+    {}%
+    {\ifboolexpr{%
+        not test {\iffieldundef{shortjournal}}%
+        and
+        ((
+        test {\ifcitation}%
+        and
+        togl {cms@citejtabb}%
+        )
+        or
+        (
+        test {\ifbibliography}%
+        and
+        togl {cms@bibjtabb}%
+        ))
+      }%
+      {\clearlist{location}\printtext[shortjournal]{%
+          \printfield[jtsnoformat]{shortjournal}}}%
+      {\printtext[journaltitle]{%
+          \printfield[jtnoformat]{journaltitle}%
+          \setunit{\subtitlepunct}%
+          \printfield[sjtnoformat]{journalsubtitle}}}}}%
+
+\newbibmacro*{cite+doi+url}{% 16th ed.
+  \iftoggle{cms@url@innotes}%
+  {\ifboolexpr{% Fix printing of urldate when url=false
+      togl {cms@url}%
+      and
+      not test {\iffieldundef{urlyear}}%
+      }%
+    {\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{eprint}}%
+    }%
+    {\usebibmacro{eprint}}%
+    {}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@url}%
+      and
+      not test {\iffieldundef{url}}%
+    }%
+    {\printfield{url}}%
+    {}}%
+  {}}%
+
+\newbibmacro*{chap+pag}{%
+  \printfield{chapter}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{pages}}
+
+\newbibmacro*{mag+news+date}{% 16th ed.
+  \iftoggle{cms@fullnote}%
+  {\usebibmacro{mag+date+issue}}%
+  {\ifnameundef{author}%
+    {\usebibmacro{date+issue}}%
+    {\usebibmacro{mag+date+issue}}}}
+
+\newbibmacro*{date+issue}{%
+  \iffieldundef{issue}%
+  {\iffieldundef{number}%
+    {\usebibmacro{date}}%
+    {\iftoggle{cms@numbermonth}% For exclusion of month
+      {\usebibmacro{date}}%
+      {\usebibmacro{cmsyear}}%
+      \setunit{\addcomma\addspace}%
+      \printfield[journum]{number}}}%
+  {\printfield{issue}%
+    \setunit{\addspace}%
+    \usebibmacro{cmsyear}}}
+
+\newbibmacro*{mag+date+issue}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{periodical+date+issue}{% For periodical type &
+  \ifboolexpr{% magazine subtype
+    not test {\iffieldundef{shorttitle}}%
+    and
+    ((
+    test {\ifcitation}%
+    and
+    togl {cms@citejtabb}%
+    )
+    or
+    (
+    test {\ifbibliography}%
+    and
+    togl {cms@bibjtabb}%
+    ))
+  }%
+  {\clearlist{location}\printtext[shorttitle]{%
+      \printfield[tnoformat]{shorttitle}}}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\iffieldundef{title}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}
+
+\newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{maintitle}%
+  {}%
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+      \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}%
+    {\iffieldundef{booktitle}% Fix for origpublin ???
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}% InIn fix
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}%
+      \printtext[maintitle]{%
+        \printfield[mtnoformat]{maintitle}%
+        \setunit{\subtitlepunct}%
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}
+
+\newbibmacro*{backref+check}{%
+  \ifbibliography%
+  {\backtrackerfalse}%
+  {}}%
+
+\newbibmacro*{cite:postnote}{%
+  \iftoggle{cms@loccit}%
+  {}%
+  {\usebibmacro{postnote}}}
+
+\newbibmacro*{semel:postnote}{% Fix to print postnote only once
+  \printfield{postnote}% Old form broke \ifloccit
+  \global\let\cms@pnsaved\abx@field@postnote%
+  \global\let\abx@field@postnote\undefined%
+  \AtNextCitekey{\ifciteibid{}{\global\let\cms@pnsaved\undefined}}}%
+
+\renewbibmacro*{postnote}{%
+  \iftoggle{cms@fullnote}%
+  {\global\togglefalse{cms@shortnote}%
+    \global\togglefalse{cms@fullnote}}%
+  {\iftoggle{cms@printshhand}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{shorthand}%
+        {\global\togglefalse{cms@printshhand}%
+          \global\togglefalse{cms@shortnote}%
+          \global\togglefalse{cms@fullnote}}%
+        {\setunit{\shorthandpunct}%
+          \usebibmacro{cms:shorthandintro}%
+          \global\togglefalse{cms@printshhand}%
+          \global\togglefalse{cms@shortnote}%
+          \global\togglefalse{cms@fullnote}}}%
+      {\iffieldundef{shorthand}%
+        {\postnotewrapper%delim%
+          \usebibmacro{semel:postnote}%
+          \global\togglefalse{cms@printshhand}%
+          \global\togglefalse{cms@shortnote}%
+          \global\togglefalse{cms@fullnote}}%
+        {\postnotewrapper%delim%
+          \usebibmacro{semel:postnote}%
+          \setunit{\shorthandpunct}%
+          \usebibmacro{cms:shorthandintro}%
+          \global\togglefalse{cms@printshhand}%
+          \global\togglefalse{cms@shortnote}%
+          \global\togglefalse{cms@fullnote}}}}%
+    {\iffieldundef{postnote}%
+      {\global\togglefalse{cms@shortnote}%
+        \global\togglefalse{cms@fullnote}}%
+      {\postnotewrapper%delim%
+        \usebibmacro{semel:postnote}%
+        \global\togglefalse{cms@shortnote}%
+        \global\togglefalse{cms@fullnote}}}}}%
+
+\newbibmacro*{fullpostnote}{%
+  \iffieldundef{postnote}%
+  {\iffieldundef{chapter}%
+    {\iffieldundef{pages}%
+      {}%
+      {\postnotedelim%
+        \printfield{pages}}}%
+    {\postnotedelim%
+      \printfield{chapter}}}%
+  {\postnotewrapper%delim% Don't need \ifbibliography test w/ following
+    \usebibmacro{semel:postnote}}}
+
+\newbibmacro*{juridpostnote}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{shortjournal}%
+      {\setunit{\addcomma\addspace}}%
+      {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+        {\setunit{\addspace}}%
+        {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+      \printfield{pages}%
+      \iffieldundef{postnote}%
+      {}%
+      {\ifthenelse{\ifentrytype{legislation}\OR\ifentrytype{legal}}%
+        {\newcunit}%
+        {\setunit*{\addcomma\addspace}}%
+        \usebibmacro{semel:postnote}}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\iffieldundef{shortjournal}%
+          {\setunit{\addcomma\addspace}}%
+          {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+            {\setunit{\addspace}}%
+            {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+          \printfield{pages}}}%
+      {\iffieldundef{shortjournal}%
+        {\setunit{\addcomma\addspace}}%
+        {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+          {\setunit{\addspace}}%
+          {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+        \usebibmacro{semel:postnote}}}% See below for alternate test here
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
+\newbibmacro*{volfullpostnote}{%
+  \iftoggle{cms@postvol}%
+  {\ifboolexpr{(
+      test {\iffieldundef{volume}}%
+      and
+      test {\iffieldundef{part}}%
+      )
+      or
+      togl {cms@usedvol}%
+    }%
+    {\usebibmacro{fullpostnote}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{chapter}%
+        {\iffieldundef{pages}%
+          {\newcunit\printfield{volume}%
+            \printfield{part}}%
+          {\iffieldundef{part}%
+            {\ifthenelse{\iffieldnums{pages}\AND%
+                \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+              {\newcunit\printfield[default]{volume}%
+                \postvolpunct%
+                \printfield{pages}}%
+              {\newcunit\printfield{volume}%
+                \addcomma\addspace%
+                \printfield{pages}}}%
+            {\newcunit\printfield{volume}%
+              \printfield{part}%
+              \addcomma\addspace%
+              \printfield{pages}}}}%
+        {\newcunit\printfield{volume}%
+          \printfield{part}%
+          \newcunit
+          \printfield{chapter}}}%
+      {\iffieldundef{part}%
+        {\ifthenelse{\iffieldnums{postnote}\AND%
+            \iffieldundef{pagination}\AND\iffieldnums{volume}}%
+          {\newcunit\printfield[default]{volume}%
+            \postvolpunct%
+            \usebibmacro{semel:postnote}}%
+          {\newcunit\printfield{volume}%
+            \addcomma\addspace%
+            \usebibmacro{semel:postnote}}}%
+        {\newcunit\printfield{volume}%
+          \printfield{part}%
+          \addcomma\addspace%
+          \usebibmacro{semel:postnote}}}}}%
+  {\usebibmacro{fullpostnote}}%
+  \global\togglefalse{cms@usedvol}}%
+
+\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
+  \ifboolexpr{ (
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+    )
+    and
+    not togl {cms@postvol}%
+    and
+    not togl {cms@usedvol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\printfield{volumes}}%
+    {\printfield{volume}%
+      \printfield{part}}}%
+  {\ifboolexpr{%
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      or
+      togl {cms@usedvol}%
+      )
+    }%
+    {\global\togglefalse{cms@vol}}%
+    {\global\togglefalse{cms@vol}%
+      \printfield{volumes}}}}
+
+\newbibmacro*{crossref:volume+postnote}{%
+  \ifcsdef{cbx@incollpgn}%
+  {\restorefield{pagination}{\cbx@incollpgn}}%
+  {}%
+  \ifcsdef{cbx@incollbkpgn}%
+  {\restorefield{bookpagination}{\cbx@incollbkpgn}}%
+  {}%
+  \iffieldundef{volume}% Volume fix (unfinished)
+  {\ifcsdef{cbx@incollvol}%
+    {\restorefield{volume}{\cbx@incollvol}%
+      \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}%
+      \iffieldundef{postnote}%
+      {\ifcsdef{cbx@incollpages}%
+        {\restorefield{pages}{\cbx@incollpages}%
+          \usebibmacro{pages+cref+print}}%
+        {\iffieldundef{pages}%
+          {\newcunit\printfield{volume}\printfield{part}}%
+          {\usebibmacro{pages+cref+print}}}}%
+      {\usebibmacro{postnote+cref+print}}}%
+    {\iffieldundef{part}%
+      {\ifcsdef{cbx@incollpart}%
+        {\restorefield{part}{\cbx@incollpart}%
+          \iffieldundef{postnote}%
+          {\ifcsdef{cbx@incollpages}%
+            {\restorefield{pages}{\cbx@incollpages}%
+              \usebibmacro{pages+cref+print}}%
+            {\iffieldundef{pages}%
+              {\newcunit\printfield{volume}\printfield{part}}%
+              {\usebibmacro{pages+cref+print}}}}%
+          {\usebibmacro{postnote+cref+print}}}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{fullpostnote}}%
+          {\usebibmacro{fullpostnote}}}}%
+      {\iffieldundef{postnote}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{pages+cref+print}}%
+          {\iffieldundef{pages}%
+            {\newcunit\printfield{volume}\printfield{part}}%
+            {\usebibmacro{pages+cref+print}}}}%
+        {\usebibmacro{postnote+cref+print}}}}}%
+  {\iffieldundef{part}%
+    {\ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}}%
+      {}}%
+    {}%
+    \iffieldundef{maintitle}% More elaborate test ???
+    {\iffieldundef{postnote}%
+      {\ifcsdef{cbx@incollpages}%
+        {\restorefield{pages}{\cbx@incollpages}%
+          \usebibmacro{pages+cref+print}}%
+        {\iffieldundef{pages}%
+          {\newcunit\printfield{volume}\printfield{part}}%
+          {\usebibmacro{pages+cref+print}}}}%
+      {\usebibmacro{postnote+cref+print}}}%
+    {\ifboolexpr{%
+        test {\ifcsdef{cbx@incollvol}}%
+        and
+        (
+        not test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        or
+        togl {cms@xrefvol}% Necessary ???
+        )
+      }%
+      {\restorefield{volume}{\cbx@incollvol}%
+        \iffieldundef{part}%
+        {\ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}}%
+        {\ifboolexpr{%
+            test {\ifcsdef{cbx@incollpart}}%
+            and
+            (
+            not test {\iffieldequalcs{part}{cbx@incollpart}}%
+            or
+            togl {cms@xrefpart}%
+            )
+          }%
+          {\clearfield{part}\restorefield{part}{\cbx@incollpart}}%
+          {\clearfield{part}}}%
+        \iffieldundef{postnote}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{pages+cref+print}}%
+          {\iffieldundef{pages}%
+            {\newcunit\printfield{volume}\printfield{part}}%
+            {\usebibmacro{pages+cref+print}}}}%
+        {\usebibmacro{postnote+cref+print}}}%
+      {\ifboolexpr{%
+          test {\ifcsdef{cbx@incollpart}}%
+          and
+          (
+          not test {\iffieldequalcs{part}{cbx@incollpart}}%
+          or
+          togl {cms@xrefpart}%
+          )
+        }%
+        {\iffieldundef{postnote}%
+          {\ifcsdef{cbx@incollpages}%
+            {\restorefield{pages}{\cbx@incollpages}%
+              \printfield{part}\newcunit\printfield{pages}}%
+            {\iffieldundef{pages}%
+              {\printfield{part}}%
+              {\printfield{part}\newcunit\printfield{pages}}}}%
+          {\printfield{part}\newcunit\usebibmacro{semel:postnote}}}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{fullpostnote}}%
+          {\usebibmacro{fullpostnote}}}}}}}%
+
+\newbibmacro*{pages+cref+print}{% Reusable chunk for above
+  \iffieldundef{part}%
+  {\ifthenelse{\iffieldnums{pages}\AND%
+      \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+    {\newcunit\printfield[default]{volume}%
+      \postvolpunct%
+      \printfield{pages}}%
+    {\newcunit\printfield{volume}%
+      \addcomma\addspace%
+      \printfield{pages}}}%
+  {\newcunit\printfield{volume}%
+    \printfield{part}%
+    \addcomma\addspace%
+    \printfield{pages}}}
+
+\newbibmacro*{postnote+cref+print}{% Reusable chunk for above
+  \iffieldundef{part}%
+  {\ifthenelse{\iffieldnums{postnote}\AND%
+      \iffieldundef{pagination}\AND\iffieldnums{volume}}%
+    {\newcunit\printfield[default]{volume}%
+      \postvolpunct%
+      \usebibmacro{semel:postnote}}%
+    {\newcunit\printfield{volume}%
+      \addcomma\addspace%
+      \usebibmacro{semel:postnote}}}%
+  {\newcunit\printfield{volume}%
+    \printfield{part}%
+    \addcomma\addspace%
+    \usebibmacro{semel:postnote}}}
+
+\newbibmacro*{inreffullpostnote}{%
+  \global\togglefalse{cms@usedvol}%
+  \iffieldundef{postnote}%
+  {\iffieldundef{chapter}%
+    {\iffieldundef{pages}%
+      {\newcunit%\addcomma\addspace% Change to axe spurious comma
+        \printlist[][-\value{listtotal}]{lista}}%
+      {\postnotedelim%
+        \printfield{pages}}}%
+    {\postnotedelim%
+      \printfield{chapter}}}%
+  {\postnotewrapper%delim%
+    \usebibmacro{semel:postnote}}}
+
+\newbibmacro*{xrefprenote}{%
+  \ifboolexpr{% Kludgy fix for spurious idem
+    test {\ifdefvoid{\blx@idemtracker}}%
+    or
+    test {\ifbibliography}%
+  }%
+  {}{\blx@idemtracker}%
+  \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}%
+  \iffieldundef{pages}{}{\savefield{pages}{\cbx@incollpages}}%
+  \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
+  \iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}%
+  \iffieldundef{bookpagination}{}{\savefield{bookpagination}%
+    {\cbx@incollbkpgn}}% The next line saves the child's backrefs
+  \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}%
+
+\newbibmacro*{xrefpostnote}{%
+  \iftoggle{cms@xrefurl}%
+  {\ifbibliography%
+    {\usebibmacro{bib+doi+url}}%
+    {\usebibmacro{cite+doi+url}}}%
+  {}%
+  \ifcsdef{cbx@incollpgref}% Here we print and clear the child's
+  {\restorelist{pageref}{\cbx@incollpgref}% backrefs
+  \newunit%
+  \usebibmacro{pageref}%
+  \global\let\cbx@incollpgref\undefined}%
+  {}%
+  \togglefalse{cms@xrefvol}%
+  \togglefalse{cms@xrefpart}%
+  \global\togglefalse{cms@usedvol}%
+  \global\let\cbx@incollvol\undefined% Volume fix
+  \global\let\cbx@incollpages\undefined%
+  \global\let\cbx@incollpart\undefined%
+  \global\let\cbx@incollpgn\undefined%
+  \global\let\cbx@incollbkpgn\undefined}%
+
+\newbibmacro*{hlpunct}{%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\newcunit\newblock}}
+
+\newbibmacro*{journalprenote}{%
+  \iffieldundef{prenote}%
+  {\bibsentence}%
+  {\usebibmacro{prenote}}}
+
+\newbibmacro*{choose+surname}{%
+  \ifboolexpr{%
+    test {\ifciteseen}%
+    and
+    not togl {cms@noneshort}%
+    }%
+  {}%
+  {\printnames{labelname}\savefield{fullhash}{\bbx@lasthash}%
+    \ifthenelse{\iffieldequalstr{labelnamesource}{shortauthor}\OR%
+      \iffieldequalstr{labelnamesource}{author}}%
+    {\clearname{author}}%
+    {\iffieldequalstr{labelnamesource}{shorteditor}%
+      {\ifnameundef{namea}%
+        {\newcunit\usebibmacro{editstrg}}%
+        {\newcunit\usebibmacro{parteditstrg}}}%%
+      {\iffieldequalstr{labelnamesource}{editor}%
+        {\newcunit\usebibmacro{editstrg}}%
+        {\iffieldequalstr{labelnamesource}{translator}%
+          {\newcunit\usebibmacro{transstrg}}%
+          {\iffieldequalstr{labelnamesource}{namea}%
+            {\newcunit\usebibmacro{parteditstrg}}%
+            {\iffieldequalstr{labelnamesource}{nameb}%
+              {\newcunit\usebibmacro{parttransstrg}}%
+              {\iffieldequalstr{labelnamesource}{namec}%
+                {\newcunit\usebibmacro{compilestrg}}%
+                {}}}}}}}}}%
+
+\newbibmacro*{clear+labelname}{%
+  \iffieldequalstr{labelnamesource}{shortauthor}%
+  {\clearname{author}\clearname{shortauthor}}%
+  {\iffieldequalstr{labelnamesource}{shorteditor}%
+    {\ifnameundef{namea}%
+      {\clearname{editor}\clearname{shorteditor}}%
+      {\clearname{namea}\clearname{shorteditor}}}%
+    {\clearname{\thefield{labelnamesource}}}}}
+
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}%
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
+
+\DeclareLabeltitle[legislation]{%
+  \field{shorttitle}%
+  \field{titleaddon}%
+  \field{title}}%
+
+\DeclareDataInheritance{collection}{suppcollection}{%
+  \inherit{title}{title}
+  \inherit{subtitle}{subtitle}
+  \inherit{titleaddon}{titleaddon}}
+
+\DeclareDataInheritance{mvbook}{incollection}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book,collection}{letter}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book}{incollection}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{mvbook,mvcollection}{letter}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{*}{*}{%
+  \noinherit{namea}
+  \noinherit{nameb}
+  \noinherit{nameatype}
+  \noinherit{sortyear}
+  \noinherit{sortname}
+  \noinherit{sorttitle}
+  \noinherit{urlyear}
+  \noinherit{urlmonth}
+  \noinherit{urlday}
+  \noinherit{urlseason}
+  \noinherit{urlhour}
+  \noinherit{urlminute}
+  \noinherit{doi}
+  \noinherit{eprint}
+  \noinherit{eprinttype}
+  \noinherit{url}}
+
+\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
+{*}{% ???
+  \noinherit{year}
+  \noinherit{month}
+  \noinherit{day}
+  \noinherit{season}
+  \noinherit{endyear}
+  \noinherit{endmonth}
+  \noinherit{endday}
+  \noinherit{endseason}
+  \noinherit{origyear}
+  \noinherit{origmonth}
+  \noinherit{origday}
+  \noinherit{origseason}
+  \noinherit{origendyear}
+  \noinherit{origendmonth}
+  \noinherit{origendday}
+  \noinherit{origendseason}}
+
+\DeclareSortingTemplate{cms}{% Updated for biblatex > 3.7
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{author}
+    \field{namea}
+    \field{editor}
+    \field{nameb}
+    \field{translator}
+    \field{namec}
+    \field{sorttitle}
+    \field{journaltitle}
+    \field{organization}
+    \field{title}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{year}
+  }
+  \sort{
+    \field[padside=left,padwidth=4,padchar=0]{volume}
+    \literal{0000}
+  }
+}
+
+\DeclareSortExclusion{misc,online}{organization}
+\DeclareSortExclusion{inreference,mvreference,reference}{%
+  author,editor,namea,nameb,namec,translator}
+
+\DeclareSortingTemplate{shortjournal}{%
+  \sort{
+    \field{shortjournal}
+  }
+}
+
+\newbibmacro*{compilestrg}{%
+  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}%
+  {\bibstring{compilers}}%
+  {\bibstring{compiler}}%
+  \clearname{namec}}%
+
+\newbibmacro*{transstrg}{%
+  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}%
+    \clearname{translator}}%
+
+\newbibmacro*{parttransstrg}{%
+  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}%
+    \clearname{nameb}}%
+
+\newbibmacro*{editstrg}{% Test added for 0.9
+  \ifthenelse{\iffieldundef{editortype}\OR%
+    \iffieldequalstr{editortype}{editor}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND%
+        \ifnamesequal{editor}{namec}}%
+      {\bibstring{editortranscompilers}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslators}%
+            \clearname{translator}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND%
+        \ifnamesequal{editor}{namec}}%
+      {\bibstring{editortranscompiler}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslator}%
+            \clearname{translator}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+    {\bibstring{\thefield{editortype}s}}%
+    {\bibstring{\thefield{editortype}}}}%
+  \clearname{editor}}%
+
+\newbibmacro*{parteditstrg}{%
+  \ifthenelse{\iffieldundef{nameatype}\OR%
+    \iffieldequalstr{nameatype}{editor}}%
+  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND%
+        \ifnamesequal{namea}{namec}}%
+      {\bibstring{editortranscompilers}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslators}%
+            \clearname{nameb}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND%
+        \ifnamesequal{namea}{namec}}%
+      {\bibstring{editortranscompiler}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslator}%
+            \clearname{nameb}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+    {\bibstring{\thefield{nameatype}s}}%
+    {\bibstring{\thefield{nameatype}}}}%
+  \clearname{namea}}%
+
+\newbibmacro*{clearorigin}{%
+  \toggletrue{cms@origcite}%
+  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+  {\ifnameundef{bookauthor}%
+    {\savefield{fullhash}{\bbx@lasthash}%
+      \clearname{author}}%
+    {\ifnamesequal{author}{bookauthor}%
+      {\clearname{bookauthor}%
+        \savefield{fullhash}{\bbx@lasthash}%
+        \clearname{author}}%
+      {\savefield{fullhash}{\bbx@lasthash}%
+        \clearname{author}}}}%
+  {\clearname{author}}}%
+
+\newbibmacro*{clearpublin}{%
+  \toggletrue{cms@origcite}%
+  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+  {\ifnameundef{bookauthor}%
+    {\savefield{fullhash}{\bbx@lasthash}%
+      \clearname{author}}%
+    {\ifnamesequal{author}{bookauthor}%
+      {\clearname{bookauthor}%
+        \savefield{fullhash}{\bbx@lasthash}%
+        \clearname{author}}%
+      {\savefield{fullhash}{\bbx@lasthash}%
+        \clearname{author}}}}%
+  {\clearname{author}}%
+  \ifthenelse{\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}}%
+  {}%
+  {\clearname{namea}%
+    \clearname{nameb}}%
+  \clearfield{nameaddon}%
+  \ifthenelse{\(\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
+    \ifentrytype{mvreference}\OR\ifentrytype{collection}\OR%
+    \ifentrytype{proceedings}\OR\ifentrytype{reference}\OR%
+    \ifentrytype{suppbook}\OR\ifentrytype{suppcollection}\)\OR%
+    \(\(\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+    \ifentrytype{video}\)\AND\iffieldundef{booktitle}\)}%
+  {}%
+  {\clearfield{title}%
+    \clearfield{subtitle}%
+    \clearfield{titleaddon}%
+    \clearfield{usere}%
+    \clearlist{language}%
+    \ifentrytype{music}%
+    {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
+      \clearfield{eventmonth}}%
+    {}}%
+  \ifentrytype{letter}%
+  {\iftoggle{cms@switchdates}%
+    {\clearfield{year}\clearfield{month}\clearfield{season}}%
+    {\clearfield{origyear}\clearfield{origmonth}\clearfield{origseason}}%
+    \clearfield{origlocation}}%
+  {}%
+  \clearfield{reprinttitle}%
+}
+
+%%%% Related macros from biblatex.def %%%%
+
+\renewcommand*{\begrelateddelim}{%
+  \ifcitation{\newcunitpunct}%
+  {\ifboolexpr{%
+      togl {cms@fullnote}%
+      or
+      togl {cms@shortnote}%
+    }%
+    {\newcunitpunct}%
+    {\newunitpunct}}}%
+
+\newcommand*{\begrelateddelimreviewof}{%
+  \ifcitation{\newcunitpunct}%
+  {\ifboolexpr{%
+      togl {cms@fullnote}%
+      or
+      togl {cms@shortnote}%
+    }%
+    {\newcunitpunct}%
+    {\newunitpunct}}}
+
+\newbibmacro*{related:reviewof}[1]{%
+  \iftoggle{cms@shortnote}%
+  {\entrydata{#1}{%
+      \ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}}%
+  {\entrydata*{#1}{%
+      \let\newunit\newcunit%
+      % \bibstring{reviewof}%
+      \iffieldundef{title}%
+      {}%
+      {\printtext[title]{%
+          \printfield[tnoformat]{title}%
+          \setunit{\subtitlepunct}%
+          \printfield[stnoformat]{subtitle}}}%
+      \newcunit%
+      \ifnameundef{author}%
+      {\newcunit%
+        \ifbibliography%
+        {\usebibmacro{byeditor+others}}%
+        {\usebibmacro{cbyeditor+others}}}%
+      {\bibstring{by}\addspace%
+        \printnames[byauthor]{author}%
+        \ifbibliography%
+        {\newcunit\usebibmacro{byeditor+others}}%
+        {\newcunit\usebibmacro{cbyeditor+others}}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{titleaddon}}}}%
+
+\renewbibmacro*{related:origpubas}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \usebibmacro{cite:origfull}}}%
+
+\renewbibmacro*{related:reprintfrom}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \nopunct% ???
+    \usebibmacro{cite:origpubl}}}%
+
+\renewbibmacro*{related:bytranslator}[1]{%
+  \entrydata{#1}{%
+    \usebibmacro{at+every+item}%
+    \renewbibmacro*{name:hook}[1]{%
+      \ifnumequal{\value{listcount}}{1}%
+        {\begingroup
+         \mkrelatedstring%
+         \lbx@initnamehook{#1}%
+         \endgroup}
+        {}}%
+    \printnames[bytranslator]{translator}%
+    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\addspace}%
+    \clearname{translator}%
+    \usebibmacro{cite:origfull}}}%
+
+\renewbibmacro*{related:default}[1]{%
+  \entrydata*{#1}{%
+    \usedriver%
+      {\ifnameundef{savedauthor}%
+         {\ifnameundef{savededitor}%
+            {}%
+            {\ifnamesequal{editor}{savededitor}%
+               {\clearname{editor}}%
+               {}}}%
+         {\ifnamesequal{author}{savedauthor}%
+            {\clearname{author}}%
+            {}}%
+          \usebibmacro{at+every+item}%
+          \renewbibmacro*{related:init}{}%
+          \DeclareNameAlias{sortname}{default}%
+          \renewbibmacro*{pageref}{}%
+          \toggletrue{cms@fullnote}%
+          \togglefalse{cms@shortnote}}%
+      {cite:\thefield{entrytype}}}}%
+
+\renewbibmacro*{related:multivolume}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {}%
+    {\printtext{%
+        \printfield{volume}%
+        \printfield{part}}%
+      \setunit{\addcolon\addspace}}%
+    \usebibmacro{ctitle+stitle}%
+    \ifboolexpr{%
+      test {\ifnamesequal{author}{savedauthor}}%
+      or
+      test {\ifnameundef{author}}%
+    }%
+    {}%
+    {\usebibmacro{bytypestrg}{author}{author}%
+      \setunit{\addspace}%
+      \printnames[byauthor]{author}%
+      \newcunit\newblock}%
+    \ifboolexpr{%
+      test {\ifnamesequal{namea}{savednamea}}%
+      or
+      test {\ifnameundef{namea}}%
+    }%
+    {\ifboolexpr{%
+        test {\ifnamesequal{editor}{savededitor}}%
+        or
+        test {\ifnameundef{editor}}%
+      }%
+      {\ifboolexpr{%
+          test {\ifnamesequal{nameb}{savednameb}}%
+          or
+          test {\ifnameundef{nameb}}%
+        }%
+        {}%
+        {\bibstring{cbytranslator}\addspace%
+          \printnames[bytranslator]{nameb}\newcunit}}%
+      {\usebibmacro{cbyeditor+others}%
+        \newcunit}}%
+    {\usebibmacro{cpart+editor+translator}%
+      \newcunit}%
+    \usebibmacro{date}}}%
+
+\renewbibmacro*{related:origpubin}[1]{%
+  \entrydata*{#1}{%
+    \usebibmacro{at+every+item}%
+    \usebibmacro{cmsyear}%
+    \ifboolexpr{%
+      test {\iflistsequal{publisher}{savedpublisher}}%
+      or
+      test {\iflistundef{publisher}}%
+    }%
+    {}%
+    {\midsentence% Why is this kludge necessary?
+      \setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+      \printlist{publisher}%
+      \setunit{\addcomma\space}%
+      \iflistsequal{location}{savedlocation}%
+      {}%
+      {\printlist{location}}}}}
+
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibquote{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1\addspace\bibstring{in}}%
+
+\DeclareFieldFormat{avchapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \ifdefstring{\blx@main@language}{french}%
+  {}%
+  {\iftoggle{smartof}%
+    {\let\lbx@inittitlehook\lbx@fr@smartof}%
+    {}}%
+  \lbx@inittitlehook{\bibstring{chapter}}%
+  \endgroup
+  \bibstring{chapter}~#1}%
+
+\DeclareFieldFormat{sitnoformat}{#1}
+\DeclareFieldFormat{sjtnoformat}{#1}
+\DeclareFieldFormat{stnoformat}{#1}
+\DeclareFieldFormat{sbtnoformat}{#1}
+\DeclareFieldFormat{smtnoformat}{#1}
+\DeclareFieldFormat{itnoformat}{#1}
+\DeclareFieldFormat{jtnoformat}{#1}
+\DeclareFieldFormat{jtsnoformat}{#1}
+\DeclareFieldFormat{tnoformat}{#1}
+\DeclareFieldFormat{btnoformat}{#1}
+\DeclareFieldFormat{mtnoformat}{#1}
+
+\providetoggle{cms@otherlang}
+
+\apptocmd\blx@opt@autolang@other%
+{\toggletrue{cms@otherlang}}%
+{\blx@info@noline{Patching 'autolang=other' option}}
+{\PackageWarningNoLine{biblatex-chicago}%
+  {Upgrading biblatex to >v2.7a recommended,\MessageBreak
+    especially if you are using the "related"\MessageBreak
+    functionality}}
+
+\newbibmacro*{cms:titlehook}{% Needed for full drivers in reprintfrom
+  \ifthenelse{\iffieldundef{chapter}\OR\NOT\(\ifentrytype{audio}\OR%
+    \ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+    \ifentrytype{inproceedings}\OR\ifentrytype{letter}\OR%
+    \ifentrytype{music}\OR\ifentrytype{video}\)}%
+  {\iffieldundef{issuetitle}%
+    {\iffieldundef{title}%
+      {\iffieldundef{booktitle}%
+        {\iffieldundef{maintitle}%
+          {\iffieldundef{journaltitle}%
+            {}%
+            {\DeclareFieldAlias{jtnoformat}{title:hook}%
+              \DeclareFieldAlias{sjtnoformat}{title}%
+              \DeclareFieldAlias{journaltitle}{default}%
+              \DeclareFieldAlias{shortjournal}{series}%
+              \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
+          {\DeclareFieldAlias{mtnoformat}{title:hook}%
+            \DeclareFieldAlias{smtnoformat}{title}%
+            \DeclareFieldAlias{maintitle}{default}}}%
+        {\DeclareFieldAlias{btnoformat}{title:hook}%
+          \DeclareFieldAlias{sbtnoformat}{title}%
+          \DeclareFieldAlias{booktitle}{default}}}%
+      {\DeclareFieldAlias{tnoformat}{title:hook}%
+        \DeclareFieldAlias{stnoformat}{citetitle}%
+        \DeclareFieldAlias[video]{title}{default}%
+        \DeclareFieldAlias[audio]{title}{default}%
+        \DeclareFieldAlias[music]{title}{default}%
+        \DeclareFieldAlias{title}{default}%
+        \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
+    {\iffieldundef{issuesubtitle}%
+      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+        \DeclareFieldAlias{issuetitle}{default}}%
+      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {\iffieldundef{title}%
+      {\DeclareFieldAlias{chapter}{avchapter:hook}}%
+      {\DeclareFieldAlias{tnoformat}{title:hook}%
+        \DeclareFieldAlias{stnoformat}{citetitle}%
+        \DeclareFieldAlias[video]{title}{default}%
+        \DeclareFieldAlias[audio]{title}{default}%
+        \DeclareFieldAlias[music]{title}{default}}}%
+    {\DeclareFieldAlias{chapter}{chapter:hook}}}}%
+
+\newbibmacro*{cite:origfull}{%
+  \printtext[cmshypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \clearname{author}\clearfield{userf}\clearfield{shorthand}%
+      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+      \frenchspacing}%
+    {cite:\thefield{entrytype}}}}
+
+\newbibmacro*{cite:origpubl}{%
+  \printtext[cmshypertarget]{%
+    \usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}\clearfield{shorthand}%
+      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+      \toggletrue{cms@origpublished}\frenchspacing%
+      \usebibmacro{cms:titlehook}}%
+    {cite:\thefield{entrytype}}}}
+
+\newbibmacro*{at+every+item}{%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}%
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}%
+    or
+    test {\iffieldundef{year}}%
+    or
+    not test {\iffieldint{year}}%
+    or
+    togl {cms@switchdates}%
+  }%
+  {}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
+
+\endinput
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 c1358168318..3934e01c8f2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-american.lbx,v 0.10.2.8 2018/01/09 18:58:58 dfussner Exp $	
-
-\ProvidesFile{cms-american.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -8,9 +6,14 @@
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Introduction}%
+  \def\sectionname{Section}%
+  \def\subsectionname{Subsection}%
+  \def\forewordname{Foreword}%
+  \def\notesname{Notes}%
   \protected\def\mkjuridordinal#1{%
     \begingroup
     \@tempcnta0#1\relax\number\@tempcnta
@@ -20,282 +23,110 @@
     \fi
     \ifcase\@tempcnta th\or st\or d\or d\else th\fi
     \endgroup}%
+  \protected\def\mkbibdatelong#1#2#3{%
+    \iffieldundef{#2}
+    {}
+    {\mkbibmonth{\thefield{#2}}%
+      \iffieldundef{#3}
+      {\iffieldundef{#1}{}{\space}}
+      {\nobreakspace}}%
+    \iffieldundef{#3}
+    {}
+    {\stripzeros{\thefield{#3}}%
+      \iffieldundef{#1}{}{,\space}}%
+    \iffieldbibstring{#1}
+    {\bibstring{\thefield{#1}}}
+    {\cmsdateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
+  \protected\def\mkbibdateshort#1#2#3{%
+    \iffieldundef{#2}
+    {}
+    {\mkmonthzeros{\thefield{#2}}%
+      \iffieldundef{#3}
+      {\iffieldundef{#1}{}{/}}
+      {/}}%
+    \iffieldundef{#3}
+    {}
+    {\mkdayzeros{\thefield{#3}}%
+      \iffieldundef{#1}{}{/}}%
+    \iffieldbibstring{#1}
+    {\bibstring{\thefield{#1}}}
+    {\cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
+  \protected\def\mkbibseasondateshort#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\mkbibseasondatelong#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\cmsmkdecade#1#2{%
+    \cms@tempcnta=\thefield{#2year}%
+    \divide\cms@tempcnta100
+    \multiply\cms@tempcnta100
+    \ifnumequal{\cms@tempcnta}{\thefield{#2year}}%
+    {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+    {\ifnumequal{\thefield{#2year}}{1}%
+      {\ifboolexpr{%
+          test {\ifdefstring\blx@dateera{christian}}%
+          and
+          test {\ifnumless{\thefield{#2year}}\blx@dateeraauto}%
+        }%
+        {\bibsstring{\blx@dateera@ce}\printdelim{dateeradelim}}%
+        {}}%
+      {}%
+      \csuse{mkbibdate#1}{#2year}{}{}%
+      \setunit{}%\blx@nounit%
+      \bibsstring{decade}%
+      \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\ifboolexpr{%
+        test {\ifdefstring\blx@dateera{christian}}%
+        and
+        test {\ifnumless{\thefield{#1year}}\blx@dateeraauto}%
+      }%
+      {\bibsstring{\blx@dateera@ce}\printdelim{dateeradelim}}%
+      {}%
+      \csuse{mkcmscentury}{#1year}%
+      \addnbspace%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\cmsdateeraprintpre{#1year}%
+      \csuse{mkcmscentury}{#1year}%
+      \addnbspace%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \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{%
-    \lbx@cms@mkbibrangetrunc@short{short}}%
-  \protected\def\mkbibrangefull{%
-    \lbx@cms@mkbibrangefull}}%
+    \lbx@cms@mkbibrangefull@us}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangeterse%
   \restorecommand\mkdaterangefull%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangeterse%
-  \restorecommand\mkbibrangefull%
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
 }
 
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
-
 \DeclareBibliographyStrings{%
   inherit = {english},
   afterwordto = {{afterword to}{afterw\adddot\space to}},
@@ -337,9 +168,13 @@
   producers = {{prods\adddot}{prods\adddot}},
   editor = {{ed\adddot}{ed\adddot}},
   editors = {{eds\adddot}{eds\adddot}},
+  choreographer = {{chor\adddot}{chor\adddot}},
+  choreographers = {{chors\adddot}{chors\adddot}},
   ibidem = {{ibid\adddot}{id\adddot}},% Shorter for legal
   origpub = {{originally published as\addspace}%
     {orig\adddot\ pub\adddot\ as\addspace}},
+  origpubin = {{first published}%
+    {first pub\adddot}},
   origpublin = {{originally published in\addspace}%
     {orig\adddot\ pub\adddot\addspace in\addspace}},
   origpubyear = {{originally published in\addspace}%
@@ -359,6 +194,15 @@
   discrecorded = {{recorded}{recorded}},
   numbers = {{nos\adddot}{nos\adddot}},
   nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}},
+  % commonera        = {{CE}{CE}},
+  % beforecommonera  = {{BCE}{BCE}},
+  % annodomini       = {{AD}{AD}},
+  % beforechrist     = {{BC}{BC}},
+%  circa            = {{ca\adddot}{ca\adddot}},
+  am = {{a\adddot m\adddot}{a\adddot m\adddot}},
+  pm = {{p\adddot m\adddot}{p\adddot m\adddot}},
+  decade = {{s}{s}},
+  century = {{century}{c\adddot}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{filed}{filed}},
   patentissued = {{issued}{issued}},
@@ -403,7 +247,10 @@
   annotators       = {{annot\adddot}{annot\adddot}},
   review = {{review}{review}},
   reviewof = {{review of}{review of}},
+  commenton = {{comment on}{comment on}},
   reprint = {{reprint}{repr\adddot}},
+  printed = {{printed}{printed}},% 17th ed.
+  selfpublished = {{self-published}{self-pub\adddot}},
   shorthands = {{Abbreviations}{Abbreviations}},
   newseries = {{n\adddot s\adddot}{n\adddot s\adddot}},
   urlseen = {{accessed}{accessed}},
@@ -423,6 +270,7 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{dir\adddot}{dir\adddot}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{chor\adddot}{chor\adddot}},
   cbyeditortr    = {{ed\adddot\space and
       trans\adddot\addspace\lbx@cfromlang}%
     {ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}},
@@ -686,6 +534,7 @@
   jourser = {{ser\adddot}{ser\adddot}},
   oldseries = {{o\adddot s\adddot}{o\adddot s\adddot}},
   edition = {{ed\adddot}{ed\adddot}},
+  version = {{version}{v\adddot}},
   page = {{p\adddot}{p\adddot}},
   pages = {{pp\adddot}{pp\adddot}},
   column = {{col\adddot}{col\adddot}},
@@ -696,6 +545,10 @@
   paragraphs = {{\P\P}{\P\P}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  preface = {{preface}{pref\adddot}},
+  note = {{note}{n\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
@@ -706,8 +559,9 @@
   verse = {{v\adddot}{v\adddot}},
   verses = {{vv\adddot}{vv\adddot}},
   number = {{no\adddot}{no\adddot}},
-  chapter = {{chap\adddot}{ch\adddot}},% for legal citations
-  part = {{part}{pt\adddot}},% ditto
+  chapter = {{chap\adddot}{chap\adddot}},%
+  part = {{part}{pt\adddot}},%  for legal citations
+  track = {{track}{track}},
   mathesis = {{master's thesis}{master's thesis}},
   phdthesis = {{PhD\addabbrvspace diss\adddot}{PhD\addabbrvspace diss\adddot}},
   techreport = {{technical report}{technical report}},
@@ -746,6 +600,7 @@
   byconductor = {{directed by}{dir\adddot}},
   bydirector = {{directed by}{dir\adddot}},
   byproducer = {{produced by}{prod\adddot}},
+  bychoreographer = {{choreographed by}{chor\adddot}},
   byeditorcp = {{edited and compiled by}{ed\adddot\space and comp\adddot}},
   byeditortrcp = {{edited, translated \lbx@fromlang, and compiled by}%
     {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}},
@@ -886,63 +741,290 @@
     {comp\adddot\space and annot\adddot, with an afterword, by}},
 }
 
+%%% The logic here is tricky because of the need to print AD before
+%%% the year and BC after, and also only to print them once in a date
+%%% range that has two years belonging to the same era. Other
+%%% subtleties include the relative positions of question mark and
+%%% date era, and of date era and end bracket.
+
 \protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
   {}%
   {\printtext[#2date]{%
-    \iffieldsequal{#2year}{#2endyear}%
-    {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-      {\csuse{mkbibdate#1}{#2year}{}{}%
-        \clearfield{#2endyear}}% Clear up inheritance problem ???
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}}%
-    {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}%
-    {\iffieldundef{#2endmonth}%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+          {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+            \clearfield{#2endyear}}% Clear up inheritance problem ???
+          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
       {}%
-      {\bibdatedash%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2endday}}%
-        {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}}%
-    {\iffieldequalstr{#2endyear}{}%
-      {\mbox{\bibdatedash}}%
-      {\bibdatedash%
-        \iffieldsequal{#2year}{#2endyear}%
-        {\iffieldsequal{#2month}{#2endmonth}%
-          {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}%
-          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
-        {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2endday}}%
+          {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\iffieldsequal{#2month}{#2endmonth}%
+              {\csuse{mkbibdate#1}{#2year}{}{#2endday}}%
+              {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
 
 \protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{% Modify ???
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
   {}%
   {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-        {\csuse{mkbibdate#1}{#2year}{}{}%
-          \clearfield{#2endyear}}% Clear up inheritance problem ???
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+          {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+            \clearfield{#2endyear}}% Clear up inheritance problem ???
+          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
       {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
       {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
 
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+\protected\gdef\lbx@cms@mkbibrangefull@us#1#2{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
   {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\bibsstring{circa}\printdelim{datecircadelim}}
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2endyear}%
+          \clearfield{#2endyear}}% Clear up inheritance problem ???
+        {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
       {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+      \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
       {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
index abe484542d6..320935b6eb1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
@@ -1,11 +1,8 @@
-% $Id: cms-brazilian.lbx,v 0.10.1.36 2016/06/01 11:02:59 dfussner Exp $	
-
-\ProvidesFile{cms-brazilian.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-brazilian.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Strings provided by native speaker Gustavo Barros.
 
-
 \DeclareRedundantLanguages{brazilian}{brazil,portuges}
 
 \InheritBibliographyExtras{brazilian}
@@ -13,332 +10,110 @@
 \DeclareBibliographyExtras{%
   \toggletrue{cms@postposit}%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Introdu\c{c}\~ao}%
+  \def\sectionname{Se\c{c}\~ao}%
+  \def\subsectionname{Subse\c{c}\~ao}%
+  \def\forewordname{Pref\'acio}%
+  \def\notesname{Notas}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \cms@mkbibrangetrunc{short}}%
   \protected\def\mkdaterangefull{%
-    \lbx@cms@mkbibrangefull}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \protected\def\cmsmkdecade#1#2{%
+    \dateeraprintpre{#2year}%
+    \bibsstring{decade}%
+    \printdelim{dateaddelim}%
+    \stripzeros{\thefield{#2year}}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {}{\dateeraprintpre{#1year}}%
+    \bibsstring{century}%
+    \printdelim{dateaddelim}%
+    \csuse{mkcmscentury}{#1year}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}%
+  \protected\def\mkcmscentury#1{%
+    \MakeUppercase{\romannumeral\numexpr\thefield{#1}/100+1}}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangeterse%
   \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
   \togglefalse{cms@postposit}%
 }%
 
-\NewBibliographyString{organizer}
-\NewBibliographyString{organizers}
-\NewBibliographyString{byorganizer}
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbyorganizer}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-% \NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-% \NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
-
 \DeclareBibliographyStrings{%
   inherit = {brazilian},
-  afterwordto = {{posf\'acio a}{posf\adddot\addspace a}},  
-  forewordto = {{pref\'acio a}{pref\adddot\addspace a}},
-  introductionto = {{introdu\c{c}\~ao a}{introd\adddot\addspace a}},
+  afterwordto = {{posf\'acio a}{posf\adddot\ a}},
+  forewordto = {{pref\'acio a}{pref\adddot\ a}},
+  introductionto = {{introdu\c{c}\~ao a}{introd\adddot\ a}},
   partvolume = {{tomo}{tomo}},
   by = {{por}{por}},
   of = {{de}{de}},
   on = {{em}{em}},
   compiler = {{comp\adddot}{comp\adddot}},
-  compilers = {{comps\adddot}{comps\adddot}},
-  transcompiler = {{trad\adddot\addspace e comp\adddot}%
-	{trad\adddot\addspace e comp\adddot}},
-  transcompilers = {{trads\adddot\addspace e comps\adddot}%
-	{trads\adddot\addspace e comps\adddot}},
-  editortranscompiler = {{ed\adddot\addcomma\addspace trad\adddot\addspace e comp\adddot}%
-	{ed\adddot\addcomma\addspace trad\adddot\addspace e comp\adddot}},
-  editorcompiler = {{ed\adddot\addspace e comp\adddot}%
-	{ed\adddot\addspace e comp\adddot}},
-  editortranslator = {{ed\adddot\addspace e trad\adddot}%
-	{ed\adddot\addspace e trad\adddot}},
-  editortranscompilers = {{eds\adddot\addcomma\addspace trads\adddot\addspace e comps\adddot}%
-    {eds\adddot\addcomma\addspace trads\adddot\addspace e comps\adddot}},
-  editorcompilers = {{eds\adddot\addspace e comps\adddot}%
-    {eds\adddot\addspace e comps\adddot}},
-  editortranslators = {{eds\adddot\addspace e trads\adddot}%
-    {eds\adddot\addspace e trads\adddot}},
+  compilers = {{comp\adddot}{comp\adddot}},
+  transcompiler = {{trad\adddot\ e comp\adddot}%
+	{trad\adddot\ e comp\adddot}},
+  transcompilers = {{trad\adddot\ e comp\adddot}%
+	{trad\adddot\ e comp\adddot}},
+  editortranscompiler = {{ed.,\addabbrvspace trad\adddot\ e comp\adddot}%
+	{ed.,\addabbrvspace trad\adddot\ e comp\adddot}},
+  editorcompiler = {{ed\adddotspace e comp\adddot}%
+	{ed\adddotspace e comp\adddot}},
+  editortranslator = {{ed\adddotspace e trad\adddot}%
+	{ed\adddotspace e trad\adddot}},
+  editortranscompilers = {{ed.,\addabbrvspace trad\adddot\ e comp\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ e comp\adddot}},
+  editorcompilers = {{ed\adddotspace e comp\adddot}%
+    {ed\adddotspace e comp\adddot}},
+  editortranslators = {{ed\adddotspace e trad\adddot}%
+    {ed\adddotspace e trad\adddot}},
   conductor = {{reg\adddot}{reg\adddot}},
-  conductors = {{regs\adddot}{regs\adddot}},
+  conductors = {{reg\adddot}{reg\adddot}},
   director = {{dir\adddot}{dir\adddot}},
-  directors = {{dirs\adddot}{dirs\adddot}},
+  directors = {{dir\adddot}{dir\adddot}},
   none = {{}{}},
   nones = {{}{}},
   producer = {{prod\adddot}{prod\adddot}},
-  producers = {{prods\adddot}{prods\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
   editor = {{ed\adddot}{ed\adddot}},
-  editors = {{eds\adddot}{eds\adddot}},
+  editors = {{ed\adddot}{ed\adddot}},
   organizer = {{org\adddot}{org\adddot}},
-  organizers = {{orgs\adddot}{orgs\adddot}},
-  byorganizer = {{organizado por}{org\adddot\addspace por}},
+  organizers = {{org\adddot}{org\adddot}},
   ibidem = {{ibid\adddot}{ibid\adddot}},
   origpub = {{originalmente publicado como\addspace}%
     {orig\adddot\ pub\adddot\ como\addspace}},
   origpublin = {{originalmente publicado em\addspace}%
-    {orig\adddot\ pub\adddot\addspace em\addspace}},
+    {orig\adddot\ pub\adddot\ em\addspace}},
   origpubyear = {{originalmente publicado em\addspace}%
     {orig\adddot\ pub\adddot\addspace}},
   origpubyearalt = {{originalmente publicado em\addspace}%
@@ -349,13 +124,15 @@
     {orig\adddot\ apresentado\addspace}},
   origedition ={{edi\c{c}\~ao}%
     {ed\adddot\addcolon\addspace}},
-  revisededition = {{ed\adddot\addspace rev\adddot}%
-    {ed\adddot\addspace rev\adddot}},
+  revisededition = {{ed\adddotspace rev\adddot}%
+    {ed\adddotspace rev\adddot}},
   broadcast = {{transmitido}{transmitido}},
   songrecorded = {{gravada}{gravada}},
   discrecorded = {{gravado}{gravado}},
-  numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},
+  numbers = {{n\adddot}{n\adddot}},
   nodate = {{{}s\adddot d\adddot}{{}s\adddot d\adddot}},
+  decade = {{d\'ecada de}{d\'ec\adddot}},
+  century = {{s\'eculo}{s\'ec\adddot}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{pedida}{pedida}},
   patentissued = {{concedida}{concedida}},
@@ -369,17 +146,17 @@
   eddanish       = {{dinamarquesa}{dinamarquesa}},
   eddutch        = {{holandesa}{holandesa}},
   edenglish      = {{inglesa}{inglesa}},
-  edfinnish      = {{finland\^esa}{finland\^esa}},
+  edfinnish      = {{finlandesa}{finlandesa}},
   edestonian     = {{estoniana}{estoniana}},
   edfrench       = {{francesa}{francesa}},
   edgalician     = {{galega}{galega}},
   edgerman       = {{alem\~a}{alem\~a}},
   edgreek        = {{grega}{grega}},
   editalian      = {{italiana}{italiana}},
-  edjapanese     = {{japon\^esa}{japon\^esa}},
+  edjapanese     = {{japonesa}{japonesa}},
   edlatin        = {{latina}{latina}},
   ednorwegian    = {{norueguesa}{norueguesa}},
-  edpolish       = {{polon\^esa}{polon\^esa}},
+  edpolish       = {{polonesa}{polonesa}},
   edportuguese   = {{portuguesa}{portuguesa}},
   edrussian      = {{russa}{russa}},
   edslovak       = {{eslovaca}{eslovaca}},
@@ -387,232 +164,234 @@
   edspanish      = {{espanhola}{espanhola}},
   edswedish      = {{sueca}{sueca}},
   translator = {{trad\adddot}{trad\adddot}},
-  translators = {{trads\adddot}{trads\adddot}},
+  translators = {{trad\adddot}{trad\adddot}},
   redactor = {{red\adddot}{red\adddot}},
-  redactors = {{reds\adddot}{reds\adddot}},
+  redactors = {{red\adddot}{red\adddot}},
+  commentator = {{coment\adddot}{coment\adddot}},
+  commentators = {{coment\adddot}{coment\adddot}},
   founder   = {{fund\adddot}{fund\adddot}},
-  founders  = {{funds\adddot}{funds\adddot}},
+  founders  = {{fund\adddot}{fund\adddot}},
   continuator      = {{cont\adddot}{cont\adddot}},
-  continuators     = {{conts\adddot}{conts\adddot}},
+  continuators     = {{cont\adddot}{cont\adddot}},
   collaborator     = {{col\adddot}{col\adddot}},
-  collaborators    = {{cols\adddot}{cols\adddot}},
-  annotator        = {{anot\adddot}{anot\adddot}},
-  annotators       = {{anots\adddot}{anots\adddot}},
+  collaborators    = {{col\adddot}{col\adddot}},
+  annotator        = {{notas}{notas}},
+  annotators       = {{notas}{notas}},
   review = {{resenha}{resenha}},
   reviewof = {{resenha de}{resenha de}},
   reprint = {{reimpress\~ao}{reimpr\adddot}},
   shorthands = {{Abreviaturas}{Abreviaturas}},
-  newseries = {{n\adddot s\adddot}{n\adddot s\adddot}},
-  urlseen = {{acesso}{acesso}},
+  newseries = {{s\adddot n\adddot}{s\adddot n\adddot}},
+  urlseen = {{acesso em}{acesso em}},
   cbynone = {{}{}},
   cbyauthor = {{por}{por}},
   cbyeditor = {{ed\adddot}{ed\adddot}},
   cbyorganizer = {{org\adddot}{org\adddot}},
-  cbytranslator = {{trad\adddot\addspace\lbx@cfromlang}%
-    {trad\adddot\addspace\lbx@cfromlang}},
+  cbytranslator = {{trad\adddot\ \lbx@cfromlang}%
+    {trad\adddot\ \lbx@cfromlang}},
   cbycompiler = {{comp\adddot}{comp\adddot}},
   cbyredactor = {{red\adddot}{red\adddot}},
   cbycommentator = {{coment\adddot}{coment\adddot}},
-  cbyannotator = {{anot\addot}{anot\addot}},
+  cbyannotator = {{anot\adddot}{anot\adddot}},
   cbyfounder        = {{fund\adddot}{fund\adddot}},
   cbycontinuator    = {{cont\adddot}{cont\adddot}},
-  cbycollaborator   = {{em col\adddot\addspace com}%
-    {em col\adddot\addspace com}},
+  cbycollaborator   = {{em col\adddot\ com}%
+    {em col\adddot\ com}},
   cbyconductor = {{reg\adddot}{reg\adddot}},
   cbydirector = {{dir\adddot}{dir\adddot}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
-  cbyeditortr    = {{ed\adddot\addspace e trad\adddot\addspace\lbx@cfromlang}%
-    {ed\adddot\addspace e trad\adddot\addspace\lbx@cfromlang}},
-  cbyeditorcp = {{ed\adddot\addspace e comp\adddot}%
-    {ed\adddot\addspace e comp\adddot}},
-  cbyeditorco    = {{ed\adddot\addspace e coment\adddot}%
-    {ed\adddot\addspace e coment\adddot}},
-  cbyeditoran = {{ed\adddot\addspace e anot\adddot}%
-    {ed\adddot\addspace e anot\adddot}},
-  cbyeditorin = {{ed\adddot\addspace e introd\adddot\ por}%
-    {ed\adddot\addspace e introd\adddot\ por}},
-  cbyeditorfo = {{ed\adddot\addspace e pref\adddot\ por}%
-    {ed\adddot\addspace e pref\adddot\ por}},
-  cbyeditoraf = {{ed\adddot\addspace e posf\adddot\ por}%
-    {ed\adddot\addspace e posf\adddot\ por}},
-  cbyeditortrcp = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e comp\adddot}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\ e comp\adddot}},
-  cbyeditortrco = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e coment\adddot}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e coment\adddot}},
-  cbyeditortran = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e anot\adddot}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e anot\adddot}},
-  cbyeditortrin = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang e introd\adddot\ por}},
-  cbyeditortrfo = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e pref\adddot\ por}},
-  cbyeditortraf = {{ed.,\addabbrvspace trad.\addspace\lbx@fromlang\addspace e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e posf\adddot\ por}},
+  cbyeditortr    = {{ed\adddotspace e trad\adddot\ \lbx@cfromlang}%
+    {ed\adddotspace e trad\adddot\ \lbx@cfromlang}},
+  cbyeditorcp = {{ed\adddotspace e comp\adddot}%
+    {ed\adddotspace e comp\adddot}},
+  cbyeditorco    = {{ed\adddotspace e coment\adddot}%
+    {ed\adddotspace e coment\adddot}},
+  cbyeditoran = {{ed\adddotspace e anot\adddot}%
+    {ed\adddotspace e anot\adddot}},
+  cbyeditorin = {{ed\adddotspace e introd\adddot}%
+    {ed\adddotspace e introd\adddot}},
+  cbyeditorfo = {{ed\adddotspace e pref\adddot}%
+    {ed\adddotspace e pref\adddot}},
+  cbyeditoraf = {{ed\adddotspace e posf\adddot}%
+    {ed\adddotspace e posf\adddot}},
+  cbyeditortrcp = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e comp\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e comp\adddot}},
+  cbyeditortrco = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e coment\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e coment\adddot}},
+  cbyeditortran = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e anot\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e anot\adddot}},
+  cbyeditortrin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e introd\adddot}},
+  cbyeditortrfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e pref\adddot}},
+  cbyeditortraf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e posf\adddot}},
   cbyeditorcpco = {{ed.,\addabbrvspace comp\adddot\ e coment\adddot}%
     {ed.,\addabbrvspace comp\adddot\ e coment\adddot}},
   cbyeditorcpan = {{ed.,\addabbrvspace comp\adddot\ e anot\adddot}%
     {ed.,\addabbrvspace comp\adddot\ e anot\adddot}},
-  cbyeditorcpin = {{ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}},
-  cbyeditorcpfo = {{ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}},
-  cbyeditorcpaf = {{ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}},
-  cbyeditorcpcoin = {{ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace comp., coment\adddot e introd\adddot\ por}},
-  cbyeditorcpcofo = {{ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}},
-  cbyeditorcpcoaf = {{ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}},
-  cbyeditorcpanin = {{ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}},
-  cbyeditorcpanfo = {{ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}},
-  cbyeditorcpanaf = {{ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}},
+  cbyeditorcpin = {{ed.,\addabbrvspace comp\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace comp\adddot\ e introd\adddot}},
+  cbyeditorcpfo = {{ed.,\addabbrvspace comp\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace comp\adddot\ e pref\adddot}},
+  cbyeditorcpaf = {{ed.,\addabbrvspace comp\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace comp\adddot\ e posf\adddot}},
+  cbyeditorcpcoin = {{ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot}},
+  cbyeditorcpcofo = {{ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot}},
+  cbyeditorcpcoaf = {{ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot}},
+  cbyeditorcpanin = {{ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot}},
+  cbyeditorcpanfo = {{ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot}},
+  cbyeditorcpanaf = {{ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot}},
   cbyeditortrcpco = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}%
     {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}},
   cbyeditortrcpan = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}%
     {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
-  cbyeditortrcpin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
-  cbyeditortrcpfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
-  cbyeditortrcpaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
-  cbyeditortrcpcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
-  cbyeditortrcpcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
-  cbyeditortrcpcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
-  cbyeditortrcpanin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
-  cbyeditortrcpanfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
-  cbyeditortrcpanaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
-  cbyeditorcoin = {{ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}},
-  cbyeditorcofo = {{ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}},
- cbyeditorcoaf = {{ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}},
-  cbyeditoranin = {{ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
-  cbyeditoranfo = {{ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}},
-  cbyeditoranaf = {{ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
-  cbyeditortrcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}},
-  cbyeditortrcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}},
-  cbyeditortrcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}},
-  cbyeditortranin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  cbyeditortranfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
-  cbyeditortranaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
+  cbyeditortrcpin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}},
+  cbyeditortrcpfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}},
+  cbyeditortrcpaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}},
+  cbyeditortrcpcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}},
+  cbyeditortrcpcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}},
+  cbyeditortrcpcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}},
+  cbyeditortrcpanin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}},
+  cbyeditortrcpanfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}},
+  cbyeditortrcpanaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}},
+  cbyeditorcoin = {{ed.,\addabbrvspace coment\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace coment\adddot\ e introd\adddot}},
+  cbyeditorcofo = {{ed.,\addabbrvspace coment\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace coment\adddot\ e pref\adddot}},
+  cbyeditorcoaf = {{ed.,\addabbrvspace coment\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace coment\adddot\ e posf\adddot}},
+  cbyeditoranin = {{ed.,\addabbrvspace anot\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace anot\adddot\ e introd\adddot}},
+  cbyeditoranfo = {{ed.,\addabbrvspace anot\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace anot\adddot\ e pref\adddot}},
+  cbyeditoranaf = {{ed.,\addabbrvspace anot\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace anot\adddot\ e posf\adddot}},
+  cbyeditortrcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot}},
+  cbyeditortrcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot}},
+  cbyeditortrcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot}},
+  cbyeditortranin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot}},
+  cbyeditortranfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot}},
+  cbyeditortranaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot}},
   cbytranslatorcp = {{trad\adddot\ \lbx@fromlang\ e comp\adddot}%
     {trad\adddot\ \lbx@fromlang\ e comp\adddot}},
   cbytranslatorco = {{trad\adddot\ \lbx@fromlang\ e coment\adddot}%
     {trad\adddot\ \lbx@fromlang\ e coment\adddot}},
   cbytranslatoran = {{trad\adddot\ \lbx@fromlang\ e anot\adddot}%
     {trad\adddot\ \lbx@fromlang\ e anot\adddot}},
-  cbytranslatorin = {{trad\adddot\ \lbx@fromlang\addspace e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang\addspace e introd\adddot\ por}},
-  cbytranslatorfo = {{trad\adddot\ \lbx@fromlang\addspace e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang\addspace e pref\adddot\ por}},
-  cbytranslatoraf = {{trad\adddot\ \lbx@fromlang\addspace e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang\addspace e posf\adddot\ por}},
-  cbytranslatorcoin = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}},
-  cbytranslatorcofo = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}},
-  cbytranslatorcoaf = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}},
-  cbytranslatoranin = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  cbytranslatoranfo = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
-  cbytranslatoranaf = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
+  cbytranslatorin = {{trad\adddot\ \lbx@fromlang\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e introd\adddot}},
+  cbytranslatorfo = {{trad\adddot\ \lbx@fromlang\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e pref\adddot}},
+  cbytranslatoraf = {{trad\adddot\ \lbx@fromlang\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e posf\adddot}},
+  cbytranslatorcoin = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot}},
+  cbytranslatorcofo = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot}},
+  cbytranslatorcoaf = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot}},
+  cbytranslatoranin = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot}},
+  cbytranslatoranfo = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot}},
+  cbytranslatoranaf = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot}},
   cbytranslatorcpco = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}%
     {trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}},
   cbytranslatorcpan = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}%
     {trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
-  cbytranslatorcpin = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
-  cbytranslatorcpfo = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
-  cbytranslatorcpaf = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
-  cbytranslatorcpcoin = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
-  cbytranslatorcpcofo = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
-  cbytranslatorcpcoaf = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
-  cbytranslatorcpanin = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
-  cbytranslatorcpanfo = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
-  cbytranslatorcpanaf = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+  cbytranslatorcpin = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}},
+  cbytranslatorcpfo = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}},
+  cbytranslatorcpaf = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}},
+  cbytranslatorcpcoin = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}},
+  cbytranslatorcpcofo = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}},
+  cbytranslatorcpcoaf = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}},
+  cbytranslatorcpanin = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}},
+  cbytranslatorcpanfo = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}},
+  cbytranslatorcpanaf = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}},
   cbycompilerco = {{comp\adddot\ e coment\adddot}%
     {comp\adddot\ e coment\adddot}},
   cbycompileran = {{comp\adddot\ e anot\adddot}%
     {comp\adddot\ e anot\adddot}},
-  cbycompilerin = {{comp\adddot\ e introd\adddot\ por}%
-    {comp\adddot\ e introd\adddot\ por}},
-  cbycompilerfo = {{comp\adddot\ e pref\adddot\ por}%
-    {comp\adddot\ e pref\adddot\ por}},
-  cbycompileraf = {{comp\adddot\ e posf\adddot\ por}%
-    {comp\adddot\ e posf\adddot\ por}},
-  cbycompilercoin = {{comp., coment\adddot\ e introd\adddot\ por}%
-    {comp., coment\adddot\ e introd\adddot\ por}},
-  cbycompilercofo = {{comp., coment\adddot\ e pref\adddot\ por}%
-    {comp., coment\adddot\ e pref\adddot\ por}},
-  cbycompilercoaf = {{comp., coment\adddot\ e posf\adddot\ por}%
-    {comp., coment\adddot\ e posf\adddot\ por}},
-  cbycompileranin = {{comp., anot\adddot\ e introd\adddot\ por}%
-    {comp., anot\adddot\ e introd\adddot\ por}},
-  cbycompileranfo = {{comp., anot\adddot\ e pref\adddot\ por}%
-    {comp., anot\adddot\ e pref\adddot\ por}},
-  cbycompileranaf = {{comp., anot\adddot\ e posf\adddot\ por}%
-    {comp., anot\adddot\ e posf\adddot\ por}},
+  cbycompilerin = {{comp\adddot\ e introd\adddot}%
+    {comp\adddot\ e introd\adddot}},
+  cbycompilerfo = {{comp\adddot\ e pref\adddot}%
+    {comp\adddot\ e pref\adddot}},
+  cbycompileraf = {{comp\adddot\ e posf\adddot}%
+    {comp\adddot\ e posf\adddot}},
+  cbycompilercoin = {{comp., coment\adddot\ e introd\adddot}%
+    {comp., coment\adddot\ e introd\adddot}},
+  cbycompilercofo = {{comp., coment\adddot\ e pref\adddot}%
+    {comp., coment\adddot\ e pref\adddot}},
+  cbycompilercoaf = {{comp., coment\adddot\ e posf\adddot}%
+    {comp., coment\adddot\ e posf\adddot}},
+  cbycompileranin = {{comp., anot\adddot\ e introd\adddot}%
+    {comp., anot\adddot\ e introd\adddot}},
+  cbycompileranfo = {{comp., anot\adddot\ e pref\adddot}%
+    {comp., anot\adddot\ e pref\adddot}},
+  cbycompileranaf = {{comp., anot\adddot\ e posf\adddot}%
+    {comp., anot\adddot\ e posf\adddot}},
   volume = {{vol\adddot}{vol\adddot}},
-  volumes = {{vols\adddot}{vols\adddot}},
-  jourvol = {{vol\adddot}{vol\adddot}},
+  volumes = {{vol\adddot}{vol\adddot}},
+  jourvol = {{v\adddot}{v\adddot}},
   jourser = {{s\'er\adddot}{s\'er\adddot}},
   oldseries = {{s\adddot a\adddot}{s\adddot a\adddot}},
   edition = {{ed\adddot}{ed\adddot}},
   page = {{p\adddot}{p\adddot}},
   pages = {{pp\adddot}{pp\adddot}},
   column = {{col\adddot}{col\adddot}},
-  columns = {{cols\adddot}{cols\adddot}},
-  line = {{line}{line}},
-  lines = {{lines}{lines}},
+  columns = {{col\adddot}{col\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{ll\adddot}{ll\adddot}},
   paragraph = {{par\adddot}{par\adddot}},
-  paragraphs = {{pars\adddot}{pars\adddot}},
+  paragraphs = {{par\adddot}{par\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
-  supranote = {{\mkbibemph{supra}\addspace nota\addnbspace}% ditto
-    {\mkbibemph{supra}\addspace nota\addnbspace}},
+  supranote = {{nota \mkbibemph{supra}\addnbspace}% ditto
+    {nota \mkbibemph{supra}\addnbspace}},
   hereinafter = {{doravante}{doravante}},
   subverbo = {{verbete}{verb\adddot}},
-  subverbis = {{verbetes}{verbs\adddot}},
+  subverbis = {{verbetes}{verb\adddot}},
   verse = {{v\adddot}{v\adddot}},
   verses = {{vv\adddot}{vv\adddot}},
-  number = {{n\textordmasculine}{n\textordmasculine}},
+  number = {{n\adddot}{n\adddot}},
   chapter = {{cap\adddot}{cap\adddot}},
   mathesis = {{diss\adddot\ de mestrado}{diss\adddot\ de mestrado}},
   phdthesis = {{tese de doutorado}{tese de doutorado}},
-  techreport = {{relat\'orio t\'ecnico}{relat\'orio t\'ecnico}},
+  techreport = {{relat\'orio t\'ecnico}{rel\adddot\ t\'ec\adddot}},
   cfromamerican     = {{do ingl\^es por}{do ingl\^es por}},
   cfrombrazilian    = {{do portugu\^es por}{do portugu\^es por}},
   cfrombulgarian    = {{do b\'ulgaro por}{do b\'ulgaro por}},
@@ -622,13 +401,14 @@
   cfromdanish       = {{do dinamarqu\^es por}{do dinamarqu\^es por}},
   cfromdutch        = {{do holand\^es por}{do holand\^es por}},
   cfromenglish      = {{do ingl\^es por}{do ingl\^es por}},
-  cfromestonian     = {{do estoniano por}{do estoniano  pr}},
+  cfromestonian     = {{do estoniano por}{do estoniano por}},
   cfromfinnish      = {{do finland\^es por}{do finland\^es por}},
   cfromfrench       = {{do franc\^es por}{do franc\^es por}},
   cfromgalician     = {{do galego por}{do galego por}},
   cfromgerman       = {{do alem\~ao por}{do alem\~ao por}},
   cfromgreek        = {{do grego por}{do grego por}},
   cfromitalian      = {{do italiano por}{do italiano por}},
+  cfromjapanese     = {{do japon\^es por}{do japon\^es por}},
   cfromlatin        = {{do latim por}{do latim por}},
   cfromnorwegian    = {{do noruegu\^es por}{do noruegu\^es por}},
   cfrompolish       = {{do polon\^es por}{do polon\^es por}},
@@ -643,8 +423,7 @@
   byconductor = {{regida por}{reg\adddot}},
   bydirector = {{dirigido por}{dir\adddot}},
   byproducer = {{produzido por}{prod\adddot}},
-  byproducer = {{produzido por}{prod\adddot}},
-  byeditorcp = {{editado e compilado por}{ed\adddot\addspace e comp\adddot}},
+  byeditorcp = {{editado e compilado por}{ed\adddotspace e comp\adddot}},
   byeditortrcp = {{editado, traduzido \lbx@fromlang\ e compilado por}%
     {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e comp\adddot}},
   byeditortrcpco = {{editado, traduzido \lbx@fromlang, compilado e comentado por}%
@@ -652,45 +431,45 @@
   byeditortrcpan = {{editado, traduzido \lbx@fromlang, compilado e anotado por}%
     {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
   byeditortrcpin = {{editado, traduzido \lbx@fromlang, compilado e introduzido por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}},
   byeditortrcpfo = {{editado, traduzido \lbx@fromlang, compilado e prefaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}},
   byeditortrcpaf = {{editado, traduzido \lbx@fromlang, compilado e posfaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}},
   byeditortrcpcoin = {{editado, traduzido \lbx@fromlang, compilado, comentado e introduzido por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}},
   byeditortrcpcofo = {{editado, traduzido \lbx@fromlang, compilado, comentado e prefaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}},
   byeditortrcpcoaf = {{editado, traduzido \lbx@fromlang, compilado, comentado e posfaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}},
   byeditortrcpanin = {{editado, traduzido \lbx@fromlang, compilado, anotado e introduzido por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}},
   byeditortrcpanfo = {{editado, traduzido \lbx@fromlang, compilado, anotado e prefaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}},
   byeditortrcpanaf = {{editado, traduzido \lbx@fromlang, compilado, anotado e posfaciado por}%
-    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}},
   byeditorcpco = {{editado, compilado e comentado por}%
     {ed.,\addabbrvspace comp\adddot\ e coment\adddot}},
   byeditorcpan = {{editado, compilado e anotado por}%
     {ed.,\addabbrvspace comp\adddot\ e anot\adddot}},
   byeditorcpin = {{editado, compilado e introduzido por}%
-    {ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace comp\adddot\ e introd\adddot}},
   byeditorcpfo = {{editado, compilado e prefaciado por}%
-    {ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace comp\adddot\ e pref\adddot}},
   byeditorcpaf = {{editado, compilado e posfaciado por}%
-    {ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace comp\adddot\ e posf\adddot}},
   byeditorcpcoin = {{editado, compilado, comentado e introduzido por}%
-    {ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot}},
   byeditorcpcofo = {{editado, compilado, comentado e prefaciado por}%
-    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot}},
   byeditorcpcoaf = {{editado, compilado, comentado e posfaciado por}%
-    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot}},
   byeditorcpanin = {{editado, compilado, anotado e introduzido por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}},
+    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot}},
   byeditorcpanfo = {{editado, compilado, anotado e prefaciado por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}},
+    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot}},
   byeditorcpanaf = {{editado, compilado, anotado e posfaciado por}%
-    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}},
+    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot}},
   bytranslatorcp = {{traduzido \lbx@fromlang\ e compilado por}%
     {trad\adddot\ \lbx@fromlang\ e comp\adddot}},
   bytranslatorcpco = {{traduzido \lbx@fromlang, compilado e comentado por}%
@@ -698,94 +477,57 @@
   bytranslatorcpan = {{traduzido \lbx@fromlang, compilado e anotado por}%
     {trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
   bytranslatorcpin = {{traduzido \lbx@fromlang, compilado e introduzido por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot}},
   bytranslatorcpfo = {{traduzido \lbx@fromlang, compilado e prefaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot}},
   bytranslatorcpaf = {{traduzido \lbx@fromlang, compilado e posfaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot}},
   bytranslatorcpcoin = {{traduzido \lbx@fromlang, compilado, comentado e introduzido por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot}},
   bytranslatorcpcofo = {{traduzido \lbx@fromlang, compilado, comentado e prefaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot}},
   bytranslatorcpcoaf = {{traduzido \lbx@fromlang, compilado, comentado e posfaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot}},
   bytranslatorcpanin = {{traduzido \lbx@fromlang, compilado, anotado e introduzido por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot}},
   bytranslatorcpanfo = {{traduzido \lbx@fromlang, compilado, anotado e prefaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot}},
   bytranslatorcpanaf = {{traduzido \lbx@fromlang, compilado, anotado e posfaciado por}%
-    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot}},
   bycompilerco = {{compilado e comentado por}%
     {comp\adddot\ e coment\adddot}},
   bycompileran = {{compilado e anotado por}%
     {comp\adddot\ e anot\adddot}},
   bycompilerin = {{compilado e introduzido por}%
-    {comp\adddot\ e introd\adddot\ por}},
+    {comp\adddot\ e introd\adddot}},
   bycompilerfo = {{compilado e prefaciado por}%
-    {comp\adddot\ e pref\adddot\ por}},
+    {comp\adddot\ e pref\adddot}},
   bycompileraf = {{compilado e posfaciado por}%
-    {comp\adddot\ e posf\adddot\ por}},
+    {comp\adddot\ e posf\adddot}},
   bycompilercoin = {{compilado, comentado e introduzido por}%
-    {comp., coment\adddot\ e introd\adddot\ por}},
+    {comp., coment\adddot\ e introd\adddot}},
   bycompilercofo = {{compilado, comentado e prefaciado por}%
-    {comp., coment\adddot\ e pref\adddot\ por}},
+    {comp., coment\adddot\ e pref\adddot}},
   bycompilercoaf = {{compilado, comentado e posfaciado por}%
-    {comp., coment\adddot\ e posf\adddot\ por}},
+    {comp., coment\adddot\ e posf\adddot}},
   bycompileranin = {{compilado, anotado e introduzido por}%
-    {comp., anot\adddot\ e introd\adddot\ por}},
+    {comp., anot\adddot\ e introd\adddot}},
   bycompileranfo = {{compilado, anotado e prefaciado por}%
-    {comp., anot\adddot\ e pref\adddot\ por}},
+    {comp., anot\adddot\ e pref\adddot}},
   bycompileranaf = {{compilado, anotado e posfaciado por}%
-    {comp., anot\adddot\ e posf\adddot\ por}},
+    {comp., anot\adddot\ e posf\adddot}},
+  note = {{nota}{nota}},
+  preface = {{pref\'acio}{pref\adddot}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  selfpublished = {{auto-publicado}{auto-pub\adddot}},
+  commenton = {{coment\'ario em}{coment\'ario em}},
+  printed = {{impresso}{impresso}},
+  track = {{faixa}{faixa}},
+  choreographer = {{coreogr\adddot}{coreogr\adddot}},
+  choreographers = {{coreogr\adddot}{coreogr\adddot}},
+  cbychoreographer = {{coreograf\adddot}{coreograf\adddot}},
+  bychoreographer = {{coreografado por}{coreograf\adddot}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 95695f1697f..74db7a87f79 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -1,18 +1,20 @@
-% $Id: cms-british.lbx,v 0.13 2018/01/09 19:00:27 dfussner Exp $	
-
-\ProvidesFile{cms-british.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-british.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 \InheritBibliographyExtras{british}
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Introduction}%
+  \def\sectionname{Section}%
+  \def\subsectionname{Subsection}%
+  \def\forewordname{Foreword}%
+  \def\notesname{Notes}%
   \protected\def\mkjuridordinal#1{%
     \begingroup
     \@tempcnta0#1\relax\number\@tempcnta
@@ -23,17 +25,17 @@
     \ifcase\@tempcnta th\or st\or d\or d\else th\fi
     \endgroup}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
   \protected\def\mkbibdatelong#1#2#3{%
     \iffieldundef{#3}%
     {}%
@@ -47,69 +49,85 @@
       \iffieldundef{#1}{}{\space}}%
     \iffieldbibstring{#1}%
     {\bibstring{\thefield{#1}}}%
-    {\stripzeros{\thefield{#1}}}}% FIXME: dateeraprintpre{#1}
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    {\cmsdateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
+  \protected\def\mkbibdateshort#1#2#3{%
+    \iffieldundef{#3}
+    {}
+    {\mkdayzeros{\thefield{#3}}%
+      \iffieldundef{#2}{}{/}}%
+    \iffieldundef{#2}
+    {}
+    {\mkmonthzeros{\thefield{#2}}%
+      \iffieldundef{#1}{}{/}}%
+    \iffieldbibstring{#1}
+    {\bibstring{\thefield{#1}}}
+    {\cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
+  \protected\def\mkbibseasondateshort#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\mkbibseasondatelong#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \cmsdateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\cmsmkdecade#1#2{%
+    \cms@tempcnta=\thefield{#2year}%
+    \divide\cms@tempcnta100
+    \multiply\cms@tempcnta100
+    \ifnumequal{\cms@tempcnta}{\thefield{#2year}}%
+    {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+    {\ifnumequal{\thefield{#2year}}{1}%
+      {\ifboolexpr{%
+          test {\ifdefstring\blx@dateera{christian}}%
+          and
+          test {\ifnumless{\thefield{#2year}}\blx@dateeraauto}%
+        }%
+        {\bibsstring{\blx@dateera@ce}\printdelim{dateeradelim}}%
+        {}}%
+      {}%
+      \csuse{mkbibdate#1}{#2year}{}{}%
+      \setunit{}%\blx@nounit%
+      \bibsstring{decade}%
+      \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\ifboolexpr{%
+        test {\ifdefstring\blx@dateera{christian}}%
+        and
+        test {\ifnumless{\thefield{#1year}}\blx@dateeraauto}%
+      }%
+      {\bibsstring{\blx@dateera@ce}\printdelim{dateeradelim}}%
+      {}%
+      \csuse{mkcmscentury}{#1year}%
+      \addnbspace%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\cmsdateeraprintpre{#1year}%
+      \csuse{mkcmscentury}{#1year}%
+      \addnbspace%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \InheritBibliographyStrings{cms-american}
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx
new file mode 100644
index 00000000000..662909b8ad3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx
@@ -0,0 +1,530 @@
+\ProvidesFile{cms-dutch.lbx}[2020/04/20 v 3.14 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Strings provided by native speaker Wouter Lancee.
+
+\InheritBibliographyExtras{dutch}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Inleiding}%
+  \def\sectionname{Sectie}%
+  \def\subsectionname{Subsectie}%
+  \def\forewordname{Voorwoord}%
+  \def\notesname{Noten}%
+  \protected\def\cmsmkdecade#1#2{%
+    \dateeraprintpre{#2year}%
+    \bibsstring{decade}%
+    \printdelim{dateaddelim}%
+    \stripzeros{\thefield{#2year}}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\mkdaterangecomp{%
+    \cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
+
+\DeclareBibliographyStrings{%
+  inherit = {dutch},
+  afterwordto = {{nawoord van}{nawoord van}},
+  forewordto = {{voorwoord van}{voorwoord van}},
+  introductionto = {{inleiding van}{inleiding van}},
+  partvolume = {{deel}{deel}},
+  by = {{door}{door}},
+  of = {{door}{door}},
+  on = {{op}{op}},
+  compiler = {{samengesteld door}{samengesteld door}},%
+  compilers = {{samengesteld door}{samengesteld door}},%
+  transcompiler = {{vertaald en samengesteld door}%
+    {vertaald en samengesteld door}},
+  transcompilers ={{vertaald en geproduceerd door}%
+    {vertaald en geproduceerd door}},
+  editortranscompiler = {{bewerkt\addcomma\addspace vertaald en samengesteld door}
+    {bewerkt\addcomma\addspace vertaald en samengesteld door}},
+  editorcompiler = {{bewerkt en samengesteld door}%
+    {bewerkt en samengesteld door}},
+  editortranslator = {{bewerkt en vertaald door}%
+    {bewerkt en vertaald door}},
+  editortranscompilers = {{bewerkt\addcomma\addspace vertaald en samengesteld door}%
+    {bewerkt\addcomma\addspace vertaald en samengesteld door}},
+  editorcompilers = {{bewerkt en samengesteld door}%
+    {bewerkt en samengesteld door}},
+  editortranslators = {{bewerkt en vertaald door}%
+    {bewerkt en vertaald door}},
+  conductor = {{gedirigeerd door}{gedirigeerd door}},%??
+  conductors = {{gedirigeerd door}{gedirigeerd door}},%??
+  director = {{gedirigeerd door}{gedirigeerd door}},%??
+  directors = {{gedirigeerd door}{gedirigeerd door}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{geproduceerd door}{geproduceerd door}},
+  producers = {{geproduceerd door}{geproduceerd door}},
+  editor = {{bewerkt door}{bewerkt door}},
+  editors = {{bewerkt door}{bewerkt door}},
+  ibidem = {{ibid\adddot}{id\adddot}},% Shorter for legal
+  origpub = {{oorspronkelijk gepubliceerd als\addspace}%
+    {oorspronkelijk gepubliceerd als\addspace}},
+  origpublin = {{oorspronkelijk gepubliceerd in\addspace}%
+    {oorspronkelijk gepubliceerd in\addspace}},
+  origpubyear = {{oorspronkelijk gepubliceerd in\addspace}%
+    {oorspronkelijk gepubliceerd in\addspace}},
+  origpubyearalt = {{eerste publicatie\addspace}%
+    {eerste publicatie\adddot\addspace}},
+  origreleaseyear = {{oorspronkelijk uitgegeven in\addspace}%
+    {oorspronkelijk uitgegeven in\addspace}},
+  origshownyear = {{oorspronkelijk vertoond in\addspace}%
+    {oorspronkelijk vertoond in\addspace}},
+  origedition ={{edition\addcolon\addspace}%
+    {bewerking\addcolon\addspace}},
+  revisededition = {{gereviseerde uitgave}%
+    {gereviseerde uitgave}},
+  broadcast = {{uitgezonden}{uitgezonden}},
+  songrecorded = {{opgenomen}{opgenomen}},
+  discrecorded = {{opgenomen}{opgenomen}},
+  numbers = {{No\adddot}{No\adddot}},
+  nodate = {{{}z\adddot d\adddot}{{}z\adddot d\adddot}},
+  decade = {{jaren}{jaren}},
+  century = {{eeuw}{eeuw}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{patentaanvraag ingediend}{patentaanvraag ingediend}},
+  patentissued = {{patent uitgegeven}{patent uitgegeven}},
+  inlang = {{in\addspace}{in\addspace}},
+  edamerican   = {{Amerikaans}{Amerikaans}},
+  edbrazilian  = {{Braziliaans}{Braziliaans}},
+  edbulgarian  = {{Bulgaars}{Bulgaars}},
+  edcatalan   = {{Catalaans}{Catalaans}},
+  edcroatian   = {{Kroatisch}{Kroatisch}},
+  edczech    = {{Tsjechisch}{Tsjechisch}},
+  eddanish    = {{Deens}{Deens}},
+  eddutch    = {{Nederlands}{Nederlands}},
+  edenglish   = {{Engels}{Engels}},
+  edestonian   = {{Estisch}{Estisch}},
+  edfinnish   = {{Fins}{Fins}},
+  edfrench    = {{Frans}{Frans}},
+  edgalician   = {{Galicisch}{Galicisch}},
+  edgerman    = {{Duits}{Duits}},
+  edgreek    = {{Grieks}{Grieks}},
+  editalian   = {{Italiaans}{Italiaans}},
+  edjapanese   = {{Japans}{Japans}},
+  edlatin    = {{Latijn}{Latijn}},
+  ednorwegian  = {{Noors}{Noors}},
+  edportuguese  = {{Portugees}{Portugees}},
+  edrussian   = {{Russisch}{Russisch}},
+  edslovak    = {{Slowaaks}{Slowaaks}},
+  edslovene   = {{Sloveens}{Sloveens}},
+  edspanish   = {{Spaans}{Spaans}},
+  edswedish   = {{Zweeds}{Zweeds}},
+  edukrainian  = {{Oekra\"{i}ens}{Oekra\"{i}ens}},
+  translator = {{vertaald door}{vertaald door}},
+  translators = {{vertaald door}{vertaald door}},
+  redactor = {{redactie door}{redactie door}},
+  redactors = {{redactie door}{redactie door}},
+  founder     = {{gesticht door}{gesticht door}},
+  founders     = {{gesticht door}{gesticht door}},
+  continuator   = {{opgevolgd door}{opgevolgd door}},% ?
+  continuators   = {{opgevolgd door}{opgevolgd door}},% ?
+  collaborator   = {{in samenwerking met}{in samenwerking met}},% ?
+  collaborators  = {{in samenwerking met}{in samenwerking met}},% ?
+  annotator    = {{geannoteerd door}{geannoteerd door}},
+  annotators    = {{geannoteerd door}{geannoteerd door}},
+  review = {{recensie}{recensie}},
+  reviewof = {{recensie van}{recensie van}},
+  reprint = {{herdruk}{herdruk}},
+  shorthands = {{afkortingen}{afkortingen}},
+  newseries = {{nieuwe serie}{nieuwe serie}},
+  urlseen = {{geraadpleegd op}{geraadpleegd op}},
+  cbynone = {{}{}},
+  cbyauthor = {{door}{door}},
+  cbyeditor = {{bewerkt door}{bewerkt door}},
+  cbytranslator   = {{vertaald\addspace\lbx@cfromlang\addspace door}%
+    {vertaald\addspace\lbx@cfromlang\addspace door}},
+  cbycompiler = {{samengesteld door}{samengesteld door}},
+  cbyredactor = {{redactie door}{redactie door}},
+  cbycommentator = {{van commentaar voorzien door}{van commentaar voorzien door}},
+  cbyannotator = {{geannoteerd door}{geannoteerd door}},
+  cbyfounder    = {{stichter}{stichter}},
+  cbycontinuator  = {{voortgezet}{voortgezet}},
+  cbycollaborator  = {{in samenwerking met}%
+    {in samenwerking met}},
+  cbyconductor = {{directie}{directie}},
+  cbydirector = {{directie}{directie}},
+  cbyproducer = {{geproduceerd door}{geproduceerd door}},
+  cbyeditortr  = {{bewerkt en vertaald\addspace\lbx@cfromlang}%
+    {bewerkt en vertaald\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{bewerkt en samengesteld door}%
+    {bewerkt en samengesteld door}},
+  cbyeditorco  = {{bewerkt en van commentaar voorzien door}%
+    {bewerkt en van commentaar voorzien door}},
+  cbyeditoran = {{bewerkt en geannoteerd door}%
+    {bewerkt en geannoteerd door}},
+  cbyeditorin = {{bewerkt en van een inleiding voorzien door}%
+    {bewerkt en van een inleiding voorzien door}},
+  cbyeditorfo = {{bewerkt en van een voorwoord voorzien door}%
+    {bewerkt en van een voorwoord voorzien door}},
+  cbyeditoraf = {{bewerkt en van een nawoord voorzien door}%
+    {bewerkt en van een nawoord voorzien door}},
+  cbyeditortrcp = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\addspace en samengesteld door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\addspace en samengesteld door}},
+  cbyeditortrco = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\addspace en van commentaar voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\addspace en van commentaar voorzien door}},
+  cbyeditortran = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\addspace en geannoteerd door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\addspace en geannoteerd door}},
+  cbyeditortrin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\ en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\ en van een inleiding voorzien door}},
+  cbyeditortrfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\addspace\ en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ en van een voorwoord voorzien door}},
+  cbyeditortraf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\addspace\ en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\addspace\ en van een nawoord voorzien door}},
+  cbyeditorcpco = {{bewerkt\addcomma\addspace samengesteld en van commentaar voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar voorzien door}},
+  cbyeditorcpan = {{bewerkt\addcomma\addspace samengesteld en geannoteerd door}%
+    {bewerkt\addcomma\addspace samengesteld en geannoteerd door}},
+  cbyeditorcpin = {{bewerkt\addcomma\addspace samengesteld en van een inleiding voorzien door}%
+    {bewerkt\space\addcomma\addspace samengesteld en van een inleiding voorzien door}},
+  cbyeditorcpfo = {{bewerkt\space\addcomma\addspace samengesteld en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van een voorwoord voorzien door}},
+  cbyeditorcpaf = {{bewerkt\addcomma\addspace samengesteld en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van een nawoord voorzien door}},
+  cbyeditorcpcoin = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een inleiding voorzien door}},
+  cbyeditorcpcofo = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een voorwoord voorzien door}},
+  cbyeditorcpcoaf = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een nawoord voorzien door}},
+  cbyeditorcpanin = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  cbyeditorcpanfo = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  cbyeditorcpanaf = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  cbyeditortrcpco = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\
+      samengesteld en van commentaar voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien door}},
+  cbyeditortrcpan = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}},
+  cbyeditortrcpin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}},
+  cbyeditortrcpfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}},
+  cbyeditortrcpaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld van een nawoord voorzien door}},
+  cbyeditortrcpcoin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}},
+  cbyeditortrcpcofo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}},
+  cbyeditortrcpcoaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}},
+  cbyeditortrcpanin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  cbyeditortrcpanfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  cbyeditortrcpanaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  cbyeditorcoin = {{bewerkt en van commentaar en een inleiding voorzien door}%
+    {bewerkt en van commentaar en een inleiding voorzien door}},
+  cbyeditorcofo = {{bewerkt en van commentaar en een voorwoord voorzien door}%
+    {bewerkt en van commentaar en een voorwoord voorzien door}},
+  cbyeditorcoaf = {{bewerkt en van commentaar en een nawoord voorzien door}%
+    {bewerkt en van commentaar en een nawoord voorzien door}},
+  cbyeditoranin = {{bewerkt\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  cbyeditoranfo = {{bewerkt\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  cbyeditoranaf = {{bewerkt\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  cbyeditortrcoin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een inleiding voorzien door}},
+  cbyeditortrcofo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een voorwoord voorzien door}},
+  cbyeditortrcoaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space en van commentaar en een nawoord voorzien door}},
+  cbyeditortranin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een inleiding voorzien door}},
+  cbyeditortranfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een voorwoord voorzien door}},
+  cbyeditortranaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  cbytranslatorcp = {{vertaald\addspace\lbx@fromlang\ en samengesteld door}%
+    {vertaald\addspace\lbx@fromlang\ en samengesteld door}},
+  cbytranslatorco = {{vertaald\addspace\lbx@fromlang\ en van commentaar voorzien door}%
+    {vertaald\addspace\lbx@fromlang\ en van commentaar voorzien door}},
+  cbytranslatoran = {{vertaald\addspace\lbx@fromlang\ en geannoteerd door}%
+    {vertaald\addspace\lbx@fromlang\ en geannoteerd door}},
+  cbytranslatorin = {{vertaald\addspace\lbx@fromlang en van een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang en van een inleiding voorzien door}},
+  cbytranslatorfo = {{vertaald\addspace\lbx@fromlang\ en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\ en van een voorwoord voorzien door}},
+  cbytranslatoraf = {{vertaald\addspace\lbx@fromlang\ en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang en van een nawoord voorzien door}},
+  cbytranslatorcoin = {{vertaald\addspace\lbx@fromlang\ en van commentaar en een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\ en van commentaar en een inleiding voorzien door}},
+  cbytranslatorcofo = {{vertaald\addspace\lbx@fromlang\ en van commentaar en een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\ en van commentaar en een voorwoord voorzien door}},
+  cbytranslatorcoaf = {{vertaald\addspace\lbx@fromlang\ en van commentaar en een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\ en van commentaar en een nawoord voorzien door}},
+  cbytranslatoranin = {{vertaald\addspace\lbx@fromlang\ geannoteerd en van een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een inleiding voorzien door}},
+  cbytranslatoranfo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een voorwoord voorzien door}},
+  cbytranslatoranaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ geannoteerd en van een nawoord voorzien door}},
+  cbytranslatorcpco = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien}},
+  cbytranslatorcpan = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}},
+  cbytranslatorcpin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}},
+  cbytranslatorcpfo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}},
+  cbytranslatorcpaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}},
+  cbytranslatorcpcoin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en  van commentaar en een inleiding voorzien door}},
+  cbytranslatorcpcofo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}},
+  cbytranslatorcpcoaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}},
+  cbytranslatorcpanin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  cbytranslatorcpanfo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  cbytranslatorcpanaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  cbycompilerco = {{samengesteld en van commentaar voorzien door}%
+    {samengesteld en van commentaar voorzien door}},
+  cbycompileran = {{samengesteld en geannoteerd door}%
+    {samengesteld en geannoteerd door}},
+  cbycompilerin = {{samengesteld en van een inleiding voorzien door}%
+    {samengesteld en van een inleiding voorzien door}},
+  cbycompilerfo = {{samengesteld en van een voorwoord voorzien door}%
+    {samengesteld en van een voorwoord voorzien door}},
+  cbycompileraf = {{samengesteld en van een nawoord voorzien door}%
+    {samengesteld en van een nawoord voorzien door}},
+  cbycompilercoin = {{samengesteld en van commentaar en een inleiding voorzien door}%
+    {samengesteld en van commentaar en een inleiding voorzien door}},
+  cbycompilercofo = {{samengesteld en van commentaar en een voorwoord voorzien door}%
+    {samengesteld en van commentaar en een voorwoord voorzien door}},
+  cbycompilercoaf = {{samengesteld en van commentaar en een nawoord voorzien door}%
+    {samengesteld en van commentaar en een nawoord voorzien door}},
+  cbycompileranin = {{samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien doorr}%
+    {samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  cbycompileranfo = {{samengesteld en geannoteerd en van een voorwoord voorzien door}% 
+    {samengesteld en geannoteerd en van een voorwoord voorzien door}},
+  cbycompileranaf = {{samengesteld en geannoteerd en van een nawoord voorzien door}%
+    {samengesteld en geannoteerd en van een nawoord voorzien door}},
+  volume = {{vol\adddot}{vol\adddot}},
+  volumes = {{vols\adddot}{vols\adddot}},
+  jourvol = {{vol\adddot}{vol\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{o\adddot s\adddot}{o\adddot s\adddot}},
+  edition = {{editie}{editie}},
+  page = {{pag\adddot}{pag\adddot}},
+  pages = {{pp\adddot}{pp\adddot}},
+  column = {{kolom}{kolom}},
+  columns = {{kolommen}{kolommen}},
+  line = {{regel}{regel}},
+  lines = {{regels}{regels}},
+  paragraph = {{\P}{\P}},
+  paragraphs = {{\P\P}{\P\P}},
+  section = {{\S}{\S}},
+  sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{noot hierboven}{noot hierboven}},% ditto (Changed)
+  hereinafter = {{hierna}{hierna}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{vv\adddot}{vv\adddot}},
+  number = {{no\adddot}{no\adddot}},
+  chapter = {{hoofdstuk}{hoofdstuk}},% for legal citations
+  part = {{deel}{deel}},% ditto
+  mathesis = {{masters thesis}{masters thesis}},
+  phdthesis = {{PhD\addabbrvspace dissertatie}{PhD\addabbrvspace dissertatie}},
+  techreport = {{technisch verslag}{technisch verslag}},
+  cfromamerican   = {{uit het Amerikaans door}{uit het Americaans door}},
+  cfrombrazilian  = {{uit het Braziliaans door}{uit het Braziliaans door}},
+  cfrombulgarian  = {{uit het Bulgaars door}{uit het Bulgaars door}},
+  cfromcatalan   = {{uit het Catalaans door}{uit het Catalaans door}},
+  cfromcroatian   = {{uit het Kroatisch door}{uit het Kroatisch door}},
+  cfromczech    = {{uit het Tsjechisch door}{uit het Tsjechisch door}},
+  cfromdanish    = {{uit het Deens door}{uit het Deens door}},
+  cfromdutch    = {{uit het Nederlands door}{uit het Nederlands door}},
+  cfromenglish   = {{uit het Engels door}{uit het Engels door}},
+  cfromestonian   = {{uit het Estisch door}{uit het Estisch door}},
+  cfromfinnish   = {{uit het Fins door}{uit het Fins door}},
+  cfromfrench    = {{uit het Frans door}{uit het Frans door}},
+  cfromgalician   = {{uit het Galicisch door}{uit het Galicisch door}},
+  cfromgerman    = {{uit het Duits door}{uit het Duits door}},
+  cfromgreek    = {{uit het Grieks door}{uit het Grieks door}},
+  cfromitalian   = {{uit het Italiaans door}{uit het Italiaans door}},
+  cfromjapanese   = {{uit het Japans door}{uit het Japans door}},
+  cfromlatin    = {{uit het Latijn door}{uit het Latijn door}},
+  cfromnorwegian  = {{uit het Noors door}{uit het Noors door}},
+  cfrompolish    = {{uit het Pools door}{uit het Pools door}},
+  cfromportuguese  = {{uit het Portugees door}{uit het Portugees door}},
+  cfromrussian   = {{uit het Russisch door}{uit het Russisch door}},
+  cfromslovak    = {{uit het Slowaaks door}{uit het Slowaaks door}},
+  cfromslovene   = {{uit het Sloveens door}{uit het Sloveens door}},
+  cfromspanish   = {{uit het Spaans door}{uit het Spaans door}},
+  cfromswedish   = {{uit het Zweeds door}{uit het Zweeds door}},
+  cfromukrainian  = {{uit het Oekra\"{i}ens door}{uit het Oekra\"{i}ens door}},
+  bynone = {{}{}},
+  bycompiler = {{samengesteld door}{samengesteld door}},
+  byconductor = {{gedirigeerd door}{gedirigeerd door}},
+  bydirector = {{gedirigeerd door}{gedirigeerd door}},
+  byproducer = {{geproduceerd door}{geproduceerd door}},
+  byeditorcp = {{bewerkt en samengesteld door}{bewerkt en samengesteld door}},
+  byeditortrcp = {{bewerkt\addcomma\addspace vertaald\lbx@fromlang en samengesteld door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ en samengesteld door}},
+  byeditortrcpco = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien door}},
+  byeditortrcpan = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}},
+  byeditortrcpin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}},
+  byeditortrcpfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld en van een voorwoord voorzien door}},
+  byeditortrcpaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}},
+  byeditortrcpcoin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}},
+  byeditortrcpcofo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld en van commentaar en een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}},
+  byeditortrcpcoaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace  vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}},
+  byeditortrcpanin = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  byeditortrcpanfo = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  byeditortrcpanaf = {{bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace en geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  byeditorcpco = {{bewerkt\addcomma\addspace samengesteld en van commentaar voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar voorzien door}},
+  byeditorcpan = {{bewerkt\addcomma\addspace samengesteld en geannoteerd door}%
+    {bewerkt\addcomma\addspace samengesteld en geannoteerd door}},
+  byeditorcpin = {{bewerkt\addcomma\addspace samengesteld en van een inleiding voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van een inleiding voorzien door}},
+  byeditorcpfo = {{bewerkt\addcomma\addspace samengesteld en van een voorwoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van een voorwoord voorzien door}},
+  byeditorcpaf = {{bewerkt\addcomma\addspace samengesteld en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van een nawoord voorzien door}},
+  byeditorcpcoin = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een inleiding voorzien door }%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een inleiding voorzien door}},
+  byeditorcpcofo = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een voorwoord voorzien door }%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een voorwoord voorzien door}},
+  byeditorcpcoaf = {{bewerkt\addcomma\addspace samengesteld en van commentaar en een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld en van commentaar en een nawoord voorzien door}},
+  byeditorcpanin = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door }%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  byeditorcpanfo = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door }%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  byeditorcpanaf = {{bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {bewerkt\addcomma\addspace samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  bytranslatorcp = {{vertaald \lbx@fromlang\ en samengesteld door}%
+    {vertaald\addspace\lbx@fromlang\ en samengesteld door}},
+  bytranslatorcpco = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar voorzien door}},
+  bytranslatorcpan = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en geannoteerd door}},
+  bytranslatorcpin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door }%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een inleiding voorzien door}},
+  bytranslatorcpfo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld en van een voorwoord voorzien door}},
+  bytranslatorcpaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\  samengesteld en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van een nawoord voorzien door}},
+  bytranslatorcpcoin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een inleiding voorzien door }},
+  bytranslatorcpcofo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een voorwoord voorzien door}},
+  bytranslatorcpcoaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld en van commentaar en een nawoord voorzien door}},
+  bytranslatorcpanin = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  bytranslatorcpanfo = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  bytranslatorcpanaf = {{vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {vertaald\addspace\lbx@fromlang\finalandcomma\space\addcomma\ samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}},
+  bycompilerco = {{samengesteld en van commentaar voorzien door}%
+    {samengesteld en van commentaar voorzien door}},
+  bycompileran = {{samengesteld en geannoteerd door}%
+    {samengesteld en geannoteerd door}},
+  bycompilerin = {{samengesteld en van een inleiding voorzien door}%
+    {samengesteld en van een inleiding voorzien door}},
+  bycompilerfo = {{samengesteld en van een voorwoord voorzien door}%
+    {samengesteld en van een voorwoord voorzien door}},
+  bycompileraf = {{samengesteld en van een nawoord voorzien door}%
+    {samengesteld en van een nawoord voorzien door}},
+  bycompilercoin = {{samengesteld  en van commentaar en een inleiding voorzien door}%
+    {samengesteld en van commentaar en een inleiding voorzien door}},
+  bycompilercofo = {{samengesteld  en van commentaar en een voorwoord voorzien door}%
+    {samengesteld en van commentaar en een voorwoord voorzien door}},
+  bycompilercoaf = {{samengesteld  en van commentaar en een nawoord voorzien door}%
+    {samengesteld en van commentaar en een nawoord voorzien door}},
+  bycompileranin = {{samengesteld en geannoteerd en van een inleiding voorzien door}%
+    {samengesteld\addcomma\addspace geannoteerd en van een inleiding voorzien door}},
+  bycompileranfo = {{samengesteld en geannoteerd en van een voorwoord voorzien door}%
+    {samengesteld\addcomma\addspace geannoteerd en van een voorwoord voorzien door}},
+  bycompileranaf = {{samengesteld\addcomma\addspace geannoteerd en van een nawoord voorzien door}%
+    {samengesteld\addcomma\addspace geannoteerd en van een nawoord
+      voorzien door}},
+  circa = {{ongeveer}{ong\adddot}},
+  spring = {{lente}{lente}},
+  summer = {{zomer}{zomer}},
+  autumn = {{herfst}{herfst}},
+  winter = {{winter}{winter}},
+  note = {{noot}{noot}},
+  preface = {{voorwoord}{woorw\adddot}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  selfpublished = {{zelf-gepubliceerde}{zelf-gep\adddot}},
+  commenton = {{reactie op}{reactie op}},
+  printed = {{gedrukt}{gedrukt}},
+  track = {{nummer}{nummer}},
+  choreographer = {{choreogr\adddot}{choreogr\adddot}},
+  choreographers = {{choreogr\adddot}{choreogr\adddot}},
+  cbychoreographer = {{gechoreograf\adddot}{gechoreograf\adddot}},
+  bychoreographer = {{gechoreografeerd door}{gechoreograf\adddot}},
+}
+
+\endinput
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 bb8be1c19e7..571b232b77b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-finnish.lbx,v 0.13 2018/01/09 19:01:03 dfussner Exp $	
-
-\ProvidesFile{cms-finnish.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-finnish.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Antti-Juhani Kaijanaho).
@@ -14,14 +12,18 @@
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
   \savecommand\lbx@fromlang%
   \savecommand\lbx@lfromlang%
   \savecommand\lbx@sfromlang%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
+  \def\introductionname{Johdanto}%
+  \def\sectionname{Kohta}% These 2 highly uncertain
+  \def\subsectionname{Kappale}%
+  \def\forewordname{Esipuhe}%
+  \def\notesname{Viitteet}% ?
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
     {\iflistundef{origlanguage}%
@@ -40,257 +42,68 @@
       {}%
       {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\cmsmkdecade#1#2{%
+    \cms@tempcnta=\thefield{#2year}%
+    \divide\cms@tempcnta100
+    \multiply\cms@tempcnta100
+    \ifnumequal{\cms@tempcnta}{\thefield{#2year}}% Disambiguation of -luku
+    {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+    {\ifnumequal{\thefield{#2year}}{1}%
+      {\printtext{I vuosikymmen}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+        \usebibmacro{cmsparensextradate}%
+        \global\boolfalse{cms:extraparens}}%
+      {\csuse{mkbibdate#1}{#2year}{}{}%
+        \setunit{}%\blx@nounit%
+        \bibsstring{decade}%
+        \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+        \usebibmacro{cmsparensextradate}%
+        \global\boolfalse{cms:extraparens}}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\printtext{I vuosisata}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\csuse{mkbibdatelong}{#1year}{}{}%
+      \setunit{}%\blx@nounit%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
   \protected\def\mkdaterangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \cms@mkbibrangetrunc{short}}%
   \protected\def\mkdaterangefull{%
-    \lbx@cms@mkbibrangefull}%
-  \protected\def\mkbibrangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
-  \protected\def\mkbibrangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
-  \protected\def\mkbibrangefull{%
-    \lbx@cms@mkbibrangefull}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}}%
 
 \UndeclareBibliographyExtras{%
   \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}%
-
-\NewBibliographyString{bynone}
-% \NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-% \NewBibliographyString{byproducer}
-% \NewBibliographyString{byeditorcp}
-% \NewBibliographyString{byeditortrcp}
-% \NewBibliographyString{byeditortrcpco}
-% \NewBibliographyString{byeditortrcpan}
-% \NewBibliographyString{byeditortrcpin}
-% \NewBibliographyString{byeditortrcpfo}
-% \NewBibliographyString{byeditortrcpaf}
-% \NewBibliographyString{byeditortrcpcoin}
-% \NewBibliographyString{byeditortrcpcofo}
-% \NewBibliographyString{byeditortrcpcoaf}
-% \NewBibliographyString{byeditortrcpanin}
-% \NewBibliographyString{byeditortrcpanfo}
-% \NewBibliographyString{byeditortrcpanaf}
-% \NewBibliographyString{byeditorcpco}
-% \NewBibliographyString{byeditorcpan}
-% \NewBibliographyString{byeditorcpin}
-% \NewBibliographyString{byeditorcpfo}
-% \NewBibliographyString{byeditorcpaf}
-% \NewBibliographyString{byeditorcpcoin}
-% \NewBibliographyString{byeditorcpcofo}
-% \NewBibliographyString{byeditorcpcoaf}
-% \NewBibliographyString{byeditorcpanin}
-% \NewBibliographyString{byeditorcpanfo}
-% \NewBibliographyString{byeditorcpanaf}
-% \NewBibliographyString{bytranslatorcp}
-% \NewBibliographyString{bytranslatorcpco}
-% \NewBibliographyString{bytranslatorcpan}
-% \NewBibliographyString{bytranslatorcpin}
-% \NewBibliographyString{bytranslatorcpfo}
-% \NewBibliographyString{bytranslatorcpaf}
-% \NewBibliographyString{bytranslatorcpcoin}
-% \NewBibliographyString{bytranslatorcpcofo}
-% \NewBibliographyString{bytranslatorcpcoaf}
-% \NewBibliographyString{bytranslatorcpanin}
-% \NewBibliographyString{bytranslatorcpanfo}
-% \NewBibliographyString{bytranslatorcpanaf}
-% \NewBibliographyString{bycompilerco}
-% \NewBibliographyString{bycompileran}
-% \NewBibliographyString{bycompilerin}
-% \NewBibliographyString{bycompilerfo}
-% \NewBibliographyString{bycompileraf}
-% \NewBibliographyString{bycompilercoin}
-% \NewBibliographyString{bycompilercofo}
-% \NewBibliographyString{bycompilercoaf}
-% \NewBibliographyString{bycompileranin}
-% \NewBibliographyString{bycompileranfo}
-% \NewBibliographyString{bycompileranaf}
-% \NewBibliographyString{cbynone}
-% \NewBibliographyString{cbyauthor}
-% \NewBibliographyString{cbyeditor}
-% \NewBibliographyString{cbytranslator}
-% \NewBibliographyString{cbycompiler}
-% \NewBibliographyString{cbyredactor}
-% \NewBibliographyString{cbycommentator}
-% \NewBibliographyString{cbyannotator}
-% \NewBibliographyString{cbyfounder}
-% \NewBibliographyString{cbycontinuator}
-% \NewBibliographyString{cbycollaborator}
-% \NewBibliographyString{cbyconductor}
-% \NewBibliographyString{cbydirector}
-% \NewBibliographyString{cbyproducer}
-% \NewBibliographyString{cbyeditortr}
-% \NewBibliographyString{cbyeditorcp}
-% \NewBibliographyString{cbyeditorco}
-% \NewBibliographyString{cbyeditoran}
-% \NewBibliographyString{cbyeditorin}
-% \NewBibliographyString{cbyeditorfo}
-% \NewBibliographyString{cbyeditoraf}
-% \NewBibliographyString{cbyeditortrcp}
-% \NewBibliographyString{cbyeditortrco}
-% \NewBibliographyString{cbyeditortran}
-% \NewBibliographyString{cbyeditortrin}
-% \NewBibliographyString{cbyeditortrfo}
-% \NewBibliographyString{cbyeditortraf}
-% \NewBibliographyString{cbyeditortrcpco}
-% \NewBibliographyString{cbyeditortrcpan}
-% \NewBibliographyString{cbyeditortrcpin}
-% \NewBibliographyString{cbyeditortrcpfo}
-% \NewBibliographyString{cbyeditortrcpaf}
-% \NewBibliographyString{cbyeditorcoin}
-% \NewBibliographyString{cbyeditorcofo}
-% \NewBibliographyString{cbyeditorcoaf}
-% \NewBibliographyString{cbyeditoranin}
-% \NewBibliographyString{cbyeditoranfo}
-% \NewBibliographyString{cbyeditoranaf}
-% \NewBibliographyString{cbyeditortrcoin}
-% \NewBibliographyString{cbyeditortrcofo}
-% \NewBibliographyString{cbyeditortrcoaf}
-% \NewBibliographyString{cbyeditortranin}
-% \NewBibliographyString{cbyeditortranfo}
-% \NewBibliographyString{cbyeditortranaf}
-% \NewBibliographyString{cbyeditortrcpcoin}
-% \NewBibliographyString{cbyeditortrcpcofo}
-% \NewBibliographyString{cbyeditortrcpcoaf}
-% \NewBibliographyString{cbyeditortrcpanin}
-% \NewBibliographyString{cbyeditortrcpanfo}
-% \NewBibliographyString{cbyeditortrcpanaf}
-% \NewBibliographyString{cbyeditorcpco}
-% \NewBibliographyString{cbyeditorcpan}
-% \NewBibliographyString{cbyeditorcpin}
-% \NewBibliographyString{cbyeditorcpfo}
-% \NewBibliographyString{cbyeditorcpaf}
-% \NewBibliographyString{cbyeditorcpcoin}
-% \NewBibliographyString{cbyeditorcpcofo}
-% \NewBibliographyString{cbyeditorcpcoaf}
-% \NewBibliographyString{cbyeditorcpanin}
-% \NewBibliographyString{cbyeditorcpanfo}
-% \NewBibliographyString{cbyeditorcpanaf}
-% \NewBibliographyString{cbytranslatorcp}
-% \NewBibliographyString{cbytranslatorco}
-% \NewBibliographyString{cbytranslatoran}
-% \NewBibliographyString{cbytranslatorin}
-% \NewBibliographyString{cbytranslatorfo}
-% \NewBibliographyString{cbytranslatoraf}
-% \NewBibliographyString{cbytranslatorcpco}
-% \NewBibliographyString{cbytranslatorcpan}
-% \NewBibliographyString{cbytranslatorcpin}
-% \NewBibliographyString{cbytranslatorcpfo}
-% \NewBibliographyString{cbytranslatorcpaf}
-% \NewBibliographyString{cbytranslatorcoin}
-% \NewBibliographyString{cbytranslatorcofo}
-% \NewBibliographyString{cbytranslatorcoaf}
-% \NewBibliographyString{cbytranslatoranin}
-% \NewBibliographyString{cbytranslatoranfo}
-% \NewBibliographyString{cbytranslatoranaf}
-% \NewBibliographyString{cbytranslatorcpcoin}
-% \NewBibliographyString{cbytranslatorcpcofo}
-% \NewBibliographyString{cbytranslatorcpcoaf}
-% \NewBibliographyString{cbytranslatorcpanin}
-% \NewBibliographyString{cbytranslatorcpanfo}
-% \NewBibliographyString{cbytranslatorcpanaf}
-% \NewBibliographyString{cbycompilerco}
-% \NewBibliographyString{cbycompileran}
-% \NewBibliographyString{cbycompilerin}
-% \NewBibliographyString{cbycompilerfo}
-% \NewBibliographyString{cbycompileraf}
-% \NewBibliographyString{cbycompilercoin}
-% \NewBibliographyString{cbycompilercofo}
-% \NewBibliographyString{cbycompilercoaf}
-% \NewBibliographyString{cbycompileranin}
-% \NewBibliographyString{cbycompileranfo}
-% \NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-% \NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-% \NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-% \NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-% \NewBibliographyString{origreleaseyear}
-% \NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}
-\NewBibliographyString{patentissued}
-\NewBibliographyString{inlang}
-% \NewBibliographyString{langrussian}
-% \NewBibliographyString{fromrussian}
-% \NewBibliographyString{edamerican}
-% \NewBibliographyString{edbrazilian}
-% \NewBibliographyString{eddanish}
-% \NewBibliographyString{eddutch}
-% \NewBibliographyString{edenglish}
-% \NewBibliographyString{edfrench}
-% \NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-% \NewBibliographyString{editalian}
-% \NewBibliographyString{edlatin}
-% \NewBibliographyString{ednorwegian}
-% \NewBibliographyString{edportuguese}
-% \NewBibliographyString{edrussian}
-% \NewBibliographyString{edspanish}
-% \NewBibliographyString{edswedish}
-% \NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-% \NewBibliographyString{section}
-% \NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-% \NewBibliographyString{compiler}
-% \NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-% \NewBibliographyString{director}
-% \NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-% \NewBibliographyString{producer}
-% \NewBibliographyString{producers}
-% \NewBibliographyString{transcompiler}
-% \NewBibliographyString{transcompilers}
-% \NewBibliographyString{editortranscompiler}
-% \NewBibliographyString{editorcompiler}
-% \NewBibliographyString{editortranslator}
-% \NewBibliographyString{editortranscompilers}
-% \NewBibliographyString{editorcompilers}
-% \NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {finnish},
   afterwordto = {{j\"alkipuhe teokselle}{j\"alkipuhe teokselle}},
   % forewordto = {{foreword to}{forew\adddot\space to}},
-  introductionto = {{johdanto teoksessa}{johdanto\adddot\space teoksessa}},
+  introductionto = {{johdanto teoksessa}{johdanto teoksessa}},
   partvolume = {{osa}{osa}},
-  by = {{kirjoittanut}{kirjoittanut}},
+  by = {{}{}},
   % of = {{of}{of}},
   on = {{levyll\"a}{levyll\"a}},
   % compiler = {{comp\adddot}{comp\adddot}},
@@ -325,6 +138,8 @@
   % producers = {{prods\adddot}{prods\adddot}},
   % editor = {{toim\adddot}{toim\adddot}},
   % editors = {{toimm\adddot}{toimm\adddot}},
+  choreographer = {{koreografi}{koreografi}},% ??
+  choreographers = {{koreografit}{koreografit}},% ??
   % ibidem = {{ibid\adddot}{ibid\adddot}},
   origpub = {{alkuper\"ainen julkaisu\addspace}%
     {alkup\adddot\ julk\adddot\ as\addspace}},
@@ -347,6 +162,8 @@
   discrecorded = {{taltioitu}{taltioitu}},
   numbers = {{not\adddot}{not\adddot}},
   nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}},
+  decade = {{-luku}{-luku}},
+  century = {{-luku}{-luku}},
   pseudonym = {{salanimi}{salan\adddot}},
   patentfiled = {{haettu}{haettu}},
   patentissued = {{my\"onnetty}{my\"onnetty}},
@@ -382,13 +199,16 @@
   % annotators       = {{annot\adddot}{annot\adddot}},
   % review = {{review}{review}},
   reviewof = {{arvio teoksesta}{arvio teoksesta}},
+  commenton = {{kommentti}{kommentti}},% ??
   % reprint = {{reprint}{repr\adddot}},
+  printed = {{painettu}{painettu}},% ??
+  selfpublished = {{omajulkaisu}{omajulk\adddot}},
   % shorthands = {{Abbreviations}{Abbreviations}},
   % newseries = {{n\adddot s\adddot}{n\adddot s\adddot}},
   % urlseen = {{accessed}{accessed}},
   % cbynone = {{}{}},
-  % cbyauthor = {{by}{by}},
-  % cbyeditor = {{ed\adddot}{ed\adddot}},
+  cbyauthor = {{kirj\adddot}{kirj\adddot}},
+  cbyeditor = {{toim\adddot}{toim\adddot}},
   % cbytranslator     = {{trans\adddot\addspace\lbx@cfromlang}%
   %   {trans\adddot\addspace\lbx@cfromlang}},
   % cbycompiler = {{comp\adddot}{comp\adddot}},
@@ -402,6 +222,7 @@
   % cbyconductor = {{johtaa}{joht\adddot}},
   % cbydirector = {{dir\adddot}{dir\adddot}},
   % cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{koreografi}{koreografi}},% ??
   % cbyeditortr    = {{ed\adddot\space and
   %     trans\adddot\addspace\lbx@cfromlang}%
   %   {ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}},
@@ -675,6 +496,10 @@
   % paragraphs = {{\P\P}{\P\P}},
   % section = {{\S}{\S}},
   % sections = {{\S\S}{\S\S}},
+  subsection = {{kappale}{kappale}},% These 3 extremely uncertain
+  subsections = {{kappaleet}{kappaleet}},
+  preface = {{esipuhe}{esipuhe}},
+  note = {{viite}{viite}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace viite\addnbspace}% ditto
@@ -686,6 +511,7 @@
   % verses = {{vv\adddot}{vv\adddot}},
   % number = {{no\adddot}{no\adddot}},
   % chapter = {{chap\adddot}{chap\adddot}},
+  track = {{kappale}{kappale}},% ??
   % mathesis = {{master's thesis}{master's thesis}},
   % phdthesis = {{PhD\addabbrvspace diss\adddot}{PhD\addabbrvspace diss\adddot}},
   % techreport = {{technical report}{technical report}},
@@ -712,6 +538,7 @@
   byconductor = {{johtaa}{joht.\adddot}},
   bydirector = {{ohjannut}{ohj\adddot}},
   % byproducer = {{produced by}{prod\adddot}},
+  bychoreographer = {{koreografi}{koreografi}},% ??
   % byeditorcp = {{edited and compiled by}{ed\adddot\space and comp\adddot}},
   % byeditortrcp = {{edited, translated \lbx@fromlang, and compiled by}%
   %   {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}},
@@ -852,53 +679,4 @@
   %   {comp\adddot\space and annot\adddot, with an afterword, by}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 aae7f702bba..c2a6b664921 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-french.lbx,v 0.9.5.39 2018/01/10 16:38:12 dfussner Exp $	
-
-\ProvidesFile{cms-french.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -16,294 +14,67 @@
   \savecommand\mkbibnamefamily%
   \protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Introduction}%
+  \def\sectionname{Section}%
+  \def\subsectionname{Paragraphe}%
+  \def\forewordname{Pr\'eface}%
+  \def\notesname{Notes}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \protected\def\cmsmkdecade#1#2{%
+    \dateeraprintpre{#2year}%
+    \bibsstring{decade}%
+    \printdelim{dateaddelim}%
+    \stripzeros{\thefield{#2year}}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\csuse{mkcmscentury}[er]{#1year}}%
+    {\dateeraprintpre{#1year}%
+      \csuse{mkcmscentury}[e]{#1year}}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury[#1]#2{%
+    \textsc{\romannumeral\numexpr\thefield{#2}/100+1}%
+    \raise.45ex\hbox{\scriptsize #1}}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\postvolpunct%
   \restorecommand\mkbibnamefamily%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \togglefalse{cms@postposit}%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangeterse%
   \restorecommand\mkdaterangefull%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbyeditoralt} % To cope with \smartof issues
-\NewBibliographyString{byeditoralt} %  in \partedit command.
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}% 2 strings to allow matching gender
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {french},
@@ -340,6 +111,8 @@
   producers = {{prod\adddot}{prod\adddot}},
   editor = {{\'ed\adddot}{\'ed\adddot}},
   editors = {{\'eds\adddot}{\'eds\adddot}},
+  choreographer = {{chor\'egr\adddot}{chor\'egr\adddot}},
+  choreographers = {{chor\'egrs\adddot}{chor\'egrs\adddot}},
   ibidem = {{ibid\adddot}{ibid\adddot}},
   origpub = {{originellement publi\'e comme}%
     {origin\adddot\ publ\adddot\ comme}},
@@ -361,6 +134,8 @@
   discrecorded = {{enregistr\'e}{enregistr\'e}},
   numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},% ?
   nodate = {{{}s\adddot d\adddot}{{}s\adddot d\adddot}},% ?
+  decade = {{ann\'ees}{ann\'ees}},
+  century = {{si\`ecle}{s\adddot}},
   pseudonym = {{pseudonym}{pseudonym}},% ?
   patentfiled = {{d\'epos\'e}{d\'epos\'e}},
   patentissued = {{d\'elivr\'e}{d\'elivr\'e}},
@@ -406,7 +181,10 @@
   annotators       = {{annot\adddot}{annot\adddot}},
   review = {{critique}{critique}},
   reviewof = {{critique de}{critique de}},
+  commenton = {{commentaire sur}{commentaire sur}},
   reprint = {{r\'eimpression}{r\'eimpr\adddot}},
+  printed = {{imprim\'e}{imprim\'e}},
+  selfpublished = {{auto-publi\'e}{auto-publ\adddot}},
   shorthands = {{Sigles}{Sigles}},
   newseries = {{nouv\adddot\ s\'er\adddot}{nouv\adddot\
       s\'er\adddot}},
@@ -429,6 +207,7 @@
     {sous la dir\adddotspace\smartof}},
   cbydirector = {{r\'eal\adddot}{r\'eal\adddot}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{chor\'egr\adddot}{chor\'egr\adddot}},
   cbyeditortr    = {{\'ed\adddotspace \'etablie et trad\adddot\
       \lbx@cfromlang}{\'ed\adddotspace \'etablie et trad\adddot\
       \lbx@cfromlang}},
@@ -677,6 +456,10 @@
   paragraphs = {{par\adddot}{par\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  preface = {{pr\'eface}{pr\'ef\adddot}},
+  note = {{note}{note}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
@@ -688,6 +471,7 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{n\textsuperscript{o}}{n\textsuperscript{o}}},
   chapter = {{chap\adddot}{chap\adddot}},
+  track = {{titre}{titre}},
   mathesis = {{m\'emoire de ma\^{\i}trise}{m\'emoire de ma\^{\i}trise}},
   phdthesis = {{th\`ese de doct\adddot}{th\`ese de doct\adddot}},
   techreport = {{rapport technique}{rapport technique}},
@@ -724,6 +508,7 @@
     {sous la dir\adddotspace\smartof}},
   bydirector = {{r\'ealis\'e par}{r\'eal\adddot}},
   byproducer = {{produit par}{prod\adddot}},
+  bychoreographer = {{chor\'egraphi\'e par}{chor\'egr\adddot}},
   byeditorcp = {{\'edition \'etablie et compil\'ee par}%
     {\'ed\adddotspace \'etablie et comp\adddot}},
   byeditortrcp = {{\'edition \'etablie, traduite \lbx@fromlang\ et
@@ -857,53 +642,4 @@
       par}{comp\adddot, annot\adddot\ et postf\adddot}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 73ac2cd225e..7bf991606ca 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-german.lbx,v 0.9.5.36 2018/01/09 19:01:32 dfussner Exp $	
-
-\ProvidesFile{cms-german.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -12,14 +10,18 @@
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
   \savecommand\lbx@fromlang%
   \savecommand\lbx@lfromlang%
   \savecommand\lbx@sfromlang%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
+  \def\introductionname{Einleitung}%
+  \def\sectionname{Paragraph}%
+  \def\subsectionname{Absatz}%
+  \def\forewordname{Vorwort}%
+  \def\notesname{Anmerkungen}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
@@ -39,258 +41,49 @@
       {}%
       {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}%
+  \protected\def\cmsmkdecade#1#2{%
+    \csuse{mkbibdate#1}{#2year}{}{}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{decade}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \protected\def\mkdaterangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \cms@mkbibrangetrunc{short}}%
   \protected\def\mkdaterangefull{%
-    \lbx@cms@mkbibrangefull}%
-  \protected\def\mkbibrangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
-  \protected\def\mkbibrangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
-  \protected\def\mkbibrangefull{%
-    \lbx@cms@mkbibrangefull}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\lbx@fromlang%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangeterse%
   \restorecommand\mkdaterangefull%
-  \restorecommand\mkbibrangecomp%  DATE FIX
-  \restorecommand\mkbibrangeterse%
-  \restorecommand\mkbibrangefull}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}
-\NewBibliographyString{patentissued}
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {german},
@@ -332,6 +125,8 @@
   producers = {{Prod\adddot}{Prod\adddot}},
   editor = {{Hrsg\adddot}{Hrsg\adddot}},
   editors = {{Hrsg\adddot}{Hrsg\adddot}},
+  choreographer = {{Choreograph}{Choreograph}},
+  choreographers = {{Choreografen}{Choreografen}},
   ibidem = {{ebd\adddot}{ebd\adddot}},
   origpub = {{urspr\"unglich ver\"offentlicht als}%
     {urspr\adddot\ ver\"offtl\adddot\ als}},
@@ -356,15 +151,16 @@
 % translationof    = {{}{}},% FIXME: missing
 % translationas    = {{}{}},% FIXME: missing
 % translationfrom  = {{}{}},% FIXME: missing
-% reviewof         = {{}{}},% FIXME: missing
   origpubas        = {{urspr\"unglich ver\"offentlicht als}%
     {urspr\adddot\ ver\"offtl\adddot\ als}},% FIXME
-  origpubin        = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}%
-    {urspr\adddot\ ver\"offtl\adddot\addspace}},% FIXME
+  origpubin        = {{urspr\"unglich ver\"offentlicht im Jahr}%
+    {urspr\adddot\ ver\"offtl\adddot}},% FIXME
   astitle          = {{als}{als}},% FIXME
   bypublisher      = {{von}{von}},% FIXME
   numbers = {{Nrn\adddot}{Nrn\adddot}},
   nodate = {{{}o\adddot Dat\adddot}{{}o\adddot Dat\adddot}},% ?
+  decade = {{er}{er}},
+  century = {{Jahrhundert}{Jh\adddot}},
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
@@ -410,7 +206,10 @@
   annotators       = {{Erl\"aut\adddot}{Erl\"aut\adddot}},
   review = {{Rezension}{Rezension}},
   reviewof = {{Rezension des}{Rezension des}},
+  commenton = {{Kommentar zu}{Kommentar zu}},
   reprint = {{Nachdruck}{Nachdr\adddot}},
+  printed = {{gedruckt}{gedruckt}},
+  selfpublished = {{selbst ver\"offentlicht}{selbst ver\"offtl\adddot}},
   shorthands = {{Sigel}{Sigel}},
   newseries = {{n.\,F\adddot}{n.\,F\adddot}},
   cbynone = {{}{}},
@@ -429,6 +228,8 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{choreograph\adddotspace von}%
+    {choreograph\adddotspace von}},
   cbyeditortr    = {{hrsg\adddot\addabbrvspace und \lbx@fromlang
       \"ubers\adddot}%
     {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}},
@@ -794,6 +595,10 @@
   paragraphs = {{Abs\adddot}{Abs\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  subsection = {{Abs\adddot}{Abs\adddot}},
+  subsections = {{Abs\adddot}{Abs\adddot}},
+  preface = {{Vorwort}{Vorw\adddot}},
+  note = {{Anmerkung}{Anm\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace Anmerkung\addnbspace}% ditto
@@ -805,6 +610,7 @@
   verses = {{V\adddot}{V\adddot}},
   number = {{Nr\adddot}{Nr\adddot}},
   chapter = {{Kap\adddot}{Kap\adddot}},
+  track = {{Track}{Track}},
   mathesis = {{Magisterarbeit}{Magisterarbeit}},
   phdthesis = {{Diss\adddot}{Diss\adddot}},
   techreport = {{Technischer Bericht}{Technischer Bericht}},
@@ -813,6 +619,7 @@
   byconductor = {{dirigiert von}{dir\adddot}},
   bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}},
   byproducer = {{produziert von}{prod\adddot}},
+  bychoreographer = {{choreographiert von}{choreograph\adddotspace von}},
   byeditorcp = {{herausgegeben und zusammengestellt von}%
     {hrsg\adddot\addabbrvspace und zusammengest\adddot}},
   byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und
@@ -1001,53 +808,4 @@
       vers\adddot\ von}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 fbc5d3781d0..0524c160d84 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-icelandic.lbx,v 0.16 2018/01/09 19:01:57 dfussner Exp $	
-
-\ProvidesFile{cms-icelandic.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-icelandic.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Baldur Kristinsson).
@@ -8,276 +6,140 @@
 % - Many bibstrings remain untranslated.
 % - Needs fine tuning, since declension of Icelandic nouns (names + titles)
 %   makes straight translations difficult in some cases.
-% - Last worked on: 2012-06-15
+% - Last worked on: 2019-11-07
 % - Date handling altered by dfussner, along with a few other small
-%   fixes.  I have added placeholders for 9 audio-visual strings, but
-%   need help from a native speaker to provide the actual strings.
-%   See "bydirector," "cbydirector," "byconductor," "cbyconductor,"
-%   "byproducer," "cbyproducer," "broadcast," "songrecorded,"
-%   "discrecorded," and "on."
+%   fixes. I have attempted to make the new decade, century, season,
+%   and dateuncertain code as grammatically correct as I can, but all
+%   fixes would be gratefully received. I have added guesses for many
+%   strings, but need help from a native speaker to provide better
+%   ones. See "bydirector," "cbydirector," "byconductor,"
+%   "cbyconductor," "byproducer," "cbyproducer," "broadcast,"
+%   "songrecorded," "discrecorded," "on," "selfpublished,"
+%   "commenton," "printed," "track," "choreographer,"
+%   "choreographers," "cbychoreographer," and "bychoreographer."
 
 \InheritBibliographyExtras{icelandic}
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Inngangur}%
+  \def\sectionname{Grein}%
+  \def\subsectionname{M\'alsgrein}%
+  \def\forewordname{Form\'ali}%
+  \def\notesname{Athugasemdir}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  %%% The following code attempts to take account of the grammatical
+  %%% complexity of season presentation in Icelandic. Corrections
+  %%% gratefully received.
+  \protected\def\mkbibseasondateshort#1#2{%
+    \begingroup
+    \let\cms@tempa\@empty
+    \blx@ifstrendswith{#2}{endseason}%
+    {\blx@stripfromendinto{#2}{endseason}\cms@datetype%
+      \def\cms@tempa{end}}%
+    {\blx@stripfromendinto{#2}{season}\cms@datetype}%
+    \ifboolexpr{%
+      test {\ifdateyearsequal{\csuse{cms@datetype}}%
+        {\csuse{cms@datetype}end}}%
+      and
+      not test {\iffieldsequal{\csuse{cms@datetype}season}%
+        {\csuse{cms@datetype}endseason}}%
+    }%
+    {\ifdefstring{\cms@tempa}{end}%
+      {\bibsstring{\thefield{#2}}}%
+      {\biblstring{\thefield{#2}}}}%
+    {\ifthenelse{\iffieldundef{\csuse{cms@datetype}year}\AND%
+        \iffieldundef{\csuse{cms@datetype}endyear}}%
+      {\biblstring{\thefield{#2}}}%
+      {\bibsstring{\thefield{#2}}}}\endgroup%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\mkbibseasondatelong#1#2{%
+    \begingroup
+    \let\cms@tempa\@empty
+    \blx@ifstrendswith{#2}{endseason}%
+    {\blx@stripfromendinto{#2}{endseason}\cms@datetype%
+      \def\cms@tempa{end}}%
+    {\blx@stripfromendinto{#2}{season}\cms@datetype}%
+    \ifboolexpr{%
+      test {\ifdateyearsequal{\csuse{cms@datetype}}%
+        {\csuse{cms@datetype}end}}%
+      and
+      not test {\iffieldsequal{\csuse{cms@datetype}season}%
+        {\csuse{cms@datetype}endseason}}%
+    }%
+    {\ifdefstring{\cms@tempa}{end}%
+      {\bibsstring{\thefield{#2}}}%
+      {\biblstring{\thefield{#2}}}}%
+    {\ifthenelse{\iffieldundef{\csuse{cms@datetype}year}\AND%
+        \iffieldundef{\csuse{cms@datetype}endyear}}%
+      {\biblstring{\thefield{#2}}}%
+      {\bibsstring{\thefield{#2}}}}\endgroup%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\cmsmkdecade#1#2{% A bulky presentation - the plain
+    \cms@tempcnta=\thefield{#2year}% year range may be better.
+    \cms@tempcntb=\cms@tempcnta%
+    \divide\cms@tempcnta100
+    \multiply\cms@tempcnta100
+    \advance\cms@tempcntb-\cms@tempcnta
+    \divide\cms@tempcnta100
+    \advance\cms@tempcnta\@ne
+    \divide\cms@tempcntb10
+    \advance\cms@tempcntb\@ne
+    \ifnumequal{\thefield{#2year}}{1}%
+    {}%
+    {\dateeraprintpre{#2year}}%
+    \mkbibordinal{\the\cms@tempcntb}%
+    \addspace%
+    \bibsstring{decade}%
+    \addspace%
+    \mkbibordinal{\the\cms@tempcnta}%
+    \addspace%
+    \biblstring{century}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
+  \protected\def\mkdaterangecompextra{%
+    \lbx@cms@mkyearrangeextra@is[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \lbx@cms@mkyearrangeextra@is[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \lbx@cms@mkyearrangeextra@is[1]}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \lbx@cms@mkbibrangetrunc@is{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \lbx@cms@mkbibrangetrunc@is{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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \lbx@cms@mkbibrangefull@is}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}
-\NewBibliographyString{patentissued}
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-% \NewBibliographyString{edbulgarian}
-% \NewBibliographyString{edcatalan}
-% \NewBibliographyString{edcroatian}
-% \NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-% \NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-% \NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-% \NewBibliographyString{edslovak}
-% \NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-% \NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {icelandic},
@@ -287,7 +149,7 @@
   partvolume = {{hl\adddot}{hl\adddot}},
   by = {{eftir}{eftir}},
   of = {{af}{af}},
-%  on = {{}{}},
+  on = {{\'a}{\'a}},
   compiler = {{ritstj\adddot}{ritstj\adddot}},% Same as editor
   compilers = {{ritstj\adddot}{ritstj\adddot}},
   transcompiler = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
@@ -310,14 +172,16 @@
   directors = {{leikstj\adddot}{leikstj\adddot}},
   none = {{}{}},
   nones = {{}{}},
-  producer = {{framleiandi}{framl\adddot}},
-  producers = {{framleiendur}{framl\adddot}},
+  producer = {{framl\adddot}{framl\adddot}},
+  producers = {{framl\adddot}{framl\adddot}},
   editor = {{ritstj\adddot}{ritstj\adddot}},
   editors = {{ritstj\adddot}{ritstj\adddot}},
+  choreographer = {{dansh\"of\adddot}{dansh\"of\adddot}},
+  choreographers = {{dansh\"of\adddot}{dansh\"of\adddot}},
   ibidem = {{sama heimild}{s\adddot h\adddot}},
   origpub = {{upphaflega birt sem}%
     {upph\adddot\ birt sem}},
-  origpublin = {{birtist upphaflega \'{\i}}%
+  origpubin = {{birtist upphaflega \'{\i}}%
     {birtist upph\adddot \'{\i}}},
   origpubyear = {{birtist upphaflega \'ari}%
     {birtist upph\adddot\ \'ari}},
@@ -329,11 +193,13 @@
     {\'utg\adddot\addcolon}},
   revisededition = {{endurskou \'utg\'afa}%
     {endursk\adddot \'utg\adddot}},
-%  broadcast = {{}{}},
-%  songrecorded = {{}{}},
-%  discrecorded = {{}{}},
+  broadcast = {{\'utvarps\th\'attur}{\'utvarps\th\'attur}},
+  songrecorded = {{skr\'a\dh}{skr\'a\dh}},
+  discrecorded = {{skr\'a\dh}{skr\'a\dh}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{\'an \'ars}{\'an \'ars}},
+  decade = {{\'aratugur}{\'aratugur}},
+  century = {{aldar}{\"oldin}},
   pseudonym = {{dulnefni}{dulnefni}},
   patentfiled = {{lagt fram til skr\'aningar}{lagt fram til skr\'aningar}},%
   patentissued = {{veitt}{veitt}},% ?
@@ -370,7 +236,10 @@
   annotators       = {{me sk\'yringum eftir}{me sk\'yringum eftir}},
   review = {{ritd\'omur}{ritd\'omur}},
   reviewof = {{ritd\'omur um}{ritd\'omur um}},
+  commenton = {{athugasemd\ \'a}{athugasemd\ \'a}},
   reprint = {{endurprentun}{endurpr\adddot}},
+  printed = {{prentu\dh}{prentu\dh}},
+  selfpublished = {{sj\'alfst\ae tt birt}{sj\'alfst\ae tt birt}},
   shorthands = {{skammstafanir}{skammstafanir}},
   newseries = {{n\'y ritr\"o}{n\adddot rr\adddot}},
   bynone = {{}{}},
@@ -385,9 +254,10 @@
     {\'y\adddot\addspace\lbx@sfromlang}},%
   cbycommentator    = {{sk\'yringar:}{sk\'yringar:}},
   cbyannotator      = {{sk\'yringar:}{sk\'yringar:}},
-%  cbyconductor      = {{}{}},
-%  cbydirector       = {{}{}},
-%  cbyproducer       = {{}{}},
+  cbyconductor      = {{stj\'orn\adddot}{stj\'orn\adddot}},
+  cbydirector       = {{leikst\adddot}{leikst\adddot}},
+  cbyproducer       = {{framl\adddot}{framl\adddot}},
+  cbychoreographer = {{dansverk af}{dansverk af}},
   cbyeditortr       = {{\'utg.~og \'y\adddot \lbx@lfromlang}%
                       {\'utg.~og \'y\adddot}},
   cbyeditorco       = {{\'utg.~og sk\'yringar:}%
@@ -475,6 +345,10 @@
   paragraphs = {{mgr\adddot}{mgr\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  preface = {{form\'ali}{form\'ali}},
+  note = {{athugasemd}{aths\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace athugasemd\addnbspace}% ditto
@@ -486,59 +360,298 @@
   verses = {{erindi}{er\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kafli}{k\adddot}},
-%  byconductor = {{}{}},
-%  bydirector = {{}{}},
-%  byproducer = {{}{}},
-  % A lot of keys already present in in icelandic.lbx omitted here
+  track = {{lag}{lag}},
+  circa = {{um \'arin}{um \'ari\dh}},% 2 cases of noun, these five
+  spring = {{vor}{vori\dh}},% Indefinite in long slot, for mkbibseason
+  summer = {{sumar}{sumari\dh}},% in NB style (?)
+  autumn = {{haust}{hausti\dh}},%
+  winter = {{vetur}{veturinn}},%
+  byconductor = {{stj\'orna\th\ af}{stj\'orn\adddot}},
+  bydirector = {{leikst\'yrt af}{leikst\adddot}},
+  byproducer = {{framleidd af}{framl\adddot}},
+  bychoreographer = {{dansverk af}{dansverk af}},
+  % A lot of keys already present in icelandic.lbx omitted here
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+\protected\gdef\lbx@cms@mkbibrangetrunc@is#1#2{% DATE FIX
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
+  {}%
   {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\if@cms@endbracket%
+          {\biblstring{circa}\printdelim{datecircadelim}}%
+          {\bibsstring{circa}\printdelim{datecircadelim}}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\iffieldsequal{#2month}{#2endmonth}%
+          {\csuse{mkbibdate#1}{}{}{#2day}}%
+          {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+            {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2endyear}%
+              \clearfield{#2endyear}}% Clear up inheritance problem ???
+            {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
+        {\cmsunspecified{#1}{#2}}}%
+      {\ifdateyearsequal{#2}{#2end}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+            \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+          {\csuse{mkbibseasondate#1}{}{#2season}}}%
+        {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+          \cmsdateeraprint{#2year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
       {}%
+      \iffieldundef{#2endyear}%
+      {\iffieldundef{#2endmonth}%
+        {\ifthenelse{\iffieldundef{#2endseason}\OR%
+            \iffieldsequal{#2season}{#2endseason}}%
+          {\ifbool{cms:bracket}%
+            {\bibclosebracket\global\boolfalse{cms:bracket}}%
+            {}}%
+          {\bibdaterangesep%
+            \csuse{mkbibseasondate#1}{}{#2endseason}}}%
+        {\bibdaterangesep%
+          \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
       {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdatedash%
+          \iffieldundef{#2endseason}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}%
+            {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}%
+          {\ifdateyearsequal{#2}{#2end}%
+            {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}%
+            {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
 
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+\protected\gdef\lbx@cms@mkbibrangefull@is#1#2{%
+  \begingroup
+  \blx@metadateinfo{#2}%
+  \clearfield{extradate}%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
+    \iffieldundef{#2season}}%
   {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
+  {\printtext[#2date]{%
+      \if@cms@bracket%
+      {\cms@datebrackets%
+        \if@cms@circa%
+        {\if@cms@endbracket%
+          {\biblstring{circa}\printdelim{datecircadelim}}%
+          {\bibsstring{circa}\printdelim{datecircadelim}}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \iffieldundef{#2season}%
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+        \ifboolexpr{%
+          test {\ifdateyearsequal{#2}{#2end}}%
+          and
+          test {\iffieldundef{#2month}}%
+          and
+          test {\iffieldundef{#2day}}%
+        }%
+        {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
+        {\cmsdateeraprint{#2year}}}%
+      {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+        \cmsdateeraprint{#2year}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {\bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#2endyear}%
+            {\bibdateuncertain}%
+            {}}%
+          {}}}%
       {}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
+        \AND\iffieldundef{#2endseason}}%
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}}%
       {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@datebrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%\bibdaterangesep%
+          \iffieldundef{#2endseason}%
+          {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+          {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#2endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#2endyear}}}%
+          {\enddateuncertainprint%
+            \cmsdateeraprint{#2endyear}}}}}}%
+  \endgroup}
+
+\protected\gdef\lbx@cms@mkyearrangeextra@is[#1]#2#3{%
+  \global\boolfalse{cms:extraparens}%
+  \begingroup
+  \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}%
+  \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}%
+  \blx@metadateinfo{#3}%
+  \iffieldundef{#3year}
+  {\blx@nounit}%
+  {\printtext{%
+      \if@cms@bracket%
+      {\cms@yearbrackets%
+        \if@cms@circa%
+        {\if@cms@endbracket%
+          {\biblstring{circa}\printdelim{datecircadelim}}%
+          {\bibsstring{circa}\printdelim{datecircadelim}}}%
+        {}}%
+      {\global\boolfalse{cms:bracket}}%
+      \ifdateyearsequal{#3}{#3end}%
+      {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3endyear}%
+        \clearfield{#3endyear}}%
+      {\ifblank{#1}%
+        {\cmsunspecified{#2}{#3}}%
+        {\csuse{mkbibdate#2}{#3year}{}{}\cmsdateeraprint{#3year}}}%
+      \if@cms@bracket%
+      {\if@cms@uncertain%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {\ifthenelse{\iffieldundef{#3endyear}\OR%
+              \iffieldequalstr{#3endyear}{}}%
+            {\global\booltrue{cms:extraparens}}%
+            {}%
+            \bibdateuncertain}}%
+        {\if@cms@enduncertain%
+          {\iffieldundef{#3endyear}%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}}%
+          {}}}%
+      {}%
+      \iffieldundef{#3endyear}
+      {\ifbool{cms:bracket}%
+        {\bibclosebracket\global\boolfalse{cms:bracket}}%
+        {}%
+        \cmsformatextra}%\usebibmacro{cmsextradate}%
+      {\iffieldequalstr{#3endyear}{}%
+        {\ifbool{cms:bracket}%
+          {\bibclosebracket\global\boolfalse{cms:bracket}}%
+          {}%
+          \cmsformatextra%\usebibmacro{cmsextradate}%
+          \mbox{\bibdaterangesep}}%
+        {\ifbool{cms:bracket}%
+          {\if@cms@circa%
+            {\if@cms@endbracket%
+              {\bibdaterangesep}%
+              {\bibclosebracket\global\boolfalse{cms:bracket}%
+                \bibdaterangesep}}%
+            {\if@cms@endcirca%
+              {\bibdaterangesep\bibsstring{circa}\printdelim{datecircadelim}}%
+              {\if@cms@enduncertain%
+                {\bibdaterangesep}%
+                {\bibclosebracket\global\boolfalse{cms:bracket}%
+                  \bibdaterangesep}}}}%
+          {\if@cms@endbracket%
+            {\bibdaterangesep%
+              \cms@yearbrackets%
+              \if@cms@endcirca%
+              {\if@cms@circa%
+                {}%
+                {\bibsstring{circa}\printdelim{datecircadelim}}}%
+              {}}%
+            {\bibdaterangesep}}%
+          \csuse{mkbibdate#2}{#3endyear}{}{}%
+          \ifbool{cms:bracket}%
+          {\if@cms@bracket%
+            {\cmsdateeraprint{#3endyear}%
+              \enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}}%
+            {\enddateuncertainprint%
+              \bibclosebracket\global\boolfalse{cms:bracket}%
+              \cmsdateeraprint{#3endyear}}}%
+          {\if@cms@enduncertain%
+            {\global\booltrue{cms:extraparens}%
+              \bibdateuncertain}%
+            {}%
+            \cmsdateeraprint{#3endyear}}%
+          \cmsformatendextra}}}}%
+  \endgroup}%
 
 \endinput
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 a9f7691e0d0..ac93c989b98 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-ngerman.lbx,v 0.9.5.36 2018/01/09 19:01:32 dfussner Exp $	
-
-\ProvidesFile{cms-ngerman.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -12,14 +10,18 @@
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
   \savecommand\lbx@fromlang%
   \savecommand\lbx@lfromlang%
   \savecommand\lbx@sfromlang%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
+  \def\introductionname{Einleitung}%
+  \def\sectionname{Paragraph}%
+  \def\subsectionname{Absatz}%
+  \def\forewordname{Vorwort}%
+  \def\notesname{Anmerkungen}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
@@ -39,258 +41,49 @@
       {}%
       {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}%
+  \protected\def\cmsmkdecade#1#2{%
+    \csuse{mkbibdate#1}{#2year}{}{}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{decade}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \protected\def\mkdaterangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \cms@mkbibrangetrunc{short}}%
   \protected\def\mkdaterangefull{%
-    \lbx@cms@mkbibrangefull}%
-  \protected\def\mkbibrangecomp{%  DATE FIX
-    \lbx@cms@mkbibrangetrunc{long}}%
-  \protected\def\mkbibrangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
-  \protected\def\mkbibrangefull{%
-    \lbx@cms@mkbibrangefull}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\lbx@fromlang%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangeterse%
   \restorecommand\mkdaterangefull%
-  \restorecommand\mkbibrangecomp%  DATE FIX
-  \restorecommand\mkbibrangeterse%
-  \restorecommand\mkbibrangefull}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}
-\NewBibliographyString{patentissued}
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {ngerman},
@@ -332,6 +125,8 @@
   producers = {{Prod\adddot}{Prod\adddot}},
   editor = {{Hrsg\adddot}{Hrsg\adddot}},
   editors = {{Hrsg\adddot}{Hrsg\adddot}},
+  choreographer = {{Choreograph}{Choreograph}},
+  choreographers = {{Choreografen}{Choreografen}},
   ibidem = {{ebd\adddot}{ebd\adddot}},
   origpub = {{urspr\"unglich ver\"offentlicht als}%
     {urspr\adddot\ ver\"offtl\adddot\ als}},
@@ -356,15 +151,16 @@
 % translationof    = {{}{}},% FIXME: missing
 % translationas    = {{}{}},% FIXME: missing
 % translationfrom  = {{}{}},% FIXME: missing
-% reviewof         = {{}{}},% FIXME: missing
   origpubas        = {{urspr\"unglich ver\"offentlicht als}%
     {urspr\adddot\ ver\"offtl\adddot\ als}},% FIXME
-  origpubin        = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}%
-    {urspr\adddot\ ver\"offtl\adddot\addspace}},% FIXME
+  origpubin        = {{urspr\"unglich ver\"offentlicht im Jahr}%
+    {urspr\adddot\ ver\"offtl\adddot}},% FIXME
   astitle          = {{als}{als}},% FIXME
   bypublisher      = {{von}{von}},% FIXME
   numbers = {{Nrn\adddot}{Nrn\adddot}},
   nodate = {{{}o\adddot Dat\adddot}{{}o\adddot Dat\adddot}},% ?
+  decade = {{er}{er}},
+  century = {{Jahrhundert}{Jh\adddot}},
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
@@ -410,7 +206,10 @@
   annotators       = {{Erl\"aut\adddot}{Erl\"aut\adddot}},
   review = {{Rezension}{Rezension}},
   reviewof = {{Rezension des}{Rezension des}},
+  commenton = {{Kommentar zu}{Kommentar zu}},
   reprint = {{Nachdruck}{Nachdr\adddot}},
+  printed = {{gedruckt}{gedruckt}},
+  selfpublished = {{selbst ver\"offentlicht}{selbst ver\"offtl\adddot}},
   shorthands = {{Sigel}{Sigel}},
   newseries = {{n.\,F\adddot}{n.\,F\adddot}},
   cbynone = {{}{}},
@@ -429,6 +228,8 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{choreograph\adddotspace von}%
+    {choreograph\adddotspace von}},
   cbyeditortr    = {{hrsg\adddot\addabbrvspace und \lbx@fromlang
       \"ubers\adddot}%
     {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}},
@@ -794,6 +595,10 @@
   paragraphs = {{Abs\adddot}{Abs\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  subsection = {{Abs\adddot}{Abs\adddot}},
+  subsections = {{Abs\adddot}{Abs\adddot}},
+  preface = {{Vorwort}{Vorw\adddot}},
+  note = {{Anmerkung}{Anm\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace Anmerkung\addnbspace}% ditto
@@ -805,6 +610,7 @@
   verses = {{V\adddot}{V\adddot}},
   number = {{Nr\adddot}{Nr\adddot}},
   chapter = {{Kap\adddot}{Kap\adddot}},
+  track = {{Track}{Track}},
   mathesis = {{Magisterarbeit}{Magisterarbeit}},
   phdthesis = {{Diss\adddot}{Diss\adddot}},
   techreport = {{Technischer Bericht}{Technischer Bericht}},
@@ -813,6 +619,7 @@
   byconductor = {{dirigiert von}{dir\adddot}},
   bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}},
   byproducer = {{produziert von}{prod\adddot}},
+  bychoreographer = {{choreographiert von}{choreograph\adddotspace von}},
   byeditorcp = {{herausgegeben und zusammengestellt von}%
     {hrsg\adddot\addabbrvspace und zusammengest\adddot}},
   byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und
@@ -1001,53 +808,4 @@
       vers\adddot\ von}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 63f6d319a84..2b53432fb5d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-norsk.lbx,v 1.11 2018/01/09 19:02:41 dfussner Exp $
-
-\ProvidesFile{cms-norsk.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-norsk.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -10,292 +8,59 @@
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Innledning}%
+  \def\sectionname{Avsnitt}%
+  \def\subsectionname{Avsnitt}%
+  \def\forewordname{Forord}%
+  \def\notesname{Noter}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\cmsmkdecade#1#2{%
+    \csuse{mkbibdate#1}{#2year}{}{}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{decade}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {norsk},
@@ -338,6 +103,8 @@
   producers = {{prod\adddot}{prod\adddot}},
   editor = {{red\adddot}{red\adddot}},
   editors = {{red\adddot}{red\adddot}},
+  choreographer = {{koreogr\adddot}{koreogr\adddot}},
+  choreographers = {{koreogr\adddot}{koreogr\adddot}},
   ibidem = {{sst\adddot}{sst\adddot}},
   origpub = {{opprinnelig utgitt som}%
     {oppr\adddot\ utg\adddot\ som}},
@@ -360,6 +127,8 @@
   discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
+  decade = {{-{\aa}rene}{-{\aa}rene}},
+  century = {{{\aa}rhundre}{{\aa}rhundre}},% Is there an abbreviation?
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{s{\o}kt}{s{\o}kt}},
   patentissued = {{meddelt}{meddelt}},
@@ -405,6 +174,9 @@
   annotators       = {{forkl\adddot}{forkl\adddot}},
   review = {{omtale}{omtale}},
   reviewof = {{omtale av}{omtale av}},
+  commenton = {{kommentar p\aa}{kommentar p\aa}},
+  printed = {{trykt}{trykt}},
+  selfpublished = {{selvpublisert}{selvpubl\adddot}},
   cbynone = {{}{}},
   cbyauthor = {{av}{av}},
   cbyeditor = {{red\adddot}{red\adddot}},
@@ -421,6 +193,7 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{regi}{regi}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{koreogr\adddotspace av}{koreogr\adddotspace av}},
   cbyeditortr    = {{red\adddot\space og
       overs\adddot\addspace\lbx@cfromlang}%
     {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}},
@@ -633,6 +406,10 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  subsection = {{avsn\adddot}{avsn\adddot}},
+  subsections = {{avsn\adddot}{avsn\adddot}},
+  preface = {{forord}{forord}},
+  note = {{note}{n\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
@@ -644,6 +421,7 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
+  track = {{sporet}{sporet}},
   cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
   cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
       brasiliansk-portugisisk av}},
@@ -676,6 +454,7 @@
   byconductor = {{dirigert av}{dir\adddot}},
   bydirector = {{regissert av}{regi}},
   byproducer = {{produsert av}{prod\adddot}},
+  bychoreographer = {{koreografert av}{koreogr\adddotspace av}},
   byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
   byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}%
     {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
@@ -785,53 +564,4 @@
     {komp\adddot\space og forkl\adddot, med etterord, av}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 caa5ce959c6..fd690c94bfe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-norwegian.lbx,v 1.11 2018/01/09 19:03:01 dfussner Exp $
-
-\ProvidesFile{cms-norwegian.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-norwegian.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -10,292 +8,59 @@
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Innledning}%
+  \def\sectionname{Avsnitt}%
+  \def\subsectionname{Avsnitt}%
+  \def\forewordname{Forord}%
+  \def\notesname{Noter}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\cmsmkdecade#1#2{%
+    \csuse{mkbibdate#1}{#2year}{}{}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{decade}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \dateeraprintpre{#1year}%
+    \csuse{mkcmscentury}{#1year}%
+    \addnbspace%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {norwegian},
@@ -338,6 +103,8 @@
   producers = {{prod\adddot}{prod\adddot}},
   editor = {{red\adddot}{red\adddot}},
   editors = {{red\adddot}{red\adddot}},
+  choreographer = {{koreogr\adddot}{koreogr\adddot}},
+  choreographers = {{koreogr\adddot}{koreogr\adddot}},
   ibidem = {{sst\adddot}{sst\adddot}},
   origpub = {{opprinnelig utgitt som}%
     {oppr\adddot\ utg\adddot\ som}},
@@ -360,6 +127,8 @@
   discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
+  decade = {{-{\aa}rene}{-{\aa}rene}},
+  century = {{{\aa}rhundre}{{\aa}rhundre}},% Is there an abbreviation?
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{s{\o}kt}{s{\o}kt}},
   patentissued = {{meddelt}{meddelt}},
@@ -405,6 +174,9 @@
   annotators       = {{forkl\adddot}{forkl\adddot}},
   review = {{omtale}{omtale}},
   reviewof = {{omtale av}{omtale av}},
+  commenton = {{kommentar p\aa}{kommentar p\aa}},
+  printed = {{trykt}{trykt}},
+  selfpublished = {{selvpublisert}{selvpubl\adddot}},
   cbynone = {{}{}},
   cbyauthor = {{av}{av}},
   cbyeditor = {{red\adddot}{red\adddot}},
@@ -421,6 +193,7 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{regi}{regi}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{koreogr\adddotspace av}{koreogr\adddotspace av}},
   cbyeditortr    = {{red\adddot\space og
       overs\adddot\addspace\lbx@cfromlang}%
     {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}},
@@ -633,6 +406,10 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  subsection = {{avsn\adddot}{avsn\adddot}},
+  subsections = {{avsn\adddot}{avsn\adddot}},
+  preface = {{forord}{forord}},
+  note = {{note}{n\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
@@ -644,6 +421,7 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
+  track = {{sporet}{sporet}},
   cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
   cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
       brasiliansk-portugisisk av}},
@@ -676,6 +454,7 @@
   byconductor = {{dirigert av}{dir\adddot}},
   bydirector = {{regissert av}{regi}},
   byproducer = {{produsert av}{prod\adddot}},
+  bychoreographer = {{koreografert av}{koreogr\adddotspace av}},
   byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
   byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}%
     {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
@@ -785,53 +564,4 @@
     {komp\adddot\space og forkl\adddot, med etterord, av}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 a529b84cd65..e5d451151b5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -1,6 +1,4 @@
-% $Id: cms-nynorsk.lbx,v 1.11 2018/01/09 19:03:19 dfussner Exp $
-
-\ProvidesFile{cms-nynorsk.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-nynorsk.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -10,292 +8,66 @@
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Innleiing}%
+  \def\sectionname{Avsnitt}%
+  \def\subsectionname{Avsnitt}%
+  \def\forewordname{F{\o}reord}%
+  \def\notesname{Notar}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\cmsmkdecade#1#2{%
+    \csuse{mkbibdate#1}{#2year}{}{}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{decade}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\dateeraprintpre{#1year}%
+      \csuse{mkcmscentury}{#1year}%
+      \addnbspace%
+      \biblstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\csuse{mkbibdatelong}{#1year}{}{}%
+      \setunit{}%\blx@nounit%
+      \bibsstring{century}%
+      \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\mkcmscentury#1{%
+    \cms@tempcnta=\numexpr\thefield{#1}/100+1%
+    \mkbibordinal{\the\cms@tempcnta}}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {nynorsk},
@@ -360,6 +132,8 @@
   discrecorded = {{spelt inn}{spelt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
+  decade = {{-{\aa}ra}{-{\aa}ra}},
+  century = {{hundre{\aa}ret}{-talet}},% Kludge for 1st c. / all others
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{s{\o}kt}{s{\o}kt}},
   patentissued = {{meldt}{meldt}},
@@ -405,6 +179,7 @@
   annotators       = {{forkl\adddot}{forkl\adddot}},
   review = {{omtale}{omtale}},
   reviewof = {{omtale av}{omtale av}},
+  selfpublished = {{selvpublisert}{selvpubl\adddot}},
   cbynone = {{}{}},
   cbyauthor = {{av}{av}},
   cbyeditor = {{red\adddot}{red\adddot}},
@@ -633,6 +408,10 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  subsection = {{avsn\adddot}{avsn\adddot}},
+  subsections = {{avsn\adddot}{avsn\adddot}},
+  preface = {{f{\o}reord}{f{\o}reord}},
+  note = {{note}{n\adddot}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
@@ -786,53 +565,4 @@
     {komp\adddot\space og forkl\adddot, med etterord, av}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
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 4927caf5aa8..87c3d962687 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
@@ -1,6 +1,4 @@
-% $Id$
-
-\ProvidesFile{cms-swedish.lbx}[2018/01/09 v 3.10 biblatex localization]
+\ProvidesFile{cms-swedish.lbx}[2020/04/20 v 3.14 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Stefan Bj\"{o}rk).
@@ -10,292 +8,64 @@
 
 \DeclareBibliographyExtras{%
   \savecommand\cms@datelong%
-  \savecommand\cms@datelongalt%
   \savecommand\mkdaterangecomp%
   \savecommand\mkdaterangeterse%
   \savecommand\mkdaterangefull%
-  \savecommand\mkbibrangecomp%
-  \savecommand\mkbibrangeterse%
-  \savecommand\mkbibrangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \def\introductionname{Inledning}%
+  \def\sectionname{Paragraf}%
+  \def\subsectionname{Paragraf}%
+  \def\forewordname{F\"orord}%
+  \def\notesname{Noter}%
   \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\cmsmkdecade#1#2{%
+    \cms@tempcnta=\thefield{#2year}%
+    \divide\cms@tempcnta100
+    \multiply\cms@tempcnta100
+    \ifnumequal{\cms@tempcnta}{\thefield{#2year}}% Disambiguation of -talet
+    {\csuse{mkbibdate#1}{#2year}{}{}\cmsdateeraprint{#2year}}%
+    {\ifnumequal{\thefield{#2year}}{1}%
+      {\printtext{00}}%
+      {\csuse{mkbibdate#1}{#2year}{}{}}%
+      \setunit{}%\blx@nounit%
+      \bibsstring{decade}%
+      \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+      \usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {\printtext{000}}%
+    {\csuse{mkbibdatelong}{#1year}{}{}}%
+    \setunit{}%\blx@nounit%
+    \bibsstring{century}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
   \protected\def\mkdaterangecomp{%
-    \lbx@cms@mkbibrangetrunc{long}}%
+    \cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
-    \lbx@cms@mkbibrangetrunc{short}}%
+    \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}%
-  \def\cms@datelong{\printorigdate}%
-  \def\cms@datelongalt{\printdate}}%
+    \cms@mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms@mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms@mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms@mkyearrangeextra[1]}%
+  \def\cms@datelong#1{\csname print#1date\endcsname}}%
 
 \UndeclareBibliographyExtras{%
   \restorecommand\cms@datelong%
-  \restorecommand\cms@datelongalt%
   \restorecommand\mkdaterangecomp%
   \restorecommand\mkdaterangefull%
   \restorecommand\mkdaterangeterse%
-  \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangefull%
-  \restorecommand\mkbibrangeterse}%
-
-\NewBibliographyString{bynone}
-\NewBibliographyString{bycompiler}
-\NewBibliographyString{byconductor}
-\NewBibliographyString{bydirector}
-\NewBibliographyString{byproducer}
-\NewBibliographyString{byeditorcp}
-\NewBibliographyString{byeditortrcp}
-\NewBibliographyString{byeditortrcpco}
-\NewBibliographyString{byeditortrcpan}
-\NewBibliographyString{byeditortrcpin}
-\NewBibliographyString{byeditortrcpfo}
-\NewBibliographyString{byeditortrcpaf}
-\NewBibliographyString{byeditortrcpcoin}
-\NewBibliographyString{byeditortrcpcofo}
-\NewBibliographyString{byeditortrcpcoaf}
-\NewBibliographyString{byeditortrcpanin}
-\NewBibliographyString{byeditortrcpanfo}
-\NewBibliographyString{byeditortrcpanaf}
-\NewBibliographyString{byeditorcpco}
-\NewBibliographyString{byeditorcpan}
-\NewBibliographyString{byeditorcpin}
-\NewBibliographyString{byeditorcpfo}
-\NewBibliographyString{byeditorcpaf}
-\NewBibliographyString{byeditorcpcoin}
-\NewBibliographyString{byeditorcpcofo}
-\NewBibliographyString{byeditorcpcoaf}
-\NewBibliographyString{byeditorcpanin}
-\NewBibliographyString{byeditorcpanfo}
-\NewBibliographyString{byeditorcpanaf}
-\NewBibliographyString{bytranslatorcp}
-\NewBibliographyString{bytranslatorcpco}
-\NewBibliographyString{bytranslatorcpan}
-\NewBibliographyString{bytranslatorcpin}
-\NewBibliographyString{bytranslatorcpfo}
-\NewBibliographyString{bytranslatorcpaf}
-\NewBibliographyString{bytranslatorcpcoin}
-\NewBibliographyString{bytranslatorcpcofo}
-\NewBibliographyString{bytranslatorcpcoaf}
-\NewBibliographyString{bytranslatorcpanin}
-\NewBibliographyString{bytranslatorcpanfo}
-\NewBibliographyString{bytranslatorcpanaf}
-\NewBibliographyString{bycompilerco}
-\NewBibliographyString{bycompileran}
-\NewBibliographyString{bycompilerin}
-\NewBibliographyString{bycompilerfo}
-\NewBibliographyString{bycompileraf}
-\NewBibliographyString{bycompilercoin}
-\NewBibliographyString{bycompilercofo}
-\NewBibliographyString{bycompilercoaf}
-\NewBibliographyString{bycompileranin}
-\NewBibliographyString{bycompileranfo}
-\NewBibliographyString{bycompileranaf}
-\NewBibliographyString{cbynone}
-\NewBibliographyString{cbyauthor}
-\NewBibliographyString{cbyeditor}
-\NewBibliographyString{cbytranslator}
-\NewBibliographyString{cbycompiler}
-\NewBibliographyString{cbyredactor}
-\NewBibliographyString{cbycommentator}
-\NewBibliographyString{cbyannotator}
-\NewBibliographyString{cbyfounder}
-\NewBibliographyString{cbycontinuator}
-\NewBibliographyString{cbycollaborator}
-\NewBibliographyString{cbyconductor}
-\NewBibliographyString{cbydirector}
-\NewBibliographyString{cbyproducer}
-\NewBibliographyString{cbyeditortr}
-\NewBibliographyString{cbyeditorcp}
-\NewBibliographyString{cbyeditorco}
-\NewBibliographyString{cbyeditoran}
-\NewBibliographyString{cbyeditorin}
-\NewBibliographyString{cbyeditorfo}
-\NewBibliographyString{cbyeditoraf}
-\NewBibliographyString{cbyeditortrcp}
-\NewBibliographyString{cbyeditortrco}
-\NewBibliographyString{cbyeditortran}
-\NewBibliographyString{cbyeditortrin}
-\NewBibliographyString{cbyeditortrfo}
-\NewBibliographyString{cbyeditortraf}
-\NewBibliographyString{cbyeditortrcpco}
-\NewBibliographyString{cbyeditortrcpan}
-\NewBibliographyString{cbyeditortrcpin}
-\NewBibliographyString{cbyeditortrcpfo}
-\NewBibliographyString{cbyeditortrcpaf}
-\NewBibliographyString{cbyeditorcoin}
-\NewBibliographyString{cbyeditorcofo}
-\NewBibliographyString{cbyeditorcoaf}
-\NewBibliographyString{cbyeditoranin}
-\NewBibliographyString{cbyeditoranfo}
-\NewBibliographyString{cbyeditoranaf}
-\NewBibliographyString{cbyeditortrcoin}
-\NewBibliographyString{cbyeditortrcofo}
-\NewBibliographyString{cbyeditortrcoaf}
-\NewBibliographyString{cbyeditortranin}
-\NewBibliographyString{cbyeditortranfo}
-\NewBibliographyString{cbyeditortranaf}
-\NewBibliographyString{cbyeditortrcpcoin}
-\NewBibliographyString{cbyeditortrcpcofo}
-\NewBibliographyString{cbyeditortrcpcoaf}
-\NewBibliographyString{cbyeditortrcpanin}
-\NewBibliographyString{cbyeditortrcpanfo}
-\NewBibliographyString{cbyeditortrcpanaf}
-\NewBibliographyString{cbyeditorcpco}
-\NewBibliographyString{cbyeditorcpan}
-\NewBibliographyString{cbyeditorcpin}
-\NewBibliographyString{cbyeditorcpfo}
-\NewBibliographyString{cbyeditorcpaf}
-\NewBibliographyString{cbyeditorcpcoin}
-\NewBibliographyString{cbyeditorcpcofo}
-\NewBibliographyString{cbyeditorcpcoaf}
-\NewBibliographyString{cbyeditorcpanin}
-\NewBibliographyString{cbyeditorcpanfo}
-\NewBibliographyString{cbyeditorcpanaf}
-\NewBibliographyString{cbytranslatorcp}
-\NewBibliographyString{cbytranslatorco}
-\NewBibliographyString{cbytranslatoran}
-\NewBibliographyString{cbytranslatorin}
-\NewBibliographyString{cbytranslatorfo}
-\NewBibliographyString{cbytranslatoraf}
-\NewBibliographyString{cbytranslatorcpco}
-\NewBibliographyString{cbytranslatorcpan}
-\NewBibliographyString{cbytranslatorcpin}
-\NewBibliographyString{cbytranslatorcpfo}
-\NewBibliographyString{cbytranslatorcpaf}
-\NewBibliographyString{cbytranslatorcoin}
-\NewBibliographyString{cbytranslatorcofo}
-\NewBibliographyString{cbytranslatorcoaf}
-\NewBibliographyString{cbytranslatoranin}
-\NewBibliographyString{cbytranslatoranfo}
-\NewBibliographyString{cbytranslatoranaf}
-\NewBibliographyString{cbytranslatorcpcoin}
-\NewBibliographyString{cbytranslatorcpcofo}
-\NewBibliographyString{cbytranslatorcpcoaf}
-\NewBibliographyString{cbytranslatorcpanin}
-\NewBibliographyString{cbytranslatorcpanfo}
-\NewBibliographyString{cbytranslatorcpanaf}
-\NewBibliographyString{cbycompilerco}
-\NewBibliographyString{cbycompileran}
-\NewBibliographyString{cbycompilerin}
-\NewBibliographyString{cbycompilerfo}
-\NewBibliographyString{cbycompileraf}
-\NewBibliographyString{cbycompilercoin}
-\NewBibliographyString{cbycompilercofo}
-\NewBibliographyString{cbycompilercoaf}
-\NewBibliographyString{cbycompileranin}
-\NewBibliographyString{cbycompileranfo}
-\NewBibliographyString{cbycompileranaf}
-\NewBibliographyString{cfromamerican}
-\NewBibliographyString{cfrombrazilian}
-\NewBibliographyString{cfrombulgarian}
-\NewBibliographyString{cfromcatalan}
-\NewBibliographyString{cfromcroatian}
-\NewBibliographyString{cfromczech}
-\NewBibliographyString{cfromdanish}
-\NewBibliographyString{cfromdutch}
-\NewBibliographyString{cfromenglish}
-\NewBibliographyString{cfromestonian}
-\NewBibliographyString{cfromfinnish}
-\NewBibliographyString{cfromfrench}
-\NewBibliographyString{cfromgalician}
-\NewBibliographyString{cfromgerman}
-\NewBibliographyString{cfromgreek}
-\NewBibliographyString{cfromitalian}
-\NewBibliographyString{cfromjapanese}
-\NewBibliographyString{cfromlatin}
-\NewBibliographyString{cfromnorwegian}
-\NewBibliographyString{cfrompolish}
-\NewBibliographyString{cfromportuguese}
-\NewBibliographyString{cfromrussian}
-\NewBibliographyString{cfromslovak}
-\NewBibliographyString{cfromslovene}
-\NewBibliographyString{cfromspanish}
-\NewBibliographyString{cfromswedish}
-\NewBibliographyString{cfromukrainian}
-\NewBibliographyString{partvolume}
-\NewBibliographyString{by}
-\NewBibliographyString{of}
-\NewBibliographyString{on}
-\NewBibliographyString{afterwordto}
-\NewBibliographyString{forewordto}
-\NewBibliographyString{introductionto}
-\NewBibliographyString{origpub}
-\NewBibliographyString{origpublin}
-\NewBibliographyString{origpubyear}
-\NewBibliographyString{origpubyearalt}
-\NewBibliographyString{origreleaseyear}
-\NewBibliographyString{origshownyear}
-\NewBibliographyString{origedition}
-\NewBibliographyString{revisededition}
-\NewBibliographyString{broadcast}
-\NewBibliographyString{songrecorded}
-\NewBibliographyString{discrecorded}
-\NewBibliographyString{numbers}
-\NewBibliographyString{nodate}
-\NewBibliographyString{pseudonym}
-\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
-\NewBibliographyString{patentissued}%
-\NewBibliographyString{inlang}
-\NewBibliographyString{edamerican}
-\NewBibliographyString{edbrazilian}
-\NewBibliographyString{edbulgarian}
-\NewBibliographyString{edcatalan}
-\NewBibliographyString{edcroatian}
-\NewBibliographyString{edczech}
-\NewBibliographyString{eddanish}
-\NewBibliographyString{eddutch}
-\NewBibliographyString{edenglish}
-\NewBibliographyString{edestonian}
-\NewBibliographyString{edfinnish}
-\NewBibliographyString{edfrench}
-\NewBibliographyString{edgalician}
-\NewBibliographyString{edgerman}
-\NewBibliographyString{edgreek}
-\NewBibliographyString{editalian}
-\NewBibliographyString{edjapanese}
-\NewBibliographyString{edlatin}
-\NewBibliographyString{ednorwegian}
-\NewBibliographyString{edpolish}
-\NewBibliographyString{edportuguese}
-\NewBibliographyString{edrussian}
-\NewBibliographyString{edslovak}
-\NewBibliographyString{edslovene}
-\NewBibliographyString{edspanish}
-\NewBibliographyString{edswedish}
-\NewBibliographyString{edukrainian}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{section}
-\NewBibliographyString{sections}
-\NewBibliographyString{canadasection}% For legal citations
-\NewBibliographyString{canadasections}% Ditto
-\NewBibliographyString{supranote}% Ditto
-\NewBibliographyString{hereinafter}% Ditto
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbis}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compilers}
-\NewBibliographyString{conductor}
-\NewBibliographyString{conductors}
-\NewBibliographyString{director}
-\NewBibliographyString{directors}
-\NewBibliographyString{none}
-\NewBibliographyString{nones}
-\NewBibliographyString{producer}
-\NewBibliographyString{producers}
-\NewBibliographyString{transcompiler}
-\NewBibliographyString{transcompilers}
-\NewBibliographyString{editortranscompiler}
-\NewBibliographyString{editorcompiler}
-\NewBibliographyString{editortranslator}
-\NewBibliographyString{editortranscompilers}
-\NewBibliographyString{editorcompilers}
-\NewBibliographyString{editortranslators}
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+}%
 
 \DeclareBibliographyStrings{%
   inherit = {swedish},
@@ -338,6 +108,8 @@
   producers = {{prod\adddot}{prod\adddot}},
   editor = {{red\adddot}{red\adddot}},
   editors = {{red\adddot}{red\adddot}},
+  choreographer = {{koreogr\adddot}{\koreogr\adddot}},
+  choreographers = {{koreogr\adddot}{koreogr\adddot}},
   ibidem = {{ibid\adddot}{ibid\adddot}},
   origpub = {{ursprungligen publicerad som}%
     {urspr\adddot\ pub\adddot\ som}},
@@ -360,6 +132,8 @@
   discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
+  decade = {{-talet}{-talet}},
+  century = {{-talet}{-talet}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{s{\o}kt}{s{\o}kt}},
   patentissued = {{meddelt}{meddelt}},
@@ -405,6 +179,9 @@
   annotators       = {{forkl\adddot}{forkl\adddot}},
   review = {{omtale}{omtale}},
   reviewof = {{omtale av}{omtale av}},
+  commenton = {{kommentar p{\aa}}{kommentar p{\aa}}},
+  printed = {{tryckt}{tryckt}},
+  selfpublished = {{sj\"alv publicerad}{sj\"alv publ\adddot}},
   cbynone = {{}{}},
   cbyauthor = {{av}{av}},
   cbyeditor = {{red\adddot}{red\adddot}},
@@ -421,6 +198,7 @@
   cbyconductor = {{dir\adddot}{dir\adddot}},
   cbydirector = {{regi}{regi}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{koreogr\adddotspace av}{koreogr\adddotspace av}},
   cbyeditortr    = {{red\adddot\space och
       \"{o}vers\adddot\addspace\lbx@cfromlang}%
     {red\adddot\space och \"{o}vers\adddot\addspace\lbx@cfromlang}},
@@ -627,12 +405,16 @@
   pages = {{s\adddot}{s\adddot}},
   column = {{sp\adddot}{sp\adddot}},
   columns = {{sp\adddot}{sp\adddot}},
-  line = {{l\adddot}{l\adddot}},
-  lines = {{l\adddot}{l\adddot}},
-  paragraph = {{avsn\adddot}{avsn\adddot}},
-  paragraphs = {{avsn\adddot}{avsn\adddot}},
-  section = {{avsn\adddot}{avsn\adddot}},
-  sections = {{avsn\adddot}{avsn\adddot}},
+  line = {{r\adddot}{r\adddot}},
+  lines = {{r\adddot}{r\adddot}},
+  paragraph = {{\S}{\S}},
+  paragraphs = {{\S}{\S}},
+  section = {{\S}{\S}},
+  sections = {{\S}{\S}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S}{\S}},
+  preface = {{f\"orord}{f\"orord}},
+  note = {{not}{not}},
   canadasection = {{s\adddot}{s\adddot}},% For legal citations
   canadasections = {{s\adddot}{s\adddot}},% ditto
   supranote = {{\mkbibemph{supra}\addspace not\addnbspace}% ditto
@@ -644,6 +426,12 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
+  track = {{sp{\aa}ret}{sp{\aa}ret}},
+  circa = {{cirka}{ca}},
+  spring = {{v{\aa}r}{v{\aa}r}},
+  summer = {{sommar}{sommar}},
+  autumn = {{h\"ost}{h\"ost}},
+  winter = {{vinter}{vinter}},
   cfromamerican     = {{fr{\aa}n engelska av}{fr{\aa}n engelska av}},
   cfrombrazilian    = {{fr{\aa}n portugisiska av}{fr{\aa}n
       portugisiska av}},
@@ -678,6 +466,7 @@
   byconductor = {{dirigerad av}{dir\adddot}},
   bydirector = {{regisserad av}{regi}},
   byproducer = {{producerad av}{prod\adddot}},
+  bychoreographer = {{koreograferad av}{koreogr\adddotspace av}},
   byeditorcp = {{redigerad och sammanst\"{a}lld av}{red\adddot\space och sam\adddot}},
   byeditortrcp = {{redigerad, \"{o}versatt \lbx@fromlang och sammanst\"{a}lld av}%
     {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst\adddot}},
@@ -787,53 +576,4 @@
     {sammanst\adddot\space och forkl\adddot, med efterord, av}},
 }
 
-\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
-  \iffieldundef{#2year}%
-  {\iffieldundef{#2month}%
-    {}%
-    {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
-        \iffieldundef{#2endyear}%
-        {\iffieldundef{#2endmonth}%
-          {}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}%
-        {\iffieldequalstr{#2endyear}{}%
-          {\mbox{\bibdatedash}}%
-          {\bibdatedash%
-            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
-  {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}%
-      {\iffieldsequal{#2month}{#2endmonth}%
-        {\csuse{mkbibdate#1}{}{}{#2day}}%
-        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-          {\csuse{mkbibdate#1}{#2year}{}{}%
-            \clearfield{#2endyear}}% Clear up inheritance problem ???
-          {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}%
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}%
-  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
-      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
-    {\clearfield{#2endyear}}% Clear up inheritance problem ???
-    {}%
-    \printtext[#2date]{%
-      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
-      {}%
-      {\iffieldequalstr{#2endyear}{}%
-        {\mbox{\bibdatedash}}%
-        {\bibdatedash%
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
index 5a7df2634a0..08cb5f61db7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
@@ -51,6 +51,9 @@
 \newcounter{Thesis}\setcounter{Thesis}{34}
 \newcounter{Unpublished}\setcounter{Unpublished}{35}
 \newcounter{Video}\setcounter{Video}{36}
+\newcounter{Performance}\setcounter{Performance}{37}
+\newcounter{Standard}\setcounter{Standard}{38}
+\newcounter{Dataset}\setcounter{Dataset}{39}
 
 %%% Here starts the adaptation of hyperendnotes.sty
 
@@ -223,7 +226,8 @@
   MVProceedings\or MVReference\or Online\or Patent\or Periodical\or
   Proceedings\or Reference\or Report\or Review\or SuppBook\or
   SuppCollection\or SuppPeriodical\or TechReport\or Thesis\or
-  Unpublished\or Video\else\@ctrerr\fi}
+  Unpublished\or Video\or Perfor\-mance\or Standard\or
+  Dataset\else\@ctrerr\fi}
 
 \renewcommand{\theendnote}{\cmssymbol{endnote}}
 
@@ -269,7 +273,7 @@
       \usedriver
       {\DeclareNameAlias{sortname}{default}\frenchspacing}
       {cite:\thefield{entrytype}}}}
-  {\iffieldequalstr{entrykey}{loc:leaders}%
+  {\iffieldequalstr{entrykey}{lac:leaders}%
     {\printtext{%
         \usedriver
         {\DeclareNameAlias{sortname}{default}\frenchspacing}
@@ -279,39 +283,39 @@
         {\DeclareNameAlias{sortname}{default}\frenchspacing}
         {cite:\thefield{entrytype}}}}}}%
 
-\renewbibmacro*{cite:short}{%
-  \ifthenelse{\ifnameundef{labelname}\OR%
-    \ifentrytype{inreference}\OR%
-    \ifentrytype{reference}\OR%
-    \ifentrytype{mvreference}}%
-  {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation
-    {\ifuseauthor%
-      {\printfield[journaltitle]{journaltitle}\isdot\newcunit}%
-      {}}%
-    {\ifentrytype{manual}%
-      {\printlist{organization}\isdot\newcunit}%
-      {}}}%
-  {\iffieldequalstr{authortype}{anon}%
-    {\bibleftbracket\printnames{labelname}%
-      \bibrightbracket\classicpunct}%
-    {\iffieldequalstr{authortype}{anon?}%
-      {\bibleftbracket\printnames{labelname}?%
-        \bibrightbracket\classicpunct}%
-      {\printnames{labelname}%\usebibmacro{choose+labelname}%
-        \isdot\classicpunct}}}%
-  \ifboolexpr{(%
-    test {\ifbibliography}%
-    or
-    test {\ifnumgreater{\the\value{refsection}}{3}}%
-    )
-    and
-    not test {\ifnumequal{\the\value{refsection}}{8}}%
-  }%
-  {\printtext[bibhyperref]{%
-    \printfield[citetitle]{labeltitle}}}%
-  {\printtext[cmsbiblink]{%
-    \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
+\ifdef{\cmshyper}%
+{\renewrobustcmd*{\cmshyper}[1]{%
+    \ifboolexpr{%
+      (
+      test {\ifbibliography}%
+      or
+      test {\ifnumgreater{\the\value{refsection}}{3}}%
+      )
+      and
+      not test {\ifnumequal{\the\value{refsection}}{8}}%
+    }%
+    {\printtext[bibhyperref]{#1}}%
+    {\printtext[cmsbiblink]{#1}}}}%
+{}%
 
+\ifdef{\cmsrelhyper}%
+{\renewrobustcmd*{\cmsrelhyper}[1]{%
+    \ifhyperref%
+    {\ifbibliography%
+      {\ifentryinbib{\strfield{clonesourcekey}}%
+        {\bibhyperref[\strfield{clonesourcekey}]{#1}}%
+        {#1}}%
+      {\iftoggle{cms@allshort}%
+        {\IfSubStr{\thefield{savedoptions}}{skipbib}%
+          {\bibhyperref[\strfield{clonesourcekey}]{#1}}%%
+          {\bibhyperref[\thefield{savedentrykey}]{#1}}}%
+        {\iftoggle{cms@fullnote}%
+          {\ifentryseen{\thefield{clonesourcekey}}%
+            {\bibhyperref[\strfield{clonesourcekey}]{#1}}%
+            {#1}}%
+          {\bibhyperref[\thefield{savedentrykey}]{#1}}}}}%
+    {#1}}}%
+{}%
 
 \renewbibmacro*{cite:journal}{%
   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -382,3 +386,7 @@
       \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}
 \newrobustcmd*{\cmspagref}[1]{\marginpar{\href{\@baseurl%
       page.\getpagerefnumber{#1}}{p.~\getpagerefnumber{#1}}}}
+\newrobustcmd*{\cmstabref}[2][]{\marginpar{\href{\@baseurl%
+      \getrefbykeydefault{#2}{anchor}{}}%
+    {\footnotesize Table\,\getrefnumber{#2}}%
+      \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty
new file mode 100644
index 00000000000..5f6d430831b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty
@@ -0,0 +1,560 @@
+% Copyright (c) 2003 John Lavagnino
+%               2003 Ulrich Dirr
+%               2020 David Fussner
+%
+% This package is currently maintained by David Fussner.
+%
+% 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 version.  The latest
+% version of this license is in http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.  This software is provided as is,
+% without warranty of any kind, either expressed or implied,
+% including, but not limited to, the implied warranties of
+% merchantability and fitness for a particular purpose.
+
+% This package is ultimately based on John Lavagnino's "endnotes"
+% package, and also on Ulrich Dirr's code, from comp.text.tex, adding
+% hyperref support to Lavagnino's package.  Dirr's code has never, to
+% my knowledge, been released as a separate package.  My own
+% contribution is to allow users easily to split the endnotes by part,
+% chapter, section, or subsection when they are printed all at once at
+% the end of a document, which is the arrangement the Chicago Manual
+% envisages for books by a single author.  This arrangement was
+% possible before by using the \addtoendnotes command in your
+% document, but this was tricky to automate, hence the following.
+
+% Please see biblatex-chicago.pdf for details of how to use this
+% package.
+
+\ProvidesPackage{cmsendnotes}[2020/04/20 v 3.14 biblatex auxiliary package]
+
+\RequirePackage{kvoptions}
+\RequirePackage{endnotes}
+\RequirePackage{etoolbox}
+\RequirePackage{nameref}
+
+\SetupKeyvalOptions{%
+  family=cms@end,
+  prefix=cms@end@}%
+
+\DeclareStringOption{split}[chapter]
+
+\DeclareStringOption{headername}% 2
+
+\DeclareStringOption{subheadername}% 3
+
+\DeclareStringOption{runningname}% 4
+
+% \DeclareStringOption{introname}[\prefacename] (#5) now provided by
+% biblatex-chicago's noterefintro option
+
+%%% For general hyperref functionality
+
+\DeclareBoolOption[true]{hyper}%
+
+%%% Dirr's \ifenotelinks, "for back-links in the endnote section"
+
+\DeclareBoolOption[true]{enotelinks}%
+
+%%% In case users want to roll their own using \addtoendnotes or
+%%% separate sectioning commands
+
+\DeclareBoolOption{noheader}%
+
+%%% Stops the printing of the subhead when using split endnotes
+
+\DeclareBoolOption{nosubheader}%
+
+%%% Provides flush-left block formatting for endnote text, instead of
+%%% usual first-line indent
+
+\DeclareBoolOption{blocknotes}%
+
+%%% For attempting more elegantly to hide the zeros in section numbers
+
+%% \DeclareBoolOption{hidezeros}% Moved to cbx.
+
+\ProcessKeyvalOptions*
+
+%%% Dirr's hyperendnotes.sty, with CMS extensions, starts here
+
+\providetoggle{cms@entheader}
+\newcounter{Hendnote}
+\newcounter{cms@enttotal}
+\newcounter{cms@entprinted}
+
+%%%   Hyperendnotes redefines portions of the endnotes package, now
+%%%   further redefined for CMS
+
+%% The absence of a Roman zero messes with .ent file creation and
+%% printing, so we reluctantly redefine \thepart here
+
+\renewcommand{\thepart}{%
+  \ifnumequal{\csuse{c@part}}{0}%
+  {\@arabic{\c@part}}%
+  {\@Roman{\c@part}}}
+
+\let\cms@entlist\@empty
+
+% This allows splitting by "part" to work, suboptimally, with babel's
+% French option
+
+\ifdef{\ifFBPartNameFull}{\FBPartNameFullfalse}{}%
+
+%% This creates as many .ent files as there are different relevant
+%% sections, the relevant section being that given by the "split"
+%% option.  It uses biblatex commands to patch the relevant section
+%% commands when they appear in the document.  In the absence of the
+%% "split" option, it reverts to standard endnotes package .ent file
+%% handling.
+
+\ifx\cms@end@split\@empty
+\def\@openenotes{%
+  \immediate\openout\@enotes=\jobname.ent\relax
+  \global\@enotesopentrue}%
+\else
+\AtEndPreamble{%
+  \ifdefstring{\cms@end@split}{section}%
+  {\blx@refpatch@sect{section}{\cms@closechap}{1}%
+    \ifundef\chapter
+    {}%
+    {\blx@refpatch@chapter\cms@closechap}}%
+  {\ifdefstring{\cms@end@split}{subsection}%
+    {\blx@refpatch@sect{subsection}{\cms@closechap}{1}%
+      \ifundef\chapter
+      {}%
+      {\blx@refpatch@chapter\cms@closechap}}%
+    {\ifboolexpr{%
+        test {\ifdefstring{\cms@end@split}{chapter}}%
+        or
+        test {\ifdefstring{\cms@end@split}{part}}%
+      }%
+      {\csuse{blx@refpatch@\cms@end@split}\cms@closechap}%
+      {}}}}%
+\def\@openenotes{%
+  \stepcounter{cms@enttotal}%
+  \listxadd\cms@entlist{\csuse{the\cms@end@split}}%
+  \immediate\openout\@enotes=\jobname\csuse{the\cms@end@split}.ent\relax
+  \global\@enotesopentrue}%
+\fi
+
+\def\cms@closechap{%
+  \immediate\closeout\@enotes
+  \global\@enotesopenfalse}
+
+\long\def\addtoendnotes#1{%
+  \if@enotesopen \else \@openenotes \fi
+  \begingroup
+  \newlinechar='40
+  \let\protect\string
+  \immediate\write\@enotes{#1}%
+  \endgroup}
+
+\let\savedhref\href
+\let\savedurl\url
+
+\def\endnotemark{%
+  \@ifnextchar[%]
+  \@xendnotemark{%
+    \stepcounter{endnote}%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@endnote}%
+    \@endnotemark}}%
+
+\def\@xendnotemark[#1]{%
+  \begingroup\c@endnote#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@endnote}%
+  \endgroup
+  \@endnotemark}%
+
+\def\endnotetext{%
+  \@ifnextchar[%]
+  \@xendnotenext{%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@endnote}%
+    \@endnotetext}}%
+
+\def\@xendnotenext[#1]{%
+  \begingroup
+  \c@endnote=#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@endnote}%
+  \endgroup
+  \@endnotetext}%
+
+\def\endnote{%
+  \@ifnextchar[%]
+  \@xendnote{%
+    \stepcounter{endnote}%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@endnote}%
+    \@endnotemark\@endnotetext}}%
+
+\def\@xendnote[#1]{%
+  \begingroup
+  \c@endnote=#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@endnote}%
+  \show\@theenvalue
+  \endgroup
+  \@endnotemark\@endnotetext}%
+
+%% This macro is part of the core of the endnotes and hyperendnotes
+%% code, with cmsendnotes booleans to control when the hyper
+%% extensions are used.
+
+\def\@endnotemark{%
+  \leavevmode
+  \ifhmode
+  \edef\@x@sf{\the\spacefactor}\nobreak
+  \fi
+  \ifcms@end@hyper
+  \ifcms@end@enotelinks
+  \expandafter\@firstofone
+  \else
+  \expandafter\@gobble
+  \fi
+  {%
+    \Hy@raisedlink{%
+      \hyper@@anchor{Hendnotepage.\@theenvalue}{\empty}%
+    }%
+  }%
+  \hyper@linkstart{link}{Hendnote.\@theenvalue}%
+  \makeenmark
+  \hyper@linkend
+  \else
+  \makeenmark
+  \fi
+  \ifhmode
+  \spacefactor\@x@sf
+  \fi
+  \relax}%
+
+\long\def\@endnotetext#1{%
+  \if@enotesopen
+  \else
+  \@openenotes
+  \fi
+  \immediate\write\@enotes{%
+    \@doanenote{\@theenmark}{\@theenvalue}%
+  }%
+  \begingroup
+  \def\next{#1}%
+  \newlinechar='40
+  \immediate\write\@enotes{\meaning\next}%
+  \endgroup
+  \immediate\write\@enotes{%
+    \@endanenote}}%
+
+%%   This new command prints each .ent file separately, with
+%%   configurable headings.  With an optional argument, it prints only
+%%   that particular .ent file, again with configurable heading.  If
+%%   the "split" option isn't set, it reverts to the standard endnotes
+%%   package command \theendnotes.  The starred version prints no
+%%   headings at all, just the notes.
+
+\newrobustcmd*{\theendnotesbypart}{\@ifstar\@theendnotesbypart%
+  \@@theendnotesbypart}%
+
+\newcommand*{\@@theendnotesbypart}[1][]{%
+  \ifcsvoid{cms@end@split}%
+  {\theendnotes}%
+  {\ifblank{#1}%
+    {\def\do##1{%
+        \IfFileExists{\jobname##1.ent}%
+        {\theendnotesbypart@i[##1]%
+          \stepcounter{cms@entprinted}}%
+        {}}%
+      \dolistcsloop{cms@entlist}}%
+    {\toggletrue{cms@entheader}%
+      \theendnotesbypart@i[#1]%
+      \togglefalse{cms@entheader}}}}%
+
+\newcommand*{\@theendnotesbypart}[1][]{%
+  \cms@end@noheadertrue
+  \ifcsvoid{cms@end@split}%
+  {\theendnotes}%
+  {\ifblank{#1}%
+    {\def\do##1{%
+        \IfFileExists{\jobname##1.ent}%
+        {\theendnotesbypart@i[##1]%
+          \stepcounter{cms@entprinted}}%
+        {}}%
+      \dolistcsloop{cms@entlist}}%
+    {\toggletrue{cms@entheader}%
+      \cms@end@nosubheadertrue%
+      \theendnotesbypart@i[#1]%
+      \togglefalse{cms@entheader}%
+      \cms@end@nosubheaderfalse}}\cms@end@noheaderfalse}%
+
+\def\theendnotesbypart@i[#1]{%
+  \ifx\cms@end@headername\@empty
+  \def\cms@end@headername{\notesname}\fi
+  \theendnotesbypart@ii[#1]{\cms@end@headername}}%
+
+\def\cms@choose@subhead{%
+  \ifcsname \cms@end@split name\endcsname%
+  \csuse{\csuse{cms@end@split}name}%
+  \else
+  \cms@end@split%
+  \fi}
+
+\def\cms@localize@subhead{%
+  \ifcsname \cms@end@subheadername name\endcsname%
+  \csuse{\csuse{cms@end@subheadername}name}%
+  \else
+  \cms@end@subheadername%
+  \fi}
+
+\def\theendnotesbypart@ii[#1]#2{%
+  \ifx\cms@end@subheadername\@empty
+  \theendnotesbypart@iii[#1]#2{\cms@choose@subhead}%
+  \else
+  \theendnotesbypart@iii[#1]#2{\cms@localize@subhead}%
+  \fi}
+
+\def\theendnotesbypart@iii[#1]#2#3{%
+  \ifx\cms@end@runningname\@empty
+  \def\cms@end@runningname{Notes to}\fi
+  \theendnotesbypart@iv[#1]#2#3{\cms@end@runningname}}%
+
+\def\cms@localize@introname{%
+  \ifcsname \cms@note@introname name\endcsname%
+  \csuse{\csuse{cms@note@introname}name}%
+  \else
+  \cms@note@introname%
+  \fi}
+
+\def\theendnotesbypart@iv[#1]#2#3#4{%
+  \ifdefvoid{\cms@note@introname}%
+  {\theendnotesbypart@v[#1]#2#3#4[]}%
+  {\theendnotesbypart@v[#1]#2#3#4[\cms@localize@introname]}}%
+
+%%% [sec. no.]{gen. title}{sec. title}{#2 + prepos.}[intro. name]
+
+\def\theendnotesbypart@v[#1]#2#3#4[#5]{%
+  \immediate\closeout\@enotes
+  \global\@enotesopenfalse
+  \begingroup
+  \makeatletter
+  \edef\@tempa{`\string>}%
+  \ifnum\catcode\@tempa=12
+  \let\@ResetGT\relax
+  \else
+  \edef\@ResetGT{\noexpand\catcode\@tempa=\the\catcode\@tempa}%
+  \@makeother\>%
+  \fi
+  \def\@doanenote##1##2##3>{%
+    \def\@theenmark{##1}%
+    \def\@theenvalue{##2}%
+    \par
+    \enoteskip% Configurable vertical gap between endnotes
+    \begingroup
+    \def\href{\expandafter\savedhref}%
+    \def\url{\expandafter\savedurl}%
+    \@ResetGT
+    \edef\@currentlabel{\csname p@endnote\endcsname\@theenmark}%
+    \toggletrue{blx@footnote}\toggletrue{cms@endnote}%
+    \enoteformat
+  }%
+  \def\@endanenote{%
+    \par\endgroup
+  }%
+  % Redefine, how numbers are formatted in the endnotes-section:
+  \renewcommand*\@makeenmark{%
+    \hbox{\normalfont\@theenmark.~}%
+  }%
+  % header(s) of endnote section(s)
+  \def\enoteheader{\section*{\MakeCapital{#2}}}%
+  \def\enotesubheader{%
+    \subsection*{\MakeCapital{#3}\ \zero@sect{#1}}%
+      \@mkboth{\MakeUppercase{#4\ #3}\ \zero@sect{#1}}%
+      {\MakeUppercase{#4\ #3}\ \zero@sect{#1}}%
+    \mbox{}\par\vskip-\baselineskip}%
+  \def\enotepartheader{%
+    \subsection*{\MakeCapital{#3}\ \zero@sect{#1}}%
+      \@mkboth{\MakeUppercase{#4\ #3}\ \zero@sect{#1}}%
+      {\MakeUppercase{#4\ #3}\ \zero@sect{#1}}%
+    \mbox{}\par\vskip-\baselineskip}%
+  \def\intropartheader{%
+    \subsection*{\MakeCapital{#5},\ \zeri@intro{#1}}%
+      \@mkboth{\MakeUppercase{#4\ #5}\ \zeri@intro{#1}}%
+      {\MakeUppercase{#4\ #5}\ \zeri@intro{#1}}%
+    \mbox{}\par\vskip-\baselineskip}%
+  \def\introsubheader{%
+    \subsection*{\MakeCapital{#5}}%
+      \@mkboth{\MakeUppercase{#4\ #5}}%
+      {\MakeUppercase{#4\ #5}}%
+    \mbox{}\par\vskip-\baselineskip}%
+  % Tests for which header(s), if any, to print
+  \ifcms@end@noheader
+  \let\enoteheader\relax\fi
+  \ifcms@end@nosubheader
+  \ifcms@end@noheader
+  \else
+  \iftoggle{cms@entheader}%
+  {}%
+  {\ifnumgreater{\value{cms@entprinted}}{0}%
+    {}%
+    {\enoteheader\mbox{}\par\vskip-\baselineskip}}\fi%
+  \else
+  \ifboolexpr{%
+    test {\ifblank{#5}}%
+    or
+    not test {\IfBeginWith{#1}{0}}%
+  }%
+  {\iftoggle{cms@entheader}%
+    {\enotepartheader}%
+    {\ifnumgreater{\value{cms@entprinted}}{0}%
+      {\enotesubheader}%
+      {\enoteheader\enotesubheader}}}%
+  {\ifboolexpr{%
+      test {\IfBeginWith{#1}{0.}}%
+      or
+      test {\IfBeginWith{#1}{0,}}%
+    }%
+    {\IfInteger{#1}
+      {\iftoggle{cms@entheader}%
+        {\introsubheader}%
+        {\ifnumgreater{\value{cms@entprinted}}{0}%
+          {\introsubheader}%
+          {\enoteheader\introsubheader}}}%
+      {\StrGobbleLeft{\@xs@afterinteger}{1}[\temp@r]%
+        \IfEq{\temp@r}{0}%
+        {\iftoggle{cms@entheader}%
+          {\introsubheader}%
+          {\ifnumgreater{\value{cms@entprinted}}{0}%
+            {\introsubheader}%
+            {\enoteheader\introsubheader}}}%
+        {\iftoggle{cms@entheader}%
+          {\intropartheader}%
+          {\ifnumgreater{\value{cms@entprinted}}{0}%
+            {\intropartheader}%
+            {\enoteheader\intropartheader}}}}}%
+    {\iftoggle{cms@entheader}%
+      {\introsubheader}%
+      {\ifnumgreater{\value{cms@entprinted}}{0}%
+        {\introsubheader}%
+        {\enoteheader\introsubheader}}}}\fi%
+  % font-size of endnotes -- by default set to \small
+  \enotesize
+  \input{\jobname#1.ent}%\cms@input@ent%
+  \endgroup}%
+
+%% An inelegant kludge attempting to remove zeros from section numbers
+%% while retaining minimal descriptive accuracy
+
+%\newrobustcmd*{\cmspref}{\emph{pref}}% Moved to .cbx file
+
+\newrobustcmd*{\zero@sect}[1]{%
+  \IfBeginWith{#1}{0}%
+  {#1}%
+  {\iftoggle{cms@hidezeros}
+    {\StrSubstitute{#1}{.0.0}{.1\ (\cmspref)}[\temp@a]%
+      \StrSubstitute{\temp@a}{,0,0}{,1\ (\cmspref)}[\temp@a]%
+      \StrSubstitute{\temp@a}{.0.}{.\cmspref.}[\temp@a]%
+      \StrSubstitute{\temp@a}{,0,}{,\cmspref,}[\temp@a]%
+      \StrSubstitute{\temp@a}{.0}{.1\ (\cmspref)}[\temp@a]%
+      \StrSubstitute{\temp@a}{,0}{,1\ (\cmspref)}}%
+    {#1}}}%
+
+\newrobustcmd*{\zeri@intro}[1]{%
+  \cmsintrosection\ \StrGobbleLeft{#1}{2}}%
+
+\def\enoteheading{\section*{\notesname}
+  \@mkboth{\MakeUppercase{\notesname}}%
+  {\MakeUppercase{\notesname}}%
+  \mbox{}\par\vskip-\baselineskip}
+
+\def\theendnotes{%
+  \immediate\closeout\@enotes
+  \global\@enotesopenfalse
+  \begingroup
+  \makeatletter
+  \edef\@tempa{`\string>}%
+  \ifnum\catcode\@tempa=12
+  \let\@ResetGT\relax
+  \else
+  \edef\@ResetGT{\noexpand\catcode\@tempa=\the\catcode\@tempa}%
+  \@makeother\>%
+  \fi
+  \def\@doanenote##1##2##3>{%
+    \def\@theenmark{##1}%
+    \def\@theenvalue{##2}%
+    \par
+    \enoteskip% Configurable vertical gap between endnotes
+    \begingroup
+    \def\href{\expandafter\savedhref}%
+    \def\url{\expandafter\savedurl}%
+    \@ResetGT
+    \edef\@currentlabel{\csname p@endnote\endcsname\@theenmark}%
+    \enoteformat
+  }%
+  \def\@endanenote{%
+    \par\endgroup
+  }%
+  % Redefine, how numbers are formatted in the endnotes-section:
+  \renewcommand*\@makeenmark{%
+    \hbox{\normalfont\@theenmark.~}%
+  }%
+  % header of endnotes-section, defined by endnotes.sty, with CMS
+  % option not to print it at all
+  \ifcms@end@noheader
+  \else
+  \enoteheading
+  \fi
+  % font-size of endnotes
+  \enotesize
+  \input{\jobname.ent}%\cms@input@ent%
+  \endgroup}%
+
+%% The second core part of the hyperendnotes code, again with CMS
+%% booleans to control when the hyperref functionality is switched on
+
+\def\enoteformat{%
+  \ifcms@end@blocknotes
+  \rightskip\z@
+  \leftskip1.8em
+  \parindent\z@
+  \else
+  \rightskip\z@
+  \leftskip\z@
+  \parindent1.8em
+  \fi
+  \leavevmode\llap{%
+    \setcounter{Hendnote}{\@theenvalue}%
+    \addtocounter{Hendnote}{-1}%
+    \refstepcounter{Hendnote}%
+    \ifcms@end@hyper
+    \ifcms@end@enotelinks
+    \expandafter\@secondoftwo
+    \else
+    \expandafter\@firstoftwo
+    \fi
+    {\@firstofone}%
+    {\hyperlink{Hendnotepage.\@theenvalue}}%
+    {\makeenmark}%
+    \else
+    \makeenmark
+    \fi}}%
+
+%%% Here the hyperendnotes code stops redefining portions of
+%%% the endnotes package
+
+%%% This sets the CMS default, which is to turn on both the general
+%%% hyperref functionality and the back-links from the endnotes
+%%% section to the main text, assuming that the hyperref package is
+%%% loaded.  If it isn't, we don't.  Also, set defaults for two
+%%% formatting macros.
+
+\AtEndPreamble{%
+  \@ifpackageloaded{hyperref}%
+  {}{\cms@end@hyperfalse}}%
+
+\def\enotesize{\small}
+\let\enoteskip\relax
+
+\endinput