biblatex-chicago (7jun16)

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

37 files changed, 14941 insertions, 9962 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 1f84671004c..b24a8fbfede 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,65 +1,59 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-works well with the latest version (3.4) of biblatex, but has been
-most thoroughly tested against 2.9a, so it may be worth trying that
-version in case you run into issues I haven't seen.  The package
-contains both the 15th- and 16th-edition Chicago style files, though I
-have marked the 15th-edition styles as "strongly deprecated" and am
-concentrating all of my development time on the 16th edition.  If you
-have used the package before, then you should be sure to consult the
-RELEASE file to find out what alterations you may need to make to your
-.bib files and document preambles to bring them up to date.  Most
-particularly please note that Biber is now required for the
-author-date styles, and very strongly advised for the notes &
-bibliography style (version 2.5 is designed for use with the latest
-biblatex).
+is designed for use with the latest version (3.4) of biblatex.  The
+package still contains both the 15th- and 16th-edition Chicago style
+files, though I have marked the 15th-edition styles as "obsolete" and
+have moved them into a separate subdirectory, and I am concentrating
+all of my development time on the 16th edition.  If you have used the
+package before, then you should be sure to consult the RELEASE file to
+find out what alterations you may need to make to your .bib files and
+document preambles to bring them up to date.  Most particularly please
+note that Biber is now required for the author-date styles, and very
+strongly advised for the notes & bibliography style (version 2.5 is
+designed for use with the latest biblatex).
 
-README (version 0.9.9i, 2016-05-16):
+README (version 1.0rc1, 2016-06-07):
 
-Biblatex-chicago contains five biblatex styles implementing the
-specifications of the Chicago Manual of Style in both its 15th and
-16th editions.  The "notes & bibliography" style was formerly
-available in the package biblatex-chicago-notes-df, and is intended
-primarily for writers in the humanities.  I would encourage all users
-of the 15th edition style to upgrade to the 16th: it contains many new
-features, and the changes involved, being largely incremental,
-generally won't require major alterations to your .bib files.  The
-"author-date" style, generally favored by writers in the sciences and
-social sciences, presents a somewhat different case.  The 16th edition
-of the Manual has brought the presentation of sources in this style
-much more into line with the notes & bibliography specification,
+Biblatex-chicago contains three biblatex styles implementing the
+specifications of the Chicago Manual of Style, 16th 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 new, traditional author-date style ("authordate-trad"), which
-provides these features while in all other respects following the
-16th-edition specifications.  I encourage all users to upgrade to one
-of these three up-to-date styles, which should now cater to nearly all
-needs.  The 15th-edition styles will be marked "obsolete" in the next
-major release, and I shall cease all work on them.  If, in the
-meantime, you wish to continue using them, you'll need to specify
-"notes15" or "authordate15" in the options when loading
-biblatex-chicago.
+the traditional author-date style ("authordate-trad"), which provides
+these features while in all other respects following the 16th-edition
+specifications.  I encourage all users to choose one of these three
+up-to-date styles, which should now cater to nearly all needs.  The
+15th-edition styles have received no fixes or updates, and won't
+compile with the latest biblatex.  If you absolutely must continue
+using them, you'll need to specify "notes15" or "authordate15" in the
+options when loading biblatex-chicago, and downgrade biblatex itself,
+perhaps to version 2.9a.
 
 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 (and/or biblatex-chicago15.pdf), which contain
-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 documentation in those
-same pdf files, which contain both a Quickstart section and a complete
-reference guide to both notes & bibliography and author-date styles
-(sections 4 and 5).  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, cms15-notes-sample.tex,
-cms15-dates-sample.tex) or my system (cms-notes-sample.pdf,
-cms-dates-sample.pdf, cms-trad-sample.pdf, cms15-notes-sample.pdf,
-cms15-dates-sample.pdf) with the actual examples in the Manual.
+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
@@ -68,16 +62,13 @@ which means that switching among various styles while using the same
 bibliography database will not be as simple and painless as it could
 be.  If you can see ways better to preserve this compatibility, or
 indeed to improve the package in any way whatsoever, please let me
-know, or better yet, send a patch.  As the 16th edition styles are
-relatively new, now is the time to suggest changes in field or
-entry-type usage there, before questions of backward compatibility
-become more pressing.  If the styles don't behave as you expect or if
-you discover a bug, I'd be very happy to hear about it, but do please
-read biblatex-chicago.pdf first, as you may find that your question
-has already been answered there.  If you do find a bug, please send me
-the .bib entry, your LaTeX preamble, and your output .log, so that I
-can try to reproduce it here.  My email address is at the head of
-biblatex-chicago.pdf.
+know, or better yet, send a patch.  If the styles don't behave as you
+expect or if you discover a bug, I'd be very happy to hear about it,
+but do please read biblatex-chicago.pdf first, as you may find that
+your question has already been answered there.  If you do find a bug,
+please send me the .bib entry, your LaTeX preamble, and your output
+.log, so that I can try to reproduce it here.  My email address is at
+the head of biblatex-chicago.pdf.
 
 Installation:
 
@@ -90,11 +81,10 @@ biblatex package:
  - The twenty-one 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-notes15.cbx, chicago-notes15.bbx, chicago-authordate15.cbx,
-   chicago-authordate15.bbx, cms-american.lbx, cms-british.lbx,
+   chicago-dates-common.cbx, cms-american.lbx, cms-british.lbx,
    cms-finnish.lbx, cms-french.lbx, cms-german.lbx, cms-icelandic.lbx,
-   cms-ngerman.lbx, cms-norsk.lbx, cms-norwegian.lbx, and
-   cms-nynorsk.lbx are located in the latex/ subdirectory, itself
+   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
    <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago, where
@@ -105,21 +95,27 @@ biblatex package:
    remember to update your TeX file name database so that TeX can find
    them.
 
- - The sixteen files biblatex-chicago.tex, biblatex-chicago.pdf,
-   biblatex-chicago15.tex, biblatex-chicago15.pdf
+ - The seventeen 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-notes-sample.pdf, cms-dates.sample.pdf, cms-trad-sample.pdf,
-   cms15-notes-sample.tex, cms15-dates-sample.tex,
-   cms15-notes-sample.pdf, cms15-dates.sample.pdf, notes-test.bib, and
-   dates-test.bib can all be found in the doc/ directory in the
-   package archive, the last 10 in the examples/ subdirectory.  You
-   can place all of this in
+   notes-test.bib, dates-test.bib, and cmsdocs.sty can all be found in
+   the doc/ directory in the package archive, the last 15 in the
+   examples/ subdirectory.  You can place all of this in
    <TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago.
 
+ - The ten files chicago-notes15.bbx, chicago-notes15.cbx,
+   chicago-authordate15.bbx, chicago-authordate15.cbx,
+   biblatex-chicago15.tex, biblatex-chicago15.pdf,
+   cms15-notes-sample.tex, cms15-dates-sample.tex,
+   cms15-notes-sample.pdf, and cms15-dates.sample.pdf can all be found
+   in the obsolete/ subdirectory in the package archive.  You can
+   place that directory in
+   <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago.
 
 Changelog: See the RELEASE file, and also the end of
-biblatex-chicago.pdf (or biblatex-chicago15.pdf).
-
+biblatex-chicago.pdf.
 
 Copyright (c) 2008-2016 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index 24205eacfb2..1be42fb3ba6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,152 @@
+Release notes for version 1.0rc1 [2016-06-07]:
+
+ - The 15th-edition styles are now obsolete, and have been moved to a
+   new obsolete/ subdirectory.  You can still use them as they stand,
+   but they won't compile against the newest biblatex, so you'll have
+   to make sure that you have an older version (2.9a, perhaps).  If
+   you are still using them, I strongly urge you to consider switching
+   to the the 16th-edition styles, which contain many new features and
+   bug-fixes.
+
+ - The old Chicago-specific option "usecompiler" is deprecated, and
+   has been replaced by the standard biblatex "usenamec".  If you have
+   been using the former in your preamble or in your .bib entries,
+   please replace it with the latter, which works better across the
+   board.  "Usecompiler" still "works," just not very well.
+
+ - Stefan Björk has very generously provided a Swedish localization
+   file for the package -- cms-swedish.lbx -- which can be loaded and
+   used with babel just like the other localizations.
+
+ - I have added support for "related" functionality to all the Chicago
+   styles, including all the standard biblatex "relatedtypes".  It is
+   turned on by default in all styles, but you can turn it off, or
+   alter where the information is printed, using the "related" option
+   in the preamble or in individual entries.  In the notes &
+   bibliography style, "related" information is printed by default
+   only in the bibliography, but you can change that by setting the
+   option.  In the author-date styles, it will only ever print in the
+   list of references, depending on the option's setting.  Please see
+   sections 4.2.1 and 5.2.1 of biblatex-chicago.pdf for the details.
+
+ - I have improved the name-handling code in all styles, regularizing
+   the functioning of the "namea", "nameb", and "namec" fields with
+   respect to the other, standard biblatex names.  The former two in
+   particular are newly available in the Collection and Periodical
+   entry types, and biblatex-chicago now recognizes the standard
+   "usenamea", "usenameb", and "usenamec" toggles, the last replacing
+   the deprecated "usecompiler" (as above).  You can also now use the
+   "nameatype" field just as you would an "editortype", extending the
+   possibilities for identifying certain roles attached specifically
+   to "titles" as opposed to "booktitles" or "maintitles".
+
+ - After a request by user BenVB, I have added support for the
+   biblatex "shortjournal" field, which allows you to present
+   abbreviated "journaltitles" in all the styles.  You can use the
+   "journalabbrev" option to control where in your document these
+   abbreviated forms will appear.  By default, the field is ignored in
+   the notes & bibliography style, and appears only in citations in
+   the author-date styles.  You can also print a list of journal
+   abbreviations, rather in the manner of a list of shorthands, using
+   a command like: \printbiblist{shortjournal}.  Even though the
+   Periodical entry type uses the "title" and "shorttitle" fields in
+   place of "journaltitle" and "shortjournal", these entries are
+   included in this functionality, and controlled by the same
+   "journalabbrev" option.  Please see s.v. "shortjournal" in sections
+   4.2 and 5.2 of biblatex-chicago.pdf.
+
+ - Following a request by Arne Skjærholt, and his generous provision
+   of some code to get me started, I have implemented a new
+   \gentextcite citation command in all styles.  The "gen" part of the
+   name refers to the genitive case, and it adds a possessive ending
+   -- 's by default -- to the author's name in what is otherwise an
+   ordinary \textcite.  You can change the added ending however you
+   want, using a third optional field to the citation command, and you
+   can control to which names the ending is added in a \gentextcites
+   multicite command by using the "genallnames" preamble and entry
+   option.  Please see sections 4.3.2 and 5.3.2 for the details.
+
+ - Stefan Björk pointed out that "url", "doi", and "eprint"
+   information could be totally ignored in some entries when you used
+   the abbreviated cross-referencing functionality accessed through
+   the "crossref" and "xref" fields.  At his request, I have provided
+   a new "xrefurl" entry and preamble option for all the styles to
+   control the printing of this information in abbreviated notes or
+   bibliography (reference list) entries.  Please see sections 4.4.3
+   and 5.4.3 for the details.
+
+ - In a related change, I have stopped child entries inheriting "url",
+   "doi", and "eprint" fields from their cross-ref'd parents, so if
+   your documents rely on this behavior please note that you'll have
+   to provide such fields manually in the child entries.
+
+ - Roger Hart long ago requested a way to control the punctuation
+   before "book-", "main-", or plain "titleaddon" fields, and I have
+   finally added it in this release in the form of two entry and
+   preamble options, "ptitleaddon" and "ctitleaddon", available in all
+   styles.  By default, the former prints \addperiod\addspace, hence
+   its name, and the latter \addcomma\addspace, but you can change
+   either or both depending on which field you are using and which
+   sort of entry it appears in -- the default output can be your guide
+   to which option(s) to change.  Please see the available valid
+   option keys in sections 4.4.2 and 5.4.2.
+
+ - The same user also long ago requested that the notes & bibliography
+   style make it possible to use "Idem" when two consecutive notes
+   cite different works by the same author.  You can now use the
+   standard biblatex option "idemtracker=constrict" in your preamble
+   to activate this in your documents, but please be aware, first,
+   that the Manual doesn't exactly approve of this and, second, that
+   you'll only see "Idem" in short notes, never in full ones, which
+   seems to be the standard biblatex way of implementing this.
+
+ - Also only in the notes & bibliography style, I have added a
+   "shorthandpunct" option to control the punctuation that appears
+   before the first appearance of a "shorthand" and/or a
+   "shorthandintro" in a long note.  The default is \addspace, but you
+   can change it in your preamble or in individual entries.  Please
+   see the available valid option keys in section 4.4.2 of
+   biblatex-chicago.pdf.
+
+ - After reading a discussion started by Ryo Furue at github, I have
+   added, in the author-date styles only, a test to some spacing
+   commands to prevent line breaks immediately after abbreviation
+   dots.  These tests apply only in running text, never in the list of
+   references, where good line breaks are already hard enough to find.
+
+ - In addition to moving the 15th-edition styles into an obsolete/
+   subdirectory, I have also reorganized the author-date style files,
+   adding chicago-dates-common.cbx, which contains the code that is
+   common to the "trad" and the standard "authordate" styles.  Nothing
+   has changed in terms of loading the styles, the changes being
+   designed primarily to ease maintenance.
+
+ - I have created two new documentation files (and an appendix) to
+   provide short introductions to the Chicago styles, introductions
+   which attempt to fill the gap between the Quickstart section of
+   biblatex-chicago.pdf and the fuller documentation contained in
+   sections 4 and 5 of that file.  Both cms-notes-intro.pdf and
+   cms-dates-intro.pdf are fully hyperlinked so you can move easily
+   from formatted citations and (annotated) references to .bib entries
+   and back, with marginal references to the fuller discussions in
+   biblatex-chicago.pdf.  There is also a short cms-trad-appendix.pdf
+   file to discuss a few entries that would need special treatment for
+   the "trad" style.  The sample files for each style still exist, but
+   I intend them mainly for testing purposes, while many more
+   (annotated) entries are still available for consultation in
+   notes-test.bib and dates-test.bib.
+
+ - I have made a number of other small enhancements to and fixed
+   numerous bugs in all the styles, including some subtle inaccuracies
+   in author-date citations spotted by Arne Skjærholt and some macros
+   in InProceedings entries that had been missing for years.  I have
+   provided some default values for counters in biblatex-chicago.sty
+   that aid in breaking long urls across lines, but I make no pretense
+   that these fully adhere to the Manual's specifications.  I have
+   added a few \bibstrings, currently missing in standard biblatex, to
+   cms-german.lbx for use with the "related" functionality.
+   Recommendations for better ones would be gratefully received.
+
 Release notes for version 0.9.9i [2016-05-16]:
 
  - This is another interim release, allowing the use of biblatex 3.4
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 ee2823d0ce5..199d3e9fa2e 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 8f8916cb6b5..30aa780e2e2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -14,6 +14,7 @@
 \setmarginsrb{1.65in}{.9in}{1.75in}{.6in}{0pt}{0pt}{12pt}{24pt}
 \setlength{\marginparwidth}{1in}
 \usepackage[colorlinks,urlcolor=blue,linkcolor=blue]{hyperref}
+\usepackage{lmodern}
 \usepackage[osf]{mathpazo}
 \usepackage[scaled]{helvet}
 \usepackage[pdftex]{xcolor}
@@ -63,7 +64,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9i (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 1.0rc1 (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -77,29 +78,32 @@
 \section{Notice}
 \label{sec:Notice}
 
-\textbf{Please be advised that this package is beta software.  Philipp
-  Lehman's \textsf{biblatex} package has now reached a stable state,
-  and is unlikely to require wholesale changes to styles written for
-  it.  The \textsf{biblatex-chicago} package has, for the last few
-  releases, implemented the 16th edition of the \emph{Chicago Manual
-    of Style}.  I am, at the moment, barely maintaining the
-  15th-edition files for those who need or want them.  I have marked
-  them as \enquote{strongly deprecated,} and I encourage all users to
-  switch to the newer specification, which is receiving just about all
-  of my development time.  If the title-formatting changes in the
-  author-date style have been an obstacle, please note that the
-  \textsf{authordate-trad} style keeps the traditional title
-  formatting but switches everything else to the 16th-edition spec.  I
-  have summarized the changes between the two editions in
-  section~\ref{sec:history} below, especially the ones that may
-  require alterations to your .bib files.  (The 15th-edition
+\textbf{Please be advised that this package is beta software.  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}.  I am, with this release,
+  marking the 15th-edition files as \enquote{obsolete,} and I have
+  ceased providing them with any bug fixes or upgrades.  I have
+  included them in the} \texttt{obsolete} \textbf{subdirectory of the
+  package, but I very strongly encourage all users to switch to the
+  newer specification, which is receiving all of my development time.
+  If the title-formatting changes in the author-date style have been
+  an obstacle, please note that the \textsf{authordate-trad} style
+  keeps the traditional title formatting but switches everything else
+  to the 16th-edition spec.  I have summarized the changes between the
+  two editions in section~\ref{sec:history} below, especially the ones
+  that may require alterations to your .bib files.  (The 15th-edition
   documentation is still available, also, in
   \textsf{biblatex-chicago15.pdf}.)  I also 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\\
-  I have tried to implement as much of the \emph{Manual's}
+  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.  One
   user has recently argued that I should attempt to include legal
   citations, so in the long term it may be that I return to this
@@ -117,6 +121,7 @@ properly with this release.  If you are new to these styles, please
 read on.
 
 \section{Quickstart}
+\label{quickstart}
 \reversemarginpar
 
 The \textsf{biblatex-chicago} package is designed for writers who wish
@@ -135,19 +140,25 @@ 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}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace The documentation you are reading covers all three of
-these Chicago styles and their variants.  Much of what follows is
-relevant to all users, but I have decided, after some experimentation,
-to keep the instructions for the two author-date styles separate from
-those pertaining to the notes \&\ bibliography style, at least in
-sections~\ref{sec:Spec} and \ref{sec:authdate}.  Information provided
-under one style will often duplicate that found under the other, but
-efficiency's loss should, I hope, be clarity's gain, and much of what
-you learn using one style will be applicable without alteration to the
-other.  Within the author-date section, the \textsf{authordate-trad}
-information really only appears separately in
+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,
+\mycolor{\textsf{cms-notes-intro.pdf}} or
+\mycolor{\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 decided, after some
+experimentation, to keep the instructions for the two author-date
+styles separate from those pertaining to the notes \&\ bibliography
+style, at least in sections~\ref{sec:Spec} and \ref{sec:authdate}.
+Information provided under one style will often duplicate that found
+under the other, but efficiency's loss should, I hope, be clarity's
+gain, and much of what you learn using one style will be applicable
+without alteration to the other.  Within the 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
@@ -157,13 +168,11 @@ release.
 \textsf{biblatex-chicago}:
 
 \begin{itemize}{}{}
-\item Philipp Lehman's \textsf{biblatex} package, of course!  The
-  current version(s) --- 1.7 or 3.4 at the time of writing --- work
-  well, but the older 2.9a has been somewhat more extensively tested,
-  so please try it if you have any issues with the latest
-  \textsf{biblatex}.  Both of these versions contain features and bug
-  fixes upon which my code relies.  Lehman's tools require several
-  packages, and he strongly recommends several more:
+\item The \textsf{biblatex} package, of course!  The current version
+  --- 3.4 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:
   \begin{itemize}{}{}
   \item e-\TeX\ (required)
   \item \textsf{etoolbox} --- available from CTAN (required)
@@ -185,12 +194,12 @@ release.
     in particular its enhanced handling of cross references, you must
     use the following:
   \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\
-    replacement, which is available from SourceForge.  You should use
-    the latest version, 2.5, to work with \textsf{biblatex} 3.4 and
-    \textsf{biblatex-chicago} (or \textsf{Biber} 1.9 with
-    \textsf{biblatex} 2.9a), and it is required for users who are
-    either using the author-date styles or processing a .bib file in
-    Unicode.  See \textsf{cms-dates-sample.pdf} and, for example, the
+    replacement by Philip Kime and François Charette, available from
+    SourceForge.  You should use the latest version, 2.5, to work with
+    \textsf{biblatex} 3.4 and \textsf{biblatex-chicago}, and it is
+    required for users who are either using the author-date styles or
+    processing a .bib file in Unicode.  See
+    \mycolor{\textsf{cms-dates-intro.pdf}} and, for example, the
     \textsf{crossref} documentation in section~\ref{sec:entryfields},
     below, for more details.
   \end{itemize}
@@ -209,20 +218,18 @@ release.
       backend=biber]\{biblatex-chicago\}}
   \end{quote}
 
-  to load the traditional variant of the author-date style.  (You can
-  use \texttt{notes15} or \texttt{authordate15} to load the
-  15th-edition styles.  Please see \textsf{bibla\-tex-chicago15.pdf}
-  for the details.)  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 number of other parameters
-  automatically.  You can also load the package via the usual
-  \cmd{usepackage\{biblatex\}}, adding either
-  \texttt{style=chicago\-notes} or \texttt{style=chicago-authordate},
-  but this is mainly for those, 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.
+  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=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.
 \item You can use \cmd{usepackage[notes,short]\{biblatex-chicago\}} to
   get the short note format even in the first reference of a notes \&\
   bibliography document, letting the bibliography provide the full
@@ -240,11 +247,13 @@ release.
   should work, too, but I haven't tested it.)  As before,
   \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 now provides (at least partial)
-  support for British, Finnish, French, German, Icelandic, and
-  Norwegian.  Please see below (section~\ref{sec:international}) for a
-  fuller explanation of all the options.
-\item \textsf{chicago-auth\-ordate.cbx},
+  \textsf{Biblatex-chicago} also provides (at least partial) support
+  for British, Finnish, French, German, Icelandic, Norwegian, and
+  \mycolor{Swedish}.  Please see below
+  (section~\ref{sec:international}) for a fuller explanation of all
+  the options.
+\item \mycolor{\textsf{chicago-dates-common.cbx}},
+  \textsf{chicago-auth\-ordate.cbx},
   \textsf{chi\-cago-authordate.bbx},
   \textsf{chi\-cago-authordate-trad.cbx},
   \textsf{chicago-auth\-ordate-trad.bbx}, \textsf{chicago-notes.bbx},
@@ -253,19 +262,16 @@ release.
   \textsf{cms-french.lbx}, \textsf{cms-ger\-man.lbx},
   \textsf{cms-icelandic.lbx}, \textsf{cms-ngerman.lbx},
   \textsf{cms-norsk.lbx}, \textsf{cms-norwe\-gian.lbx},
-  \textsf{cms-nynorsk.lbx}, and \textsf{biblatex-chicago.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.  (To use the 15th-edition styles, you'll also require
-  \textsf{chicago-notes15.bbx}, \textsf{chicago-notes15.cbx},
-  \textsf{chicago-authordate15.bbx}, and
-  \textsf{chicago-authordate15.cbx}.)  The .zip file from CTAN
+  \textsf{cms-nynorsk.lbx}, \mycolor{\textsf{cms-swedish.lbx}},and
+  \textsf{biblatex-chica\-go.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 using the standard
-  layout and creating
+  you install in a system-wide directory, I suggest a standard layout
+  using
   \texttt{<TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago},
   where\ \texttt{<TEXMFLOCAL>} is the root of your local \TeX\
   installation --- for example, and depending on your system and
@@ -278,14 +284,32 @@ release.
   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 Philipp Lehman's very clear and detailed documentation of the
-  \textsf{biblatex} system, available in his package as
-  \textsf{biblatex.pdf}.  Here he explains 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
+\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 \mycolor{\textsf{cms-notes-intro.pdf}},
+  \mycolor{\textsf{cms-dates-intro.pdf}}, and
+  \mycolor{\textsf{cms-trad-appendix.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 \mycolor{\textsf{cmsdocs.sty}} contains code and kludges
+  designed specifically for compiling
+  \mycolor{\textsf{cms-dates-intro.tex}},
+  \mycolor{\textsf{cms-notes-intro.tex}} and
+  \mycolor{\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}, which will acquaint you with most of the
+  \textsf{dates-test.bib}, 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},
@@ -295,7 +319,8 @@ release.
   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}.  All of these files are in
-  \texttt{doc/examples/}.
+  \texttt{doc/examples/}, and the \textsf{sample} files in particular
+  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
@@ -309,8 +334,8 @@ 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 seven previous files
-  in the \texttt{doc/} subdirectory once you've extracted
+  page~\pageref{deprec:obsol}.  You will find the sixteen 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},
@@ -324,6 +349,14 @@ release.
   which naturally contains incomparably more information than I can
   hope to present here.  It should always be your first port of call
   when any doubts arise as to exactly what the specification requires.
+\item If you really still need the 15th-edition style files, you'll
+  find chicago-notes15.cbx, chicago-notes15.bbx,
+  chicago-authordate15.cbx, and chicago-auth\-ordate15.bbx, along with 
+  cms15-notes-sample.tex, cms15-dates-sam\-ple.tex,
+  cms15-notes-sample.pdf, and cms15-dates-sample.pdf all in the
+  \mycolor{\texttt{obsolete}} subdirectory of the package.  Please
+  remember that they won't compile with the current \textsf{biblatex},
+  so you'll need to downgrade, perhaps to version 2.9a.
 \end{itemize}
 
 \subsection{License}
@@ -345,36 +378,37 @@ purpose.
 \label{sec:acknowl}
 
 Even a cursory glance at the cbx and bbx files in the package will
-demonstrate how much of Lehman's code from \textsf{biblatex} I've
-adapted and re-used, and I've also followed some of the advice he gave
-to others in the \texttt{comp.text.tex} newsgroup.  He has been
-instrumental in improving the contextual capitalization procedures of
-which the style makes such frequent use, and his advice on
-constructing \textsf{biblatex-chicago.sty} was invaluable.  The code
-for formatting the footnote marks, and that for printing the
-separating rule only after a run-on note, I've adapted from the
-\textsf{footmisc} package by Robin Fairbairns, and I've borrowed ideas
-for the \texttt{shorthandibid} option from Dominik Waßenhoven's
-\textsf{biblatex-dw} package.  I've adapted Audrey Boruvka's
-\cmd{textcite} code from
+demonstrate how much of \textsf{biblatex's} code I've adapted and
+re-used, and I've also followed some of the advice the authors have
+given to others in the \texttt{comp.text.tex} newsgroup and on
+\href{http://tex.stackexchange.com}{Stackexchange}.  In particular,
+Philipp Lehman's advice on constructing \textsf{biblatex-chicago.sty}
+was invaluable.  The code for formatting the footnote marks, and that
+for printing the separating rule only after a run-on note, I've
+adapted from the \textsf{footmisc} package by Robin Fairbairns, and
+I've borrowed ideas for the \texttt{shorthandibid} option from Dominik
+Waßenhoven's \textsf{biblatex-dw} package.  I've adapted Audrey
+Boruvka's \cmd{textcite} code from
 \href{http://tex.stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange}
 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 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 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}.  I am very grateful to Stefan Björk for the new 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.
 
 \section{Detailed Introduction}
 \label{sec:Intro}
@@ -464,18 +498,11 @@ original \LaTeX\ .sty file and \textsc{Bib}\TeX\ .bst file.  As you
 proceed, you will no doubt encounter some of the consequences of this
 decision, with certain fields and entry types in the .bib file having
 less-than-memorable names because I chose to use the supplementary
-ones provided by \textsf{biblatex.bst} rather than alter that file.  I
-intended then, if it turned out that anyone besides myself actually
-used \textsf{biblatex-chicago}, to ask Mr.\ Lehman to include more
-descriptive names for these few entry types and fields in
-biblatex.bst, if he were willing.  As luck would have it, several new
-types appeared in \textsf{biblatex} 0.8, many of which I have
-incorporated as replacements for the custom entry types I defined
-before.  If a consensus emerges about how best to assign the data to
-various fields in such entries, then I shall adopt it.  In the
-meantime, as you will see below, I have made two of the old custom
-types obsolete, and recycled the third for an entirely new purpose.
-Needless to say, I'm open to advice and suggestions on this score.
+ones provided by \textsf{biblatex} rather than alter that package's
+files.  With additions to the standard data model now possible, this
+will be one of the directions for future development, particularly if
+other styles are adopting certain broad conventions.  Needless to say,
+I'm open to advice and suggestions on this score.
 
 \section{The Specification:\ Notes\,\&\,Bibliography}
 \label{sec:Spec}
@@ -505,19 +532,17 @@ from the latter file below in parentheses.
 
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-notes}, minus the odd \textsf{biblatex}
-alias, is as follows: \textbf{article}, \textbf{artwork},
-\textbf{audio}, \mycolor{\textbf{book}},
-\mycolor{\textbf{bookinbook}}, \textbf{booklet},
-\mycolor{\textbf{collection}}, \textbf{customc}, \textbf{image},
-\mycolor{\textbf{inbook}}, \textbf{incollection},
-\textbf{inproceedings}, \textbf{inreference}, \textbf{letter},
-\textbf{manual},\textbf{misc}, \textbf{music},
-\mycolor{\textbf{mvbook}}, \mycolor{\textbf{mvcollection}},
-\mycolor{\textbf{mvproceedings}}, \mycolor{\textbf{mvreference}},
-\textbf{online} (with its alias \textbf{www}), \textbf{patent},
-\textbf{periodical}, \mycolor{\textbf{proceedings}},
+alias, is as follows: \mycolor{\textbf{article}}, \textbf{artwork},
+\textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet},
+\textbf{collection}, \textbf{customc}, \textbf{image},
+\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
+\textbf{inreference}, \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{periodical}}, \textbf{proceedings},
 \textbf{reference}, \textbf{report} (with its alias
-\textbf{techreport}), \textbf{review}, \textbf{suppbook},
+\textbf{techreport}), \mycolor{\textbf{review}}, \textbf{suppbook},
 \textbf{supp\-collection}, \textbf{suppperiodical}, \textbf{thesis}
 (with its aliases \textbf{mastersthesis} and \textbf{phdthesis}),
 \textbf{unpublished}, and \textbf{video}.
@@ -533,7 +558,9 @@ 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.
 
-\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of
+\enlargethispage{\baselineskip}
+
+\mybigspace The \colmarginpar{\textbf{article}} \emph{Chicago Manual of
   Style} (14.170) recognizes three different sorts of periodical
 publication, \enquote{journals,} \enquote{magazines,} and
 \enquote{newspapers.} The first (14.172) includes \enquote{scholarly
@@ -587,8 +614,6 @@ 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.)
 
-%%\enlargethispage{-\baselineskip}
-
 \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
 latter in the \textsf{titleaddon} field.  Standard \textsf{biblatex}
@@ -602,7 +627,7 @@ 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 No less than eight more things need explication here.
+\mylittlespace No less than nine 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,
@@ -647,7 +672,7 @@ bibliography entry is alphabetized correctly.  (See
 lakeforester:pushcarts and, for the sorting issue,
 \cmd{DeclareSortingScheme} in section~\ref{sec:formatopts} below.)
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace Fourth, Bertold Schweitzer has pointed out, following
 the \emph{Manual} (14.192), that while an \textsf{issuetitle} often
@@ -672,8 +697,8 @@ 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 now
-obsolete, replaced by Lehman's macro \cmd{autocap}, which itself only
+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
@@ -712,10 +737,11 @@ 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 into \textsf{misc} entries with an
-\textsf{entrysubtype} [coolidge:speech, roosevelt:speech].)
+archives fit best either into \textsf{online} or into \textsf{misc}
+entries with an \textsf{entrysubtype} [coolidge:speech,
+roosevelt:speech].)
 
-\mylittlespace Finally, the 16th edition of the \emph{Manual}
+\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
@@ -729,6 +755,15 @@ 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, \colmarginpar{New} the special
+\textsf{biblatex} field \mycolor{\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
+\mycolor{\textbf{shortjournal}} in section~\ref{sec:entryfields} for
+all the details on how this works.
+
 % %\enlargethispage{-\baselineskip}
 
 \mylittlespace If you're still with me, allow me to recommend that you
@@ -819,9 +854,11 @@ such favorite educational formats as the slideshow and the filmstrip
 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 best be presented in a \textbf{misc}
-entry with an \textsf{entrysubtype} (coolidge:speech,
-roosevelt:speech).
+of an archive, online or no, may be presented either in an
+\textsf{online} or in a \textsf{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}
 
@@ -842,19 +879,18 @@ from a cycle.  If the medium in question needs specifying, the
 \textsf{biblatex-chicago} provides no automated handling, e.g., a
 librettist (verdi:corsaro).
 
-\mybigspace This \colmarginpar{\textbf{book}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this
-release the package can now provide automatically 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 enable it in the preamble or in the
-\textsf{options} field using the new \mycolor{\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.
-
-\mybigspace This \colmarginpar{\textbf{bookinbook}} type provides the
+\mybigspace This \mymarginpar{\textbf{book}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but 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
+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.
+
+\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
@@ -862,10 +898,10 @@ articles.  Such an entry can have a \textsf{title} and a
 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 now enable automatically
+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 \mycolor{\texttt{booklongxref}} 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
@@ -889,26 +925,25 @@ uses the \textsf{howpublished} field instead of a standard
 \textsf{howpublished} field should instead go in \textsf{publisher}.
 (See clark:mesopot.)
 
-\mybigspace This \colmarginpar{\textbf{collection}} is the standard
-\textsf{biblatex} entry type, but with this release the package can
-now provide automatically 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
-enable it in the preamble or in the \textsf{options} field using the
-new \mycolor{\texttt{booklongxref}} option.  Please see
-\textbf{crossref} in section~\ref{sec:entryfields} and
+\mybigspace This \mymarginpar{\textbf{collection}} is the standard
+\textsf{biblatex} entry type, but 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 enable it in the preamble or in
+the \textsf{options} field using the new \texttt{booklongxref} option.
+Please see \textbf{crossref} in section~\ref{sec:entryfields} and
 \texttt{booklongxref} in section~\ref{sec:chicpreset}, below.  See
 harley:ancient:cart, harley:cartography, and harley:hoc for how this
 might look.
 
-\mybigspace This \mymarginpar{\textbf{customa}} entry type is now
+\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 now
+\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.
@@ -916,20 +951,20 @@ 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
-recommended by the \emph{Manual}.  (This is different from the usual
-\textsf{crossref}, \textsf{xref}, and \textsf{userf} mechanisms, all
-primarily designed to include cross-references to other works.  Cf.\
-14.84,86).  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 read the
-specification, these cross-references are particularly 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.
+recommended by the \emph{Manual}.  (This is different from the
+\textsf{crossref}, \textsf{xref}, \textsf{userf} and
+\mycolor{\textsf{related}} mechanisms, all primarily designed to
+include cross-references to other works.  Cf.\ 14.84,86).  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 read the specification, these
+cross-references are particularly 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.
 
 \mylittlespace In these latter cases, you would need merely to place
 the pseudonym in the \textsf{author} field, and the author's real
@@ -960,30 +995,27 @@ media.  This means that this entry type is now a clone of the
 for users migrating from the old to the new specification.  (See 3.22,
 8.193; bedford:photo.)
 
-\mybigspace These
-\mymarginpar{\mycolor{\textbf{inbook}}\\\textbf{incollection}} two
-standard \textsf{biblatex} types have very nearly identical formatting
-requirements as far as the Chicago specification is concerned, but I
-have retained both of them for compatibility.  \textsf{Biblatex.pdf}
-(§~2.1.1) intends the first for \enquote{a part of a book which forms
-  a self-contained unit with its own title,} 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 notes and
-bibliography when you cite multiple pieces from the same
-\textsf{collection}.  These abbreviations are now activated by default
-when you use the \textsf{crossref} or \textsf{xref} field in
-\textsf{incollection} entries \emph{and} in \textsf{inbook} entries,
+\mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
+two standard \textsf{biblatex} types have very nearly identical
+formatting requirements as far as the Chicago specification is
+concerned, but I have retained both of them for compatibility.
+\textsf{Biblatex.pdf} (§~2.1.1) intends the first for \enquote{a part
+  of a book which forms a self-contained unit with its own title,}
+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.  I have, in both types,
+implemented the \emph{Manual's} recommendations for space-saving
+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
 \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},
-below, and the new option \mycolor{\texttt{longcrossref}} in
+below, and the new option \texttt{longcrossref} in
 section~\ref{sec:chicpreset}.  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
@@ -1018,9 +1050,9 @@ 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
 \textsf{incollection} and \textsf{inbook} entries.  See
-\textbf{crossref} in section~\ref{sec:entryfields} and the new option
-\mycolor{\texttt{longcrossref}} in section~\ref{sec:chicpreset} for
-more details.
+\textbf{crossref} in section~\ref{sec:entryfields} and the option
+\texttt{longcrossref} in section~\ref{sec:chicpreset} for more
+details.
 
 \mybigspace This \mymarginpar{\textbf{inreference}} entry type is
 aliased to \textsf{incollection} in the standard styles, but the
@@ -1057,7 +1089,7 @@ 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 previous releases of
+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
@@ -1068,12 +1100,12 @@ 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 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.
+\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}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace If it seems appropriate to include such a work in the
 bibliography, be aware that the contents of the \textsf{lista} field
@@ -1135,10 +1167,10 @@ type with a comma, like so: \texttt{memorandum, London}.
 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 now allows a full date specification, while the publishing date
-of the whole collection goes in the \textsf{date} field, instead of in
+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 now has its ordinary meaning of \enquote{date of
+\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
@@ -1161,8 +1193,8 @@ 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 now correctly inherit fields from
-\textsf{book} and \textsf{collection} entries, and also from the new
+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
@@ -1176,8 +1208,8 @@ bibliography if more than one piece from a single collection is cited.
 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 new \mycolor{\texttt{longcrossref=true}} option, on which
-see section~\ref{sec:chicpreset}, below.  To stop individual letters
+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.
 
@@ -1233,7 +1265,7 @@ take no parentheses in full footnotes.  (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.\
-coolidge:speech, roosevelt:speech, shapey:partita.)
+roosevelt:speech, shapey:partita.)
 
 \mylittlespace If you are wondering what to put in
 \textsf{entrysubtype}, the answer is, currently, anything at all.  You
@@ -1242,16 +1274,16 @@ 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 now understand the specification, it draws a
+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 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., and into the
-\textsf{date} field for the others.
+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
@@ -1266,9 +1298,9 @@ 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}
-below.  (See 14.219-220, 14.231, 14.232-242; creel:house,
-dinkel:agassiz, spock:interview.)
+\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 Recipient}, and
@@ -1290,7 +1322,7 @@ date of a letter in a short note, I have provided the
 the citation command.  (The standard \textsf{biblatex} command
 \cmd{printdate} will work if you need to do the same for interviews.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace As with \textsf{letter} entries, the \emph{Manual}
 (14.233) suggests that bibliography entries contain only the name of
@@ -1317,10 +1349,11 @@ 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} 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
+\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
@@ -1382,14 +1415,14 @@ equivalences.
   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 now 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.
+  \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}
@@ -1409,12 +1442,11 @@ equivalences.
   \texttt{recorded} to the \textsf{eventdate} or, in the absence of
   this \textsf{pubstate} mechanism, to the \textsf{origdate}, or even
   to both, but you can modify what is printed there using the
-  \mycolor{\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 the \textsf{date}.  (See floyd:atom,
-  nytrumpet:art.)
+  \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 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.
@@ -1433,21 +1465,20 @@ course, be entertained.  (Cf. 14.276--77; \textsf{eventdate},
 bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
 rubinstein:chopin.)
 
-\mybigspace All \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
+\mybigspace All \mymarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
   \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry
-types are new to \textsf{biblatex-chicago}, and all 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
+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
+\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.)
@@ -1497,10 +1528,12 @@ 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
-best as \textsf{misc} entries with an \textsf{entrysubtype}:
-coolidge:speech, roosevelt:speech.)  Some online materials will, no
+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.
@@ -1517,7 +1550,7 @@ 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}
+\enlargethispage{\baselineskip}
 
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on this subject (14.230), but very clear about which information
@@ -1547,7 +1580,7 @@ the \textsf{title} field to provide the lowercase letters manually.
 See petroff:impurity.
 
 
-\mybigspace This \mymarginpar{\textbf{periodical}} is the standard
+\mybigspace This \colmarginpar{\textbf{periodical}} is the standard
 \textsf{biblatex} entry type for presenting an entire issue of a
 periodical, rather than one article within it.  It has the same
 function in \textsf{biblatex-chicago-notes}, and in the main uses the
@@ -1560,15 +1593,27 @@ 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.)
 
-\mybigspace This \colmarginpar{\textbf{proceedings}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this
-release the package can now provide automatically 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 enable it in the preamble or in the
-\textsf{options} field using the new \mycolor{\texttt{booklongxref}}
-option.  Please see \textbf{crossref} in section~\ref{sec:entryfields}
-and \texttt{booklongxref} in section~\ref{sec:chicpreset}, below.
+\mylittlespace It is worth \colmarginpar{New} noting that the special
+\textsf{biblatex} field \mycolor{\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 \mycolor{\textbf{shortjournal}} in
+section~\ref{sec:entryfields} for all the details on how this works.
+
+\mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but 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
+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.
 
 \mybigspace This \mymarginpar{\textbf{reference}} entry type is
 aliased to \textsf{collection} by the standard \textsf{biblatex}
@@ -1604,7 +1649,7 @@ report type in \textsf{note} and the \textsf{institution} in
 
 %%\enlargethispage{\baselineskip}
 
-\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry
+\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
@@ -1669,9 +1714,9 @@ 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 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
+\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
@@ -1697,6 +1742,15 @@ 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, \colmarginpar{New} the special
+\textsf{biblatex} field \mycolor{\textsf{shortjournal}} allows you to
+present shortened \textsf{journaltitles} in \textsf{review} entries,
+as well as in \textsf{article} and \textsf{periodical} entries, and it
+facilitates the creation of lists of journal abbreviations in the
+manner of a \textsf{shorthand} list.  Please see the documentation of
+\mycolor{\textbf{shortjournal}} in section~\ref{sec:entryfields} for
+all the details on how this works.
+
 \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,
@@ -1722,7 +1776,7 @@ 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}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace There are a few other rules for constructing your .bib
 entry.  The \textsf{author} field refers to the author of the
@@ -1759,7 +1813,7 @@ this purpose, and now you can use either of these, as I've added
 above under \textbf{review} for the full instructions on how to
 construct a .bib entry for such a reference.
 
-%%\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace The \mymarginpar{\textbf{unpublished}}
 \textsf{unpublished} entry type works largely as it does in standard
@@ -1768,8 +1822,8 @@ lowercase letter at the start of your \textsf{note} field (or perhaps
 an\ \cmd{autocap} command in the somewhat contradictory
 \textsf{howpublished}, if you have one) for material that wouldn't
 ordinarily be capitalized except at the beginning of a sentence.
-Thanks to a bug report by Henry D. Hollithron, such entries will now
-print information about any \textsf{editor}, \textsf{translator},
+Thanks to a bug report by Henry D. Hollithron, such entries will print
+information about any \textsf{editor}, \textsf{translator},
 \textsf{compiler}, etc., that you include in the .bib file (14.228;
 nass:address).
 
@@ -1826,9 +1880,9 @@ by \textsf{biblatex}.  Here are the main correspondences:
   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 \mycolor{\textsf{userd}} field
-  to change the string printed there.  (Absent an \textsf{eventdate},
-  the \textsf{userd} field in \textsf{video} entries will modify the
+  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
@@ -1902,9 +1956,9 @@ undefined, and \textsf{biblatex-chicago-notes} will do the rest. Cf.\
 \paragraph*{\protect\mymarginpar{\textbf{annotation}}}
 \label{sec:annote}
 
-At the request of Emil Salim, \textsf{biblatex-chicago-notes} has, as
-of version 0.9, added a package option (see \texttt{annotation} below,
-section \ref{sec:useropts}) to allow you to produce annotated
+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
@@ -1927,74 +1981,58 @@ be useful for some purposes.  Cf.\ \textsf{commentator}.
 
 %%\enlargethispage{\baselineskip}
 
-\mybigspace For \mymarginpar{\textbf{author}} the most part, I have
+\mybigspace For \colmarginpar{\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:manual).  If there is no \textsf{author}, then
-\textsf{biblatex-chicago-notes} will look, in sequence, for an
-\textsf{editor}, \textsf{translator}, or \textsf{compiler} (actually
-\textsf{namec}, currently) 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:bremer,
-harley:cartography, schellinger:novel, sechzer:women, silver:ga\-wain,
-soltes:georgia).  Please note that when a \textsf{namec} appears at
-the head of an entry, and you're not using \textsf{Biber}, you'll need
-to assist \textsf{biblatex}'s sorting algorithms by providing a
-\textsf{sortkey} field to ensure correct alphabetization in the
+\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:bremer, harley:cartography,
+schellinger:novel, sechzer:women, silver:ga\-wain, soltes:georgia).
+\textsf{Biblatex's} sorting algorithms will use the first of those
+names found, which should ensure correct alphabetization in the
 bibliography.  (See \cmd{DeclareSortingScheme} in
-section~\ref{sec:formatopts}, below.)  A \textsf{shortauthor} entry is
-no longer necessary to provide a \textsf{namec} at the head of the
-short note form --- \textsf{biblatex-chicago} now takes care of this
-automatically.
+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 two options: either you can
+isn't appropriate, you have (at least) two options: either you can
 (chaucer:liferecords) put all the information into a \textsf{note}
 field rather than individual fields, or you can use the
 \textsf{biblatex} options \texttt{useauthor=false},
-\texttt{useeditor=false}, \texttt{usetranslator=false}, and
-\texttt{usecompiler=\\false} in the \textsf{options} field
-(chaucer:alt).  If you look at the chaucer:alt entry in
-\textsf{notes-test.bib}, you'll notice a peculiarity of this system of
-toggles.  In order to ensure that the \textsf{title} of the book
-appears at the head of the entry, you need to use \emph{all four} of
-the toggles, even though the entry contains no \textsf{translator}.
-Internally, \textsf{biblatex-chicago} is either searching for an
-author-substitute, or it is skipping over elements of the ordered,
-unidirectional chain \textsf{author -> editor -> translator ->
-  compiler -> title}.  If you don't include
-\texttt{usetranslator=false} in the \textsf{options} field, then the
-package begins its search at \textsf{translator} and continues on to
-\textsf{namec}, even though you have \texttt{usecompiler=false} in
-\textsf{options}.  The result will be that the compilers' names will
-appear at the head of the entry.  If you want to skip over parts of
-the chain, you must turn off \emph{all} of the parts up to the one you
-wish printed.  (Another peculiarity of the system, if you're using
-\textsf{Biber}, is that setting the Chicago-specific
-\texttt{usecompiler} option to \texttt{false} doesn't remove
-\textsf{namec} from the sorting list, whereas the other standard
-\textsf{biblatex} toggles \emph{do} remove their names from the
-sorting list, so in the chaucer:alt case you need the \textsf{sortkey}
-field.  See \cmd{DeclareSortingScheme} in
-section~\ref{sec:formatopts}, below.)
-
-\mylittlespace This system of toggles, then, can turn off
+\mycolor{\texttt{usenamea=false}}, \texttt{useeditor=false},
+\mycolor{\texttt{usenameb=false}}, \texttt{usetranslator=false}, and
+\mycolor{\texttt{usenamec=false}} in the \textsf{options} field
+(chaucer:alt).  If you \colmarginpar{New} look at the chaucer:alt
+entry in \textsf{notes-test.bib}, you'll notice that you only need to
+turn off the fields that are present in the entry, but please remember
+to use the new option \mycolor{\texttt{usenamec}} instead of the old
+\texttt{usecompiler}, as the latter doesn't work as smoothly and
+completely as \textsf{biblatex's} own name toggles.
+
+\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
 wasn't possible before.  For full details of how this works, see the
 \textsf{editortype} documentation below.  (Of course, in
-\textsf{collection} and \textsf{proceedings} entry types, an
-\textsf{author} isn't expected, so there the \textsf{editor} is
-required, as in standard \textsf{biblatex}.  Also, in \textsf{article}
-or \textsf{review} entries with \textsf{entrysubtype}
-\texttt{magazine}, the absence of an \textsf{author} triggers the use
-of the \textsf{journaltitle} in its stead.  See those entry types for
-further details.)
+\textsf{collection}, \textsf{periodical} and \textsf{proceedings}
+entries, an \textsf{author} isn't expected, so there the chain of
+substitutions starts with \textsf{namea} and \textsf{editor}.  Also,
+in \textsf{article} or \textsf{review} entries with
+\textsf{entrysubtype} \texttt{magazine}, the absence of an
+\textsf{author} triggers the use of the \textsf{journaltitle} in its
+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
@@ -2017,10 +2055,10 @@ 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 \textsf{nameaddon} most entry types (except
-\textsf{customc} and \textsf{review}, which see), this field furnishes
+\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
+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
@@ -2111,12 +2149,16 @@ invariably be providing information for the traditional
 (\textbf{crossref}).  This provision is unnecessary if you are using
 \textsf{Biber}.
 
-\mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the
+\mybigspace An \colmarginpar{\textbf{booktitleaddon}} annex to the
 \textsf{booktitle}.  It will be printed in the main text font, without
 quotation marks.  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
 \textsf{biblatex-chicago-notes} will automatically do the right thing.
+The package and entry options \colmarginpar{New}
+\mycolor{\texttt{ptitleaddon}} and \mycolor{\texttt{ctitleaddon}}
+(section~\ref{sec:chicpreset}) allow you to customize the punctuation
+that appears before the \textsf{booktitleaddon} field.
 
 \mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
@@ -2130,7 +2172,7 @@ be useful for some purposes.  Cf.\ \textsf{annotator}.
 
 %\enlargethispage{\baselineskip}
 
-\paragraph*{\protect\colmarginpar{\textbf{crossref}}}
+\paragraph*{\protect\mymarginpar{\mycolor{\textbf{crossref}}}}
 \label{sec:crossref}
 
 This field is the standard \textsc{Bib}\TeX\ cross-referencing
@@ -2143,11 +2185,11 @@ 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.  New functionality, discussed below, for
+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 new \mycolor{\textsf{mv*}} entry types to do so, will prove
-extremely difficult with the older backends, so if you plan on lots of
+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}.
 
@@ -2184,29 +2226,28 @@ form is appropriate for all the child entries.  The
 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).  With this release, I \colmarginpar{New!} have
-considerably extended this functionality.
-
-\mylittlespace First, I have added five new entry types ---
-\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}},
-\mycolor{\textbf{collection}}, \mycolor{\textbf{inbook}}, and
-\mycolor{\textbf{proceedings}} --- to the list of those which use
-shortened cross references, and I have added two new options ---
-\mycolor{\texttt{longcrossref}} and \mycolor{\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.)
+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.)
 
 \mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook},
 \textbf{collection}, and \textbf{proceedings} entries fulfills a
@@ -2263,13 +2304,17 @@ such entry types, I thought it might help in these abbreviated
 book-like entries to provide a date for the \textsf{title} when it's
 part of a \textsf{maintitle}, though not when it's only part of a
 \textsf{booktitle}.  If dates appear in shortened references where
-you'd rather not have them, I have provided the new
-\mycolor{\texttt{omitxrefdate}} option
-\colmarginpar{\texttt{omitxrefdate}} to turn them off, either in the
-preamble for the document as a whole or in the \textsf{options} field
-of individual entries.  See \textbf{mvbook} in
-section~\ref{sec:entrytypes} and \texttt{omitxrefdate} in
-section~\ref{sec:useropts}.
+you'd rather not have them, I have provided the \texttt{omitxrefdate}
+option to turn them off, either in the preamble for the document as a
+whole or in the \textsf{options} field of individual entries.  There
+is also \colmarginpar{New} an \mycolor{\texttt{xrefurl}} option
+available to control the printing of \textsf{url}, \textsf{doi}, and
+\textsf{eprint} fields in abbreviated references where such
+information might otherwise never appear.  See \textbf{mvbook} in
+section~\ref{sec:entrytypes}, and both \texttt{omitxrefdate} and
+\mycolor{\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
@@ -2300,19 +2345,19 @@ 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 all previous releases of \textsf{biblatex-chicago}, so if your
-documents have come 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 will no longer work 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 now dependent on the settings of
-two new preamble and entry options.
-
-\mylittlespace Those \colmarginpar{\texttt{longcrossref}} options
-function asymmetrically.  The first, \mycolor{\texttt{longcrossref}},
-generally controls the settings for the entry types more-or-less
-authorized by the \emph{Manual}: \textsf{inbook},
+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}.
 
 \begin{description}
@@ -2333,10 +2378,10 @@ authorized by the \emph{Manual}: \textsf{inbook},
   and in the bibliography.
 \end{description}
 
-The \colmarginpar{\texttt{booklongxref}} second option,
-\mycolor{\texttt{booklongxref}}, controls the settings for
-\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and
-\textsf{proceedings} entries:
+The \mymarginpar{\texttt{booklongxref}} second option,
+\texttt{booklongxref}, controls the settings for \textsf{book},
+\textsf{bookinbook}, \textsf{collection}, and \textsf{proceedings}
+entries:
 
 \begin{description}
 \item[\qquad true:] This is the default.  If you use \textsf{crossref}
@@ -2355,30 +2400,30 @@ 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.
 
-\mylittlespace Please \colmarginpar{New!} further note that in
-previous releases of \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 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.  The \textsf{userf} and
-\textsf{reprinttitle} fields should now just work automatically in
-such circumstances, but \colmarginpar{\texttt{inheritshort\-hand}} the
-\textsf{shorthand} field in parent entries needs to be enabled by
-setting the \mycolor{\texttt{inheritshorthand}} package option to
-\texttt{true}.  There are, in addition, several other steps required
-to make this function smoothly --- please see the documentation of the
-\textbf{shorthand} field, below, for a full explanation.  (In case it
-isn't clear, the 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 \colmarginpar{\textbf{date}} field may be used to
+\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
+in combination with this abbreviated cross-referencing mechanism.  I
+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.  The \textsf{userf} and \textsf{reprinttitle} fields should
+just work automatically in such circumstances, but
+\mymarginpar{\texttt{inheritshort\-hand}} the \textsf{shorthand} field
+in parent entries needs to be enabled by setting the
+\texttt{inheritshorthand} package option to \texttt{true}.  There are,
+in addition, several other steps required to make this function
+smoothly --- please see the documentation of the \textbf{shorthand}
+field, below, for a full explanation.  (In case it isn't clear, the
+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 Lehman's instructions in §~2.3.8 of
+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
@@ -2392,23 +2437,22 @@ 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 With \colmarginpar{New!} this release, you can now 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 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.
 
 \mylittlespace (Users of the Chicago author-date style who wish to
 minimize the labor needed to convert a .bib database for the notes \&\
-bibliography style should be aware that, in this release, the latter
-style includes compatibility code for the \texttt{cmsdate} (silently
-ignored) and \texttt{switchdates} options, along with the mechanism
-for reversing \textsf{date} and \textsf{origdate}.  This means that
-you can, in theory, leave all of this alone in your .bib file when
-making the 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.)
+bibliography style should be aware that the latter style includes
+compatibility code for the \texttt{cmsdate} (silently ignored) and
+\texttt{switchdates} options, along with the mechanism for reversing
+\textsf{date} and \textsf{origdate}.  This means that you can, in
+theory, leave all of this alone in your .bib file when making the
+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}
 
@@ -2446,8 +2490,8 @@ 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
-complications that need explaining.  Lehman points out in his
-documentation that the \textsf{editor} field will be associated with a
+complications that need explaining.  \textsf{Biblatex.pdf} points out
+that the \textsf{editor} field will be associated with a
 \textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
 depending on the sort of entry.  More specifically,
 \textsf{biblatex-chicago} associates the \textsf{editor} with the most
@@ -2477,7 +2521,10 @@ or in one of the \textsf{titleaddon} fields (chaucer:liferecords).
 (Because the strings identifying an editor differ in notes and
 bibliography, one can't simply write them out in such a field, hence
 the need for a macro, which I discuss further in the commands section
-below [\ref{sec:formatcommands}].)  Cf.\ \textsf{namea},
+below [\ref{sec:formatcommands}].)  Please note that, when attempting
+to find a name for the head of a note or a bibliography entry,
+\textsf{namea} takes precedence over \textsf{editor}, and
+\textsf{nameb} over \textsf{translator}.  Cf.\ \textsf{namea},
 \textsf{nameb}, \textsf{namec}, and \textsf{translator}.
 
 \mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} newer
@@ -2492,18 +2539,18 @@ bernstein:shostakovich, handel:messiah.)
 
 %\enlargethispage{\baselineskip}
 
-\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
-proceeding in order through \textsf{editor}, \textsf{translator}, and
-\textsf{namec} (the compiler).  If all four are missing, then the
-\textsf{title} will be placed at the head.  (In \textsf{article} and
-\textsf{review} entries with a \texttt{magazine}
-\textsf{entrysubtype}, a missing author immediately prompts the use of
-\textsf{journaltitle} at the head of an entry.  See above under
-\textsf{article} for details.)  The \textsf{editortype} field, added
-in \textsf{biblatex 0.7}, provides even greater flexibility, giving
+proceeding in order through \textsf{namea}, \textsf{editor},
+\textsf{nameb}, \textsf{translator}, and \textsf{namec} (the
+compiler).  If all six are missing, then the \textsf{title} will be
+placed at the head.  (In \textsf{article} and \textsf{review} entries
+with a \texttt{magazine} \textsf{entrysubtype}, a missing author
+immediately prompts the use of \textsf{journaltitle} at the head of an
+entry.  See above under \textsf{article} for details.)  The
+\textsf{editortype} field provides even greater flexibility, giving
 you the ability to indicate any number of roles at the head of an
 entry.  You can do this even though an author is named (eliot:pound
 shows this mechanism in action for a standard editor, rather than for
@@ -2520,42 +2567,44 @@ name in both the bibliography and in the long note form.
 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 \textsf{editortype} mechanism 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 it will go ahead and look
-for an \textsf{editor}.  When the \textsf{editor} field is used,
-\textsf{biblatex}'s sorting algorithms will work properly, and also
-its \textsf{labelname} mechanism, meaning that a shortened form of the
-\textsf{editor} will be used in the short note form.  If, however, the
-\textsf{namea} field provides the name, and you are not using
-\textsf{Biber}, then your .bib entry will need to have a
-\textsf{sortkey} field to aid in alphabetizing, and it will also need
-a \textsf{shorteditor} defined to help with the short note form, not a
-\textsf{shortauthor}, ruled out because \texttt{useauthor=false}.
+\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
+\mycolor{\texttt{usenamea=false}}, the algorithm will go ahead and
+look for an \textsf{editor}.  The \textsf{editortype} field applies
+only to the \textsf{editor}, but you can use
+\mycolor{\textsf{nameatype}} to modify \textsf{namea}.  Either of
+these names should be sorted properly in the bibliography, but please
+be aware that if you want a shortened form to appear in short notes
+then there's only the \textsf{shorteditor}, which you should ensure
+presents whichever of the two editors' names appears at the head of
+long notes or bibliography entries.
 
 \mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string
 concatenation mechanism, for reasons he outlined in his RELEASE file,
 and I have followed his lead.  In short, if you define the
 \textsf{editortype} field, then concatenation is turned off, even if
 the name of the \textsf{editor} matches, for example, that of the
-\textsf{translator}.  In the absence of an \textsf{editortype}, the
-usual mechanisms remain in place, that is, if 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)
-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
+\textsf{translator}.  In the absence of an \textsf{editortype} (or
+\mycolor{\textsf{nameatype}}), the usual mechanisms remain in place,
+that is, if 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) 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
 manually in the \textsf{shorteditor} field, or perhaps, in a different
 sort of entry, in a \textsf{shortauthor} field.
 
 \mylittlespace It may also be worth noting that because of certain
 requirements in the specification -- absence of an \textsf{author},
-for example -- the \texttt{useauthor} mechanism won't work properly in
-the following entry types: \textsf{collection}, \textsf{letter},
-\textsf{patent}, \textsf{periodical}, \textsf{proceedings},
-\textsf{review}, \textsf{suppbook}, \textsf{suppcollection}, and
+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{review},
+\textsf{suppbook}, \textsf{suppcollection}, and
 \textsf{suppperiodical}.
 
 \mybigspace These
@@ -2624,18 +2673,18 @@ section~\ref{sec:entrytypes} above under \textbf{misc} for all the
 details on how these citations work.
 
 \mylittlespace Fourth, and finally, the field can be defined in the
-new \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.
+\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.
 
 \mybigspace Kazuo
 \mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}}
 Teramoto suggested adding \textsf{biblatex's} excellent
 \textsf{eprint} handling to \textsf{biblatex-chicago}, and he sent me
-a patch implementing it.  With minor alterations, I have applied it to
-this release, so these three fields now work more or less as they do
-in standard \textsf{biblatex}.  They may prove helpful in providing
-more abbreviated references to online content than conventional URLs,
+a patch implementing it.  I have applied it, with minor alterations,
+so these three fields now work more or less as they do in 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
@@ -2748,7 +2797,11 @@ where a piece in an \textsf{article} or \textsf{review}
 the author.  See above (section~\ref{sec:entrytypes}) under
 \textbf{article} for details.  The lakeforester:pushcarts and
 nyt:trevorobit entries in \textsf{notes-test.bib} will give you some
-idea of how this works.
+idea of how this works.  Please note there is a
+\mycolor{\textsf{shortjournal}} field which you can use to abbreviate
+the \textsf{journaltitle} in notes and/or in the bibliography, and you
+can also use it to print a list of journal abbreviations.  Cf.\ the
+\mycolor{\textbf{shortjournal}} documentation below.
 
 \mybigspace This \mymarginpar{\textbf{keywords}} field is
 \textsf{biblatex}'s extremely powerful and flexible technique for
@@ -2763,18 +2816,18 @@ 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},
-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.
+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.
 
 \mybigspace A \mymarginpar{\textbf{language}} standard
 \textsf{biblatex} field, designed to allow you to specify the
@@ -2854,10 +2907,10 @@ macro \cmd{reprint}, followed by a comma, 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 below.)  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).
+\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).
 
 \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a
 \textsf{maintitle} --- see next entry.
@@ -2872,39 +2925,48 @@ child entry.
 
 %%\enlargethispage{\baselineskip}
 
-\mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
+\mybigspace An \colmarginpar{\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
 that would ordinarily only be capitalized at the beginning of a
 sentence, then simply ensure that that word is in lowercase, and
 \textsf{biblatex-chicago-notes} will automatically do the right thing.
+The package and entry options \colmarginpar{New}
+\mycolor{\texttt{ptitleaddon}} and \mycolor{\texttt{ctitleaddon}}
+(section~\ref{sec:chicpreset}) allow you to customize the punctuation
+that appears before the \textsf{maintitleaddon} field
+(schubert:muellerin).
 
 \mybigspace Standard \mymarginpar{\textbf{month}} \textsf{biblatex}
 field, containing the month of publication.  This should be an
 integer, i.e., \texttt{month=\{3\}} not \texttt{month=\{March\}}.  See
 \textsf{date} for more information.
 
-\mybigspace This \mymarginpar{\textbf{namea}} is one of the fields
+\mybigspace This \colmarginpar{\textbf{namea}} is one of the fields
 \textsf{biblatex} provides for style writers to use, but which it
 leaves undefined itself.  In \textsf{biblatex-chicago} it contains the
 name(s) of the editor(s) of a \textsf{title}, if the entry has a
-\textsf{booktitle} or \textsf{maintitle}, or both, in which situation
-the \textsf{editor} would be associated with one of these latter
-fields (donne:var).  (In \textsf{article} and \textsf{review} entries,
+\textsf{booktitle} and/or a \textsf{maintitle}, in which situation the
+\textsf{editor} would be associated with one of these latter fields
+(donne:var).  (In \textsf{article} and \textsf{review} entries,
 \textsf{namea} applies to the \textsf{title} instead of the
 \textsf{issuetitle}, should the latter be present.)  You should
 present names in the field exactly as you would those in an
 \textsf{author} or \textsf{editor} field, and the package will
-concatenate this field with \textsf{nameb} if they are identical.  See
-under \textbf{editor} above for the full details.  Please note that,
-as the field is highly single-entry specific, if you are using
-\textsf{Biber} \textsf{namea} isn't inherited from a
-\textsf{crossref}'ed parent entry.  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
-section~\ref{sec:formatcommands}.
+concatenate this field with \textsf{nameb} if they are identical.
+When choosing a name to head a note or a bibliography entry,
+\textsf{biblatex-chicago} gives precedence to \textsf{namea} over
+\textsf{editor}.  See under \textbf{editor} above for the full
+details.  Please note that, as the field is highly single-entry
+specific, if you are using \textsf{Biber} \textsf{namea} isn't
+inherited from a \textsf{crossref}'ed parent entry.  Please note,
+also, that you can use the \mycolor{\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{parteditandcomp},
+\cmd{parttransandcomp}, and \cmd{partedittransand\-comp}, for which
+see section~\ref{sec:formatcommands}.
 
 \mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
@@ -2935,6 +2997,13 @@ string linking the two parts of the cross-reference.  The code
 automatically tests for a known bibstring, which it will italicize.
 Otherwise, it prints the string as is.
 
+\mybigspace You \colmarginpar{\textbf{nameatype}} can use this field
+to change the role of a \textsf{namea} just as you can use
+\textsf{editortype} to change the role of an \textsf{editor}.  As with
+the \textsf{editortype}, using this field prevents string
+concatenation with identical \textsf{nameb} or \textsf{namec} fields.
+Please see \textbf{editortype}, above, for the details.
+
 \mybigspace Like \mymarginpar{\textbf{nameb}} \textsf{namea}, above,
 this is a field left undefined by the standard \textsf{biblatex}
 styles.  In \textsf{biblatex-chicago}, it contains the name(s) of the
@@ -2950,14 +3019,16 @@ concatenate this field with \textsf{namea} if they are identical.  See
 under the \textbf{translator} field below for the full details.
 Please note that, as the field is highly single-entry specific, if you
 are using \textsf{Biber} \textsf{nameb} isn't inherited from a
-\textsf{crossref}'ed parent entry.  Cf.\ also \textsf{namea},
-\textsf{namec}, \textsf{origlanguage}, \textsf{translator},
-\textsf{userf} and the macros \cmd{partedit}, \cmd{parttrans},
-\cmd{parteditandtrans}, \cmd{partcomp}, \cmd{parteditandcomp},
-\cmd{parttransandcomp}, and \cmd{partedittransandcomp} in
-section~\ref{sec:formatcommands}.
+\textsf{crossref}'ed parent entry.  Please note, also, that in
+\textsf{biblatex-chicago's} name-finding algorithms \textsf{nameb}
+takes precedence over \textsf{translator}.  Cf.\ \textsf{namea},
+\textsf{namec}, \textsf{origlanguage} (section~\ref{sec:related}),
+\textsf{translator}, \textsf{userf} (section~\ref{sec:related}), and
+the macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans},
+\cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and
+\cmd{partedittransand\-comp} in section~\ref{sec:formatcommands}.
 
-\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (14.87)
+\mybigspace The \colmarginpar{\textbf{namec}} \emph{Manual} (14.87)
 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
@@ -2982,14 +3053,10 @@ please note that I've arranged the concatenation algorithms to include
 so in this particular circumstance you can, if needed, make
 \textsf{namec} analogous to these two latter, \textsf{title}-only
 fields.  (See above under \textbf{editortype} for details of how you
-may, in certain circumstances, use that field to identify a compiler.
-This method will be particularly useful if you don't need to
-concatenate the \textsf{namec} with any other role, because if you use
-the \textsf{editor} field \textsf{biblatex} will automatically attend
-to alphabetization and name-replacement in the bibliography, and will
-also provide a name for short notes.)
+may, in certain circumstances, use that field, or the
+\mycolor{\textsf{nameatype}} field, to identify a compiler.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace It might conceivably be necessary at some point to
 identify the compiler(s) of a \textsf{title} separate from the
@@ -3000,23 +3067,16 @@ to fall back on the \cmd{partcomp} macro or the related
 \cmd{partedittransandcomp}, on which see Commands
 (section~\ref{sec:formatcommands}) below.  (Future releases may be
 able to remedy this.)  It may be as well to mention here too that of
-the three names that can be substituted for the missing
-\textsf{author} at the head of an entry,
-\textsf{biblatex-chicago-notes} will choose an \textsf{editor} if
-present, then a \textsf{translator} if present, falling back to
-\textsf{namec} only in the absence of the other two, and assuming that
-the fields aren't identical, and therefore to be concatenated.  In a
-change from the previous behavior, these algorithms also now test for
-\textsf{namea} or \textsf{nameb}, which will be used instead of
-\textsf{editor} and \textsf{translator}, respectively, giving the
-package the greatest likelihood of finding a name to place at the head
-of an entry.  Please remember, however, that if this name is supplied
-by any of the non-standard fields \textsf{name[a-c]}, and you're not
-using \textsf{Biber}, then you will need to provide a \textsf{sortkey}
-to assist with alphabetization in the bibliography (cf.\
-\cmd{DeclareSortingScheme} in section~\ref{sec:formatopts}, below.)  A
-\textsf{shortauthor} is no longer necessary for the short note form,
-as the style will provide it automatically.
+the names that can be substituted for the missing \textsf{author} at
+the head of an entry, \textsf{biblatex-chicago-notes} will choose a
+\textsf{namea} if present, then an \textsf{editor}, a \textsf{nameb},
+or a \textsf{translator}, with \textsf{namec} coming last, assuming
+that the fields aren't identical, and therefore to be concatenated.
+The alphabetization routines should work properly for any of these
+names, but do please remember that if you want the package to skip
+over any names you can employ the \texttt{use<name>=false} options.
+Indeed, \textsf{biblatex's} \mycolor{\texttt{usenamec}} has replaced
+the old Chicago-specific \texttt{usecompiler}, which is deprecated.
 
 \mybigspace As \mymarginpar{\textbf{note}} in standard
 \textsf{biblatex}, this field allows you to provide bibliographic data
@@ -3122,86 +3182,17 @@ 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.
+\textsf{location} field.  (The \textsf{origyear} field usually works,
+too.)
 
-%%\enlargethispage{\baselineskip}
+\mybigspace See
+\vspace{-14.2pt}
+\colmarginpar{\textbf{origlanguage}\\
+\textbf{origlocation}\\\textbf{origpublisher}}
+section~\ref{sec:related}, below.
+\vspace{18pt}
 
-\mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the
-\emph{Manual}'s specifications, I have fairly thoroughly redefined
-\textsf{biblatex}'s facilities for treating translations.  The
-\textsf{origtitle} field isn't used, while the \textsf{language} and
-\textsf{origdate} fields have been press-ganged for other duties.  The
-\textsf{origlanguage} field, for its part, retains a dual role in
-presenting translations in a bibliography.  The details of the
-\emph{Manual}'s suggested treatment when both a translation and an
-original are cited may be found below under \textbf{userf}.  Here,
-however, I simply note that the introductory string used to connect
-the translation's citation with the original's is \enquote{Originally
-  published as,} which I suggest may well be inaccurate in a great
-many cases, as for instance when citing a work from classical
-antiquity, which will most certainly not \enquote{originally} have
-been published in the Loeb Classical Library.  Although not, strictly
-speaking, authorized by the \emph{Manual}, I have provided another way
-to introduce the original text, using the \textsf{origlanguage} field,
-which must be provided \emph{in the entry for the translation, not the
-  original text} (aristotle:metaphy:trans).  If you put one of the
-standard \textsf{biblatex} bibstrings there (enumerated below), then
-the entry will work properly across multiple languages.  Otherwise,
-just put the name of the language there, localized as necessary, and
-\textsf{biblatex-chicago} will eschew \enquote{Originally published
-  as} in favor of, e.g., \enquote{Greek edition:} or \enquote{French
-  edition:}.  This has no effect in notes, where only the work cited
---- original or translation --- will be printed, but it may help to
-make the \emph{Manual}'s suggestions for the bibliography more
-palatable.
-
-\mylittlespace That was the first usage, in keeping at least with the
-spirit of the \emph{Manual}.  I have also, perhaps less in keeping
-with that specification, retained some of \textsf{biblatex}'s
-functionality for this field.  If an entry doesn't have a
-\textsf{userf} field, and therefore won't be combining a text and its
-translation in the bibliography, you can also use
-\textsf{origlanguage} as Lehman intended it, so that instead of
-saying, e.g., \enquote{translated by X,} the entry will read
-\enquote{translated from the German by X.}  The \emph{Manual} doesn't
-mention this, but it may conceivably help avoid certain ambiguities in
-some citations.  As in \textsf{biblatex}, if you wish to use this
-functionality, you have to provide \emph{not} the name of the
-language, but rather a bibliography string, which may, at the time of
-writing, be one of \texttt{american}, \texttt{brazilian},
-\texttt{danish}, \texttt{dutch}, \texttt{english}, \texttt{french},
-\texttt{german}, \texttt{greek}, \texttt{italian}, \texttt{latin},
-\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).  Starting with this release of \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 now 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 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}, \textsf{origpublisher} and \textsf{pubstate};
-schweitzer:bach.)
-
-\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 now 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}, and
-\textsf{pubstate}; schweitzer:bach.)
-
-\mybigspace This \colmarginpar{\textbf{pages}} is the standard
+\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
@@ -3218,8 +3209,8 @@ 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 has recently brought to my attention a
-discussion that took place a couple of years ago on
+\mylittlespace David Gohlke brought to my attention a discussion that
+took place a couple of years ago on
 \href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{Stackexchange}
 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
@@ -3229,10 +3220,9 @@ 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
-\mycolor{\texttt{compresspages=true}} when loading
-\textsf{biblatex-chicago} should automatically give you the
-Chicago-recommended page ranges.
+this code a package option, so setting \texttt{compresspages=true}
+when loading \textsf{biblatex-chicago} should automatically give you
+the Chicago-recommended page ranges.
 
 \mybigspace This, \mymarginpar{\textbf{pagination}} a standard
 \textsf{biblatex} field, allows you automatically to prefix the
@@ -3243,7 +3233,7 @@ appropriate identifying string to information you provide in the
 all the details on this functionality, as aside from the difference
 just mentioned the two fields are equivalent.
 
-\mybigspace Standard \colmarginpar{\textbf{part}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{part}} \textsf{biblatex}
 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
@@ -3257,13 +3247,13 @@ capitalizing it if necessary, rather than supplying the usual
 bibstring, so this provides a mechanism for altering the string to
 your liking.  The field will be printed in the same place in any entry
 as would a \textsf{volume} number, and although it will most usually
-be associated with such a number, it can also, as of this release,
-function independently, allowing you to identify parts of works that
-don't fit into the standard scheme.  If you need to identify
-\enquote{parts} or \enquote{books} that are part of a published
-\textsf{series}, for example, then you'll need to use a different
-field, (which in this case would be \textsf{number}
-[palmatary:pottery]).  Cf.\ \textsf{volume}.
+be associated with such a number, it can also function independently,
+allowing you to identify parts of works that don't fit into the
+standard scheme.  If you need to identify \enquote{parts} or
+\enquote{books} that are part of a published \textsf{series}, for
+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}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
@@ -3293,71 +3283,16 @@ 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 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.
-
-%\enlargethispage{\baselineskip}
-
-\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.)
-Please remember that, currently, if you put anything besides
-\texttt{reprint} in the \textsf{pubstate} field it will silently be
-ignored, but this may change in future releases.
+\mybigspace See \colmarginpar{\textbf{pubstate}}
+section~\ref{sec:related}, below.
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
 \emph{Manual} doesn't actually mention it.  It may be useful for some
 purposes.  Cf.\ \textsf{annotator} and \textsf{commentator}.
 
-\mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
-\textbf{Please note that this feature is in an alpha state, and that
-  I'm contemplating using a different field in the future for this
-  functionality.  I include it here in the hope that it might receive
-  some testing in the meantime.}  At the 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.
+\mybigspace See \colmarginpar{\textbf{reprinttitle}}
+section~\ref{sec:related}, below.
 
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
@@ -3388,7 +3323,7 @@ preferences regarding the formatting of numerals.
 
 %\enlargethispage{\baselineskip}
 
-\paragraph*{\protect\mymarginpar{\textbf{shortauthor}}}
+\paragraph*{\protect\colmarginpar{\textbf{shortauthor}}}
 \label{sec:shortauthor}
 
 This is a standard \textsf{biblatex} field, but
@@ -3400,19 +3335,18 @@ the \textsf{biblatex} system selects the author's last name from the
 \textsf{author} field and uses it in such a reference, and if there is
 no \textsf{author} it will search \textsf{namea}, \textsf{editor},
 \textsf{nameb}, \textsf{translator}, and \textsf{namec}, in that
-order.  (In the case of the non-standard names \textsf{name[a-c]}, you
-will need to provide a \textsf{sortkey} if you aren't using
-\textsf{Biber}.  Cf.\ \cmd{DeclareSortingScheme} and
-\cmd{DeclareLabelname} in section~\ref{sec:formatopts}, below.)  In an
-author-less \textsf{article} or \textsf{review} entry
+order.  In an author-less \textsf{article} or \textsf{review} entry
 (\textsf{entrysubtype} \texttt{magazine}), where
 \textsf{biblatex-chicago-notes} will use the \textsf{journaltitle} as
-the author, or in author-less \textsf{manual} entries, where the
-\textsf{organization} will be so used, the style automatically
-provides the same substitution in the short note form, though you'll
-still need to help the alphabetization routines by providing a
-\textsf{sortkey} field in such cases (dyna:browser, gourmet:052006,
-lakeforester:pushcarts, nyt:trevorobit).
+the author, you can use the \colmarginpar{New}
+\mycolor{\textsf{shortjournal}} field instead, but you'll need to set
+up the \mycolor{\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,
+gourmet:052006, lakeforester:pushcarts, nyt:trevorobit).
 
 \mylittlespace As mentioned under \textsf{editortype}, the
 \emph{Manual} (14.87) recommends against providing the identifying
@@ -3428,22 +3362,28 @@ in this case for, e.g., a \textsf{collection} entry that typically
 lacks an author.  The \textsf{shortauthor} field works just as well in
 most situations, but if you have set \texttt{useauthor=false} (and not
 \texttt{useeditor=false}) in an entry's \textsf{options} field, then
-only \textsf{shorteditor} will be recognized.  Cf.\
-\textsf{editortype}, above.
+only \textsf{shorteditor} will be recognized.  It may be worth
+pointing out that, because \textsf{biblatex-chicago} also provides a
+\textsf{namea} field for the editor of a \textsf{title} as opposed to
+a \textsf{main-} or \textsf{booktitle}, and because in standard use
+the \textsf{namea}, if present, will be chosen to head a bibliography
+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.
 
-\mybigspace This \colmarginpar{\textbf{shorthand}} is
+\mybigspace This \mymarginpar{\textbf{shorthand}} is
 \textsf{biblatex}'s mechanism for using abbreviations in place of the
 usual short note form, and in previous releases I left it effectively
 unmodified in \textsf{biblatex-chicago-notes}, apart from a few
-formatting tweaks.  For this release, at the request of Kenneth Pearce
-and following some hints in the \emph{Manual}, I have made the system
-considerably more flexible, which I hope might be useful for those
-with specialized formatting needs.  In the default configuration, any
-entry which contains a \textsf{shorthand} field will produce a normal
-first note, 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
+formatting tweaks.  At the request of Kenneth Pearce, and following
+some hints in the \emph{Manual}, I have made the system considerably
+more flexible, which I hope might be useful for those with specialized
+formatting needs.  In the default configuration, any entry which
+contains a \textsf{shorthand} field will produce a normal first note,
+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
 abbreviations for reference purposes, a list which the \emph{Manual}
 suggests should be placed either in the front matter (when using
@@ -3470,22 +3410,22 @@ 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
 information.)
 
-\mylittlespace Alexandre \colmarginpar{New!} Roberts has suggested a
-further refinement to \textsf{shorthand} behavior, which allows for it
-to appear in the place of the usual abbreviated citation of parent
-entries cross-referenced by several different child entries.  In such
-a case, instead of the usual \enquote{\ldots\,in Author, \emph{Title},
+\mylittlespace Alexandre Roberts suggested a further refinement to
+\textsf{shorthand} behavior, which allows for it to appear in the
+place of the usual abbreviated citation of parent entries
+cross-referenced by several different child entries.  In such a case,
+instead of the usual \enquote{\ldots\,in Author, \emph{Title},
   24--38,} you would see instead \enquote{\ldots\,in \emph{ShrtHd},
   24--38.}  There are several steps required for enabling this
-behavior.  First, you need to set the new package option
-\mycolor{\texttt{inheritshorthand}} to \texttt{true}, which allows
-child entries to inherit the necessary fields from their
-cross-referenced parents.  Second, you'll probably want to use the
-\textsf{shorthandintro} field somehow to clarify that the
-\textsf{shorthand} applies to the \emph{parent} rather than to the
-\emph{child}, as otherwise the reference will be ambiguous.  Third,
-you'll need to put \texttt{skipbiblist}, formerly \texttt{skiplos}, in
-the \textsf{options} field of the child entries so that the
+behavior.  First, you need to set the package option
+\texttt{inheritshorthand} to \texttt{true}, which allows child entries
+to inherit the necessary fields from their cross-referenced parents.
+Second, you'll probably want to use the \textsf{shorthandintro} field
+somehow to clarify that the \textsf{shorthand} applies to the
+\emph{parent} rather than to the \emph{child}, as otherwise the
+reference will be ambiguous.  Third, you'll need to put
+\texttt{skipbiblist}, formerly \texttt{skiplos}, in the
+\textsf{options} field of the child entries so that the
 \textsf{shorthand} itself appears in the list of shorthands
 \emph{only} next to the parent entry, and not also next to all of its
 children.
@@ -3494,15 +3434,15 @@ children.
 formerly recommended against using shorthands with cross-references,
 but this extension of their use makes sense as an extra space-saving
 measure.  I'm not certain that I've identified all the possible
-drawbacks to enabling the \mycolor{\texttt{inheritshorthand}} option,
-so care is still needed, at least in the current state of
+drawbacks to enabling the \texttt{inheritshorthand} option, so care is
+still needed, at least in the current state of
 \textsf{biblatex-chicago-notes}.  Please report any problems you might
 have with this functionality to the email address at the head of this
 documentation.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
-\mybigspace When \mymarginpar{\textbf{shorthandintro}} you include a
+\mybigspace When \colmarginpar{\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
 parentheses and prefaced by the phrase \enquote{hereafter cited as.}
@@ -3515,18 +3455,63 @@ shorthand in later citations and in the list of shorthands.  Finally,
 I've tried to allow for as many different styles of notification as
 possible, so by default the only punctuation that will appear between
 the rest of the citation and the \textsf{shorthandintro} is a space.
-If you are not enclosing the whole phrase in parentheses, you may need
-to provide additional punctuation in the field itself, e.g.,
-\texttt{\{\textbackslash addperiod\textbackslash space Cited
-  as\ldots\}}.
-
-\mybigspace A \mymarginpar{\textbf{shorttitle}} standard
+You can \colmarginpar{New} change this punctuation, either in the
+preamble for the whole document or in individual entries, using the
+\mycolor{\texttt{shorthandpunct}} option, documented in
+section~\ref{sec:chicpreset}.  If the available option keys aren't
+adequate, you can use \texttt{none} and then provide custom
+punctuation inside the \textsf{shorthandintro} field itself.
+
+\mybigspace A \colmarginpar{\textbf{shortjournal}} special
+\textsf{biblatex} field, used to provide both 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
+utilize this functionality in your documents, but there are several
+steps to take in order to do so.  First, you'll need to provide both
+\textsf{shortjournal} and \textsf{journaltitle} fields in the entry
+types that use them, i.e., mainly \textsf{article} and \textsf{review}
+entries.  In \textsf{periodical} entries the \textsf{title} field
+presents what would be the \textsf{journaltitle} in the previous two,
+so in such entries you can provide the standard \textsf{shorttitle}
+field to accompany the \textsf{title}, and \textsf{biblatex-chicago}
+will automatically copy the \textsf{shorttitle} into a
+\mycolor{\textsf{shortjournal}}.
+
+\mylittlespace Having done this, you need to set the
+\mycolor{\texttt{journalabbrev}} option either when loading
+\textsf{biblatex-chicago} or in the \textsf{options} field of
+individual .bib entries.  By default, this option is not set, so your
+\textsf{shortjournal} 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 \cmd{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-
+or endnotes (\mycolor{\texttt{sjnotes}} and
+\mycolor{\texttt{sjendnotes}}, 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 (bold italic), you can
+roll your own using \cmd{DeclareFieldFormat\{shortjour\-nalwidth\}} ---
+you can see its default definition at the top of
+\textsf{chicago-notes.bbx}.
+
+\mybigspace A \colmarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
-title for short notes.  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;
-jackson:paulina:letter, white:ross:memo, white:russ.)  Some
+title for short notes.  (It is also the way to hook
+\textsf{periodical} entries into the \mycolor{\textsf{shortjournal}}
+mechanism, 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; 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
@@ -3557,11 +3542,11 @@ 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).  Lehman also provides
-\textbf{sortname}, \textbf{sorttitle}, and \textbf{sortyear} for more
-fine-grained control.  Please consult \textsf{biblatex.pdf} and the
-remarks on \cmd{DeclareSortingScheme} in section~\ref{sec:formatopts},
-below.
+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
+\textsf{biblatex.pdf} and the remarks on \cmd{DeclareSortingScheme} in
+section~\ref{sec:formatopts}, below.
 
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
@@ -3661,10 +3646,10 @@ quotation, retains those marks in all title types (kimluu:diethyl).
 \textsf{biblatex-chicago-notes} will automatically capitalize the
 first word of the \textsf{title} after sentence-ending punctuation,
 assuming that such a \textsf{title} begins with a lowercase letter in
-your .bib database.  See \textbf{\textbackslash autocap} below for
-more details.
+your .bib database.  See\,\textbf{\textbackslash autocap} in
+section~\ref{sec:formatcommands} below for more details.
 
-\mybigspace Standard \mymarginpar{\textbf{titleaddon}}
+\mybigspace Standard \colmarginpar{\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
@@ -3679,21 +3664,27 @@ this rule is when your data begins with a word that would ordinarily
 only be capitalized at the beginning of a sentence, in which case you
 need then simply ensure that that word is in lowercase, and
 \textsf{biblatex-chicago-notes} will automatically do the right thing.
-See\ \textbf{\textbackslash autocap}, below.  (Cf.\ brown:bremer,
-osborne:poison, reaves:rosen, and white:ross:memo for examples where
-the field starts with a lowercase letter; morgenson:market provides an
-example where the \textsf{titleaddon} field, holding the name of a
-regular column in a newspaper, is capitalized, a situation that is
-handled as you would expect.)
-
-\enlargethispage{-\baselineskip}
-
-\mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
+See\,\textbf{\textbackslash autocap} in
+section~\ref{sec:formatcommands}, below.  The package and entry
+options \colmarginpar{New} \mycolor{\texttt{ptitleaddon}} and
+\mycolor{\texttt{ctitleaddon}} (section~\ref{sec:chicpreset}) allow
+you to customize the punctuation that appears before the
+\textsf{titleaddon} field.  (Cf.\ brown:bremer, osborne:poison,
+reaves:rosen, and white:ross:memo for examples where the field starts
+with a lowercase letter; morgenson:market provides an example where
+the \textsf{titleaddon} field, holding the name of a regular column in
+a newspaper, is capitalized, a situation that is handled as you would
+expect; coolidge:speech shows both entry options for controlling the
+punctuation.)
+
+%\enlargethispage{-\baselineskip}
+
+\mybigspace As \colmarginpar{\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
-complications that need explaining.  Lehman points out in his
-documentation that the \textsf{translator} field will be associated
-with a \textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
+complications that need explaining.  \textsf{Biblatex.pdf} points out
+that the \textsf{translator} field will be associated with a
+\textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
 depending on the sort of entry.  More specifically,
 \textsf{biblatex-chicago} associates the \textsf{translator} with the
 most comprehensive of those titles, that is, \textsf{maintitle} if
@@ -3706,7 +3697,9 @@ one part of a collection or for one volume of a multi-volume work.
 For these cases I have provided the \textsf{nameb} field.  You should
 format names for this field as you would for \textsf{author} or
 \textsf{editor}, and these names will always be associated with the
-\textsf{title} (euripides:orestes).
+\textsf{title} (euripides:orestes) In the algorithm for finding a name
+for the head of notes and bibliography entries, \textsf{nameb} takes
+precedence over \textsf{translator}.
 
 \mylittlespace I have also provided a \textsf{namea} field, which
 holds the editor of a given \textsf{title} (euripides:orestes).  If
@@ -3725,11 +3718,11 @@ macro, which I discuss further in the commands section below
 [\ref{sec:formatcommands}].)
 
 \mylittlespace Finally, as I detailed above under \textbf{author}, in
-the absence of an \textsf{author} or an \textsf{editor}, the
-\textsf{translator} will be used at the head of an entry
-(silver:gawain), and the bibliography entry alphabetized by the
-translator's name, behavior that can be controlled with the
-\texttt{{usetranslator}} switch in the \textsf{options} field.  Cf.\
+the absence of an \textsf{author}, \textsf{namea}, \textsf{editor},
+and \textsf{nameb}, the \textsf{translator} will be used at the head
+of an entry (silver:gawain), and the bibliography entry alphabetized
+by the translator's name, behavior that can be controlled with the
+\texttt{use<name>} switches in the \textsf{options} field.  Cf.\
 \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and
 \textsf{namec}.
 
@@ -3765,7 +3758,7 @@ do the right thing in citations.  Cf.\ \textsf{artwork},
 above, for all the details.  (See auden:reading, bedford:photo,
 cleese:holygrail, leo:madonna, nytrumpet:art.)
 
-%%\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace A standard \mymarginpar{\textbf{url}} \textsf{biblatex}
 field, it holds the url of an online publication, though you can
@@ -3774,7 +3767,11 @@ provide one for all entry types.  The 16th edition of the
 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.
+properly, in the text and in the reference apparatus.  It
+\colmarginpar{New} 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}}
 \textsf{biblatex} field, it identifies exactly when you accessed a
@@ -3798,7 +3795,7 @@ field will be placed, unformatted and between commas, after the
 identifying the broadcast network when you cite a radio or television
 program (14.221; bundy:macneil).
 
-\mybigspace I \mymarginpar{\textbf{userc}} have now implemented this
+\mybigspace I \mymarginpar{\textbf{userc}} have implemented this
 supplemental \textsf{biblatex} field as part of Chicago's name
 cross-referencing system.  (The \enquote{c} part is meant as a sort of
 mnemonic for this function, though it's perfectly possible to use the
@@ -3816,19 +3813,18 @@ entry in the bibliography to which the cross-reference will point.
 (See 14.84, 14.86; creasey:ashe:blast, creasey:morton:hide,
 creasey:york:death, lecarre:quest.)
 
-\mybigspace The \colmarginpar{\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 \colmarginpar{New!} the absence
-of a \textsf{urldate}, you can now, in most entry types, include a
+contain (14.7--8; 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}.
 
@@ -3865,40 +3861,10 @@ 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.)
 
-%%\enlargethispage{\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{userf}} is the last 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)
-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
-provided a third cross-referencing system (the others being
-\textsf{crossref} and \textsf{xref}), and have chosen the name
-\textsf{userf} because it might act as a mnemonic for its function.
+\mybigspace See \colmarginpar{\textbf{userf}}
+section~\ref{sec:related}, below.
 
-\mylittlespace In order to use this system, you should start by
-entering both the original and its translation into your .bib file,
-just as you normally would.  The mechanism works for any entry type,
-and the two entries need not be of the same type.  In the entry for
-the \emph{translation}, you put the cite key of the original into the
-\textsf{userf} field.  In the \emph{original's} entry, you need to
-include something that will prevent the entry from being printed
-separately in the bibliography --- \texttt{skipbib} in the
-\textsf{options} field will work, as would something in the
-\textsf{keywords} field in conjunction with a \texttt{notkeyword=}
-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: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
-language in \textsf{origlanguage}, and instead of \texttt{originally
-  published as}, you'll get \texttt{French edition:} or \texttt{Latin
-  edition:}, etc.\ (aristotle:metaphy:gr, aristotle:metaphy:trans).
+%%\enlargethispage{\baselineskip}
 
 \mybigspace Standard \mymarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
@@ -3911,7 +3877,7 @@ instead.  Anything in a \textsf{venue} field will be ignored.
 field, currently only available in \textsf{misc} and \textsf{patent}
 entries in \textsf{biblatex-chicago-notes}.
 
-\mybigspace Standard \colmarginpar{\textbf{volume}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex}
 field.  It holds the volume of a \textsf{journaltitle} in
 \textsf{article} (and some \textsf{review}) entries, and also the
 volume of a multi-volume work in many other sorts of entry.  The
@@ -3924,11 +3890,11 @@ possibility of this information appearing \emph{after} the publication
 data, just before page numbers.  In the past, if you wanted the volume
 information to appear here, you had to leave that information out of
 your .bib entry and give it in the \textsf{pages} or \textsf{postnote}
-field.  Now, you can use the new \textsf{biblatex-chicago} option
-\mycolor{\texttt{delayvolume}} \colmarginpar{\texttt{delayvolume}} in
-your preamble or in the \textsf{options} field of an entry to ensure
-that any \textsf{volume} information that would normally have appeared
-just before the publication data in a long note appears after it.
+field.  Now, you can use the \textsf{biblatex-chicago} option
+\texttt{delayvolume} \mymarginpar{\texttt{delayvolume}} in your
+preamble or in the \textsf{options} field of an entry to ensure that
+any \textsf{volume} information that would normally have appeared just
+before the publication data in a long note appears after it.
 
 \mylittlespace The \textsf{volume} information in both books and
 periodicals, and in both the bibliography and long notes, can appear
@@ -3937,16 +3903,16 @@ periodicals, and in both the bibliography and long notes, can appear
 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 new command \mycolor{\cmd{postvolpunct}}
-\colmarginpar{\cmd{postvolpunct}}.  By default it prints
-\cmd{addcolon}, but you can use \cmd{renewcommand\{\textbackslash
+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}
 
-\mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex}
+\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;
@@ -3955,14 +3921,13 @@ 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 new
-option \mycolor{\texttt{hidevolumes}},
-\colmarginpar{\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.
+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.
 
 \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref}
 field provided by \textsf{biblatex}, which prevents inheritance of any
@@ -3978,6 +3943,325 @@ 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.
 
+\subsubsection{\mycolor{Fields for Related Entries}}
+\label{sec:related}
+
+As \textsf{biblatex.pdf} puts it (§~3.4), \enquote{Almost all
+  bibliography styles require authors to specify certain types of
+  relationship between entries such as \enquote{Reprint of},
+  \enquote{Reprinted in,} etc. It is impossible to provide data fields
+  to cover all of these relationships and so \textsf{biblatex}
+  provides a general mechanism for this using the entry fields
+  \textsf{related}, \textsf{relatedtype} and \textsf{relatedstring}.}
+Before this mechanism was available \textsf{biblatex-chicago}
+attempted to provide a similar but much more limited set of
+inter-entry relationships using the \textsf{biblatex} fields
+\textsf{origlanguage}, \textsf{origlocation}, \textsf{origpublisher},
+\textsf{pubstate}, \textsf{reprinttitle}, and \textsf{userf}.  All of
+these still work just as they always have or, I hope, somewhat better
+than they always have after many recent bug fixes, but the more
+general and more powerful \textsf{biblatex} \mycolor{\texttt{related}}
+mechanism is also available.  It can provide much of what the older
+system provided and a great deal that it couldn't.  What follows is a
+field-by-field discussion of the options now available.
+
+\mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the
+\emph{Manual}'s specifications, I have fairly thoroughly redefined
+\textsf{biblatex}'s facilities for treating translations.  The
+\textsf{origtitle} field isn't used, while the \textsf{language} and
+\textsf{origdate} fields have been press-ganged for other duties.  The
+\textsf{origlanguage} field, for its part, retains a dual role in
+presenting translations in a bibliography.  The details of the
+\emph{Manual}'s suggested treatment when both a translation and an
+original are cited may be found below under \textbf{userf}.  Here,
+however, I simply note that the introductory string used to connect
+the translation's citation with the original's is \enquote{Originally
+  published as,} which I suggest may well be inaccurate in a great
+many cases, as for instance when citing a work from classical
+antiquity, which will most certainly not \enquote{originally} have
+been published in the Loeb Classical Library.  Although not, strictly
+speaking, authorized by the \emph{Manual}, I have provided another way
+to introduce the original text, using the \textsf{origlanguage} field,
+which must be provided \emph{in the entry for the translation, not the
+  original text} (aristotle:metaphy:trans).  If you put one of the
+standard \textsf{biblatex} bibstrings there (enumerated below), then
+the entry will work properly across multiple languages.  Otherwise,
+just put the name of the language there, localized as necessary, and
+\textsf{biblatex-chicago} will eschew \enquote{Originally published
+  as} in favor of, e.g., \enquote{Greek edition:} or \enquote{French
+  edition:}.  This has no effect in notes, where only the work cited
+--- original or translation --- will be printed, but it may help to
+make the \emph{Manual}'s suggestions for the bibliography more
+palatable.  \textbf{NB:} You can use the \mycolor{\textsf{relatedtype}
+  \texttt{origpubas}} with a customized
+\mycolor{\textsf{relatedstring}} field to achieve the same ends.
+
+\mylittlespace That was the first usage, in keeping at least with the
+spirit of the \emph{Manual}.  I have also, perhaps less in keeping
+with that specification, retained some of \textsf{biblatex}'s
+functionality for this field.  If an entry doesn't have a
+\textsf{userf} field, and therefore won't be combining a text and its
+translation in the bibliography, you can also use
+\textsf{origlanguage} as the standard styles use it, so that instead
+of saying, e.g., \enquote{translated by X,} the entry will read
+\enquote{translated from the German by X.}  The \emph{Manual} doesn't
+mention this, but it may conceivably help avoid certain ambiguities in
+some citations.  As in \textsf{biblatex}, if you wish to use this
+functionality, you have to provide \emph{not} the name of the
+language, but rather a bibliography string, which may, at the time of
+writing, be one of \texttt{american}, \texttt{brazilian},
+\texttt{danish}, \texttt{dutch}, \texttt{english}, \texttt{french},
+\texttt{german}, \texttt{greek}, \texttt{italian}, \texttt{latin},
+\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
+\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 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 \mycolor{\texttt{related}}
+field, though the \mycolor{\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 \mycolor{\texttt{related}} field, though the
+\mycolor{\textsf{relatedtype} \texttt{origpubin}} presents much the
+same information \emph{after} the entry, using data extracted from a
+separate entry.
+
+\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.)
+Please remember that, currently, if you put anything besides
+\texttt{reprint} in the \textsf{pubstate} field it will silently be
+ignored, but this may change in future releases.  \textbf{NB:} The
+\textsf{pubstate} functionality currently has no equivalent using the
+\mycolor{\textsf{related}} field.
+
+\mybigspace This \colmarginpar{\textbf{related}} field is required to
+use \textsf{biblatex's} \mycolor{\textsf{related}} functionality, and
+it should contain the entry key or keys from which \textsf{biblatex}
+should extract data for presentation not on its own, but rather in the
+bibliography entry (or long note) which contains the \textsf{related}
+field itself.  Indeed, unless you change the defaults using the
+\mycolor{\textsf{relatedoptions}} field this data will only appear in
+such entries, never on its own.  Without a
+\mycolor{\textsf{relatedtype}} field, this will print the default
+type, equivalent to a long note citation \emph{immediately after} the
+bibliography entry containing the \textsf{related} field, with no
+intervening string.  You can specify a string using the
+\mycolor{\textsf{relatedstring}} field, so in effect this presents a
+powerful mechanism for presenting full references to related material
+of any sort whatsoever.
+
+\mylittlespace By \colmarginpar{\texttt{related=bib}} default, the
+package option \mycolor{\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.)
+
+\mybigspace This \colmarginpar{\textbf{relatedoptions}} field will, I
+should expect, only be needed very rarely.  If you want to set
+entry-level options for a \mycolor{\textsf{related}} entry this is
+where you can do it, though please remember one important detail.  By
+default, \textsf{Biber} sets this option to \texttt{dataonly}, which
+among other things prevents the \mycolor{\textsf{related}} entry from
+appearing separately in the bibliography.  If you use the field
+yourself, then you'll need to include \texttt{dataonly} as one of the
+options therein to maintain this effect.  Of course, it may be you
+don't want all the effects of \texttt{dataonly}, so you can tailor it
+however you wish.  See \textsf{biblatex.pdf} §~3.4.
+
+\mybigspace The \colmarginpar{\textbf{relatedstring}} procedure for
+choosing a string to connect the main entry with its related entry/ies
+is straightforward, the default being a \texttt{bibstring}, if any,
+with the same name as the \mycolor{\textsf{relatedtype}}, or
+alternately a string or strings defined within the driver for that
+\mycolor{\textsf{relatedtype}}, as happens with the types
+\mycolor{\texttt{origpubin}} and \mycolor{\texttt{bytranslator}}.
+Failing these, you can supply your own in the
+\mycolor{\textsf{relatedstring}} field, either in the form of the name
+of a pre-defined \texttt{bibstring} or as any text you choose, and
+anything in this field always takes precedence over the automatic
+choices.  If your non-\texttt{bibstring} starts with a lowercase
+letter then \textsf{biblatex-chicago} will capitalize it automatically
+for you depending on context (weed:flatiron).  I have not altered the
+standard \textsf{relatedtype} strings, and have indeed changed the
+\textsf{reprinttitle} mechanism to use the
+\mycolor{\texttt{reprintfrom}} string, which works better
+syntactically in this context.
+
+\mybigspace The \colmarginpar{\textbf{relatedtype}} standard
+\textsf{biblatex} styles define six \mycolor{\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:
+
+\begin{description}
+\item[\qquad \mycolor{bytranslator:}] This prints a full citation of a
+  translation, starting with the (localized) string
+  \enquote{Translated by \textsf{translator} as \textsf{Title},
+    \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}
+  mechanism provides the other, as does the
+  \mycolor{\texttt{origpubas} \textsf{relatedtype}} (see below).
+\item[\qquad \mycolor{default:}] This is the macro used when no
+  \mycolor{\textsf{relatedtype}} is defined.  It prints, as in the
+  standard styles, and with no intervening string, a full citation of
+  the \mycolor{\textsf{related}} entries.  In
+  \textsf{biblatex-chicago-notes}, the citation is in long note form,
+  rather than bibliography form, as this is the usual practice in the
+  \emph{Manual}.
+\item[\qquad \mycolor{multivolume:}] This briefly lists the individual
+  volumes in a multi-volume work, and works much as in the standard
+  styles.  The \emph{Manual}, as far as I can see, has little to say
+  on the matter.
+\item[\qquad \mycolor{origpubas:}] This type can, if you want, replace
+  the old \textsf{userf} mechanism, described below, for presenting an
+  original with its translation.  It's quite similar to the
+  \mycolor{\texttt{default}} type, but with a \texttt{bibstring}
+  automatically connecting the entry with its \textsf{related}
+  entries.  You can identify other sorts of relationships if you
+  change the introductory string using \textsf{relatedstring}.
+\item[\qquad \mycolor{origpubin:}] I haven't altered this from the
+  \textsf{biblatex} default at all, and it presents reprint
+  information \emph{after} the main entry rather than within it.  The
+  \emph{Manual} seems to prefer the latter for the notes \&
+  bibliography style and, in some circumstances, the former for
+  author-date.
+\item[\qquad \mycolor{reprintfrom:}] This type provides a replacement
+  for the old \textsf{reprinttitle} mechanism described below.  As in
+  the standard styles, it presents a fuller reference to the reprinted
+  material than does \mycolor{\texttt{origpubin}}, and is designed
+  particularly for presenting pieces formerly printed in other
+  collections or perhaps essays collected from various periodicals.
+  (In \textsf{biblatex-chicago} it contains some kludges to cope with
+  possible \textsf{babel} language environments, so if you find it
+  behaving oddly please let me know, including whether you are using
+  \textsf{babel} [which I've tested] or \textsf{polyglossia} [which I
+  haven't].)
+\end{description}
+
+\mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
+\textbf{If you have been using this feature, you may want to have a
+  look at the} \mycolor{\textsf{relatedtype} \texttt{reprintfrom}},
+\textbf{documented above, for a better solution to this problem, one
+  that also allows you to change the introductory string using the}
+\mycolor{\textsf{relatedstring}} \textbf{field.  The}
+\textsf{reprinttitle} \textbf{field will continue to work as before,
+  however.}  At the 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{Reprinted
+  from.}  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)
+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
+provided a third cross-referencing system (the others being
+\textsf{crossref} and \textsf{xref}), and have chosen the name
+\textsf{userf} because it might act as a mnemonic for its function.
+
+\mylittlespace In order to use this system, you should start by
+entering both the original and its translation into your .bib file,
+just as you normally would.  The mechanism works for any entry type,
+and the two entries need not be of the same type.  In the entry for
+the \emph{translation}, you put the cite key of the original into the
+\textsf{userf} field.  In the \emph{original's} entry, you need to
+include something that will prevent the entry from being printed
+separately in the bibliography --- \texttt{skipbib} in the
+\textsf{options} field will work, as would something in the
+\textsf{keywords} field in conjunction with a \texttt{notkeyword=}
+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: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
+language in \textsf{origlanguage}, and instead of \texttt{originally
+  published as}, you'll get \texttt{French edition:} or \texttt{Latin
+  edition:}, etc.\ (aristotle:metaphy:gr, aristotle:metaphy:trans).
+\textbf{NB:} You can use the \mycolor{\textsf{relatedtype}
+  \texttt{origpubas}} to replicate the \textsf{userf} functionality,
+and you can also customize the \mycolor{\textsf{relatedstring}} field
+to achieve the same result as with \textsf{origlanguage}.
+
+
 \subsection{Commands}
 \label{sec:commands}
 
@@ -3996,7 +4280,7 @@ These commands allow you to fine-tune the presentation of your
 references in both notes and bibliography.  You can find many examples
 of their usage in \textsf{notes-test.bib}, and I shall try to point
 you toward a few such entries in what follows.  \textbf{NB:}
-\textsf{biblatex's} \cmd{mkbibquote} command is now mandatory in some
+\textsf{biblatex's} \cmd{mkbibquote} command is mandatory in some
 situations.  See its entry below.
 
 \mybigspace Version \mymarginpar{\textbf{\textbackslash autocap}} 0.8
@@ -4010,10 +4294,10 @@ than the kludge I designed for a previous version of
 single-letter \cmd{bibstring} commands in your .bib file is obsolete.
 
 \mylittlespace In order somewhat to reduce the burden on users even
-further, I have, following Lehman's example, implemented a new system
-which automatically tracks the capitalization of certain fields in
-your .bib file.  I chose these fields after a non-scientific survey of
-entries in my own databases, so of course if you have ideas for the
+further, I have, following \textsf{biblatex's} example, implemented a
+system which automatically tracks the capitalization of certain fields
+in your .bib file.  I chose these fields after a non-scientific survey
+of entries in my own databases, so of course if you have ideas for the
 extension of this facility I would be most interested to hear them.
 In order to take advantage of this functionality, all you need do is
 begin the data in the appropriate field with a lowercase letter,
@@ -4027,15 +4311,16 @@ mechanism without printing anything itself.  Here, then, is the
 complete list of fields where this functionality is active:
 
 \begin{enumerate}
+\setlength{\parskip}{-4pt}
 \item The \textbf{addendum} field in all entry types.
 \item The \textbf{booktitleaddon} field in all entry types.
 \item The \textbf{edition} field in all entry types.  (Numerals work
   as you expect them to here.)
 \item The \textbf{maintitleaddon} field in all entry types.
 \item The \textbf{note} field in all entry types.
-\item The \mycolor{\textbf{part}} field in entry types that use it.
-\item The \mycolor{\textbf{prenote}} field prefixed to citation
-  commands.
+\item The \textbf{part} field in entry types that use it.
+\item The \textbf{prenote} field prefixed to citation commands.
+\item The \mycolor{\textbf{relatedstring}} field in all entry types.
 \item The \textbf{shorttitle} field in the \textsf{review}
   (\textsf{suppperiodical}) entry type and in the \textsf{misc} type,
   in the latter case, however, only when there is an
@@ -4059,38 +4344,36 @@ accidentally do so in one of the above fields, it 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.
 
-\mybigspace This \mymarginpar{\textbf{\textbackslash bibstring}} is
-Lehman's 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.  This command was designed by Philipp Lehman, and has now
-been included in version 0.8 of \textsf{biblatex}.  For yet greater
-convenience I have implemented, following Lehman'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 new 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.
+\mybigspace This \mymarginpar{\textbf{\textbackslash bibstring}} is a
+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 a new functionality which sometimes allows you simply to
-input, for example, \texttt{newseries} instead of
+introduced functionality which sometimes allows you simply to input,
+for example, \texttt{newseries} instead of
 \cmd{bib\-string\{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
@@ -4099,11 +4382,9 @@ cases either form will work.  This functionality is available in the
 \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.  These are the
-places, as far as I can make out, where \textsf{biblatex's} standard
-styles support this feature, and I have added the last,
-style-specific, one.  If Lehman generalizes it still further in a
-future release, I shall do the same, if possible.
+\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
@@ -4136,7 +4417,7 @@ 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).
 
-\mybigspace These \colmarginpar{\textbf{\textbackslash
+\mybigspace These \mymarginpar{\textbf{\textbackslash
     foottextcite\\\textbackslash foottextcites}} two commands look
 like citation commands, but are in fact wrappers for customizing the
 behavior of the \cmd{textcite} and \cmd{textcites} citation commands
@@ -4149,15 +4430,15 @@ preamble.  The default definitions are: \texttt{\{\textbackslash
   addspace\textbackslash headlessparenshortcite\}} and
 \texttt{\{\textbackslash addspace\textbackslash
   headlessparenshortcites\}}.  If you wanted to return to the default
-behavior of the previous release of \textsf{biblatex-chicago}, for
+behavior of previous releases of \textsf{biblatex-chicago}, for
 example, you could change the first to: \texttt{\{\textbackslash
   newcunit\textbackslash bibstring\{in\}\textbackslash
   addspace\textbackslash headlesscite\}}, and the second similarly,
 only using \cmd{headlesscites}.  (There is also, by the way, a
-\cmd{headlessparencite(s)} command if you want to retain the long
+\cmd{head\-lessparencite(s)} command if you want to retain the long
 citations inside the parentheses.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash isdot}} is a
 standard \textsf{biblatex} macro, which in previous releases of
@@ -4186,7 +4467,7 @@ command \cmd{printorigdate}.)
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
-because it is a crucial part of the mechanism of Lehman's
+because it is a crucial part of the mechanism for the
 \enquote{American} punctuation system.  If you look in
 \textsf{chicago-notes.cbx} you'll see that the quoted fields, e.g., an
 \textsf{article} or \textsf{incollection title}, have this command in
@@ -4235,7 +4516,7 @@ the latter isn't strictly necessary in texts using an American style,
 to which \textsf{biblatex} defaults when \textsf{csquotes} isn't
 loaded.
 
-\mybigspace The \colmarginpar{\textbf{\textbackslash postvolpunct}}
+\mybigspace The \mymarginpar{\textbf{\textbackslash postvolpunct}}
 \emph{Manual} (14.121) unequivocally prescribes that when a
 \textsf{volume} number appears immediately before a page number,
 \enquote{the abbreviation \emph{vol.}\ is omitted and a colon
@@ -4244,7 +4525,7 @@ loaded.
 of a book or of a periodical, and it appears to be a surprising and
 unwelcome feature for many users, conflicting as it may do with
 established typographic traditions in a number of contexts.  Clea~ F.\
-Rees has requested a way to customize this, so I have provided the new
+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,
@@ -4255,7 +4536,7 @@ 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}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash reprint}} and the
 following 7 macros all help \textsf{biblatex-chicago-notes} cope with
@@ -4307,7 +4588,7 @@ currently you'll need to add either \texttt{de} or \texttt{d'} after
 this command in your .bib files to make the references come out right.
 I'm working on this.)  See chaucer:liferecords.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace As \mymarginpar{\textbf{\textbackslash
     partedit-\\andcomp}} before, but for use when an editor is also a
@@ -4416,7 +4697,7 @@ 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}
+\enlargethispage{-\baselineskip}
 
 \mybigspace Another \mymarginpar{\textbf{\textbackslash footfullcite}}
 standard \textsf{biblatex} command, modified to work properly with
@@ -4433,6 +4714,42 @@ is a standard command, and it too provides a full citation, but unlike
 the previous command it doesn't automatically place it in a footnote.
 It may be useful within long textual notes.
 
+\mybigspace Arne \colmarginpar{\textbf{\textbackslash gentextcite}}
+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.  As a convenience for users, I've also ported this to
+the notes \& bibliography style.  In most respects it behaves exactly
+like \cmd{textcite}, on which see below.  The difference is that I've
+added a new optional field to the front of the command to allow you to
+choose which declensional ending to add to the name.  If you don't
+specify this field, you'll get the standard English \enquote{\,'s\,}.
+If you want something different, then you'll need to present a third
+option to the command, like so:
+\cmd{gentextcite[<ending>][][]\{entry:key\}}.  You must include the
+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 \mycolor{\cmd{gentextcites}} command as
+well, and for it you may need to specify
+\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\}}.
+
+\mylittlespace The syntax of multiple authors' names in running text
+is unpredictable.  There is currently no way to add the genitival
+ending to all the names attached to a single citation key, so it will
+only appear at the end of a group of names in such a case.  (This is
+in keeping with the usual syntax when referring to a multi-author
+work, at least in English.)  When using \mycolor{\cmd{gentextcites}},
+however, you can control whether the ending appears after the name(s)
+attached to each citation key, or whether it only appears after the
+names attached to the last key.  By default, it only appears after the
+last, but the \mycolor{\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}}
 Lundin requested a more generalized \cmd{headlesscite} macro,
 suppressing the author's name in specific contexts while allowing
@@ -4483,8 +4800,8 @@ 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.)
 
-\mybigspace Norman \colmarginpar{\textbf{\textbackslash textcite}}
-Gray started a discussion on
+\mybigspace Norman \mymarginpar{\textbf{\textbackslash textcite}} Gray
+started a discussion on
 \href{http://tex.stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange}
 which established both that \textsf{biblatex} had begun including a
 \cmd{textcite} command in its verbose styles and that
@@ -4500,20 +4817,18 @@ request within the package, but there are now at least commands
 functionality is a little complicated.  In the main text, they will
 provide an \textsf{author's} name(s), followed immediately by a foot-
 or endnote which contains the full (or short) reference, following the
-usual rules.  If you use \cmd{textcite} inside \colmarginpar{New!} a
-foot- or endnote, then the default behavior has changed for this
-release, but I've made that behavior configurable, so you can tailor
-it to your needs.  Now, by default, for both \cmd{textcite} and
-\cmd{textcites}, 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 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
+usual rules.  If you use \cmd{textcite} inside a foot- or endnote,
+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
+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
 syntactically.  If you want to configure this behavior for either
-citation command, please see \mycolor{\cmd{foottextcite}} and
-\mycolor{\cmd{foottextcites}} in section~\ref{sec:formatcommands}.
+citation command, please see \cmd{foottextcite} and
+\cmd{foottextcites} in section~\ref{sec:formatcommands}.
 
 \mylittlespace If you look at \textsf{chicago-notes.cbx}, you'll see a
 number of other citation commands, but those are intended for internal
@@ -4552,9 +4867,11 @@ for the \cmd{ifciteseen} test is enabled globally.
 for the long format when presenting dates, slightly shortened when
 presenting date ranges.
 
+\enlargethispage{-\baselineskip}
+
 \mylittlespace The \mymarginpar{\texttt{dateabbrev=\\false}}
-\emph{Manual} prefers full month names in the notes \&\ bibliography
-style.
+\emph{Manual} prefers to use full month names in the notes \&\
+bibliography style.
 
 \mybigspace This \mymarginpar{\texttt{ibidtracker=\\constrict}}
 enables the use of \enquote{Ibid} in notes, but only in the most
@@ -4565,6 +4882,22 @@ 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.
 
+\mylittlespace Roger \colmarginpar{\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}
+\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.
+
 \mylittlespace This \mymarginpar{\texttt{loccittracker\\=constrict}}
 allows the package to determine whether two consecutive citations of
 the same source also cite the same page of that source.  In such a
@@ -4572,12 +4905,12 @@ case, \texttt{Ibid} alone will be printed, without the page reference,
 following the specification (14.29).
 
 \mylittlespace These \mymarginpar{\textsf{\texttt{maxbibnames\\=10\\
-      minbibnames\\=7}}} two options are new, and control the number
-of names 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
+      minbibnames\\=7}}} two options control the number of names
+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{printbibliography} command at the bottom
+\texttt{minnames} in the \cmd{printbiblio\-graphy} 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.
@@ -4588,6 +4921,16 @@ 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 \colmarginpar{\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 \mycolor{\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{sortcase=\\false}} turns off
 the sorting of uppercase and lowercase letters separately, a practice
 which the \emph{Manual} doesn't appear to recommend.
@@ -4641,66 +4984,60 @@ chosen font.  The default definition is:
 
 \mylittlespace At \mymarginpar{\texttt{losnotes}
   \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have
-added two new \texttt{bibenvironments} to \textsf{chicago-notes.bbx},
-for use with the \texttt{env} option to the \cmd{printshorthands}
-command.  The first, \texttt{losnotes}, is designed to allow a list of
+added two \texttt{bibenvironments} to \textsf{chicago-notes.bbx}, for
+use with the \texttt{env} option to the \cmd{printshorthands} command.
+The first, \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 latter case to clear up some spurious punctuation and white
 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.)  Please see the documentation of
-\textsf{shorthand} in section~\ref{sec:entryfields} above for further
-options available to you for presenting and formatting the list of
-shorthands.
-
-\mylittlespace The \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}}
-next-generation backend \textsf{Biber} offers enhanced functionality
-in many areas, two of which I've implemented in this release.
-\cmd{DeclareLabelname} allows you to add name fields for consideration
-when \textsf{biblatex} is attempting to find a shortened name for
-short notes.  This, for example, allows a compiler (=\textsf{namec})
-to appear at the head of short notes without any other intervention
-from the user, rather than requiring a \textsf{shortauthor} field as
-previous releases of \textsf{biblatex-chicago} did.  In point of fact,
-I have implemented this functionality in such a way as to make it
-available even to users of other backends, but this required reducing
-its flexibility considerably.  When \textsf{biblatex} reaches version
-2.0, \textsf{Biber} will become a requirement, so I recommend getting
-to know it sooner rather than later.
-
-\mylittlespace The
-\mymarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} second
-\textsf{Biber} enhancement I have implemented allows you to include
-almost any field whatsoever in \textsf{biblatex's} sorting algorithms
-for the bibliography, so that a great many more entries will be sorted
-correctly automatically rather than requiring manual intervention in
-the form of a \textsf{sortkey} field or the like.  Code in
-\textsf{biblatex-chicago.sty} detects whether you are using
-\textsf{Biber}, and if and only if this is the case changes the
-sorting scheme to a custom one (\texttt{cms}), a Chicago-specific
-variant of the default \texttt{nty}.  (You can find its definition in
-\textsf{chicago-notes.cbx}.)  Users of all other backends will still
-be using \texttt{nty}.
-
-%%\enlargethispage{\baselineskip}
-
-\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
+\cmd{footnote} command.)  If \colmarginpar{New} you use a command like
+\cmd{printbiblist\{shortjournal\}} to print a list of journal
+abbreviations, you can use the \mycolor{\texttt{sjnotes}} and
+\mycolor{\texttt{sjendnotes}} \texttt{bibenvironments} in exactly the
+same way.  Please see the documentation of \textsf{shorthand} and
+\mycolor{\textsf{shortjournal}} in section~\ref{sec:entryfields} above
+for further options available to you for presenting and formatting
+these two types of \texttt{biblist}.
+
+\mylittlespace Formerly
+\mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} available only to
+those using \textsf{Biber}, but since version 3.0 handled by
+\textsf{biblatex} itself, \cmd{DeclareLabelname} allows you to add
+name fields for consideration when \textsf{biblatex} is attempting to
+find a shortened name for short notes.  This, for example, allows a
+compiler (=\textsf{namec}) to appear at the head of short notes
+without any other intervention from the user, rather than requiring a
+\textsf{shortauthor} field as previous releases of
+\textsf{biblatex-chicago} did.  The default search order for the
+Chicago styles is \textsf{shortauthor}, \textsf{author},
+\textsf{shorteditor}, \textsf{namea}, \textsf{editor}, \textsf{nameb},
+\textsf{translator}, \textsf{namec}.  You can set the option
+\texttt{use<name>=false} in entries or when loading
+\textsf{biblatex-chicago} to exclude individual fields from appearing
+in short notes, or indeed at the head of long notes and bibliography
+entries.  See the documentation of those name types in
+section~\ref{sec:entryfields} for further details.
+
+\mylittlespace I \mymarginpar{\cmd{Declare-}\\\texttt{SortingScheme}}
+have provided, using this declaration, a custom sorting algorithm for
+the bibliography.  The idea is that \textsf{biblatex} can use any
+field whatsoever for sorting, so that a great many more entries will
+be sorted correctly automatically rather than requiring manual
+intervention in the form of a \textsf{sortkey} field or the like.
+Code in \textsf{biblatex-chicago.sty} loads the custom scheme
+\enquote{\texttt{cms},} a Chicago-specific variant of the default
+\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} will no longer need a
-\textsf{sortkey} set.  The main disadvantage should only occur very
-rarely, and appears because the supplemental name fields are treated
-differently from the standard name fields by \textsf{biblatex}.
-Ordinarily, you can set, for example, \texttt{useauthor=false} in the
-\textsf{options} field to remove the \textsf{author's} name from
-consideration for sorting purposes.  The Chicago-specific option
-\textsf{usecompiler=false}, however, doesn't remove \textsf{namec}
-from such consideration, so in an entry like chaucer:alt you \emph{do}
-need a \textsf{sortkey} or else it will be alphabetized by
-\textsf{namec} rather than by \textsf{title}.
+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}
@@ -4717,6 +5054,8 @@ 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}
+
 \mylittlespace This \mymarginpar{\texttt{doi=true}} option controls
 whether any \textsf{doi} fields present in the .bib file will be
 printed in notes and bibliography.  At the request of Daniel
@@ -4732,8 +5071,6 @@ preamble, for the whole document, or on a per-entry basis in the
 field will always be printed, but the \texttt{only} switch will still
 eliminate any \textsf{url}.
 
-% %\enlargethispage{\baselineskip}
-
 \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
@@ -4819,8 +5156,8 @@ you can change it either in the preamble for the whole document or,
 for specific fields, in the \textsf{options} field of individual
 entries.
 
-\mylittlespace At \colmarginpar{\texttt{booklongxref=\\true}} the
-request of Bertold Schweitzer, I have included two new options for
+\mylittlespace At \mymarginpar{\texttt{booklongxref=\\true}} the
+request of Bertold Schweitzer, I have included two options 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.  This option controls whether multiple
@@ -4850,10 +5187,44 @@ This option can be set either in the preamble or in the
 \textsf{options} field of individual entries.  For controlling the
 behavior of \textsf{inbook}, \textsf{incollection},
 \textsf{inproceedings}, and \textsf{letter} entries, please see
-\mycolor{\texttt{longcrossref}}, below, and also the documentation of
+\texttt{longcrossref}, below, and also the documentation of
 \textsf{crossref} in section~\ref{sec:entryfields}.
 
-\mylittlespace If \colmarginpar{\texttt{hidevolumes=\\true}} both a
+\mylittlespace Roger
+\colmarginpar{\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}} (\mycolor{\textsf{ctitleaddon}}) for all
+occurrences in notes and for nearly all \textsf{book-} and
+\textsf{maintitleaddons} in the bibliography, while
+\cmd{addperiod\cmd{addspace}} (\mycolor{\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.
+(Cf.\ coolidge:speech and schubert:muellerin.)  The accepted option
+keys are:
+
+\begin{description}
+\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}}
+\end{description}
+
+If you need something a little more exotic, you can directly
+\cmd{renewcommand} either \cmd{ctitleaddonpunct} or
+\cmd{ptitleaddonpunct} (or both) in your preamble, but it's worth
+remembering that the redefinition will hold for all instances, unless
+you use the \textsf{options} field in your other entries with a
+\textsf{titleaddon} field.  A simpler solution might be to set the
+relevant option to \texttt{none} in your entry and then include the
+punctuation in the \textsf{titleaddon} field itself.
+
+\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
 \textsf{biblatex-chicago} will ordinarily suppress the
@@ -4865,7 +5236,7 @@ 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 \colmarginpar{\texttt{longcrossref=\\false}} is
+\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
@@ -4900,35 +5271,45 @@ governed by the following options:
 This option can be set either in the preamble or in the
 \textsf{options} field of individual entries.  For controlling the
 behavior of \textsf{book}, \textsf{bookinbook}, \textsf{collection},
-and \textsf{proceedings} entries, please see
-\mycolor{\texttt{booklongxref}}, above, and also the documentation of
-\textsf{crossref} in section~\ref{sec:entryfields}.
+and \textsf{proceedings} entries, please see \texttt{booklongxref},
+above, and also the documentation of \textsf{crossref} in
+section~\ref{sec:entryfields}.
 
-\mylittlespace This \mymarginpar{\texttt{usecompiler=\\true}} option
-enables automatic use of the name of the compiler (in the
-\textsf{namec} field) at the head of an entry, usually in the absence
-of an \textsf{author}, \textsf{editor}, or \textsf{translator}, in
-accordance with the specification (\emph{Manual} 14.87).  It may also,
-like \texttt{useauthor}, \texttt{useeditor}, and
-\texttt{usetranslator}, be disabled on a per-entry basis by setting
-\texttt{usecompiler=false} in the \textsf{options} field.  Please
-remember that, because \textsf{namec} isn't a standard
-\textsf{biblatex} field, it may take a little extra effort to get it
-to work smoothly.  The package should now automatically take care of
-finding a name for short notes, but it will alphabetize by this name
-in the bibliography only if you use \textsf{Biber}, failing which
-you'll need to provide a \textsf{sortkey} for this purpose.  (These
-rules don't apply when you modify the \textsf{editor's} identifying
-string using the \textsf{editortype} field, which is the procedure I
-recommend if the entry-heading compiler is only a compiler, and not
-also, e.g., an editor or a translator.)  Cf.\
-\cmd{DeclareSortingScheme} and \cmd{DeclareLabelname} in
-section~\ref{sec:formatopts}, above; also, chaucer:alt for an entry
-where, because none of the names provided appear at the head of the
-reference, you will need to provide a \textsf{sortkey} to stop
-\textsf{Biber} using the \textsf{namec} --- because it's not a
-standard name field, you can stop it being printed at the head of the
-entry, but you can't stop it turning up in the sorting algorithms.
+\mylittlespace This
+\colmarginpar{\texttt{shorthand\\punct\\=space}}
+option controls the punctuation that appears before the first
+introduction of a \textsf{shorthand} field, including the
+\textsf{shorthandintro}, in long notes.  The default is
+\cmd{addspace}, but if this isn't correct for your needs, especially
+if you change the \textsf{shorthandintro} or don't want the whole
+phrase inside parentheses, then you can change it in the preamble or
+in individual entries.  The accepted option keys are:
+
+\begin{description}
+\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}}
+\end{description}
+
+You can, in emergencies, directly
+\cmd{renewcommand\{\cmd{shorthandpunct}\}} in the pre\-amble, but it
+might be easier to use the \texttt{none} option to
+\mycolor{\texttt{shorthandpunct}} and hand-craft solutions inside the
+\textsf{shorthandintro} fields of individual entries.
+
+\mylittlespace As \colmarginpar{\texttt{usecompiler=\\true}}
+\textsf{biblatex} automatically includes a \mycolor{\texttt{usenamec}}
+option as standard, the Chicago-specific option \texttt{usecompiler}
+is now deprecated.  Please replace it your documents and .bib files
+with \mycolor{\texttt{usenamec}}, which works much better across the
+board.
 
 \subsubsection{Style Options -- Preamble}
 \label{sec:useropts}
@@ -4950,7 +5331,7 @@ 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 When \colmarginpar{\texttt{compresspages}} set to
+\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).
@@ -4958,7 +5339,7 @@ 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.
 
-\mylittlespace The \colmarginpar{\texttt{delayvolume}} presentation of
+\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
 on the presence or absence of a \textsf{booktitle} or a
@@ -4975,7 +5356,7 @@ basis, to allow you to move \textsf{volume} data to the end of a long
 note.  Please note that this doesn't affect any \textsf{volume} data
 printed \emph{before} a \textsf{maintitle}, but only data that would,
 without this option, be printed \emph{after} a \textsf{booktitle} or
-\textsf{maintitle}.  Cf.\ also \mycolor{\cmd{postvolpunct}}, below.
+\textsf{maintitle}.  Cf.\ also \cmd{postvolpunct}, below.
 
 \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the
 \emph{Manual} (14.19) recommends specific formatting for footnote (and
@@ -4993,7 +5374,13 @@ revert to the \LaTeX\ default, but of course you also lose a fair
 amount of other formatting, as well.  See section~\ref{sec:loading},
 below.
 
-\mylittlespace Setting \colmarginpar{\texttt{inheritshort\-hand}} this
+\mylittlespace This \colmarginpar{\texttt{genallnames}} option affects
+the choice of which names to present in the genitive case when using
+the \mycolor{\cmd{gentextcites}} command.  Please see the
+documentation of that command in section~\ref{sec:citecommands},
+above.
+
+\mylittlespace Setting \mymarginpar{\texttt{inheritshort\-hand}} this
 option to \texttt{true} allows child entries to inherit the
 \textsf{shorthand} and \textsf{shorthandintro} fields from
 cross-referenced parent entries.  This in turn allows abbreviated
@@ -5003,6 +5390,20 @@ savings.  There are several other steps required to make this all
 function smoothly, so please see the documentation of the
 \textbf{shorthand} field in section~\ref{sec:entryfields}, above.
 
+\mylittlespace This \colmarginpar{\texttt{journalabbrev}} option
+controls the printing of the \mycolor{\textsf{shortjournal}} field in
+place of the \textsf{journaltitle} field 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 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.  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 \mycolor{\textbf{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.}\
   and \emph{Sr.},} so by default \textsf{biblatex-chicago} has
@@ -5044,7 +5445,7 @@ form.  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 \colmarginpar{\texttt{omitxrefdate}} part of the new
+\mylittlespace As \mymarginpar{\texttt{omitxrefdate}} part of the
 abbreviated cross-referencing functionality for \textsf{book},
 \textsf{bookinbook}, \textsf{collection}, and \textsf{proceedings}
 entries, I have thought it helpful to include, in the abbreviated
@@ -5057,7 +5458,7 @@ harley:ancient:cart, harley:cartography, and harley:hoc; and
 \textsf{crossref} in section~\ref{sec:entryfields}, above.
 
 \mylittlespace Several
-\colmarginpar{\texttt{postnotepunct}\\(experimental)} users, most
+\mymarginpar{\texttt{postnotepunct}\\(experimental)} users, most
 recently David Gohlke, have requested a way to alter the punctuation
 that appears just before the \textsf{postnote} argument of citation
 commands, usually, but perhaps not always, to allow citations to fit
@@ -5065,15 +5466,14 @@ better into the flow of text.  This punctuation is a complex issue in
 the \emph{Manual}, and I've attempted to make
 \textsf{biblatex-chicago} follow the specifications closely.  Still,
 as a first stab at enabling the greater flexibility in punctuation
-that some have requested, I have introduced the
-\mycolor{\texttt{postnotepunct}} package option.  Set to
-\texttt{true}, it 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 \mycolor{experimental}.  Note
-also that the option only affects the \textsf{postnote} field of
+that some have requested, I have introduced the \texttt{postnotepunct}
+package option.  Set to \texttt{true}, it 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 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}
@@ -5122,6 +5522,17 @@ rule intervenes to emphasize this continuation.  I haven't tested this
 code very thoroughly, and it's possible that frequent use of floats
 might interfere with it.  Let me know if it causes problems.
 
+\mylittlespace Stefan \colmarginpar{\texttt{xrefurl}} Björk pointed
+out that when, using the \texttt{longcrossref} or
+\texttt{booklongxref} options, you turn on the automatic abbreviation
+of multiple entries in the same (e.g.) \textsf{collection} or
+\textsf{mvcollection}, you could entirely lose a \textsf{url} that
+might be helpful for locating a source, as the abbreviated forms in
+notes and in the bibliography wouldn't include this information.
+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.
+
 \subsection{General Usage Hints}
 \label{sec:hints}
 
@@ -5177,7 +5588,7 @@ footnotes.  Also in this file is the code that calls
 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 Lehman's \textsf{biblatex.pdf}.
+§§~4.9.1 and 4.11.8 in \textsf{biblatex.pdf}.
 
 %%\enlargethispage{-\baselineskip}
 
@@ -5211,15 +5622,15 @@ information you're providing.  I've tried to make
 complex, data-rich citations, but there may be instances where you can
 save yourself some typing by keeping it simple.
 
-\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
-helpfully provide as much information as is available, including
-fields that users may well wish not to have printed (ISBN, URL, DOI,
+\mylittlespace Scot Becker 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 helpfully
+provide as much information as is available, including fields that
+users may well wish not to have printed (ISBN, URL, DOI,
 \textsf{pagetotal}, inter alia).  The standard \textsf{biblatex}
 styles contain a series of options, detailed in \textsf{biblatex.pdf}
-§3.1.2.2, for controlling the printing of some of these fields, and
-with this release I have implemented the ones that are relevant to
+§3.1.2.2, for controlling the printing of some of these fields, and I
+have implemented the ones that are relevant to
 \textsf{biblatex-chicago}, along with a couple that Scot requested and
 that may be of more general usefulness.  There is also a general
 option to excise with one command all the fields under consideration
@@ -5260,34 +5671,34 @@ 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 Philipp Lehman says
-in \textsf{biblatex.pdf}, 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.  In this release, for example, the new
-\mycolor{\textbf{mv*}} entry types 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 Lehman
-advises using \textsf{bibtex8}, rather than standard \textsc{Bib}\TeX,
+\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.
 
 \section{The Specification: Author-Date}
 \label{sec:authdate}
 
-The \textsf{biblatex-chicago} package now contains \emph{two}
-different author-date styles.  The first,
-\textsf{biblatex-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 specification but with a markedly different style of title
+The \textsf{biblatex-chicago} package contains two different
+author-date styles.  The first, \textsf{biblatex-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
+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
@@ -5330,18 +5741,17 @@ included the reference keys from the latter file below in parentheses.
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-authordate} and \textsf{authordate-trad},
 minus the odd \textsf{biblatex} alias, is as follows:
-\textbf{article}, \textbf{artwork}, \textbf{audio},
-\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}},
-\textbf{booklet}, \mycolor{\textbf{collection}}, \textbf{customc},
-\textbf{image}, \textbf{inbook}, \textbf{incollection},
-\textbf{inproceedings}, \textbf{inreference}, \textbf{letter},
-\textbf{manual}, \textbf{misc}, \textbf{music},
-\mycolor{\textbf{mvbook}}, \mycolor{\textbf{mvcollection}},
-\mycolor{\textbf{mvproceedings}}, \mycolor{\textbf{mvreference}},
-\textbf{online} (with its alias \textbf{www}), \textbf{patent},
-\textbf{periodical}, \mycolor{\textbf{proceedings}},
+\mycolor{\textbf{article}}, \textbf{artwork}, \textbf{audio},
+\textbf{book}, \textbf{bookinbook}, \textbf{booklet},
+\textbf{collection}, \textbf{customc}, \textbf{image},
+\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
+\textbf{inreference}, \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{periodical}}, \textbf{proceedings},
 \textbf{reference}, \textbf{report} (with its alias
-\textbf{techreport}), \textbf{review}, \textbf{suppbook},
+\textbf{techreport}), \mycolor{\textbf{review}}, \textbf{suppbook},
 \textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis}
 (with its aliases \textbf{mastersthesis} and \textbf{phdthesis}),
 \textbf{unpublished}, and \textbf{video}.
@@ -5357,17 +5767,19 @@ 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.
 
-\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of
-  Style} (14.170) 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} 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.
+\paragraph*{\protect\colmarginpar{\textbf{article}}}
+\label{sec:ad:article}
+The \emph{Chicago Manual of Style} (14.170) 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} 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.
 
 \mylittlespace For articles in \enquote{journals} you can simply use
 the traditional \textsc{Bib}\TeX\ --- and indeed \textsf{biblatex} ---
@@ -5408,6 +5820,8 @@ 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
@@ -5428,8 +5842,8 @@ need the \textsf{review} entry type, with or without this same
 \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.)
+  0.6}, but the current arrangement is somewhat simpler and therefore,
+I hope, better.)
 
 \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
@@ -5445,9 +5859,7 @@ 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.
 
-%\enlargethispage{\baselineskip}
-
-\mylittlespace No less than eight more things need explication under
+\mylittlespace No less than nine 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
@@ -5480,7 +5892,7 @@ missing \textsf{author} field results in the name of the periodical
 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 new default sorting scheme in
+\emph{Manual} (14.175).  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
@@ -5488,10 +5900,10 @@ retain the definite or indefinite article at the beginning of the
 \textsf{journaltitle} in author-less entries with an
 \textsf{entrysubtype}.  If you want to abbreviate the
 \textsf{journaltitle} for use in citations, but give the full name in
-the list of references, then the \textsf{shortauthor} field, somewhat
-surprisingly, is the place for it.  A shortened \textsf{title} should
-go, as usual, in \textsf{shorttitle}.  (See
-section~\ref{sec:authformopts}, below; lakeforester:pushcarts,
+the list of references, then \colmarginpar{New} the
+\mycolor{\textsf{shortjournal}} field is the place for it.  A
+shortened \textsf{title} should go, as usual, in \textsf{shorttitle}.
+(See section~\ref{sec:authformopts}, below; lakeforester:pushcarts,
 nyt:trevorobit, unsigned:ranke.)
 
 \mylittlespace Fourth, Bertold Schweitzer has pointed out, following
@@ -5509,18 +5921,19 @@ 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}
+%\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} 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 \textsf{article} entries, I thought the problem merited a
-preliminary mention here.
+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
+\textsf{article} entries, I thought the problem merited a preliminary
+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
@@ -5549,10 +5962,11 @@ episode in \textsf{title}.  The network's name goes into the
 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 into \textsf{misc} entries with an
-\textsf{entrysubtype} [coolidge:speech, roosevelt:speech].)
+recordings from archives fit best either into \textsf{online} or into
+\textsf{misc} entries with an \textsf{entrysubtype} [coolidge:speech,
+roosevelt:speech].)
 
-\mylittlespace Finally, the 16th edition of the \emph{Manual}
+\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
@@ -5566,6 +5980,15 @@ 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, \colmarginpar{New} the special
+\textsf{biblatex} field \mycolor{\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
+\mycolor{\textbf{shortjournal}} in section~\ref{sec:fields:authdate}
+for all the details on how this works.
+
 % %\enlargethispage{-\baselineskip}
 
 \mylittlespace If you're still with me, allow me to recommend that you
@@ -5626,13 +6049,13 @@ sources in accordance with the Chicago specifications.  The
 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 \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.
+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
@@ -5669,9 +6092,10 @@ such favorite educational formats as the slideshow and the filmstrip
 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 best be presented in a \textbf{misc}
-entry with an \textsf{entrysubtype} (coolidge:speech,
-roosevelt:speech).
+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).
 
 \mylittlespace Once you've accepted the analogy of composer to
 \textsf{author}, constructing an \textsf{audio} entry should be fairly
@@ -5690,19 +6114,18 @@ from a cycle.  If the medium in question needs specifying, the
 \textsf{biblatex-chicago} provides no automated handling, e.g., a
 librettist (verdi:corsaro).
 
-\mybigspace This \colmarginpar{\textbf{book}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this
-release the package can now provide automatically 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 new \mycolor{\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.
-
-\mybigspace This \colmarginpar{\textbf{bookinbook}} type provides the
+\mybigspace This \mymarginpar{\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
+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.
+
+\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
@@ -5710,13 +6133,13 @@ articles.  Such an entry can have a \textsf{title} and a
 three of which will be italicized in the reference matter.  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 now 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 \mycolor{\texttt{booklongxref}}
-in section~\ref{sec:preset:authdate}, below.  (Cf.\ \emph{Manual}
-14.114, 14.127, 14.130; bernhard:boris, bernhard:ritter, and
-bernhard:themacher for the new abbreviating functionality; also
+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
+bernhard:themacher for the abbreviating functionality; also
 euripides:orestes, plato:republic:gr.)
 
 \mylittlespace \textbf{NB}: The Euripides play receives slightly
@@ -5737,25 +6160,25 @@ which uses the \textsf{howpublished} field instead of a standard
 \textsf{howpublished} field should instead go in \textsf{publisher}.
 (See clark:mesopot.)
 
-\mybigspace This \colmarginpar{\textbf{collection}} is the standard
-\textsf{biblatex} entry type, but with this release the package can
-now provide automatically 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 new
-\mycolor{\texttt{booklongxref}} option.  Please see \textbf{crossref}
-in section~\ref{sec:fields:authdate} and \texttt{booklongxref} in
-section~\ref{sec:authpreset}, below.  See harley:ancient:cart,
-harley:cartography, and harley:hoc for how this might look.
+\mybigspace This \mymarginpar{\textbf{collection}} is the standard
+\textsf{biblatex} entry type, but the package can provide
+automatically 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.  See
+harley:ancient:cart, harley:cartography, and harley:hoc for how this
+might look.
 
-\mybigspace This \mymarginpar{\textbf{customa}} entry type is now
+\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 now
+\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.
@@ -5764,17 +6187,18 @@ type instead.
 to include alphabetized cross-references to other, separate entries in
 the bibliography, particularly to other names or pseudonyms, as
 recommended by the \emph{Manual}.  (This is different from the usual
-\textsf{crossref}, \textsf{xref}, and \textsf{userf} 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 new 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.,
+\textsf{crossref}, \textsf{xref}, \textsf{userf}, and
+\mycolor{\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.)
@@ -5810,18 +6234,17 @@ wish to include a comment inside the parentheses of a citation, as
 specified by the \emph{Manual} (15.23).  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 now
-have two choices.  You can enable the new
-\mycolor{\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.,
+  trans.]\{stendhal:parma\}}.  Without a \textsf{postnote}, you have
+two choices.  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\{chicago:manual\}\{chicago:\\comment\}}.  Cf.\
-\mycolor{\texttt{postnotepunct}} in section~\ref{sec:authuseropts},
-below.
+\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
@@ -5833,23 +6256,23 @@ media.  This means that this entry type is now a clone of the
 for users migrating from the old to the new specification.  (See 3.22,
 8.193; bedford:photo.)
 
-\mybigspace These
-\mymarginpar{\mycolor{\textbf{inbook}}\\\textbf{incollection}} two
-standard \textsf{biblatex} types have very nearly identical formatting
-requirements as far as the Chicago specification is concerned, but I
-have retained both of them for compatibility.  \textsf{Biblatex.pdf}
-(§~2.1.1) intends the first for \enquote{a part of a book which forms
-  a self-contained unit with its own title,} 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 now activated by default when you use the
+\mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
+two standard \textsf{biblatex} types have very nearly identical
+formatting requirements as far as the Chicago specification is
+concerned, but I have retained both of them for compatibility.
+\textsf{Biblatex.pdf} (§~2.1.1) intends the first for \enquote{a part
+  of a book which forms a self-contained unit with its own title,}
+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
@@ -5857,9 +6280,9 @@ 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 new option
-\mycolor{\texttt{longcrossref}} in section~\ref{sec:authpreset}.
-Please note that it is also active by default in \textsf{letter} and
+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,
@@ -5877,7 +6300,7 @@ 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}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works
 pretty much as in standard \textsf{biblatex}.  Indeed, the main
@@ -5889,17 +6312,18 @@ 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
 \textsf{incollection} and \textsf{inbook} entries.  See
-\textbf{crossref} in section~\ref{sec:fields:authdate} and the new
-option \mycolor{\texttt{longcrossref}} in
-section~\ref{sec:authpreset}, below, for more details.
+\textbf{crossref} in section~\ref{sec:fields:authdate} and the option
+\texttt{longcrossref} in section~\ref{sec:authpreset}, below, for more
+details.
 
-\mybigspace This \mymarginpar{\textbf{inreference}} 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).
+\paragraph*{\protect\mymarginpar{\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
@@ -5984,8 +6408,8 @@ section~\ref{sec:entrytypes}, s.v.\ \enquote{\textsf{letter,}} should
 get you started.  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 now
-simply use the \textsf{origdate} field in both of them, because in the
+published collection, both written in the same year.  You can simply
+use the \textsf{origdate} field in both of them, because in the
 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
@@ -6023,19 +6447,21 @@ entry for such a reference, then you would need to define both
 have put in \textsf{organization}.  (See 14.92; chicago:manual,
 dyna:browser, natrecoff:camera.)
 
-\mybigspace As \mymarginpar{\textbf{misc}} its name suggests, the
-\textsf{misc} entry type was designed as a hold-all for citations that
-didn't quite fit into other categories.  In \textsf{biblatex-chicago},
-I have somewhat extended its applicability, while retaining its
-traditional use.  Put simply, with no \textsf{entrysubtype} field, a
-\textsf{misc} entry will retain backward compatibility with the
-standard styles, so the usual \textsf{howpublished}, \textsf{version},
-and \textsf{type} fields are all available for specifying an otherwise
-unclassifiable text, and the \textsf{title} will be italicized.  (The
-\emph{Manual}, you may wish to note, doesn't give specific
-instructions on how such citations should be formatted, so when using
-the Chicago style I would recommend you have recourse to this
-traditional entry type as sparingly as possible.)
+\paragraph*{\protect\mymarginpar{\textbf{misc}}}
+\label{sec:ad:misc}
+As its name suggests, the \textsf{misc} entry type was designed as a
+hold-all for citations that didn't quite fit into other categories.
+In \textsf{biblatex-chicago}, I have somewhat extended its
+applicability, while retaining its traditional use.  Put simply, with
+no \textsf{entrysubtype} field, a \textsf{misc} entry will retain
+backward compatibility with the standard styles, so the usual
+\textsf{howpublished}, \textsf{version}, and \textsf{type} fields are
+all available for specifying an otherwise unclassifiable text, and the
+\textsf{title} will be italicized.  (The \emph{Manual}, you may wish
+to note, doesn't give specific instructions on how such citations
+should be formatted, so when using the Chicago style I would recommend
+you have recourse to this traditional entry type as sparingly as
+possible.)
 
 \mylittlespace If you do provide an \textsf{entrysubtype} field, the
 \textsf{misc} type provides a means for citing unpublished letters,
@@ -6051,17 +6477,16 @@ 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.\ coolidge:speech,
-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 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, dinkel:agassiz, and spock:interview cite individual
-pieces.)
+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
+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,
+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}
@@ -6075,17 +6500,18 @@ 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).
-Like with the \textsf{letter} type, if the only date present is an
-\textsf{origdate}, you no longer 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 now 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.)
+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}
 
 \mylittlespace As in \textsf{letter} entries, the titles of
 unpublished letters are of the form \texttt{Author to Recipient},
@@ -6182,15 +6608,15 @@ equivalences.
   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 now 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.
+  \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
@@ -6216,12 +6642,12 @@ equivalences.
   \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 new \mycolor{\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.)
+  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.
@@ -6242,25 +6668,24 @@ section~\ref{sec:authpreset}; auden:reading, beethoven:sonata29,
 bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
 rubinstein:chopin.)
 
-\mybigspace All \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
+\mybigspace All \mymarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
   \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry
-types are new to \textsf{biblatex-chicago}, and all 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{\textbf{mv}} from their
-names.  Second, 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:fields:authdate}, below.)
+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{\textbf{mv}} from their names.  Second, 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:fields:authdate}, below.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace On the same subject, when multi-volume works are
 presented in the reference apparatus, the \emph{Manual} (14.121--27,
@@ -6304,13 +6729,14 @@ ac:comment).  Otherwise, for online documents not \enquote{formally
 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 best as
-\textsf{misc} entries 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.
+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
@@ -6353,7 +6779,7 @@ down-casing code from previous editions, you may need manually to
 revise the \textsf{title} field to provide the lowercase letters.  See
 petroff:impurity.
 
-\mybigspace This \mymarginpar{\textbf{periodical}} is the standard
+\mybigspace This \colmarginpar{\textbf{periodical}} is the standard
 \textsf{biblatex} entry type for presenting an entire issue of a
 periodical, rather than one article within it.  It has the same
 function in \textsf{biblatex-chicago}, and in the main uses the same
@@ -6367,15 +6793,28 @@ 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.)
 
-\mybigspace This \colmarginpar{\textbf{proceedings}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this
-release the package can now provide automatically 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 new \mycolor{\texttt{booklongxref}} option.  Please see
-\textbf{crossref} in section~\ref{sec:fields:authdate} and
-\texttt{booklongxref} in section~\ref{sec:authpreset}, below.
+\mylittlespace It is worth \colmarginpar{New} noting that the special
+\textsf{biblatex} field \mycolor{\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 \mycolor{\textbf{shortjournal}} in
+section~\ref{sec:fields:authdate} for all the details on how this
+works.
+
+\mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
+can provide automatically 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.
 
 \mybigspace This \mymarginpar{\textbf{reference}} entry type is
 aliased to \textsf{collection} by the standard \textsf{biblatex}
@@ -6406,10 +6845,10 @@ then the \textsf{type} field automatically defaults to
 report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
-\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry
+\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 now become
+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
@@ -6523,6 +6962,15 @@ 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:fields:authdate}, below.
 
+\mylittlespace Finally, \colmarginpar{New} the special
+\textsf{biblatex} field \mycolor{\textsf{shortjournal}} allows you to
+present shortened \textsf{journaltitles} in \textsf{review} entries,
+as well as in \textsf{article} and \textsf{periodical} entries, and it
+facilitates the creation of lists of journal abbreviations in the
+manner of a \textsf{shorthand} list.  Please see the documentation of
+\mycolor{\textbf{shortjournal}} in section~\ref{sec:fields:authdate}
+for all the details on how this works.
+
 %%\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to
@@ -6643,13 +7091,13 @@ by \textsf{biblatex}.  Here are the main correspondences:
   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
-  \mycolor{\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}.)  Typically, any given
-  \textsf{video} entry will only need an \textsf{eventdate} \emph{or}
-  an \textsf{origdate}, and it is this date that will appear in
-  citations and at the head of the entry in the reference list.  It's
+  \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}.)  Typically, any given \textsf{video}
+  entry will only need an \textsf{eventdate} \emph{or} an
+  \textsf{origdate}, and it is this date that will appear in citations
+  and at the head of the entry in the reference list.  It's
   conceivable that you may need all three dates, in which case you can
   also use the standard \textsf{pubstate} field with \texttt{reprint}
   in it to control the printing of the \textsf{origdate} at the end of
@@ -6715,7 +7163,7 @@ undefined, and \textsf{biblatex-chicago} will do the rest. Cf.\
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91,
 14.116; polakow:afterw.)
 
-% %\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
 Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a
@@ -6740,80 +7188,52 @@ serves as an alias for this.)
 do, even though the \emph{Manual} doesn't actually mention it.  It may
 be useful for some purposes.  Cf.\ \textsf{commentator}.
 
-\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, 15.36;
-assocpress:gun, chicago:manual).  If there is no \textsf{author}, then
-\textsf{biblatex-chicago} will look, in sequence, for an
-\textsf{editor}, \textsf{translator}, or \textsf{compiler} (actually
-\textsf{namec}, currently) 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, schellinger:novel, sechzer:women, silver:ga\-wain,
-soltes:georgia).  \textsf{Biber} now takes care of alphabetizing
-entries no matter which name appears at their head, and the package
-also automatically provides a name for citations.
-
-\mylittlespace If you wish to emphasize the activity of an editor or a
-translator, you can use the \textsf{biblatex} and
-\textsf{biblatex-chicago} options \texttt{useauthor=false},
-\texttt{useeditor=false}, \texttt{usetranslator=false}, and
-\texttt{usecompiler=false} in the \textsf{options} field to choose
-which one appears at the head of an entry.  A peculiarity of this
-system of toggles is that in order to ensure that the \textsf{title}
-of a book appears at the head of an entry, you would need to use
-\emph{all four} of the toggles, even though the hypothetical entry
-contains no \textsf{translator}.  Internally,
-\textsf{biblatex-chicago} is either searching for an
-author-substitute, or it is skipping over elements of the ordered,
-unidirectional chain \textsf{author -> editor -> translator ->
-  compiler -> title}.  If you don't include
-\texttt{usetranslator=false} in the \textsf{options} field, then the
-package begins its search at \textsf{translator} and continues on to
-\textsf{namec}, even though you have \texttt{usecompiler=false} in
-\textsf{options}.  The result will be that the compilers' names will
-appear at the head of the entry.  If you want to skip over parts of
-the chain, you must turn off \emph{all} of the parts up to the one you
-wish printed.  Another peculiarity of the system is that setting the
-Chicago-specific \texttt{usecompiler} option to \texttt{false} doesn't
-remove \textsf{namec} from the sorting list, whereas the other
-standard \textsf{biblatex} toggles \emph{do} remove their names from
-the sorting list, so in some corner cases you may need the
-\textsf{sortkey} field.  See \cmd{DeclareSortingScheme} in
-section~\ref{sec:authformopts}, below.
-
-\mylittlespace This system of toggles, then, can turn off
-\textsf{biblatex-chicago}'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 wasn't
-possible before.  For full details of how this works, see the
-\textsf{editortype} documentation below.  (Of course, in
-\textsf{collection} and \textsf{proceedings} entry types, an
-\textsf{author} isn't expected, so there the \textsf{editor} is
-required, as in standard \textsf{biblatex}.  Also, in \textsf{article}
-and \textsf{review} entries with \textsf{entrysubtype}
-\texttt{magazine}, the absence of an \textsf{author} triggers the use
-of the \textsf{journaltitle} in its stead.  Without an
-\textsf{entrysubtype}, the \textsf{title} will be used.  See the next
-paragraph, and those entry types, for further details.)
-
-\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
-list of references and for the in-text citations.  The \emph{Manual}
-is nothing if not flexible, however, so with unsigned articles or
-encyclopedia entries the \textsf{journaltitle} or \textsf{title} may
-take the place of the \textsf{author} (gourmet:052006,
-lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke,
-wikipedia:bibtex).  Even in such entries, however, it may be
-advantageous to provide either a standard \textsf{shorttitle} or, for
-abbreviating a \textsf{journaltitle}, a (formatted)
-\textsf{shortauthor} field, thereby keeping the in-text citations to a
-reasonable length, though not at the expense of making it hard to find
-the relevant entries in the reference list.
+\paragraph*{\protect\colmarginpar{\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: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,
+schellinger:novel, sechzer:wo\-men, silver:ga\-wain, soltes:georgia).
+\textsf{Biber} and \textsf{biblatex} take care of alphabetizing
+entries no matter which name appears at their head.  In citations,
+where the \textsf{labelname} is used, the order searched is somewhat
+augmented: \textsf{shortauthor}, \textsf{author},
+\textsf{shorteditor}, \textsf{namea}, \textsf{editor}, \textsf{nameb},
+\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
+\textsf{biblatex} options \texttt{useauthor=false},
+\mycolor{\texttt{usenamea=false}}, \texttt{useeditor=false},
+\mycolor{\texttt{usenameb=false}}, \texttt{usetranslator=false}, and
+\mycolor{\texttt{usenamec=false}} in the \textsf{options} field to
+choose which name appears at the head of an entry and in the citation.
+You \colmarginpar{New} only need to turn off any fields that are
+present in the entry, but please remember to use the new option
+\mycolor{\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\-ingScheme} in section~\ref{sec:authformopts}, and the
+\textsf{editortype} documentation, below.
+
+\mylittlespace Of course, in \textsf{collection} and
+\textsf{proceedings} entry types, an \textsf{author} isn't expected,
+so there the chain of substitutions begins with \textsf{namea} and
+\textsf{editor}.  Also, in \textsf{article} and \textsf{review}
+entries with \textsf{entrysubtype} \texttt{magazine}, the absence of
+an \textsf{author} triggers the use of the \textsf{journaltitle} in
+its stead.  Without an \textsf{entrysubtype}, the \textsf{title} will
+be used.  See the discussion a few paragraphs down, and those entry
+types, for further details.
 
 % %\enlargethispage{\baselineskip}
 
@@ -6859,27 +7279,43 @@ name in the \textsf{author} field, then the pseudonym goes in
 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 now strengthened its policies
+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
 pseudonyms back to the author's name, using the \textsf{customc} entry
 type, which see (ashe:creasey, morton:creasey, york:creasey).
 
-\mylittlespace One final piece of advice.  An institutional author's
-name, or a journal's name being used in place of an author, can be
-rather too long for in-text citations.  In unsigned:ranke I placed an
-abbreviated form of the \textsf{journaltitle} into
-\textsf{shortauthor}, adapting for a periodical the practice
-recommended for books in 15.32.  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 now also appear 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 also still utilize
-the list of shorthands to clarify the abbreviation, if you wish.)
+\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
+list of references and for the in-text citations.  The \emph{Manual}
+is nothing if not flexible, however, so with unsigned articles or
+encyclopedia entries the \textsf{journaltitle} or \textsf{title} may
+take the place of the \textsf{author} (gourmet:052006,
+lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke,
+wikipedia:bibtex).  Even in such entries, however, it may be
+advantageous to provide either a standard \textsf{shorttitle} or, for
+abbreviating a \textsf{journaltitle}, a
+\mycolor{\textsf{shortjournal}} field, thereby keeping the in-text
+citations to a reasonable length, though not at the expense of making
+it hard to find the relevant entries in 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 \mycolor{\textsf{shortjournal}}, adapting
+for a periodical the practice recommended for books in 15.32.  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, 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
+\mycolor{\cmd{printbiblist\{shortjournal\}}} command.  Please cf.\ the
+\mycolor{\textbf{shortjournal}} documentation, below, and the
+\mycolor{\texttt{journalabbrev}} option in
+section~\ref{sec:authpreset}.)
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
@@ -6961,12 +7397,16 @@ in \textsf{authordate-trad}.
 
 %%\enlargethispage{\baselineskip}
 
-\mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the
+\mybigspace An \colmarginpar{\textbf{booktitleaddon}} annex to the
 \textsf{booktitle}.  It will be printed in the main text font, without
 quotation marks.  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
-\textsf{biblatex-chicago} will automatically do the right thing.
+\textsf{biblatex-chicago} will automatically do the right thing.  The
+package and entry options \colmarginpar{New}
+\mycolor{\texttt{ptitleaddon}} and \mycolor{\texttt{ctitleaddon}}
+(section~\ref{sec:authpreset}) allow you to customize the punctuation
+that appears before the \textsf{booktitleaddon} field.
 
 \mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
@@ -6978,9 +7418,9 @@ of a book (ashbrook:brain).
 do, even though the \emph{Manual} doesn't actually mention it.  It may
 be useful for some purposes.  Cf.\ \textsf{annotator}.
 
-\mybigspace \textsf{Biblatex} \colmarginpar{\textbf{crossref}} uses
-the standard \textsc{Bib}\TeX\ cross-referencing mechanism, and has
-also introduced a modified one of its own (\textsf{xref}).  The latter
+\mybigspace \textsf{Biblatex} \mymarginpar{\textbf{crossref}} uses the
+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}
@@ -6988,15 +7428,15 @@ 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 now inherit from \textsf{book}
-and \textsf{mvbook} just as they do from \textsf{mvcollection}
-entries; \textsf{letter} entries now inherit from \textsf{book},
+here: \textsf{incollection} entries can inherit from \textsf{book} and
+\textsf{mvbook} just as they do from \textsf{mvcollection} entries;
+\textsf{letter} entries inherit from \textsf{book},
 \textsf{collection}, \textsf{mvbook}, and \textsf{mvcollection}
 entries the same way an \textsf{inbook} or an \textsf{incollection}
 entry would; the \textsf{namea}, \textsf{nameb}, \textsf{sortname},
 \textsf{sorttitle}, and \textsf{sortyear} fields, all highly
 single-entry specific, are no longer inheritable; and \textsf{date}
-and \textsf{origdate} fields are not inheritable from any of the new
+and \textsf{origdate} fields are not inheritable from any of the
 \textbf{mv*} entry types.
 
 \mylittlespace Aside from these inheritance questions, the other main
@@ -7014,29 +7454,27 @@ 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).  With this release, I
-\colmarginpar{New!} have considerably extended this functionality.
-
-\mylittlespace First, I have added five new entry types ---
-\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}},
-\mycolor{\textbf{collection}}, \mycolor{\textbf{inbook}}, and
-\mycolor{\textbf{proceedings}} --- to the list of those which use
-shortened cross references, and I have added two new options ---
-\mycolor{\texttt{longcrossref}} and \mycolor{\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 the reference list.)
+entries (on the last named, see just below).  More recently, I 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 provided 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 the reference list.)
 
 \mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook},
 \textbf{collection}, and \textbf{proceedings} entries fulfills a
@@ -7065,17 +7503,17 @@ outlined, even though the \emph{Manual} doesn't explicitly require it.
 As with \textsf{book}, \textsf{bookinbook}, \textsf{collection},
 \textsf{inbook}, \textsf{incollection}, \textsf{inproceedings}, and
 \textsf{proceedings} entries, the use of a \textsf{crossref} or
-\textsf{xref} field will activate this mechanism, assuming the new
+\textsf{xref} field will activate this mechanism, assuming the 
 preamble and entry options are set to enable it.  (See
 white:ross:memo, white:russ, and white:total, for examples of the
 \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.)
 
-\mylittlespace These \colmarginpar{\texttt{longcrossref}} new options
-function asymmetrically.  The first, \mycolor{\texttt{longcrossref}},
-generally controls the settings for the entry types more-or-less
-authorized by the \emph{Manual}: \textsf{inbook},
+\mylittlespace These \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}.
 
 \begin{description}
@@ -7094,10 +7532,10 @@ authorized by the \emph{Manual}: \textsf{inbook},
   \texttt{false} and \textsf{true}, respectively.
 \end{description}
 
-The \colmarginpar{\texttt{booklongxref}} second option,
-\mycolor{\texttt{booklongxref}}, controls the settings for
-\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and
-\textsf{proceedings} entries:
+The \mymarginpar{\texttt{booklongxref}} second option,
+\texttt{booklongxref}, controls the settings for \textsf{book},
+\textsf{bookinbook}, \textsf{collection}, and \textsf{proceedings}
+entries:
 
 \begin{description}
 \item[\qquad true:] This is the default.  If you use \textsf{crossref}
@@ -7114,30 +7552,38 @@ 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.
 
-\mylittlespace Please \colmarginpar{New!} further note that in
-previous releases of \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 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 now 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.
-
-\mybigspace Predictably, \colmarginpar{\textbf{date}} 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.
+\mylittlespace Please further note that in previous releases of
+\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 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 \colmarginpar{New} an
+\mycolor{\texttt{xrefurl}} option available to control the printing of
+\textsf{url}, \textsf{doi}, and \textsf{eprint} fields in abbreviated
+references where such information might otherwise never appear.  See
+\mycolor{\texttt{xrefurl}} in section~\ref{sec:authuseropts}.
+
+\paragraph*{\protect\mymarginpar{\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.
 
 \mylittlespace To start, in each entry, \textsf{Biber} attempts to
 find something which it can designate a \textsf{labeldate}, which
@@ -7161,10 +7607,7 @@ 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
-section~\ref{sec:authpreset}, below.  If you wish to provide the
-\enquote{\texttt{n.d.}}\ yourself in the \textsf{year} field, please
-instead put \cmd{bibstring\{nodate\}} there, as otherwise the
-punctuation in citations will come out [subtly] wrong.)
+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
@@ -7199,19 +7642,19 @@ the specification.  If users modified \cmd{DeclareLabeldate}, and
 their references entered these tricky corners, the results could be
 surprising.
 
-\mylittlespace With \colmarginpar{New!} this release, therefore, I
-have included a new means of coping with multiple dates in database
-entries, while retaining the old mechanisms for those for whom they
-work well.  These old 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 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 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
+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
@@ -7224,11 +7667,11 @@ default \textsf{biblatex-chicago-authordate} will use 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
+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}.
 
-\mylittlespace If, \colmarginpar{\texttt{cmsdate}\\\emph{in entry}}
+\mylittlespace If, \mymarginpar{\texttt{cmsdate}\\\emph{in entry}}
 for any reason, you wish the \textsf{origdate} to appear at the head
 of the entry, then your first option is to use the \texttt{cmsdate}
 toggle in the \textsf{options} field of the entry itself.  This has 3
@@ -7249,7 +7692,7 @@ state (\texttt{full}) which I shall discuss below:
   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
-  \texttt{new} and \texttt{old} now work like \texttt{both}.
+  \texttt{new} and \texttt{old} work like \texttt{both}.
 \end{enumerate}
 
 In the first and third cases, if you put the string \texttt{reprint}
@@ -7295,10 +7738,10 @@ the \textsf{date} --- (Author [1898] 1974a) and (Author [1898] 1974b)
 how to cope with these situations, but
 \textsf{biblatex-chicago-authordate} provides help.  You can't
 manually put the alphabetical suffix on an \textsf{origdate} yourself
-because that field only accepts numerical data.  Instead, we can now
+because that field only accepts numerical data.  Instead, we can
 choose between two solutions.  The old way
-\colmarginpar{\texttt{cmsdate}\\\emph{in entry}
-  \\+ \texttt{switchdates}} is an unusual expedient, which amounts to
+\mymarginpar{\texttt{cmsdate}\\\emph{in entry} \\+
+  \texttt{switchdates}} is an unusual expedient, which amounts to
 switching the two date fields, placing the earlier date in
 \textsf{date} and the later one in \textsf{origdate}.  The style tests
 for this condition using a simple arithmetical comparison between the
@@ -7316,7 +7759,7 @@ follows:
 \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 now synonyms for this.
+  options \texttt{old} and \texttt{new} are synonyms for this.
 \end{enumerate}
 
 If, for some reason, the automatic switching of the dates cannot be
@@ -7328,14 +7771,14 @@ in print (preventing the comparison between a year and the word
 \texttt{switchdates} in the \textsf{options} field to achieve the
 required effects.
 
-\mylittlespace The \mycolor{new}
-\colmarginpar{\texttt{cmsdate}\\\emph{in preamble}} 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 \enquote{correctly} as I can.  The switches
-for this option are the same as for the entry-only option, that is:
+\mylittlespace The more \mymarginpar{\texttt{cmsdate}\\\emph{in
+    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
+\enquote{correctly} as I can.  The switches for this option are the
+same as for the entry-only option, that is:
 
 \begin{enumerate}
 \item \texttt{cmsdate=off} is the default: (Author 1952).
@@ -7350,25 +7793,24 @@ for this option are the same as for the entry-only option, that is:
   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
-  \texttt{new} and \texttt{old} now work like \texttt{both}.
+  \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
 synonyms for the latter, \texttt{new} or \texttt{old}), then
-\textsf{biblatex-chicago-authordate} will now change the default
+\textsf{biblatex-chicago-authordate} will change the default
 \cmd{DeclareLa\-bel\-date} definition so that the \textsf{labelyear}
-search order will be \mycolor{\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} and the
-correct sorting, without having to switch dates around
-counter-intuitively in your .bib file.  A few clarifications may yet
-be in order.
+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} and the correct
+sorting, without having to switch dates around counter-intuitively in
+your .bib file.  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
@@ -7452,12 +7894,11 @@ 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, with \colmarginpar{New!} this release, you can now 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.
+finally, 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 I recommend that you have a look through
 \textsf{dates-test.bib} to see how all these complications will affect
@@ -7502,8 +7943,8 @@ citations (emerson:nature).
 \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
-complications that need explaining.  Lehman points out in his
-documentation that the \textsf{editor} field will be associated with a
+complications that need explaining.  \textsf{Biblatex.pdf} points out
+that the \textsf{editor} field will be associated with a
 \textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
 depending on the sort of entry.  More specifically,
 \textsf{biblatex-chicago} associates the \textsf{editor} with the most
@@ -7540,40 +7981,41 @@ languages, but they are otherwise unnecessary.
 Cf. section~\ref{sec:international}, and also \textsf{namea},
 \textsf{nameb}, \textsf{namec}, and \textsf{translator}.)
 
-\mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} newer
-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
+\mybigspace \textsf{Biblatex}
+\mymarginpar{\textbf{editora\\editorb\\editorc}} provides 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},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
 bernstein:shostakovich, 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
 put at the head of an entry, starting with an \textsf{author}, and
-proceeding in order through \textsf{editor}, \textsf{translator}, and
-\textsf{namec} (the compiler).  If all four are missing, then the
-\textsf{title} will be placed at the head.  (In \textsf{article} and
-\textsf{review} entries with a \texttt{magazine}
-\textsf{entrysubtype}, a missing author immediately prompts the use of
-\textsf{journaltitle} at the head of an entry.  See above under
-\textsf{article} for details.)  The \textsf{editortype} field provides
-even greater flexibility, allowing you to choose from a variety of
-editorial roles while only using the \textsf{editor} field.  You can
-do this even though an author is named (eliot:pound shows this
-mechanism in action for a standard editor, rather than for some other
-role).  Two things are necessary for this to happen.  First, in the
-\textsf{options} field you need to set \texttt{useauthor=false} (if
-there is an \textsf{author}), then you need to put the name you wish
-to see at the head of your entry into the \textsf{editor} or the
-\textsf{namea} field.  If the \enquote{editor} is in fact, e.g., a
-compiler, 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.
+proceeding in order through \textsf{namea}, \textsf{editor},
+\textsf{nameb}, \textsf{translator}, and \textsf{namec} (the
+compiler).  If all six are missing, then the \textsf{title} will be
+placed at the head.  (In \textsf{article} and \textsf{review} entries
+with a \texttt{magazine} \textsf{entrysubtype}, a missing
+\textsf{author} immediately prompts the use of \textsf{journaltitle}
+at the head of an entry.  See above under \textsf{article} for
+details.)  The \textsf{editortype} field provides even greater
+flexibility, allowing you to choose from a variety of editorial roles
+while only using the \textsf{editor} field.  You can do this even
+though an author is named (eliot:pound shows this mechanism in action
+for a standard editor, rather than for some other role).  Two things
+are necessary for this to happen.  First, in the \textsf{options}
+field you need to set \texttt{useauthor=false} (if there is an
+\textsf{author}), then you need to put the name you wish to see at the
+head of your entry into the \textsf{editor} or the \textsf{namea}
+field.  If the \enquote{\textsf{editor}} is in fact, e.g., a compiler,
+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}
 
@@ -7583,30 +8025,34 @@ 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 \textsf{editortype} mechanism 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 it will go ahead and look
-for an \textsf{editor}.  \textsf{Biblatex}'s sorting algorithms, and
+used at the head of the entry, if it isn't , or if you've set the
+option \mycolor{\texttt{usenamea=false}}, it will go ahead and look
+for an \textsf{editor}.  The \textsf{editortype} field applies only to
+the \textsf{editor}, but you can use \mycolor{\textsf{nameatype}} to
+modify \textsf{namea}.  \textsf{Biblatex}'s sorting algorithms, and
 also its \textsf{labelname} mechanism, should both work properly no
 matter sort of name you provide, thanks to \textsf{Biber} and the
 (default) Chicago-specific definitions of \cmd{DeclareLabelname} and
 \cmd{DeclareSortingScheme}.  (Cf.\ section~\ref{sec:authformopts},
-below).  If, however, the \textsf{namea} field provides the name, and
-that name isn't automatically shortened properly by \textsf{biblatex},
-then your .bib entry will need to have a \textsf{shorteditor} defined
-to help with in-text citations, not a \textsf{shortauthor}, possibly
-ruled out because \texttt{useauthor=false}.
+below).  Please be aware that if you want a shortened form to appear
+in citations then there's only the \textsf{shorteditor}, which you
+should ensure presents whichever of the two editors' names
+(\textsf{namea} or \textsf{editor}) appears at the head of the
+reference-list entry.
 
 \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
 \textsf{editortype} field, then concatenation is turned off, even if
 the name of the \textsf{editor} matches, for example, that of the
-\textsf{translator}.  In the absence of an \textsf{editortype}, the
-usual mechanisms remain in place, that is, if 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 (15.7) recommends
-not using these identifying strings in citations, and
+\textsf{translator}.  In the absence of an \textsf{editortype} (or
+\mycolor{\textsf{nameatype}}), the usual mechanisms remain in place,
+that is, if 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 (15.7) recommends not using these
+identifying strings in citations, and
 \textsf{biblatex-chicago-authordate} follows that recommendation.  If
 you nevertheless need to provide such a string, you'll have to do it
 manually in the \textsf{shorteditor} field, or perhaps, in a different
@@ -7614,20 +8060,20 @@ sort of entry, in a \textsf{shortauthor} field.
 
 \mylittlespace It may also be worth noting that because of certain
 requirements in the specification -- absence of an \textsf{author},
-for example -- the \texttt{useauthor} mechanism 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}.
+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}.
 
 \mybigspace These
 \mymarginpar{\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
 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, and they have found a use particularly in \textsf{music}
+and \textsf{video} entries.  Cf.\ bernstein:shostakovich,
+handel:messiah.
 
 \mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
@@ -7635,19 +8081,20 @@ identify a particular article.  Only applicable to the
 \textsf{article} entry type.  Not typically required by the
 \emph{Manual}.
 
-\mybigspace Standard \mymarginpar{\textbf{entrysubtype}} 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 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 between scholarly
-\enquote{journals,} on the one hand, and \enquote{magazines} and
-\enquote{newspapers} on the other.  Usage is fairly simple: you need
-to put the exact string \texttt{magazine} into the
-\textsf{entrysubtype} field if you are citing one of the latter two
-types of source, whereas if your source is a \enquote{journal,} then
-you need do nothing.
+\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
+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
+between scholarly \enquote{journals,} on the one hand, and
+\enquote{magazines} and \enquote{newspapers} on the other.  Usage is
+fairly simple: you need to put the exact string \texttt{magazine} into
+the \textsf{entrysubtype} field if you are citing one of the latter
+two types of source, whereas if your source is a \enquote{journal,}
+then you need do nothing.
 
 \mylittlespace The second use involves references to works from
 classical antiquity and, according to the \emph{Manual}, from the
@@ -7703,16 +8150,16 @@ above, and that of \textsf{userd} below.)
 \mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}}
 Teramoto suggested adding \textsf{biblatex's} excellent
 \textsf{eprint} handling to \textsf{biblatex-chicago}, and he sent me
-a patch implementing it.  With minor alterations, I have applied it to
-this release, so these three fields now work more or less as they do
-in standard \textsf{biblatex}.  They may prove helpful in providing
-more abbreviated references to online content than conventional URLs,
+a patch implementing it.  I have applied it, with minor alterations, 
+so these three fields work more or less as they do in 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 will now play a significant role in \textsf{music},
+\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
@@ -7721,9 +8168,9 @@ 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).
+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 the default configuration of \cmd{DeclareLabeldate},
 dates for citations and for the head of reference list entries are
@@ -7764,7 +8211,7 @@ 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}
+\enlargethispage{\baselineskip}
 
 \mybigspace Standard \mymarginpar{\textbf{howpublished}}
 \textsf{biblatex} field, mainly applicable in the \textsf{booklet}
@@ -7834,7 +8281,11 @@ where a piece in an \textsf{article} or \textsf{review}
 author.  See above (section~\ref{sec:fields:authdate}) under
 \textbf{article} for details.  The lakeforester:pushcarts and
 nyt:trevorobit entries in \textsf{dates-test.bib} will give you some
-idea of how this works.
+idea of how this works.  Please note there is a
+\mycolor{\textsf{shortjournal}} field which you can use to abbreviate
+the \textsf{journaltitle} in citations and/or in the reference list,
+and you can also use it to print a list of journal abbreviations.
+Cf.\ the \mycolor{\textsf{shortjournal}} documentation below.
 
 \mybigspace This \mymarginpar{\textbf{keywords}} field is
 \textsf{biblatex}'s extremely powerful and flexible technique for
@@ -7850,12 +8301,11 @@ 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
-(furet:passing:eng, furet:passing:fr, 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).
+(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).
 
 \mybigspace A \mymarginpar{\textbf{language}} standard
 \textsf{biblatex} field, designed to allow you to specify the
@@ -7946,38 +8396,48 @@ cross references produced using the \textsf{crossref} field, the
 euripides:\-orestes, harley:cartography, lach:asia,
 pelikan:chris\-tian, and plato:re\-public:gr.)
 
-\mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
+\mybigspace An \colmarginpar{\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
 that would ordinarily only be capitalized at the beginning of a
 sentence, then simply ensure that that word is in lowercase, and
-\textsf{biblatex-chicago} will automatically do the right thing.
+\textsf{biblatex-chicago} will automatically do the right thing.  The
+package and entry options \colmarginpar{New}
+\mycolor{\texttt{ptitleaddon}} and \mycolor{\texttt{ctitleaddon}}
+(section~\ref{sec:authpreset}) allow you to customize the punctuation
+that appears before the \textsf{maintitleaddon} field
+(schubert:muellerin).
 
 \mybigspace Standard \mymarginpar{\textbf{month}} \textsf{biblatex}
 field, containing the month of publication.  This should be an
 integer, i.e., \texttt{month=\{3\}} not \texttt{month=\{March\}}.  See
 \textsf{date} for more information.
 
-\mybigspace This \mymarginpar{\textbf{namea}} is one of the fields
+\mybigspace This \colmarginpar{\textbf{namea}} is one of the fields
 \textsf{biblatex} provides for style writers to use, but which it
 leaves undefined itself.  In \textsf{biblatex-chicago} it contains the
 name(s) of the editor(s) of a \textsf{title}, if the entry has a
-\textsf{booktitle} or \textsf{maintitle}, or both, in which situation
-the \textsf{editor} would be associated with one of these latter
-fields (donne:var).  (In \textsf{article} and \textsf{review} entries,
+\textsf{booktitle} and/or a \textsf{maintitle}, in which situation the
+\textsf{editor} would be associated with one of these latter fields
+(donne:var).  (In \textsf{article} and \textsf{review} entries,
 \textsf{namea} applies to the \textsf{title} instead of the
 \textsf{issuetitle}, should the latter be present.)  You should
 present names in this field exactly as you would those in an
 \textsf{author} or \textsf{editor} field, and the package will
-concatenate this field with \textsf{nameb} if they are identical.  See
-under \textbf{editor} and \textbf{editortype} above for the full
-details.  Please note that, as the field is highly single-entry
-specific, \textsf{namea} isn't inherited from a \textsf{crossref}'ed
-parent entry.  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 section~\ref{sec:formatting:authdate}.
+concatenate this field with \textsf{nameb} if they are identical.
+When choosing a name for a citation or to head a reference-list entry,
+\textsf{biblatex-chicago} gives precedence to \textsf{namea} over
+\textsf{editor}.  See under \textbf{editor} and \textbf{editortype}
+above for the full details.  Please note that, as the field is highly
+single-entry specific, \textsf{namea} isn't inherited from a
+\textsf{crossref}'ed parent entry.  Please note, also, that you can
+use the \mycolor{\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{parteditandcomp}, \cmd{parttransandcomp}, and
+\cmd{partedittransand\-comp}, for which see
+section~\ref{sec:formatting:authdate}.
 
 \mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
@@ -7996,11 +8456,10 @@ details.
 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.
+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 the \textsf{customc} entry type, finally, which is
 used to create alphabetized cross-references to other entries in the
@@ -8009,6 +8468,13 @@ default string linking the two parts of the cross-reference.  The code
 automatically tests for a known bibstring, which it will italicize.
 Otherwise, it prints the string as is.
 
+\mybigspace You \colmarginpar{\textbf{nameatype}} can use this field
+to change the role of a \textsf{namea} just as you can use
+\textsf{editortype} to change the role of an \textsf{editor}.  As with
+the \textsf{editortype}, using this field prevents string
+concatenation with identical \textsf{nameb} or \textsf{namec} fields.
+Please see \textbf{editortype}, above, for the details.
+
 \mybigspace Like \mymarginpar{\textbf{nameb}} \textsf{namea}, above,
 this is a field left undefined by the standard \textsf{biblatex}
 styles.  In \textsf{biblatex-chicago}, it contains the name(s) of the
@@ -8024,13 +8490,15 @@ concatenate this field with \textsf{namea} if they are identical.  See
 under the \textbf{translator} field below for the full details.
 Please note that, as the field is highly single-entry specific,
 \textsf{nameb} isn't inherited from a \textsf{crossref}'ed parent
-entry.  Cf.\ also \textsf{namea}, \textsf{namec},
+entry.  Please note, also, that in \textsf{biblatex-chicago's}
+name-finding algorithms \textsf{nameb} takes precedence over
+\textsf{translator}.  Cf.\ also \textsf{namea}, \textsf{namec},
 \textsf{origlanguage}, \textsf{translator}, \textsf{userf} and the
 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 \colmarginpar{\textbf{namec}} \emph{Manual} (15.35)
 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
@@ -8040,7 +8508,7 @@ reference, so I have added that possibility to the many that
 \textsf{biblatex} already provides, such as the \textsf{editor},
 \textsf{translator}, \textsf{commentator}, \textsf{annotator}, and
 \textsf{redactor}, along with writers of an \textsf{introduction},
-\textsf{foreword}, or \textsf{afterword}.  Since \textsf{biblatex.bst}
+\textsf{foreword}, or \textsf{afterword}.  Since \textsf{biblatex}
 doesn't offer a \textsf{compiler} field, I have adopted for this
 purpose the otherwise unused field \textsf{namec}.  It is important to
 understand that, despite the analogous name, this field does not
@@ -8055,7 +8523,8 @@ please note that I've arranged the concatenation algorithms to include
 so in this particular circumstance you can, if needed, make
 \textsf{namec} analogous to these two latter, \textsf{title}-only
 fields.  (See above under \textbf{editortype} for details of how you
-can use that field to identify a compiler.)
+can use that field, or the \mycolor{\textsf{nameatype}} field, to
+identify a compiler.)
 
 \mylittlespace It might conceivably be necessary at some point to
 identify the compiler(s) of a \textsf{title} separate from the
@@ -8068,19 +8537,16 @@ to fall back on the \cmd{partcomp} macro or the related
 be able to remedy this.)  It may be as well to mention here too that
 of the three names that can be substituted for the missing
 \textsf{author} at the head of an entry, \textsf{biblatex-chicago}
-will choose an \textsf{editor} if present, then a \textsf{translator}
-if present, falling back to \textsf{namec} only in the absence of the
-other two, and assuming that the fields aren't identical, and
-therefore to be concatenated.  In a change from the previous behavior,
-these algorithms also now test for \textsf{namea} or \textsf{nameb},
-which will be used instead of \textsf{editor} and \textsf{translator},
-respectively, giving the package the greatest likelihood of finding a
-name to place at the head of an entry.  \textsf{Biblatex}'s sorting
-algorithms, and also its \textsf{labelname} mechanism, should both
-work properly no matter sort of name you provide, thanks to
-\textsf{Biber} and the (default) Chicago-specific definitions of
-\cmd{DeclareLabelname} and \cmd{DeclareSortingScheme}.  (Cf.\
-section~\ref{sec:authformopts}, below).
+will choose a \textsf{namea} if present, then an \textsf{editor}, a
+\textsf{nameb}, or a \textsf{translator}, with \textsf{namec} coming
+last, assuming that the fields aren't identical, and therefore to be
+concatenated.  \textsf{Biblatex}'s sorting algorithms, and also its
+\textsf{labelname} mechanism, should both work properly no matter what
+sort of name you provide, but do please remember that if you want the
+package to skip over any names you can employ the
+\texttt{use<name>=false} options.  Indeed, \textsf{biblatex's}
+\mycolor{\texttt{usenamec}} has replaced the old Chicago-specific
+\texttt{usecompiler}, which is deprecated.
 
 \mybigspace As \mymarginpar{\textbf{note}} in standard
 \textsf{biblatex}, this field allows you to provide bibliographic data
@@ -8105,7 +8571,7 @@ 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
 \textsf{review} entry, this will be a plain cardinal number, but in
-such entries \textsf{biblatex-chicago} now does the right thing if you
+such entries \textsf{biblatex-chicago} does the right thing if you
 have a list or range of numbers (unsigned:ranke).  In any
 \textsf{book}-like entry it may well contain considerably more
 information, including even a reference to \enquote{2nd ser.,} for
@@ -8144,7 +8610,7 @@ 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 \colmarginpar{\textbf{origdate}} is a standard
+\mybigspace This \mymarginpar{\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
@@ -8186,8 +8652,8 @@ 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 new
-\colmarginpar{\texttt{cmsdate}\\\emph{in preamble}} \texttt{cmsdate}
+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
 multiple dates.  In short, setting \texttt{cmsdate} to \texttt{both}
@@ -8238,85 +8704,17 @@ 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.
-
-%\enlargethispage{\baselineskip}
-
-\mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the
-\emph{Manual}'s specifications, I have fairly thoroughly redefined
-\textsf{biblatex}'s facilities for treating translations.  The
-\textsf{origtitle} field isn't used, while the \textsf{language} and
-\textsf{origdate} fields have been press-ganged for other duties.  The
-\textsf{origlanguage} field, for its part, retains a dual role in
-presenting translations in a list of references.  The details of the
-\emph{Manual}'s suggested treatment when both a translation and an
-original are cited may be found below under \textbf{userf}.  Here,
-however, I simply note that the introductory string used to connect
-the translation's citation with the original's is \enquote{Originally
-  published as,} which I suggest may well be inaccurate in a great
-many cases, as for instance when citing a work from classical
-antiquity, which will most certainly not \enquote{originally} have
-been published in the Loeb Classical Library.  Although not, strictly
-speaking, authorized by the \emph{Manual}, I have provided another way
-to introduce the original text, using the \textsf{origlanguage} field,
-which must be provided \emph{in the entry for the translation, not the
-  original text} (aristotle:metaphy:trans).  If you put one of the
-standard \textsf{biblatex} bibstrings there (enumerated below), then
-the entry will work properly across multiple languages.  Otherwise,
-just put the name of the language there, localized as necessary, and
-\textsf{biblatex-chicago} will eschew \enquote{Originally published
-  as} in favor of, e.g., \enquote{Greek edition:} or \enquote{French
-  edition:}.  This has no effect in citations, where only the work
-cited --- original or translation --- will be printed, but it may help
-to make the \emph{Manual}'s suggestions for the list of references
-more palatable.
+\textsf{location} field.  (The \textsf{origyear} field usually works,
+too.)
 
-\mylittlespace That was the first usage, in keeping at least with the
-spirit of the \emph{Manual}.  I have also, perhaps less in keeping
-with that specification, retained some of \textsf{biblatex}'s
-functionality for this field.  If an entry doesn't have a
-\textsf{userf} field, and therefore won't be combining a text and its
-translation in the list of references, you can also use
-\textsf{origlanguage} as Lehman intended it, so that instead of
-saying, e.g., \enquote{translated by X,} the entry will read
-\enquote{translated from the German by X.}  The \emph{Manual} doesn't
-mention this, but it may conceivably help avoid certain ambiguities in
-some citations.  As in \textsf{biblatex}, if you wish to use this
-functionality, you have to provide \emph{not} the name of the
-language, but rather a bibstring, which may, at the time of writing,
-be one of \texttt{american}, \texttt{brazilian}, \texttt{danish},
-\texttt{dutch}, \texttt{english}, \texttt{french}, \texttt{german},
-\texttt{greek}, \texttt{italian}, \texttt{latin}, \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 now 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 now 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}, \textsf{origpublisher} and
-\textsf{pubstate}; schweitzer:bach.)
+\mybigspace See
+\vspace{-14.2pt}
+\colmarginpar{\textbf{origlanguage}\\
+\textbf{origlocation}\\\textbf{origpublisher}}
+section~\ref{sec:authrelated}, below.
+\vspace{18pt}
 
-\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 now 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}, and
-\textsf{pubstate}; schweitzer:bach.)
-
-\mybigspace This \colmarginpar{\textbf{pages}} is the standard
+\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
@@ -8332,8 +8730,8 @@ 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 has recently brought to my attention a
-discussion that took place a couple of years ago on
+\mylittlespace David Gohlke brought to my attention a discussion that
+took place a couple of years ago on
 \href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{Stackexchange}
 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
@@ -8343,10 +8741,9 @@ 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
-\mycolor{\texttt{compresspages=true}} when loading
-\textsf{biblatex-chicago} should automatically give you the
-Chicago-recommended page ranges.
+this code a package option, so setting \texttt{compresspages=true}
+when loading \textsf{biblatex-chicago} should automatically give you
+the Chicago-recommended page ranges.
 
 \mybigspace This, \mymarginpar{\textbf{pagination}} a standard
 \textsf{biblatex} field, allows you automatically to prefix the
@@ -8357,7 +8754,7 @@ appropriate identifying string to information you provide in the
 all the details on this functionality, as aside from the difference
 just mentioned the two fields are equivalent.
 
-\mybigspace Standard \colmarginpar{\textbf{part}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{part}} \textsf{biblatex}
 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}
@@ -8371,13 +8768,13 @@ necessary, rather than supplying the usual bibstring, so this provides
 a mechanism for altering the string to your liking.  The field will be
 printed in the same place in any entry as would a \textsf{volume}
 number, and although it will most usually be associated with such a
-number, it can also, as of this release, function independently,
-allowing you to identify parts of works that don't fit into the
-standard scheme.  If you need to identify \enquote{parts} or
-\enquote{books} that are part of a published \textsf{series}, for
-example, then you'll need to use a different field, (which in the case
-of a series would be \textsf{number} [palmatary:pottery]).  Cf.\
-\textsf{volume}; iso:electrodoc.
+number, it can also function independently, allowing you to identify
+parts of works that don't fit into the standard scheme.  If you need
+to identify \enquote{parts} or \enquote{books} that are part of a
+published \textsf{series}, for example, then you'll need to use a
+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}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
@@ -8407,71 +8804,16 @@ 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 A \mymarginpar{\textbf{pubstate}} standard
-\textsf{biblatex} field, introduced in version 0.9.  Because the
-author-date specification has fairly complicated rules about
-presenting reprinted editions, I have adopted this field as a means of
-simplifying the problem for users.  Instead of hand-formatting in the
-\textsf{location} field, you can now 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
-parenthesized 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.)  If the field contains something
-other than the word \texttt{reprint}, then it 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, the original release date will be printed near
-the end, preceded by the appropriate string.
-
-%\enlargethispage{\baselineskip}
+\mybigspace See \colmarginpar{\textbf{pubstate}}
+section~\ref{sec:authrelated}, below.
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
 \emph{Manual} doesn't actually mention it.  It may be useful for some
 purposes.  Cf.\ \textsf{annotator} and \textsf{commentator}.
 
-\mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
-\textbf{Please note that this feature is in an alpha state, and that
-  I'm contemplating using a different field in the future for this
-  functionality.  I include it here in the hope that it might receive
-  some testing in the meantime.}  At the 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 need be provided
-only if they 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{Orig.\ pub.\ in.}  Please see the documentation on
-\textsf{userf} below for all the details on how to create .bib entries
-for presenting your data.
-
-%%\enlargethispage{\baselineskip}
+\mybigspace See \colmarginpar{\textbf{reprinttitle}}
+section~\ref{sec:authrelated}, below.
 
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
@@ -8499,7 +8841,7 @@ 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
+\mybigspace This \colmarginpar{\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
 purposes of the author-date specification, the field provides the name
@@ -8509,20 +8851,21 @@ the author's last name from the \textsf{author} field and uses it in
 such a reference, and if there is no \textsf{author} it will search
 \textsf{namea}, \textsf{editor}, \textsf{nameb}, \textsf{translator},
 and \textsf{namec}, in that order.  The current versions of
-\textsf{biblatex} and \textsf{Biber} will now automatically
-alphabetize by any of these names if they appear at the head of an
-entry.  If, in an author-less \textsf{article} entry
-(\textsf{entrysubtype} \texttt{magazine}), you allow
-\textsf{biblatex-chicago} to use the title of the periodical as the
-author --- the default behavior --- then your \textsf{shortauthor}
-field can optionally contain an abbreviated form of the periodical
-name, formatted appropriately, which usually means something like
-\enquote{\cmd{mkbibemph\{Abbrev.\ Period.\ Title\}}} (gourmet:052006,
-lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke).  Indeed, with
-long, institutional authors, a shortened version in
-\textsf{shortauthor} may save space in the running text
-(evanston:library).  See just below under \textbf{shorthand} for
-another method of saving space.
+\textsf{biblatex} and \textsf{Biber} will automatically alphabetize by
+any of these names if they appear at the head of an entry.  If, in an
+author-less \textsf{article} entry (\textsf{entrysubtype}
+\texttt{magazine}), you allow \textsf{biblatex-chicago} to use the
+\textsf{journaltitle} as the author --- the default behavior --- and
+you have been accustomed to using the \textsf{shortauthor} field to
+abbreviate it, it may be simpler now to use the
+\mycolor{\textsf{shortjournal}} field instead, which does all of the
+formatting for you, and additionally adds the possibility of printing
+a list of journal abbreviations.  See just below for the details.
+(Cf.\ gourmet:052006, lakeforester:pushcarts, nyt:trevorobit,
+unsigned:ranke).  With long, institutional authors, a shortened
+version in \textsf{shortauthor} may 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
@@ -8538,16 +8881,23 @@ in this case for, e.g., a \textsf{collection} entry that typically
 lacks an author.  The \textsf{shortauthor} field works just as well in
 most situations, but if you have set \texttt{useauthor=false} (and not
 \texttt{useeditor=false}) in an entry's \textsf{options} field, then
-only \textsf{shorteditor} will be recognized.  Cf.\
-\textsf{editortype}, above.
+only \textsf{shorteditor} will be recognized.  It may be worth
+pointing out that, because \textsf{biblatex-chicago} also provides a
+\textsf{namea} field for the editor of a \textsf{title} as opposed to
+a \textsf{main-} or \textsf{booktitle}, and because in standard use
+the \textsf{namea}, if present, will be chosen to head a reference
+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}
 
-\mybigspace This \mymarginpar{\textbf{shorthand}} is
-\textsf{biblatex}'s mechanism for using abbreviations in citations.
-For \textsf{biblatex-chicago-authordate} I have modified it somewhat
-to conform to the needs of the specification, though there is a
-package option to revert the behavior to something closer to the
+This is \textsf{biblatex}'s mechanism for using abbreviations in
+citations.  For \textsf{biblatex-chicago-authordate} I have modified
+it somewhat to conform to the needs of the specification, though there
+is a package option to revert the behavior to something closer to the
 \textsf{biblatex} standard --- see below and under \texttt{cmslos} in
 section~\ref{sec:authpreset}.  The main problem when presenting
 readers with an abbreviation is to ensure that they know how to expand
@@ -8561,30 +8911,33 @@ in themselves already highly-abbreviated keys to the fuller
 information to be found in the list of references.  There are cases,
 however, particularly when institutions or \textsf{journaltitles}
 appear as authors, when you may feel the need to provide a shortened
-version for citations.  I have already discussed one option available
-to you just above (cf.\ \textbf{shortauthor}), but for this to work
-the abbreviation must either be instantly recognizable to your
-readership or at least easily parseable by them.
-
-\mylittlespace The \emph{Manual's} recommendation (15.36), and this
-has changed for the 16th edition, involves using an abbreviation for
-long institutional names, an abbreviation which will appear not only
-in citations but also at the head of the entry in the list of
+version for citations.  I have already discussed two options available
+to you just above (cf.\ \textbf{shortauthor} and
+\mycolor{\textbf{shortjournal}}).  For the former to work the
+abbreviation must either be instantly recognizable to your readership
+or at least easily 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
+\mycolor{\cmd{printbiblist\{shortjournal\}}}.
+
+\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, which will be expanded within the same entry and placed
-(inside parentheses) between the abbreviation and the date.  This new
-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.)
+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.)
 
 \mylittlespace I should clarify here that this automatic placement of
 the \textsf{shorthand} at the head of the entry will \emph{not} occur
@@ -8597,21 +8950,21 @@ itself.  You can place \texttt{skiplos} in the \textsf{options} field
 to exclude a particular entry from the list of shorthands if you do
 decide to print that list, giving maximum flexibility.
 
-\mylittlespace Indeed, I have provided two new options to add to this
-flexibility.  First, I have included two new \texttt{bibenvironments}
-for 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 latter case to clear up some spurious punctuation and white 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.)  Second, I have provided a new 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
+\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:
+\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
+latter case to clear up some spurious punctuation and white 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.)  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{cmslos=false}, as otherwise the shorthand will be printed
 twice.  (See 15.36, 13.65, 14.54--55, and also \textsf{biblatex.pdf}
 for more information.)
@@ -8619,14 +8972,66 @@ for more information.)
 %%\enlargethispage{-\baselineskip}
 
 \mylittlespace As I mentioned above under \textbf{crossref}, I believe
-it is now safe to use shorthands in parent entries, as this, in the
+it is safe to use shorthands in parent entries, as this, in the
 standard configuration, gives you the shorthand itself in the child
 entry's abbreviated cross-reference, which may well save space in the
 list of references.
 
-\mybigspace A \mymarginpar{\textbf{shorttitle}} standard
+\mybigspace A \colmarginpar{\textbf{shortjournal}} special
+\textsf{biblatex} field, used to provide both an abbreviated form of a
+\textsf{journaltitle} in citations and/or the reference list and to
+facilitate the creation of a list of journal abbreviations, should
+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
+\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
+individual publications, but were you to require such a thing, you'd
+have to move the abbreviation from the \textsf{journaltitle} to the
+\mycolor{\textsf{shortjournal}} field, placing the full title in the
+former.  In \textsf{periodical} entries the \textsf{title} field
+presents what would be the \textsf{journaltitle} in the
+\textsf{articles} or \textsf{reviews}, so in such entries you can
+provide the standard \textsf{shorttitle} field to accompany the
+\textsf{title}, and \textsf{biblatex-chicago} will automatically copy
+the \textsf{shorttitle} into a \mycolor{\textsf{shortjournal}}.
+
+\mylittlespace Having done this, you then need to choose where to
+print the \mycolor{\textsf{shortjournal}}, which is controlled by the
+\mycolor{\texttt{journalabbrev}} option either in the preamble or in
+the \textsf{options} field of individual .bib entries.  By default,
+and taking account of the space-saving features of the author-date
+styles, this option is set to \texttt{notes}, so your
+\textsf{shortjournal} fields will be printed only in those citations
+where they appear in place of an \textsf{author}.  There are three
+other settings: \texttt{true} prints the shortened fields both in
+citations and in the 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 \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{sjnotes}} and
+\mycolor{\texttt{sjendnotes}}, 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 (bold italic), you can
+roll your own using \cmd{DeclareFieldFormat\{shortjournalwidth\}} ---
+you can see its default definition at the top of
+\textsf{chicago-authordate.bbx}.
+
+\mybigspace A \colmarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
-title for citation styles that need one.  In
+title for citation styles that need one.  (It is also the way to hook
+\textsf{periodical} entries into the \mycolor{\textsf{shortjournal}}
+mechanism, on which see the previous entry.)  In
 \textsf{biblatex-chicago-authordate} such a field will be necessary
 only very rarely (unlike in the notes \&\ bibliography style), and is
 most likely to turn up in \textsf{inreference} or \textsf{reference}
@@ -8642,28 +9047,28 @@ space in your running text this is the field where you can provide it.
 \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 now omit
-the definite or indefinite article, which should help (14.85;
+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{DeclareSortingScheme} now 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.  Lehman also provides \textbf{sortname} and
+\cmd{DeclareSortingScheme} 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 by Lehman 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{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.
 
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
@@ -8671,23 +9076,22 @@ present several reprinted books by the same author.  See
 %\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{title}} release of
-\textsf{biblatex-chicago} now 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.
+\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.
 
 \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
@@ -8793,14 +9197,14 @@ quotation, retains those marks in all title types (kimluu:diethyl).
 \textsf{biblatex-chicago-authordate} will automatically capitalize the
 first word of the \textsf{title} after sentence-ending punctuation,
 assuming that such a \textsf{title} begins with a lowercase letter in
-your .bib database.  See \textbf{\textbackslash autocap} below for
-more details.
+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
-new \textsf{authordate-trad} style, your \textsf{title} and related
-fields will need extra care, familiar to users of the 15th-edition
+\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
 system is for it to do the formatting for you, and in most cases
 \textsf{biblatex-chicago-authordate-trad} does just that, capitalizing
@@ -8940,7 +9344,7 @@ determine capitalization.  It works by redefining the command
 latter anywhere in your document please be aware that it will also be
 turned off there.  See section~\ref{sec:authuseropts}, below.
 
-\mybigspace Standard \mymarginpar{\textbf{titleaddon}}
+\mybigspace Standard \colmarginpar{\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} uses it in just this way, with the
@@ -8954,20 +9358,28 @@ to provide manually yourself.  The single exception to this rule is
 when your data begins with a word that would ordinarily only be
 capitalized at the beginning of a sentence, in which case you need
 then simply ensure that that word is in lowercase, and
-\textsf{biblatex-chicago} will automatically do the right thing.  See\
-\textbf{\textbackslash autocap}, below.  (Cf.\ brown:bremer,
-osborne:poison, reaves:rosen, and white:ross:memo for examples where
-the field starts with a lowercase letter; morgenson:market provides an
-example where the \textsf{titleaddon} field, holding the name of a
-regular column in a newspaper, is capitalized, a situation that is
-handled as you would expect.)
-
-\mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
+\textsf{biblatex-chicago} will automatically do the right thing.
+See\,\textbf{\textbackslash autocap} in
+section~\ref{sec:formatting:authdate} below.  The \colmarginpar{New}
+package and entry options \mycolor{\texttt{ptitleaddon}} and
+\mycolor{\texttt{ctitleaddon}} (section~\ref{sec:authpreset}) can help
+you customize the punctuation that appears before the
+\textsf{titleaddon} field.  (Cf.\ brown:bremer, osborne:poison,
+reaves:rosen, and white:ross:memo for examples where the field starts
+with a lowercase letter; morgenson:market provides an example where
+the \textsf{titleaddon} field, holding the name of a regular column in
+a newspaper, is capitalized, a situation that is handled as you would
+expect; coolidge:speech shows an entry option for controlling the
+punctuation.)
+
+\enlargethispage{\baselineskip}
+
+\mybigspace As \colmarginpar{\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
-complications that need explaining.  Lehman points out in his
-documentation that the \textsf{translator} field will be associated
-with a \textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
+complications that need explaining.  \textsf{Biblatex.pdf} points out
+that the \textsf{translator} field will be associated with a
+\textsf{title}, a \textsf{booktitle}, or a \textsf{maintitle},
 depending on the sort of entry.  More specifically,
 \textsf{biblatex-chicago} associates the \textsf{translator} with the
 most comprehensive of those titles, that is, \textsf{maintitle} if
@@ -8980,7 +9392,9 @@ one part of a collection or for one volume of a multi-volume work.
 For these cases I have provided the \textsf{nameb} field.  You should
 format names for this field as you would for \textsf{author} or
 \textsf{editor}, and these names will always be associated with the
-\textsf{title} (euripides:orestes).
+\textsf{title} (euripides:orestes).  In the algorithm for finding a
+name for the head of a reference list entry or for a citation,
+\textsf{nameb} takes precedence over \textsf{translator}.
 
 \mylittlespace I have also provided a \textsf{namea} field, which
 holds the editor of a given \textsf{title} (euripides:orestes).  If
@@ -9002,13 +9416,13 @@ languages, but they are otherwise unnecessary.  [See
 section~\ref{sec:international}].)
 
 \mylittlespace Finally, as I detailed above under \textbf{author}, in
-the absence of an \textsf{author} or an \textsf{editor}, the
-\textsf{translator} will be used at the head of an entry
-(silver:gawain), and the reference list entry alphabetized by the
-translator's name, behavior that can be controlled with the
-\texttt{{usetranslator}} switch in the \textsf{options} field.  Cf.\
-\textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and
-\textsf{namec}.
+the absence of an \textsf{author}, a \textsf{namea}, an
+\textsf{editor}, and a \textsf{nameb}, the \textsf{translator} will be
+used at the head of an entry (silver:gawain), and the reference list
+entry alphabetized by the translator's name, behavior that can be
+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}
 
@@ -9052,7 +9466,11 @@ provide one for all entry types.  The 16th edition of the
 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.
+properly, in the text and in the reference apparatus.  It
+\colmarginpar{New} 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
@@ -9066,9 +9484,9 @@ 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 now use the
-\textsf{urldate} to find a year for citations and the list of
-references (grove:sibelius, wikiped:bibtex).
+\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}
 
@@ -9082,7 +9500,7 @@ field will be placed, unformatted and between commas, after the
 identifying the broadcast network when you cite a radio or television
 program (14:221; bundy:macneil).
 
-\mybigspace I \mymarginpar{\textbf{userc}} have now implemented this
+\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
@@ -9102,7 +9520,7 @@ 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,
 creasey:morton:hide, creasey:york:death, lecarre:quest.)
 
-\mybigspace The \colmarginpar{\textbf{userd}} \textsf{userd} field,
+\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
@@ -9113,10 +9531,10 @@ 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 \colmarginpar{New!} the absence
-of a \textsf{urldate}, you can now, 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}.
+contain (14.7--8; 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 schema changes for \textsf{music}
@@ -9152,40 +9570,8 @@ can translate the title and use that translation in your
 \textbf{language}, above.  (See 14.108--110, 14.194; kern,
 pirumova:russian, weresz.)
 
-%%\enlargethispage{-\baselineskip}
-
-\mybigspace This \mymarginpar{\textbf{userf}} is the last 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)
-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
-possibility also for a list of references, though in-text citations
-will still only refer to individual works.  In order to follow this
-specification, I have provided a third cross-referencing system (the
-others being \textsf{crossref} and \textsf{xref}), and have chosen the
-name \textsf{userf} because it might act as a mnemonic for its
-function.
-
-\mylittlespace In order to use this system, you should start by
-entering both the original and its translation into your .bib file,
-just as you normally would.  The mechanism works for any entry type,
-and the two entries need not be of the same type.  In the entry for
-the \emph{translation}, you put the cite key of the original into the
-\textsf{userf} field.  In the \emph{original's} entry, you need to
-include some means of preventing it appearing separately in the list
-of references, either a toggle in the \textsf{keywords} field or
-perhaps \texttt{skipbib} in the \textsf{options} field.  In this
-standard case, the data for the translation will be printed first,
-followed by the string \texttt{orig. pub. as}, followed by the
-original, author omitted (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 language in
-\textsf{origlanguage}, and instead of \texttt{originally published
-  as}, you'll get \texttt{French edition:} or \texttt{Latin edition:},
-etc.\ (aristotle:metaphy:gr, aristotle:metaphy:trans).
+\mybigspace See \colmarginpar{\textbf{userf}}
+section~\ref{sec:authrelated}, below.
 
 \mybigspace Standard \mymarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
@@ -9198,7 +9584,7 @@ instead.  Anything in a \textsf{venue} field will be ignored.
 field, currently only available in \textsf{misc} and \textsf{patent}
 entries in \textsf{biblatex-chicago}.
 
-\mybigspace Standard \colmarginpar{\textbf{volume}} \textsf{biblatex}
+\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
@@ -9214,16 +9600,16 @@ In such a case, the \emph{Manual} (14.121) 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 new command
-\mycolor{\cmd{postvolpunct}} \colmarginpar{\cmd{postvolpunct}}.  By
-default it prints \cmd{addcolon}, but you can use
+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:formatting:authdate};
 conway:evolution shows how sometimes this field may hold series
 information, as well.
 
-\mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{volumes}} \textsf{biblatex}
 field.  It holds the total number of volumes of a multi-volume work,
 and in such references you should provide the volume and page numbers
 in the \textsf{postnote} field of the relevant \cmd{cite} command,
@@ -9241,9 +9627,9 @@ 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, except in some cases
 when a \textsf{maintitle} is present.  In this latter case, if the
-\textsf{volume} appears before the \textsf{maintitle}, the new option
-\mycolor{\texttt{hidevolumes}}, \colmarginpar{\texttt{hidevolumes}}
-set to \texttt{true} by default, controls whether to print 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
@@ -9253,6 +9639,8 @@ 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}
 field, especially important for the author-date specification.  Please
 see all the details under \textbf{date} above.  Unlike the
@@ -9263,6 +9651,328 @@ then you can include that guess in square brackets instead of
 \cmd{bibstring\{nodate\}}.  Cf.\ bedford:photo, clark:mesopot,
 leo:madonna, ross:thesis.
 
+\subsubsection{\mycolor{Fields for Related Entries}}
+\label{sec:authrelated}
+
+As \textsf{biblatex.pdf} puts it (§~3.4), \enquote{Almost all
+  bibliography styles require authors to specify certain types of
+  relationship between entries such as \enquote{Reprint of},
+  \enquote{Reprinted in,} etc. It is impossible to provide data fields
+  to cover all of these relationships and so \textsf{biblatex}
+  provides a general mechanism for this using the entry fields
+  \textsf{related}, \textsf{relatedtype} and \textsf{relatedstring}.}
+Before this mechanism was available \textsf{biblatex-chicago}
+attempted to provide a similar but much more limited set of
+inter-entry relationships using the \textsf{biblatex} fields
+\textsf{origlanguage}, \textsf{origlocation}, \textsf{origpublisher},
+\textsf{pubstate}, \textsf{reprinttitle}, and \textsf{userf}.  All of
+these still work just as they always have or, I hope, somewhat better
+than they always have after many recent bug fixes, but the more
+general and more powerful \textsf{biblatex} \mycolor{\texttt{related}}
+mechanism is also available.  It can provide much of what the older
+system provided and a great deal that it couldn't.  What follows is a
+field-by-field discussion of the options now available.
+
+\mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the
+\emph{Manual}'s specifications, I have fairly thoroughly redefined
+\textsf{biblatex}'s facilities for treating translations.  The
+\textsf{origtitle} field isn't used, while the \textsf{language} and
+\textsf{origdate} fields have been press-ganged for other duties.  The
+\textsf{origlanguage} field, for its part, retains a dual role in
+presenting translations in a list of references.  The details of the
+\emph{Manual}'s suggested treatment when both a translation and an
+original are cited may be found below under \textbf{userf}.  Here,
+however, I simply note that the introductory string used to connect
+the translation's citation with the original's is \enquote{Originally
+  published as,} which I suggest may well be inaccurate in a great
+many cases, as for instance when citing a work from classical
+antiquity, which will most certainly not \enquote{originally} have
+been published in the Loeb Classical Library.  Although not, strictly
+speaking, authorized by the \emph{Manual}, I have provided another way
+to introduce the original text, using the \textsf{origlanguage} field,
+which must be provided \emph{in the entry for the translation, not the
+  original text} (aristotle:metaphy:trans).  If you put one of the
+standard \textsf{biblatex} bibstrings there (enumerated below), then
+the entry will work properly across multiple languages.  Otherwise,
+just put the name of the language there, localized as necessary, and
+\textsf{biblatex-chicago} will eschew \enquote{Originally published
+  as} in favor of, e.g., \enquote{Greek edition:} or \enquote{French
+  edition:}.  This has no effect in citations, where only the work
+cited --- original or translation --- will be printed, but it may help
+to make the \emph{Manual}'s suggestions for the list of references
+more palatable.  \textbf{NB:} You can use the
+\mycolor{\textsf{relatedtype} \texttt{origpubas}} with a customized
+\mycolor{\textsf{relatedstring}} field to achieve the same ends.
+
+\mylittlespace That was the first usage, in keeping at least with the
+spirit of the \emph{Manual}.  I have also, perhaps less in keeping
+with that specification, retained some of \textsf{biblatex}'s
+functionality for this field.  If an entry doesn't have a
+\textsf{userf} field, and therefore won't be combining a text and its
+translation in the list of references, you can also use
+\textsf{origlanguage} as \textsf{biblatex} intended it, so that
+instead of saying, e.g., \enquote{translated by X,} the entry will
+read \enquote{translated from the German by X.}  The \emph{Manual}
+doesn't mention this, but it may conceivably help avoid certain
+ambiguities in some citations.  As in \textsf{biblatex}, if you wish
+to use this functionality, you have to provide \emph{not} the name of
+the language, but rather a bibstring, which may, at the time of
+writing, be one of \texttt{american}, \texttt{brazilian},
+\texttt{danish}, \texttt{dutch}, \texttt{english}, \texttt{french},
+\texttt{german}, \texttt{greek}, \texttt{italian}, \texttt{latin},
+\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}],
+\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 \mycolor{\texttt{related}}
+field, though the \mycolor{\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, 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}
+[section~\ref{sec:fields:authdate}], \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 \mycolor{\texttt{related}} field, though the
+\mycolor{\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.)  If the field contains something other than the word
+\texttt{reprint}, then it 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
+those uses of the \textsf{pubstate} field that print a notice at the
+end of the entry, the \mycolor{\textsf{relatedtype}
+  \texttt{origpubin}} provides much the same information, using data
+extracted from a different entry.  If the information appears inside
+the entry then there is no equivalent \mycolor{\textsf{related}}
+functionality.
+
+\mybigspace This \colmarginpar{\textbf{related}} field is required to
+use \textsf{biblatex's} \mycolor{\textsf{related}} functionality, and
+it should contain the entry key or keys from which \textsf{biblatex}
+should extract data for presentation not on its own, but rather in the
+reference list entry which contains the \textsf{related} field itself.
+Indeed, unless you change the defaults using the
+\mycolor{\textsf{relatedoptions}} field this data will only appear in
+such entries, never on its own and never in citations.  Without a
+\mycolor{\textsf{relatedtype}} field, this will print the default
+type, equivalent to a full reference list entry \emph{immediately
+  after} the entry containing the \textsf{related} field, with no
+intervening string.  You can specify a string using the
+\mycolor{\textsf{relatedstring}} field, so in effect this presents a
+powerful mechanism for presenting full references to related material
+of any sort whatsoever.
+
+\mylittlespace By \colmarginpar{\texttt{related=true}} default, the
+package option \mycolor{\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 \mycolor{\textsf{relatedoptions}} field of
+the relevant entry, to \texttt{false}.
+
+\mybigspace This \colmarginpar{\textbf{relatedoptions}} field will, I
+should expect, only be needed very rarely.  If you want to set
+entry-level options for a \mycolor{\textsf{related}} entry this is
+where you can do it, though please remember one important detail.  By
+default, \textsf{Biber} sets this option to \texttt{dataonly}, which
+among other things prevents the \mycolor{\textsf{related}} entry from
+appearing separately in the list of references, assuming you don't
+specifically cite it elsewhere.  If you use the field yourself, then
+you'll need to include \texttt{dataonly} as one of the options therein
+to maintain this effect.  Of course, it may be you don't want all the
+effects of \texttt{dataonly}, so you can tailor it however you wish.
+See \textsf{biblatex.pdf} §~3.4.
+
+\mybigspace The \colmarginpar{\textbf{relatedstring}} procedure for
+choosing a string to connect the main entry with its related entry/ies
+is straightforward, the default being a \texttt{bibstring}, if any,
+with the same name as the \mycolor{\textsf{relatedtype}}, or
+alternately a string or strings defined within the driver for that
+\mycolor{\textsf{relatedtype}}, as happens with the types
+\mycolor{\texttt{origpubin}} and \mycolor{\texttt{bytranslator}}.
+Failing these, you can supply your own in the
+\mycolor{\textsf{relatedstring}} field, either in the form of the name
+of a pre-defined \texttt{bibstring} or as any text you choose, and
+anything in this field always takes precedence over the automatic
+choices.  If your non-\texttt{bibstring} starts with a lowercase
+letter then \textsf{biblatex-chicago} will capitalize it automatically
+for you depending on context (coolidge:speech, weed:flatiron).  I have
+not altered the standard \textsf{relatedtype} strings, and have in
+fact modified the \textsf{reprinttitle} mechanism to use the
+\mycolor{\texttt{reprintfrom}} string, which works better
+syntactically in this context, and modified the \textsf{pubstate}
+mechanism to use the \mycolor{\texttt{origpubin}} string, which brings
+it into line with the notes \&\ bibliography style.
+
+\mybigspace The \colmarginpar{\textbf{relatedtype}} standard
+\textsf{biblatex} styles define six \mycolor{\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:
+
+\begin{description}
+\item[\qquad \mycolor{bytranslator:}] This prints a full reference to
+  a translation, starting with the (localized) string
+  \enquote{Translated by \textsf{translator} as \textsf{Title},
+    \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}
+  mechanism provides the other, as does the
+  \mycolor{\texttt{origpubas} \textsf{relatedtype}} (see below).
+\item[\qquad \mycolor{default:}] This is the macro used when no
+  \mycolor{\textsf{relatedtype}} is defined.  It prints, as in the
+  standard styles, and with no intervening string, full references to
+  the \mycolor{\textsf{related}} entries.
+\item[\qquad \mycolor{multivolume:}] This briefly lists the individual
+  volumes in a multi-volume work, and works much as in the standard
+  styles.  The \emph{Manual}, as far as I can see, has little to say
+  on the matter.
+\item[\qquad \mycolor{origpubas:}] This type can, if you want, replace
+  the old \textsf{userf} mechanism, described below, for presenting an
+  original with its translation.  It's quite similar to the
+  \mycolor{\texttt{default}} type, but with a \texttt{bibstring}
+  automatically connecting the entry with its \textsf{related}
+  entries.  You can identify other sorts of relationships if you
+  change the introductory string using \textsf{relatedstring}.
+\item[\qquad \mycolor{origpubin:}] I have barely altered this from the
+  \textsf{biblatex} default, and it will present reprint information
+  \emph{after} the main entry rather than within it.  The
+  \emph{Manual} seems to prefer the latter for the notes \&
+  bibliography style and, in some circumstances, the former for
+  author-date.
+\item[\qquad \mycolor{reprintfrom:}] This type provides a replacement
+  for the old \textsf{reprinttitle} mechanism described below.  As in
+  the standard styles, it presents a fuller reference to the reprinted
+  material than does \mycolor{\texttt{origpubin}}, and is designed
+  particularly for presenting pieces formerly printed in other
+  collections or perhaps essays collected from various periodicals.
+  (In \textsf{biblatex-chicago} it contains some kludges to cope with
+  possible \textsf{babel} language environments, so if you find it
+  behaving oddly please let me know, including whether you are using
+  \textsf{babel} [which I've tested] or \textsf{polyglossia} [which I
+  haven't].)
+\end{description}
+
+\mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
+\textbf{If you have been using this feature, you may want to have a
+  look at the} \mycolor{\textsf{relatedtype} \texttt{reprintfrom}},
+\textbf{documented above, for a better solution to this problem, one
+  that also allows you to change the introductory string using the}
+\mycolor{\textsf{relatedstring}} \textbf{field.  The}
+\textsf{reprinttitle} \textbf{field will continue to work as before,
+  however.}  At the 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.
+
+\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)
+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
+possibility also for a list of references, though in-text citations
+will still only refer to individual works.  In order to follow this
+specification, I have provided a third cross-referencing system (the
+others being \textsf{crossref} and \textsf{xref}), and have chosen the
+name \textsf{userf} because it might act as a mnemonic for its
+function.
+
+\mylittlespace In order to use this system, you should start by
+entering both the original and its translation into your .bib file,
+just as you normally would.  The mechanism works for any entry type,
+and the two entries need not be of the same type.  In the entry for
+the \emph{translation}, you put the cite key of the original into the
+\textsf{userf} field.  In the \emph{original's} entry, you need to
+include some means of preventing it appearing separately in the list
+of references, either a toggle in the \textsf{keywords} field or
+perhaps \texttt{skipbib} in the \textsf{options} field.  In this
+standard case, the data for the translation will be printed first,
+followed by the string \texttt{orig. pub. as}, followed by the
+original, author omitted.  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 language in \textsf{origlanguage}, and instead of
+\texttt{originally published as}, you'll get \texttt{French edition:}
+or \texttt{Latin edition:}, etc.\ (aristotle:metaphy:gr,
+aristotle:metaphy:trans).  \textbf{NB:} You can use the
+\mycolor{\textsf{relatedtype} \texttt{origpubas}} to replicate the
+\textsf{userf} functionality, and you can also customize the
+\mycolor{\textsf{relatedstring}} field to achieve the same result as
+with \textsf{origlanguage}.
+
+\enlargethispage{\baselineskip}
+
 \subsection{Commands}
 \label{sec:commands:authdate}
 
@@ -9281,8 +9991,8 @@ These commands allow you to fine-tune the presentation of your
 references in both citations and list of references.  You can find
 many examples of their usage in \textsf{dates-test.bib}, and I shall
 try to point you toward a few such entries in what follows.
-\textbf{NB:} \textsf{biblatex's} \cmd{mkbibquote} command is now
-mandatory in some situations.  See its entry below.
+\textbf{NB:} \textsf{biblatex's} \cmd{mkbibquote} command is mandatory
+in some situations.  See its entry below.
 
 \mybigspace Version \mymarginpar{\textbf{\textbackslash autocap}} 0.8
 of \textsf{biblatex} introduced the \cmd{autocap} command, which
@@ -9298,10 +10008,10 @@ involve the string \texttt{forthcoming} in the \textsf{year} field
 (author:forthcoming, contrib:contrib).
 
 \mylittlespace I have nonetheless retained the system developed,
-following Lehman's example, for the notes \&\ bibliography style,
-which automatically tracks the capitalization of certain fields in
-your .bib file.  I chose these fields after a non-scientific survey of
-entries in my own databases, so of course if you have ideas for the
+following \textsf{biblatex's} example, for the notes \&\ bibliography
+style, which automatically tracks the capitalization of certain fields
+in your .bib file.  I chose these fields after a non-scientific survey
+of entries in my own databases, so of course if you have ideas for the
 extension of this facility I would be most interested to hear them.
 In order to take advantage of this functionality, all you need do is
 begin the data in the appropriate field with a lowercase letter,
@@ -9316,15 +10026,16 @@ purposes, is the complete list of fields where this functionality is
 active:
 
 \begin{enumerate}
+\setlength{\parskip}{-4pt}
 \item The \textbf{addendum} field in all entry types.
 \item The \textbf{booktitleaddon} field in all entry types.
 \item The \textbf{edition} field in all entry types.  (Numerals work
   as you expect them to here.)
 \item The \textbf{maintitleaddon} field in all entry types.
 \item The \textbf{note} field in all entry types.
-\item The \mycolor{\textbf{part}} field in entry types that use it.
-\item The \mycolor{\textbf{prenote}} field prefixed to citation
-  commands.
+\item The \textbf{part} field in entry types that use it.
+\item The \textbf{prenote} field prefixed to citation commands.
+\item The \mycolor{\textbf{relatedstring}} field in all entry types.
 \item The \textbf{shorttitle} field in the \textsf{review}
   (\textsf{suppperiodical}) entry type and in the \textsf{misc} type,
   in the latter case, however, only when there is an
@@ -9346,32 +10057,31 @@ fields, it frankly 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.
 
-\mybigspace This \mymarginpar{\textbf{\textbackslash bibstring}} is
-Lehman's 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.  \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 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.  These are the places, as far as I can make
-out, where \textsf{biblatex's} standard styles support this feature,
-though I have added the last, style-specific, one.  If Lehman
-generalizes it still further in a future release, I shall do the same,
-if possible.
+\mybigspace This \mymarginpar{\textbf{\textbackslash bibstring}} is a
+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.
+\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
+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.  These are the
+places, as far as I can make out, where \textsf{biblatex's} standard
+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 This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
-because it is a crucial part of the mechanism of Lehman's
+because it is a crucial part of the mechanism of that package's
 \enquote{American} punctuation system.  Quotation marks around the
 \textsf{title} field in various entry types are automatically provided
 by \textsf{biblatex-chicago}, but titles-within-titles frequently also
@@ -9424,7 +10134,7 @@ the latter isn't strictly necessary in texts using an American style,
 to which \textsf{biblatex} defaults when \textsf{csquotes} isn't
 loaded.
 
-\mybigspace The \colmarginpar{\textbf{\textbackslash postvolpunct}}
+\mybigspace The \mymarginpar{\textbf{\textbackslash postvolpunct}}
 \emph{Manual} (14.121) unequivocally prescribes that when a
 \textsf{volume} number appears immediately before a page number,
 \enquote{the abbreviation \emph{vol.}\ is omitted and a colon
@@ -9433,7 +10143,7 @@ loaded.
 of a book or of a periodical, and it appears to be a surprising and
 unwelcome feature for many users, conflicting as it may do with
 established typographic traditions in a number of contexts.  Clea~F.\
-Rees has requested a way to customize this, so I have provided the new
+Rees has 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,
@@ -9525,13 +10235,56 @@ that \textsf{biblatex-chicago-authordate} sets this command to use
 the most common citation command you will use, and also works fine in
 its multicite form, \textbf{\textbackslash autocites}.
 
+\mybigspace Arne \colmarginpar{\textbf{\textbackslash gentextcite}}
+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 \mycolor{\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 \cmd{textcite}, on which see below.  The difference is that I've
+added a new optional field to the front of the command to allow you to
+choose which declensional ending to add to the name.  If you don't
+specify this field, you'll get the standard English \enquote{\,'s\,}.
+If you want something different, you'll need to present a third option
+to the command, like so:\
+\cmd{gentextcite[<ending>][][]\{entry:key\}}.  You must include the
+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 \mycolor{\cmd{gentextcites}} command as
+well, though currently you can only specify one genitival ending for
+all keys, like so:\
+\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\}}.
+
+\mylittlespace The syntax of multiple authors' names in running text
+is unpredictable.  There is currently no way to add the genitival
+ending to all the names attached to a single citation key, so it will
+only appear at the end of a group of names in such a case.  (This is
+in keeping with the usual syntax when referring to a multi-author
+work, at least in English.)  When using \mycolor{\cmd{gentextcites}},
+however, you can control whether the ending appears after the name(s)
+attached to each citation key, or whether it only appears after the
+names attached to the last key.  By default, it only appears after the
+last, but the \mycolor{\texttt{genallnames}} preamble and/or entry
+option set to \texttt{true} will attach the ending to each key's
+name(s).  When using one citation command to cite more than one work
+by the same author, it is the \emph{first} occurrence of the name
+which \textsf{biblatex} prints, eliding subsequent ones.  In order to
+get the possessive ending on that name you'll need to set
+\mycolor{\texttt{genallnames}} to \texttt{true}.
+
 \mybigspace In \mymarginpar{\textbf{\textbackslash textcite}} standard
 \textsf{biblatex} this command searches first for a
 \textsf{labelname}, usually taken from the \textsf{author} or
 \textsf{shortauthor} field, then uses the \textsf{shorthand} field if
 the former doesn't exist.  Because of the way the Chicago author-date
 specification recommends handling abbreviations, I have switched this
-around, and the command now searches for a \textsf{shorthand} first.
+around, and the command searches for a \textsf{shorthand} first.
 This holds also for the multicite form \textbf{\textbackslash
   textcites}, though both commands revert to their standard
 \textsf{biblatex} behavior when you give the \texttt{cmslos=false}
@@ -9583,10 +10336,9 @@ ambiguity, \textsf{biblatex} should default to printing a more
 informative reference.
 
 \mylittlespace If you are going to repeat a source, make sure that the
-cite command provides a postnote --- from this release of
-\textsf{biblatex-chicago} you'll no longer get any annoying empty
-parentheses, but you will get another standard citation, which may add
-too much clutter.
+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}
 
@@ -9595,18 +10347,17 @@ tells \textsf{biblatex} to provide the special \textsf{labelyear} and
 \textsf{extrayear} fields for author-date styles.
 
 \mylittlespace These \mymarginpar{\textsf{\texttt{maxbibnames\\=10\\
-      minbibnames\\=7}}} two options are new, and 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}
-now 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.
+      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.
 
 \mylittlespace This \mymarginpar{\texttt{pagetracker=\\true}} enables
 page tracking for the \cmd{iffirstonpage} and \cmd{ifsamepage}
@@ -9618,6 +10369,14 @@ or whole spreads in twoside mode.
 minor problem with punctuation in titles, ensuring that the colon
 between a title and a subtitle appears in the correct, matching font.
 
+\mylittlespace This \colmarginpar{\texttt{related=true}} is the
+standard \textsf{biblatex} bibliography option, and it enables the use
+of \mycolor{\textsf{related}} functionality in the list of references.
+I have added an entry option, as well, so if you set this to
+\texttt{false} in your preamble, in the \textsf{options} field, or in
+the \mycolor{\textsf{relatedoptions}} field, you can make the package
+ignore the \mycolor{\textsf{related}} fields.
+
 \mylittlespace This \mymarginpar{\texttt{sortcase=\\false}} turns off
 the sorting of uppercase and lowercase letters separately, a practice
 which the \emph{Manual} doesn't appear to recommend.
@@ -9646,7 +10405,7 @@ surname, using initials in the first instance, and whole names if
 initials aren't enough (15.21).  The option is \textsf{Biber}-only,
 like the previous one.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}}
 enables automatic use of the \textsf{translator} at the head of
@@ -9689,25 +10448,29 @@ chosen font.  The default definition is:
 
 \mylittlespace At \mymarginpar{\texttt{losnotes}
   \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have
-added two new \texttt{bibenvironments} to
-\textsf{chicago-authordate.bbx}, for use with the \texttt{env} option
-to the \cmd{printshorthands} command.  The first, \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 latter case to clear up
-some spurious punctuation and white 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.)  Please see the
-documentation of \textsf{shorthand} in
-section~\ref{sec:fields:authdate} above for further options available
-to you for presenting and formatting the list of shorthands.
-
-\mylittlespace The next-generation backend \textsf{Biber} offers
-enhanced functionality in many areas, three of which I've implemented
-in this release.  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.
+added two \texttt{bibenvironments} to \textsf{chicago-authordate.bbx},
+for use with the \texttt{env} option to the \cmd{printshorthands}
+command.  The first, \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 latter case to clear up some spurious punctuation and white
+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 \colmarginpar{New} you use a command like
+\cmd{printbiblist\{shortjournal\}} to print a list of journal
+abbreviations, you can use the \mycolor{\texttt{sjnotes}} and
+\mycolor{\texttt{sjendnotes}} \texttt{bibenvironments} in exactly the
+same way.  Please see the documentation of \textsf{shorthand} and
+\mycolor{\textsf{shortjournal}} in section~\ref{sec:fields:authdate}
+above for further options available to you for presenting and
+formatting these two types of \texttt{biblist}.
+
+\mylittlespace The next-generation backend \textsf{Biber} and
+\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}
 
@@ -9722,7 +10485,7 @@ currently is
 \texttt{\{shortauthor,author,\\shorteditor,namea,editor,nameb,%
   translator,namec\}}.
 
-\mylittlespace This \colmarginpar{\cmd{Declare-}\\\texttt{Labeldate}}
+\mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labeldate}}
 option allows you to alter the order in which \textsf{Biber} and
 \textsf{biblatex} search for the year to use both in citations and at
 the head of entries in the list of references.  This will also be the
@@ -9734,19 +10497,19 @@ configuration, a year will be searched for in the order \textsf{date,
 author-date styles well, except for two situations.  First, when a
 reference apparatus contains many entries with multiple dates, it may
 be simplest to promote the \textsf{origdate} to the head of the list,
-which you can do using the new \mycolor{\texttt{cmsdate} preamble}
-option.  This changes the order to \mycolor{\textsf{origdate, date,
-    eventdate, urldate}}.  Second, in \textsf{music} and
-\textsf{video} entries, and, exceptionally, some \textsf{review}
-entries, the general rule is to emphasize the earliest date.  For
-these three entry types, then, \cmd{DeclareLabeldate} uses the order
-\textsf{eventdate, origdate, date, urldate}.  See \texttt{avdate} in
+which you can do using the \texttt{cmsdate} preamble option.  This
+changes the order to \textsf{origdate, date, eventdate, urldate}.
+Second, in \textsf{music} and \textsf{video} entries, and,
+exceptionally, some \textsf{review} entries, the general rule is to
+emphasize the earliest date.  For these three entry types, then,
+\cmd{DeclareLabeldate} uses the order \textsf{eventdate, origdate,
+  date, urldate}.  See \texttt{avdate} in
 section~\ref{sec:authpreset}, \texttt{cmsdate} in
 section~\ref{sec:authuseropts}, and the \textbf{date} docs in
 section~\ref{sec:fields:authdate}.
 
 \mylittlespace The
-\colmarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} third
+\mymarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} third
 \textsf{Biber} enhancement I have implemented allows you to include
 almost any field whatsoever in \textsf{biblatex's} sorting algorithms
 for the list of references, so that a great many more entries will be
@@ -9756,7 +10519,7 @@ Code in \textsf{biblatex-chicago.sty} sets the \textsf{biblatex}
 option \texttt{sorting=cms}, which is a custom scheme, basically a
 Chicago-specific variant of the default \texttt{nyt}.  You can find
 its definition in \textsf{chicago-authordate.cbx}.  (Please note that
-it now uses the \textsf{labelyear} as its main year component, which
+it uses the \textsf{labelyear} as its main year component, which
 should help improve the automatic sorting of entries by the same
 \textsf{author}.)
 
@@ -9765,20 +10528,15 @@ 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.  The two main
-disadvantages should only occur very rarely.  First, in
-\textsf{author}-less \textsf{article} and \textsf{review} entries
+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
-\textsf{sortkey} for proper alphabetization.  The second occurs
-because the supplemental name fields are treated differently from the
-standard name fields by \textsf{biblatex}.  Ordinarily, you can set,
-for example, \texttt{useauthor=false} in the \textsf{options} field to
-remove the \textsf{author's} name from consideration for sorting
-purposes.  The Chicago-specific option \textsf{usecompiler=false},
-however, doesn't remove \textsf{namec} from such consideration, so in
-some rare corner cases you may need a \textsf{sortkey}.
+\textsf{sortkey} for proper alphabetization.
 
 \subsubsection{{Pre-set \textsf{chicago} Options}}
 \label{sec:authpreset}
@@ -9861,20 +10619,21 @@ 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.
 
-\mylittlespace For \mymarginpar{\texttt{avdate=true}} \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
+\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
 \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
@@ -9887,8 +10646,8 @@ cases, surprise.  Please see \textsf{music}, \textsf{review}, and
 section~\ref{sec:fields:authdate}; and \cmd{DeclareLabeldate} in
 section~\ref{sec:authformopts}.
 
-\mylittlespace At \colmarginpar{\texttt{booklongxref=\\true}} the
-request of Bertold Schweitzer, I have included two new options for
+\mylittlespace At \mymarginpar{\texttt{booklongxref=\\true}} the
+request of Bertold Schweitzer, I have included two options 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.  This option controls whether multiple
@@ -9916,7 +10675,7 @@ This option can be set either in the preamble or in the
 \textsf{options} field of individual entries.  For controlling the
 behavior of \textsf{inbook}, \textsf{incollection},
 \textsf{inproceedings}, and \textsf{letter} entries, please see
-\mycolor{\texttt{longcrossref}}, below, and also the documentation of
+\texttt{longcrossref}, below, and also the documentation of
 \textsf{crossref} in section~\ref{sec:fields:authdate}.
 
 \mylittlespace This \mymarginpar{\texttt{cmslos=true}} option alters
@@ -9938,19 +10697,67 @@ document preamble.  Cf.\ section~\ref{sec:fields:authdate},
 s.v. \enquote{\textbf{shorthand}} above, and also
 \textsf{cms-dates-sample.pdf}.
 
-\mylittlespace If \colmarginpar{\texttt{hidevolumes=\\true}} both a
+\mylittlespace Roger
+\colmarginpar{\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}} (\mycolor{\textsf{ctitleaddon}}) for
+nearly all \textsf{book-} and \textsf{maintitleaddons} in the list of
+references, while \cmd{addperiod\cmd{addspace}}
+(\mycolor{\textsf{ptitleaddon}}) is the default before most
+\textsf{titleaddons} there.  If the punctuation printed isn't correct
+for your needs, you can set the relevant option either in the preamble
+or in individual entries.  (Cf.\ coolidge:speech and
+schubert:muellerin.) The accepted option keys are:
+
+\begin{description}
+\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}}
+\end{description}
+
+If you need something a little more exotic, you can directly
+\cmd{renewcommand} either \cmd{ctitleaddonpunct} or
+\cmd{ptitleaddonpunct} (or both) in your preamble, but it's worth
+remembering that the redefinition will hold for all instances, unless
+you use the \textsf{options} field in your other entries with a
+\textsf{titleaddon} field.  A simpler solution might be to set the
+relevant option to \texttt{none} in your entry and then include the
+punctuation in the \textsf{titleaddon} field itself.
+
+\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
 \textsf{biblatex-chicago} will ordinarily suppress the
 \textsf{volumes} field.  In some instances, when a \textsf{maintitle}
 is present, this may not be the desired result.  In this latter case,
-if the \textsf{volume} appears before the \textsf{maintitle}, this new
+if the \textsf{volume} appears before the \textsf{maintitle}, this
 option, 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}.
 
-\mylittlespace This \colmarginpar{\texttt{longcrossref=\\false}} is
+\mylittlespace This \colmarginpar{\texttt{journalabbrev\\=notes}}
+option controls the printing of the \mycolor{\textsf{shortjournal}}
+field in place of the \textsf{journaltitle} field in citations and
+reference lists.  It is set to \texttt{notes} by default, so as
+shipped \textsf{biblatex-chicago-authordate} will print such fields
+only in citations, but you can set it, either in the preamble or in
+individual entries, to one of three other values: \texttt{true} prints
+the abbreviated form both in citations and reference lists,
+\texttt{bib} 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
+\mycolor{\textbf{shortjournal}} in section~\ref{sec:entryfields},
+above.
+
+\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
@@ -9983,9 +10790,9 @@ governed by the following options:
 This option can be set either in the preamble or in the
 \textsf{options} field of individual entries.  For controlling the
 behavior of \textsf{book}, \textsf{bookinbook}, \textsf{collection},
-and \textsf{proceedings} entries, please see
-\mycolor{\texttt{booklongxref}}, above, and also the documentation of
-\textsf{crossref} in section~\ref{sec:fields:authdate}.
+and \textsf{proceedings} entries, please see \texttt{booklongxref},
+above, and also the documentation of \textsf{crossref} in
+section~\ref{sec:fields:authdate}.
 
 %\enlargethispage{\baselineskip}
 
@@ -9999,20 +10806,12 @@ 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 This \mymarginpar{\texttt{usecompiler=\\true}} option
-enables automatic use of the name of the compiler (in the
-\textsf{namec} field) at the head of an entry, usually in the absence
-of an \textsf{author}, \textsf{editor}, or \textsf{translator}, in
-accordance with the specification (\emph{Manual} 15.35).  It may also,
-like \texttt{useauthor}, \texttt{useeditor}, and
-\texttt{usetranslator}, be disabled on a per-entry basis by setting
-\texttt{usecompiler=false} in the \textsf{options} field.  The only,
-subtle, difference between this switch and those standard
-\textsf{biblatex} switches is that this one won't remove
-\textsf{namec} from the sorting list, whereas \texttt{useauthor=false}
-and \texttt{useeditor=false} do remove the \textsf{author} and
-\textsf{editor}.  You may, therefore, in corner cases, require a
-\textsf{sortkey} in the entry.
+\mylittlespace As \colmarginpar{\texttt{usecompiler=\\true}}
+\textsf{biblatex} automatically includes a \mycolor{\texttt{usenamec}}
+option as standard, the Chicago-specific option \texttt{usecompiler}
+is now deprecated.  Please replace it your documents and .bib files
+with \mycolor{\texttt{usenamec}}, which works much better across the
+board.
 
 \subsubsection{Style Options -- Preamble}
 \label{sec:authuseropts}
@@ -10034,13 +10833,12 @@ 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 With \colmarginpar{\texttt{cmsdate}} this release, I am
-providing a new method for simplifying the creation of databases with
-a great many multi-date entries: 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
-\enquote{correctly} as I can.  The switches for this option are
+\mylittlespace This \mymarginpar{\texttt{cmsdate}} option used
+\emph{in the preamble} provides a method for simplifying the creation
+of databases with a great many multi-date entries.  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 \enquote{correctly} as I can.  The switches for it are
 basically the same as for the entry-only option, that is, assuming an
 entry presents a reprinted edition of a work by Smith, first published
 in 1926 (the \textsf{origdate}) and reprinted in 1985 (the
@@ -10059,18 +10857,18 @@ in 1926 (the \textsf{origdate}) and reprinted in 1985 (the
   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
-  \texttt{new} and \texttt{old} now work like \texttt{both}.
+  \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
-synonyms for the latter, \texttt{new} or \texttt{old}), then
-\textsf{biblatex-chicago-authordate} (and \textsf{authordate-trad})
-will now change the default \cmd{DeclareLabel\-date} definition so
-that the \textsf{labelyear} search order will be
-\mycolor{\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
+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{DeclareLabel\-date} 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
@@ -10102,18 +10900,17 @@ please see the documentation of the \textbf{date} field in
 section~\ref{sec:fields:authdate} for the fullest discussion of date
 presentation in the \textsf{authordate} styles.
 
-\mylittlespace Although \colmarginpar{\texttt{cmsorigdate}} I can't
+\mylittlespace Although \mymarginpar{\texttt{cmsorigdate}} I can't
 currently think of any reason why anyone would want to use it on its
 own, I should nonetheless mention that the \texttt{cmsorigdate} option
 in your preamble will change the default \cmd{DeclareLabeldate}
-settings to \mycolor{\textsf{origdate, date, eventdate, urldate}}.
-Setting \texttt{cmsdate} to \texttt{on} or \texttt{both} in the
-preamble --- see the previous option --- sets this to true, but if for
-some reason you want to set it to true without any of the other
-effects of the \texttt{cmsdate} option, then you can.  The effects may
-surprise.
-
-\mylittlespace When \colmarginpar{\texttt{compresspages}} set to
+settings to \textsf{origdate, date, eventdate, urldate}.  Setting
+\texttt{cmsdate} to \texttt{on} or \texttt{both} in the preamble ---
+see the previous option --- sets this to true, but if for some reason
+you want to set it to true without any of the other effects of the
+\texttt{cmsdate} option, then you can.  The effects may surprise.
+
+\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).
@@ -10136,6 +10933,12 @@ once again footnote marks will revert to the \LaTeX\ default, but of
 course you also lose a fair amount of other formatting, as well.  See
 section~\ref{sec:loading:auth}, below.
 
+\mylittlespace This \colmarginpar{\texttt{genallnames}} option affects
+the choice of which names to present in the genitive case when using
+the \mycolor{\cmd{gentextcites}} command.  Please see the
+documentation of that command in section~\ref{sec:cite:authordate},
+above.
+
 \mylittlespace Several \mymarginpar{\texttt{headline}\\\texttt{(trad
     only)}} users requested an option that turned off the automatic
 transformations that produce sentence-style capitalization in the
@@ -10196,7 +10999,7 @@ use the \cmd{citereset} command, allied possibly with the
 \textsf{biblatex.pdf} §3.1.2.1.
 
 \mylittlespace Originally
-\colmarginpar{\texttt{postnotepunct}\\(experimental)} designed for the
+\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
 you to alter the punctuation that appears just before the
@@ -10205,15 +11008,15 @@ 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\}}.  Now, with
-this option enabled, \cmd{autocite[; some comment]\{citekey\}} will
-do.  More generally, the \mycolor{\texttt{postnotepunct}} option
+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 \mycolor{experimental}.  Note also that the
+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.
 
@@ -10237,6 +11040,17 @@ rule intervenes to emphasize this continuation.  I haven't tested this
 code very thoroughly, and it's possible that frequent use of floats
 might interfere with it.  Let me know if it causes problems.
 
+\mylittlespace Stefan \colmarginpar{\texttt{xrefurl}} Björk pointed
+out that when, using the \texttt{longcrossref} or
+\texttt{booklongxref} options, you turn on the automatic abbreviation
+of multiple entries in the same (e.g.) \textsf{collection} or
+\textsf{mvcollection}, you could entirely lose a \textsf{url} that
+might be helpful for locating a source, as the abbreviated forms in
+the reference list wouldn't include this information.  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{Style Options -- Entry}
 \label{sec:authentryopts}
 
@@ -10244,7 +11058,7 @@ 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.
 
-\mylittlespace The \colmarginpar{\texttt{cmsdate}} 16th edition of the
+\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
 \texttt{cmsdate} entry option.  It has 3 possible states relevant to
@@ -10263,7 +11077,7 @@ reprinted edition of a work by Smith, first published in 1926 (the
   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
-  \texttt{old} now work like \texttt{both}.
+  \texttt{old} work like \texttt{both}.
 \end{description}
 
 As I explained in detail above in section~\ref{sec:fields:authdate},
@@ -10283,8 +11097,8 @@ be as follows:
   (Smith 1926a).  This style is no longer recommended by the 16th
   edition of the \emph{Manual}.
 \item[\qquad both:] The citation will look like (Smith [1926a] 1985).
-  The 15th-edition options \texttt{old} and \texttt{new} are now
-  synonyms for this.
+  The 15th-edition 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}.
@@ -10293,13 +11107,13 @@ be as follows:
 If, \mymarginpar{\texttt{switchdates}} for any reason, simply
 switching the \textsf{date} and the \textsf{origdate} isn't possible
 in a given entry, then you can put \texttt{switchdates} in the
-\textsf{options} field to achieve the same result.  Also, now you can
-use the new preamble version \colmarginpar{\texttt{cmsdate}\\\emph{in
-    preamble}} of \mycolor{\texttt{cmsdate}} to change the default
-order of \cmd{DeclareLabeldate}, generally making this date-switching
-in your .bib file unnecessary.  Please take a look at the full
-documentation of the \textbf{date} field to which I referred just
-above, at the preamble \texttt{cmsdate} documentation in
+\textsf{options} field to achieve the same result.  Also, you can use
+the preamble version \mymarginpar{\texttt{cmsdate}\\\emph{in
+    preamble}} of \texttt{cmsdate} to change the default order of
+\cmd{DeclareLabeldate}, generally making this date-switching in your
+.bib file unnecessary.  Please take a look at the full documentation
+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.
@@ -10384,7 +11198,7 @@ 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 Lehman's \textsf{biblatex.pdf}.
+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
@@ -10420,19 +11234,19 @@ 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 new
-(\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 limits,
-listed above, on how many names to print in a citation.  Without
-\texttt{uniquelist}, \textsf{biblatex} would present such a work as,
-e.g., (Hlatky et al. 2002b), while hlatky:hrt would be (Hlatky et
-al. 2002a).  This does distinguish between them, but inaccurately, as
-it suggests that the two different author lists are exactly the same.
-With \texttt{uniquelist}, the two citations might look like (Hlatky,
-Boothroyd et al.\ 2002) and (Hlatky, Smith et al.\ 2002), which is
-what the specification requires.
+  must distinguish between them} (15.28).  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 limits, listed above, on how many names to
+print in a citation.  Without \texttt{uniquelist}, \textsf{biblatex}
+would present such a work as, e.g., (Hlatky et al. 2002b), while
+hlatky:hrt would be (Hlatky et al. 2002a).  This does distinguish
+between them, but inaccurately, as it suggests that the two different
+author lists are exactly the same.  With \texttt{uniquelist}, the two
+citations might look like (Hlatky, Boothroyd et al.\ 2002) and
+(Hlatky, Smith et al.\ 2002), which is what the specification
+requires.
 
 \mylittlespace If, however, the distinguishing name occurs further
 down the author list --- in fourth or fifth position in our examples
@@ -10474,15 +11288,15 @@ helpfully provide as much information as is available, including
 fields that users may well wish not to have printed (ISBN, URL, DOI,
 \textsf{pagetotal}, inter alia).  The standard \textsf{biblatex}
 styles contain a series of options, detailed in \textsf{biblatex.pdf}
-§3.1.2.2, for controlling the printing of some of these fields, and
-with this release I have implemented the ones that are relevant to
+§3.1.2.2, for controlling the printing of some of these fields, and I
+have implemented others that are relevant to
 \textsf{biblatex-chicago}, along with a couple that Scot requested and
 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 Philipp Lehman says
-in \textsf{biblatex.pdf}, to wit, if you aren't going to use
+\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.
@@ -10496,12 +11310,13 @@ 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, Antti-Juhani
-Kaijahano has very kindly provided \textsf{cms-finnish.lbx} for
+partial fulfillment of this request.  For this release, Stefan Björk
+has very kindly provided \mycolor{\textsf{cms-swedish.lbx}} for
 speakers of that language, thereby adding to the generous
-contributions of Baldur Kristinsson (\textsf{cms-icelandic.lbx}) and
-Håkon Malmedal (\textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx},
-and \textsf{cms-nynorsk.lbx}).  I include \textsf{cms-british.lbx} in
+contributions of Antti-Juhani Kaijahano (\textsf{cms-finnish.lbx}),
+Baldur Kristinsson (\textsf{cms-icelandic.lbx}), and Håkon Malmedal
+(\textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx}, and
+\textsf{cms-nynorsk.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
@@ -10540,13 +11355,13 @@ complicated rules outlined in previous releases of
 the \texttt{british} option.
 
 \mylittlespace If you want to use Finnish, French, German, Icelandic,
-or Norwegian strings in the reference apparatus, then you can load
-\textsf{babel} with \texttt{finnish}, \texttt{french},
+Norwegian, or Swedish strings in the reference apparatus, then you can
+load \textsf{babel} with \texttt{finnish}, \texttt{french},
 \texttt{german}, \texttt{icelandic}, \texttt{ngerman}, \texttt{norsk},
-or \texttt{nynorsk} 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 provides these if
-you load the package in the standard way.
+\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
+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
@@ -10595,11 +11410,11 @@ 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 and Norwegian 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.
+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}
+\section{One\,.bib Database, Two Chicago Styles}
 \label{sec:twostyles}
 
 I have, when designing this package, attempted to keep at least half
@@ -10645,7 +11460,7 @@ nonetheless:
   \ref{sec:authentryopts} when doing the conversion to author-date.
 \end{enumerate}
 
-\subsection{Author-date -> Notes}
+\subsection{Author-Date -> Notes}
 \label{sec:conv:authnotes}
 
 It is my impression that an author-date .bib database is somewhat
@@ -10696,8 +11511,8 @@ of the things you may need to address:
 
 For \mymarginpar{\textbf{endnotes}} users of the \textsf{endnotes}
 package --- or of \textsf{pagenote} --- \textsf{biblatex} 0.9 offers
-considerably enhanced functionality.  Please read Lehman's RELEASE
-file and the documentation of the \texttt{notetype} option in
+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.
 
 \mylittlespace Another \mymarginpar{\textbf{memoir}} problem I have
@@ -10714,14 +11529,14 @@ 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}
+%\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 Lehman's punctuation-tracking code for
+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
@@ -10735,15 +11550,15 @@ package.
 \label{sec:bugs}
 
 This release implements the 16th edition of the \emph{Chicago Manual
-  of Style}.  It now also contains a version of the author-date style
+  of Style}.  It also 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 hope
-that users will migrate to one of these styles implementing the most
-recent specification, as I am focusing my development and testing time
-there.  With the current release, I am calling the 15th-edition styles
-\enquote{strongly deprecated,} but if you still have urgent feature
-requests for them, I'll do what I can.
+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 calling the
+15th-edition styles \enquote{obsolete,} and have moved them into a
+separate directory in the package.
 
 \mylittlespace Regardless of which edition you are considering, there
 are a number of things I haven't implemented.  The solution in
@@ -10760,7 +11575,7 @@ the \emph{Manual} (14.281) even makes it clear that you should be
 using a different reference book if you are presenting work in the
 field, so I've thought it prudent to stay clear of those waters so
 far.  I have received a request for this feature, however, so when I
-have finished the updates for the 16th edition I shall look at it more
+have cleared a few long-standing requests I shall look at it more
 closely.  If you have other issues with particular sorts of citation,
 I'm of course happy to take them on board.  The \emph{Manual} covers
 an enormous range of materials, but if we exclude the legal citations
@@ -10769,48 +11584,17 @@ 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 new(-ish) \textsf{biblatex} fields
-\textsf{related}, \textsf{relatedtype}, and \textsf{relatedstring}.
-It's possible they will solve some issues more simply and elegantly
-than my own kludges do, so I hope to address this for the next
-release.  The same holds for the \textsf{datelabelsource} field, new
-in \textsf{biblatex} 2.8.
+\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.  As late as I am with the file for the
-16th edition, I shall attempt to address this in a future release.  If
-you run into this problem, he suggests placing all the citations
-together in parentheses at the end of the annotation, though on my
-machine this doesn't always work too well, either.
-
-\mylittlespace Version 1.5 of \textsf{biblatex} revised the way the
-package deals with breaking long URLs and DOIs across lines.  The new
-code is designed to deal as elegantly as possible with as wide a
-variety of cases as possible, but in a few of my test entries it has
-caused some line-breaking issues of its own.  Depending on the nature
-of your cited sources, it may be useful for you to revert to the
-older, pre-1.5 \textsf{biblatex} behavior, something which is easily
-done by copying and pasting the old definition of the
-\cmd{biburlsetup} command into your document preamble.  If you look in
-the preambles of \textsf{cms-notes-sample.tex} or
-\textsf{cms-dates-sample.tex}, you can see the redefinition and copy
-it from there, just to see whether it helps your situation.  If it
-would be generally useful, I could also easily turn it into a package
-option.  Feedback welcome.
-
-\mylittlespace The switch to \textsf{Biber} for the author-date
-specification means that \textsf{biblatex} now provides considerably
-enhanced handling of the various date fields.  I have attempted to
-document the relevant changes in \textsf{cms-dates-sample.pdf} and in
-the \textbf{date} discussion in section~\ref{sec:fields:authdate},
-above, but it's possible the package may need some changes to cope
-with all the permutations.  Please let me know if you find something
-that looks like a bug.
-
-\mylittlespace Speaking of \textsf{dates}, now that there's an option
-for the automatic compression of page ranges, something similar could
-perhaps be provided for year ranges.  I shall be looking into this.
+of annotated bibliographies.  If you run into this problem, he
+suggests placing all the citations together in parentheses at the end
+of the annotation, though on my machine this doesn't always work too
+well, either.
 
 \mylittlespace Roger Hart, Pierric Sans, and a number of other users
 have reported a bug in the formatting of title fields.  This, as far
@@ -10821,14 +11605,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.
 
-\mylittlespace Roger Hart has requested that I incorporate some means
-of changing the punctuation before \textsf{titleaddon} fields, perhaps
-using a customizable command like \cmd{titleaddonpunct}.  I hope to
-provide this in the next release.  He has also requested, despite the
-\emph{Manual's} objections, the possibility of using both
-\texttt{Idem} and \texttt{Ibid.}\ in notes.  I shall look into this
-for the next major release.
-
 \enlargethispage{-4\baselineskip}
 
 \mylittlespace This release fixes the formatting errors of which I am
@@ -10837,11 +11613,11 @@ the \cmd{partedit} command in section~\ref{sec:formatcommands} above.
 There also remain the larger issues I've discussed throughout this
 documentation, which mainly represent my inability to make all of
 \textsf{biblatex-chicago's} formatting functions transparent for the
-user, but thankfully Lehman's superb punctuation-tracking code has
-preemptively fixed a great many small errors, some of which I hadn't
-even noticed before I began testing that functionality.  That there
-are other micro-bugs seems certain --- if you report them I'll do my
-best to fix them.
+user, but thankfully \textsf{biblatex's} superb punctuation-tracking
+code preemptively fixed a great many small errors, some of which I
+hadn't even noticed before I began testing that functionality.  That
+there are other micro-bugs seems certain --- if you report them I'll
+do my best to fix them.
 
 \mylittlespace I haven't looked closely at the standard
 \textsc{Bib}\TeX\ style by Glenn Paulley, contained in
@@ -10853,7 +11629,172 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.9i: Released \today}
+\textbf{1.0rc1: Released \today}
+
+\mylittlespace Obsolete and Deprecated Features:\label{deprec:obsol}
+\begin{itemize}
+\item The 15th-edition styles are now obsolete, and have been moved to
+  a new \mycolor{\texttt{obsolete}} subdirectory.  You can still use
+  them as they stand, but they won't compile against the newest
+  \textsf{biblatex}, so you'll have to make sure that you have an
+  older version (2.9a, perhaps).  If you are still using them, I
+  strongly urge you to consider switching to the the 16th-edition
+  styles, which contain many new features and bug-fixes.
+\item The old Chicago-specific option \texttt{usecompiler} is
+  deprecated, and has been replaced by the standard \textsf{biblatex}
+  \mycolor{\texttt{usenamec}}.  If you have been using the former in
+  your preamble or in your .bib entries, please replace it with the
+  latter, which works better across the board.  \texttt{Usecompiler}
+  still \enquote{works,} just not very well.
+\end{itemize}
+
+Other New Features:
+
+\begin{itemize}
+\item Stefan Björk has very generously provided a Swedish localization
+  file for the package --- \mycolor{\textsf{cms-swedish.lbx}} ---
+  which can be loaded and used with \textsf{babel} just like the other
+  localizations.
+\item I have added support for \mycolor{\textbf{related}}
+  functionality to all the Chicago styles, including all the standard
+  \textsf{biblatex} \mycolor{\textbf{relatedtypes}}.  It is turned on
+  by default in all styles, but you can turn it off, or alter where
+  the information is printed, using the \mycolor{\texttt{related}}
+  option in the preamble or in individual entries.  In the notes \&\
+  bibliography style, \textsf{related} information is printed by
+  default only in the bibliography, but you can change that by setting
+  the option.  In the author-date styles, it will only ever print in
+  the list of references, depending on the option's setting.  Please
+  see sections~\ref{sec:related} and \ref{sec:authrelated} for the
+  details.
+\item I have improved the name-handling code in all styles,
+  regularizing the functioning of the \textsf{namea}, \textsf{nameb},
+  and \textsf{namec} fields with respect to the other, standard
+  \textsf{biblatex} names.  The former two in particular are newly
+  available in the \textsf{collection} and \textsf{periodical} entry
+  types, and \textsf{biblatex-chicago} now recognizes the standard
+  \mycolor{\texttt{usenamea}}, \mycolor{\texttt{usenameb}}, and
+  \mycolor{\texttt{usenamec}} toggles, the last replacing the
+  deprecated \texttt{usecompiler} (as above).  You can also now use
+  the \mycolor{\textbf{nameatype}} field just as you would an
+  \textsf{editortype}, extending the possibilities for identifying
+  certain roles attached specifically to \textsf{titles} as opposed to
+  \textsf{booktitles} or \textsf{maintitles}.
+\item After a request by user BenVB, I have added support for the
+  \textsf{biblatex} \mycolor{\textbf{shortjournal}} field, which
+  allows you to present abbreviated \textsf{journaltitles} in all the
+  styles.  You can use the \mycolor{\texttt{journalabbrev}} option to
+  control where in your document these abbreviated forms will appear.
+  By default, the field is ignored in the notes \&\ bibliography
+  style, and appears only in citations in the author-date styles.  You
+  can also print a list of journal abbreviations, rather in the manner
+  of a list of shorthands, using a command like:
+  \cmd{printbiblist\{shortjournal\}}.  Even though the
+  \textsf{periodical} entry type uses the \textsf{title} and
+  \textsf{shorttitle} fields in place of \textsf{journaltitle} and
+  \textsf{shortjournal}, these entries are included in this
+  functionality, and controlled by the same \texttt{journalabbrev}
+  option.  Please see s.v.\ \enquote{shortjournal} in
+  sections~\ref{sec:entryfields} and \ref{sec:fields:authdate}.
+\item Following a request by Arne Skjærholt, and his generous
+  provision of some code to get me started, I have implemented a new
+  \mycolor{\cmd{gentextcite}} citation command in all styles.  The
+  \enquote{gen} part of the name refers to the genitive case, and it
+  adds a possessive ending --- \textbf{'s} by default --- to the
+  author's name in what is otherwise an ordinary \cmd{textcite}.  You
+  can change the added ending however you want, using a third optional
+  field to the citation command, and you can control to which names
+  the ending is added in a \mycolor{\cmd{gentextcites}} multicite
+  command by using the \mycolor{\texttt{genallnames}} preamble and
+  entry option.  Please see sections~\ref{sec:citecommands} and
+  \ref{sec:cite:authordate} for the details.
+\item Stefan Björk pointed out that \textsf{url}, \textsf{doi}, and
+  \textsf{eprint} information could be totally ignored in some entries
+  when you used the abbreviated cross-referencing functionality
+  accessed through the \textsf{crossref} and \textsf{xref} fields.  At
+  his request, I have provided a new \mycolor{\texttt{xrefurl}} entry
+  and preamble option for all the styles to control the printing of
+  this information in abbreviated notes or bibliography (reference
+  list) entries.  Please see sections~\ref{sec:useropts} and
+  \ref{sec:authuseropts} for the details.
+\item In a related change, I have stopped child entries inheriting
+  \textsf{url}, \textsf{doi}, and \textsf{eprint} fields from their
+  cross-ref'd parents, so if your documents rely on this behavior
+  please note that you'll have to provide such fields manually in the
+  child entries.
+\item Roger Hart long ago requested a way to control the punctuation
+  before \textsf{book-}, \textsf{main-}, or plain \textsf{titleaddon}
+  fields, and I have finally added it in this release in the form of
+  two entry and preamble options, \mycolor{\texttt{ptitleaddon}} and
+  \mycolor{\texttt{ctitleaddon}}, available in all styles.  By
+  default, the former prints \cmd{addperiod}\cmd{addspace}, hence its
+  name, and the latter\,\cmd{addcomma}\cmd{addspace}, but you can
+  change either or both depending on which field you are using and
+  which sort of entry it appears in --- the default output can be your
+  guide to which option(s) to change.  Please see the available valid
+  option keys in sections~\ref{sec:chicpreset} and
+  \ref{sec:authpreset}.
+\item The same user also long ago requested that the notes \&\
+  bibliography style make it possible to use \emph{Idem} when two
+  consecutive notes cite different works by the same author.  You can
+  now use the standard \textsf{biblatex} option
+  \texttt{idemtracker=constrict} in your preamble to activate this in
+  your documents, but please be aware, first, that the \emph{Manual}
+  doesn't exactly approve of this and, second, that you'll only see
+  \emph{Idem} in short notes, never in full ones, which seems to be
+  the standard (\textsf{biblatex}) way of implementing this.
+\item Also only in the notes \& bibliography style, I have added a
+  \mycolor{\texttt{shorthandpunct}} option to control the punctuation
+  that appears before the first appearance of a \textsf{shorthand}
+  and/or a \textsf{shorthandintro} in a long note.  The default is
+  \cmd{addspace}, but you can change it in your preamble or in
+  individual entries.  Please see the available valid option keys in
+  section~\ref{sec:chicpreset}.
+\item After reading a discussion started by Ryo Furue at
+  \href{https://github.com/plk/biblatex/issues/363}{github}, I have
+  added, in the author-date styles only, a test to some spacing
+  commands to prevent line breaks immediately after abbreviation dots.
+  These tests apply only in running text, never in the list of
+  references, where good line breaks are already hard enough to find.
+\item In addition to moving the 15th-edition styles into an
+  \texttt{obsolete} subdirectory, I have also reorganized the
+  author-date style files, adding
+  \mycolor{\textsf{chicago-dates-common.cbx}} which contains the code
+  that is common to the \texttt{trad} and the standard
+  \texttt{authordate} styles.  Nothing has changed in terms of loading
+  the styles, the changes being designed primarily to ease
+  maintenance.
+\item I have created two new documentation files (and an appendix) to
+  provide short introductions to the Chicago styles, introductions
+  which attempt to fill the gap between the Quickstart section
+  (\ref{quickstart}) and the fuller documentation contained in
+  sections~\ref{sec:Spec} and \ref{sec:authdate} of this file.  Both
+  \mycolor{\textsf{cms-notes-intro.pdf}} and
+  \mycolor{\textsf{cms-dates-intro.pdf}} are fully hyperlinked so you
+  can move easily from formatted citations and (annotated) references
+  to .bib entries and back, with marginal references to the fuller
+  discussions here.  There is also a short
+  \mycolor{\textsf{cms-trad-appendix.pdf}} file to discuss a few
+  entries that would need special treatment for the \texttt{trad}
+  style.  The \textsf{sample} files for each style still exist, but I
+  intend them mainly for testing purposes, while many more (annotated)
+  entries are still available for consultation in
+  \textsf{notes-test.bib} and \textsf{dates-test.bib}.
+\item I have made a number of other small enhancements to and fixed
+  numerous bugs in all the styles, including some subtle inaccuracies
+  in author-date citations spotted by Arne Skjærholt and some macros
+  in \textsf{inproceedings} entries that had been missing for years.
+  I have provided some default values for counters in
+  \textsf{biblatex-chicago.sty} that aid in breaking long
+  \textsf{urls} across lines, but I make no pretense that these fully
+  adhere to the \emph{Manual's} specifications.  I have added a few
+  \texttt{bibstrings}, currently missing in standard
+  \textsf{biblatex}, to \textsf{cms-german.lbx} for use with the
+  \mycolor{\textsf{related}} functionality.  Recommendations for
+  better ones would be gratefully received.
+\end{itemize}
+
+\textbf{0.9.9i: Released May 16, 2016}
 \begin{itemize}
 \item This is another interim release, allowing the use of
   \textsf{biblatex} 3.4 for those who want to try it.  I have also
@@ -10896,10 +11837,10 @@ code for it, let me know, and I'll look into it.
 
 \textbf{0.9.9f: Released August 15, 2014}
 \begin{itemize}
-\item I've \label{deprec:obsol} made the alterations needed to bring
-  the styles into line with the latest version of \textsf{biblatex}
-  (2.9a).  This is the version that has been tested most thoroughly
-  with \textsf{biblatex-chicago}, so I strongly recommend using it.
+\item I've made the alterations needed to bring the styles into line
+  with the latest version of \textsf{biblatex} (2.9a).  This is the
+  version that has been tested most thoroughly with
+  \textsf{biblatex-chicago}, so I strongly recommend using it.
 \item I fixed several inaccuracies in the presentation of abbreviated
   cross-referen\-ces in all the Chicago styles, and while I was working
   on that portion of the code it seemed an opportune moment to fulfill
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
new file mode 100644
index 00000000000..4fbf77248f8
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..8eb2ad03c17
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
@@ -0,0 +1,1333 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+%\usepackage{endnotes}
+\usepackage[latin1]{inputenc}
+\usepackage[german,french,american]{babel}
+\usepackage[autostyle]{csquotes}
+%\usepackage[document]{ragged2e}
+\usepackage[authordate,backend=biber,autolang=none,booklongxref=false,%
+bibencoding=latin1,postnotepunct,compresspages,strict,%
+annotation]{biblatex-chicago}
+% \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
+% babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
+\usepackage{lmodern}
+%\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}{13pt}
+\usepackage{url}
+\urlstyle{rm}
+\appto\bibsetup{\sloppy}
+\hyphenation{evans-ton clem-ens mc-hugh}
+\setlength{\dimen\footins}{9.5in}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{5pt}
+\providecommand{\theendnote}{}
+\protected\def\onethird{{\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[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}
+\usepackage{cmsdocs}
+\bibliography{dates-test}
+%%\onehalfspacing
+%\tracingstats=2
+\begin{document}
+
+\section*{The Chicago Author-Date Specification}
+\label{sec:spec}
+
+This file is intended as a brief introduction to the Chicago
+author-date specification (16th 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~5 \cmssecref{cms-sec:authdate} of that same document.  I've
+attempted to design this introduction for ease of cross-reference, so
+clicking on citations should bring you to the reference list entry,
+whence clicking on the entry key in the annotations should present you
+with the entry as it appears in the .bib file, where clicking on the
+entry type should return you to the reference list.  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 two .pdf
+files in the recommended directories 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*{Important Note}
+\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.5) and \textsf{biblatex} (3.4), 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.
+
+\subsection*{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
+\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.  The 15th-edition styles are still in the package, but they
+have not been updated in some time, and are now officially obsolete.
+I would strongly encourage all users to switch to one of the
+16th-edition styles as soon as possible, as I am concentrating all of
+my development time there.
+
+\subsection*{Usage}
+\label{usage}
+
+As a general rule, you'll probably want to use the \cmd{autocite}
+command for most citations.  For most sources, the result will be
+exactly as you expect it to be.  A few examples:
+\autocite{adorno:benj}; \autocite{ashbrook:brain};
+\autocite{babb:peru}; \autocite{barcott:review}.  Any page references
+should also appear as you expect: \autocite[338]{batson};
+\autocite[79]{beattie:crime}; \autocite[36]{boxer:china}.
+
+\subsection*{Repeated citations}
+\label{sec:ibidem}
+
+Repeated citations are somewhat complicated.  The Chicago author-date
+style doesn't use \enquote{\emph{Ibid},} but in general a repeated
+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}
+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}
+automatically resets the tracker at page breaks:
+
+\citereset\cmd{citereset}\ \autocite[15.27]{chicago:manual}.  If you
+are going to repeat a source, make sure that the cite command provides
+a postnote --- when using \textsf{biblatex-chicago} you'll no longer
+get any annoying empty parentheses, but you will get another standard
+citation, which may add too much clutter: \autocite{chicago:manual}.
+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}
+\label{sec:other}
+
+The other \cmssecref{cms-sec:cite:authordate} citation commands from
+\textsf{biblatex} also work fine:
+
+\cmd{textcite}: \textcite{conley:fifthgrade}; \cmd{autocite*}:
+\autocite*{connell:chronic}; \cmd{cite}: \cite{conway:evolution};
+\cmd{cite*}: \cite*{davenport:attention}; \cmd{foot\-note} with
+\cmd{autocite};\footnote{\autocite{donne:var}.}\ \cmd{footcite}
+(=\cmd{cite} inside a \cmd{footnote}).  \footcite{dunn:revolutions}
+
+Multicites should work as you expect, too:
+
+\cmd{autocites}: \autocites{dyna:browser}{eliot:pound};
+\cmd{autocites} by the same author:
+\autocites{pirumova}{pirumova:russian}; \cmd{autocites} by the same
+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:
+\cmd{gentextcite[<ending>][][]\{entry:key\}}.  There is also a
+\cmd{gentextcites} command, modified thus:
+\cmd{gentextcites[<ending>]()()[][]\{key1\}\{key2\}}.
+
+\subsection*{Shorthands}
+\label{sec:shorthands}
+
+Chicago's author-date style
+\cmssecref[shorthand]{cms-sec:ad:shorthand} only seems to recommend
+the use of shorthands as abbreviations for long authors' names,
+particularly institutional names \autocite[15.36]{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
+document preamble.
+
+\subsection*{Mildly problematic entries}
+\label{sec:problematic}
+
+In most \cmssecref[author]{cms-sec:ad:author} entries, the absence of
+an author can be supplied by, e.g., an editor or a translator:
+\autocite{chaucer:alt}; \autocite{silver:gawain}.  Sometimes an
+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.
+
+By default, in most \cmssecref[date]{cms-sec:ad:date} entry types, an
+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}.)
+
+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}.  Forthcoming works
+are straightforward, assuming you remember to use the \cmd{autocap}
+macro and the \textsf{year} (instead of the \textsf{date}) field, so
+that the word appears correctly 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
+\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
+the original publication date will be printed at the end of the
+reference list entry.  Alternatively, you can use
+\texttt{cmsdate=both}: \autocite{emerson:nature};
+\autocite{maitland:canon}.  \texttt{cmsdate=new} and
+\texttt{cmsdate=old} are both now synonyms of \texttt{both}, while
+\texttt{cmsdate=on} is still available even though it falls outside
+the specification: \autocite{james:ambassadors}.  These options, in
+combination with others available in your .bib files, can cover a wide
+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}
+\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.
+
+\subsubsection*{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
+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}.
+
+\subsubsection*{Author-less Article, Review, and Manual entries}
+\label{sec:authless:art}
+
+In \textsf{Article} and \textsf{Review} entries
+\cmssecref[article]{cms-sec:ad:article} with the \texttt{magazine}
+entrysubtype, the absence of an author automatically places the
+\textsf{journaltitle} of the periodical in citations and at the head
+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
+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}.
+
+\subsubsection*{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.
+
+\subsubsection*{entrysubtype = \{classical\}}
+\label{sec:classical}
+
+This option's \cmssecref[entrysubtype]{cms-sec:ad:entrysubtype} name
+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}
+
+Classical works: without abbreviation:
+\autocite{aristotle:metaphy:trans}; with abbreviation:
+\autocite{aristotle:metaphy:gr}; \autocite{plato:republic:gr}; using
+standard pagination: \autocite*[3.2.996b5--8]{aristotle:metaphy:gr};
+\autocite*[420e]{plato:republic:gr}; work cited by page of a modern
+edition, i.e., without \textsf{entrysubtype}:
+\autocite[198]{euripides:orestes}.
+
+Sacred works, e.g., the Bible and the Qur'an:
+\autocite[25:19--36:43]{genesis}.
+
+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}.)
+
+\subsubsection*{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},
+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
+\texttt{postnotepunct} package option, which allows you simply to type
+\cmd{autocite[; the unrevised trans.]\{stendhal:\\parma\}}
+\citereset\autocite[; the unrevised trans.]{stendhal:parma}, or you
+can continue to use a separate \textsf{Misc} or \textsf{CustomC} entry
+containing just the text of the comment in the \textsf{title} field,
+\textsf{entrysubtype} \texttt{classical}, and \textsf{options}
+\texttt{skipbib}.  An \cmd{autocites} command calling both the main
+text and the comment will then do the trick, e.g.,
+\autocites{chicago:manual}{chicago:comment}.
+
+\subsubsection*{Multiple authors}
+\label{sec:multiple}
+
+The default settings in \textsf{biblatex-chicago} are
+\texttt{maxnames=3,minnames=1} in citations and
+\texttt{max\-bibnames=10,minbibnames=7} in the list of references
+(these latter parameters set in \textsf{biblatex-chicago.sty}).  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: \autocite{hlatky:hrt}.  For the vast
+majority of circumstances, these settings are exactly right for the
+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
+\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
+limits, listed above, on how many names to print in a citation.
+Without \texttt{uniquelist}, \textsf{biblatex} would present such a
+work as, e.g., (Hlatky et al. 2002b), while hlatky:hrt would be
+(Hlatky et al. 2002a).  This does distinguish between them, but
+inaccurately, as it suggests that the two different author lists are
+exactly the same.  With \texttt{uniquelist}, the two citations might
+look like (Hlatky, Boothroyd et al.\ 2002) and (Hlatky, Smith et al.\
+2002), which is what the specification requires.
+
+If, however, the distinguishing name occurs further down the author
+list --- in fourth or fifth position in our examples --- then the
+default settings would produce citations with all 4 or 5 names
+printed, which can become awkwardly long.  In such a situation, you
+can provide \textsf{shortauthor} fields that look like this:
+\{\{Hlatky et al., \textbackslash mkbibquote\{Quality of Life,\}\}\}
+and \{\{Hlatky et al., \textbackslash mkbibquote\{Depressive
+Symptoms,\}\}\}, using a shortened title to distinguish the
+references.  This would produce (Hlatky et al., \enquote{Quality of
+  Life,} 2002) and (Hlatky et al., \enquote{Depressive Symptoms,}
+2002), as the spec recommends.  There is, unfortunately, no simpler
+way that I know of to deal with this situation.
+
+\subsubsection*{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.
+
+\subsubsection*{Related entries}
+\label{sec:related}
+
+\textsf{Biblatex} provides \cmssecref{cms-sec:authrelated} a powerful
+mechanism, using the \textsf{related} field, for grouping two (or
+more) works together in a single entry in the list of references,
+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}.
+
+\subsection*{In conclusion}
+\label{sec:conclude}
+
+Allow me, finally, to emphasize just how multifarious are the sources
+illustrated in the \emph{CMS}, only a small selection of which have
+appeared in this introduction.  You will find significantly fuller
+guidance in \textsf{biblatex.pdf} and \textsf{biblatex-chicago.pdf},
+but the \emph{CMS} itself defines the specification and shall
+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.
+
+
+\printbibliography[title=References]
+\setlength{\textheight}{10.5in}
+\twocolumn[\Large \texttt{The Database File}]
+\vspace*{-6pt}
+\begin{lstlisting}[language=BibTeX,label=prologue]
+%% Database entries used to produce
+%% citations in this file, taken
+%% from dates-test.bib. I have
+%% removed the annotations to save
+%% room -- you can click on
+%% the entry type to return to the
+%% reference list entry, where you'll
+%% also find the annotations. You can
+%% click on text with a grey back-
+%% ground to switch to that entry
+%% within this .bib listing. Through-
+%% out this listing you'll see curly
+%% braces around parts of titles and
+%% subtitles, which allow the entry
+%% to work equally well in authordate
+%% and authordate-trad.
+
+@String{cup = {Cambridge University Press}}
+@String{hup = {Harvard University Press}}
+@String{uchp = {University of Chicago Press}}
+@String{oup = {Oxford University Press}}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=adorno:benj]
+*\adlnbackref{Book}{adorno:benj}*,
+  title = 	 {The Complete Correspondence, 1928--1940},
+  publisher = 	 hup,
+  year = 	 1999,
+  author = 	 {Adorno, Theodor~W. and Benjamin, Walter},
+  editor = 	 {Lonitz, Henri},
+  translator = 	 {Nicholas Walker},
+  location =  {Cambridge, MA}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=anon:stanze]
+*\adlnbackref{Book}{anon:stanze}*,
+  title = 	 {Stanze in lode della donna brutta},
+  date = 	 1547,
+  address = 	 {Florence},
+  shorttitle = 	 {Stanze}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=aristotle:metaphy:gr]
+*\adlnbackref{Book}{aristotle:metaphy:gr}[aristotle:metaphy:trans]*,
+  shorttitle = 	 {Metaph\adddot},
+  title = 	 {Metaphysics},
+  options = 	 {skipbib},
+  entrysubtype = {classical},
+  origdate = 	 1924,
+  date = 1997,
+  author = 	 {Aristotle},
+  editor = 	 {Ross, W.~D.},
+  publisher = {Oxford Univ.\ Press and Sandpiper Books},
+  pubstate = 	 {reprint},
+  volumes = 	 2,
+  location =  {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=aristotle:metaphy:trans]
+*\adlnbackref{Book}{aristotle:metaphy:trans}*,
+  title = 	 {Metaphysica},
+  entrysubtype = {classical},
+  year = 	 1928,
+  volume = 	 8,
+  author = 	 {Aristotle},
+  editor = 	 {Ross, W.~D.},
+  nameb = 	 {Ross, W.~D.},
+  origlanguage = {greek},
+  userf = 	 {*\hyperlink{\getrefbykeydefault%
+{aristotle:metaphy:gr}{anchor}{}}%
+{\{\colorbox{Gainsboro}{aristotle:metaphy:gr}\}}*},
+  maintitle = 	 {The Works of {Aristotle}, Translated into {English}},
+  publisher = {Clarendon Press},
+  edition = 	 2,
+  location =  {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ashbrook:brain]
+*\adlnbackref{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},
+  year = 	 1997,
+  chapter = 	 7,
+  location =  {Cleveland, OH},
+  shorttitle = {The Frontal Lobes}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=auden:reading]
+*\adlnbackref{Music}{auden:reading}*,
+  title = 	 {Selected Poems},
+  author = 	 {Auden, W. H.},
+  date = 	 {1991},
+  number = 	 7137,
+  series = 	 {Spoken Arts},
+  type = 	 {audiocassette},
+  note = 	 {read by the author}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=author:forthcoming]
+*\adlnbackref{Article}{author:forthcoming}*,
+  author = 	 {Author, Margaret~M.},
+  title = 	 {Article Title},
+  journaltitle = {Journal Name},
+  year = 	 {\autocap{f}orthcoming},
+  volume = 	 98
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=babb:peru]
+*\adlnbackref{Book}{babb:peru}*,
+  title = 	 {Between Field and Cooking Pot},
+  subtitle = 	 {The Political Economy of Marketwomen in {Peru}},
+  year = 	 1989,
+  author = 	 {Babb, Florence},
+  publisher = {University of Texas Press},
+  edition = 	 {\bibstring{revisededition}},
+  location =  {Austin}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=barcott:review]
+*\adlnbackref{Review}{barcott:review}*,
+  journaltitle = {New York Times Book Review},
+  author =	 {Barcott, Bruce},
+  date = 	 {2000-04-16},
+  entrysubtype = {magazine},
+  title =	 {\bibstring{reviewof} \mkbibemph{The Last Marlin: The Story of a Family at Sea}, \bibstring{by} Fred Waitzkin},
+  pages =	 7
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=batson]
+*\adlnbackref{Article}{batson}*,
+  author =	 {Batson, C.~Daniel},
+  title =	 {How Social Is the Animal? {The} Human Capacity for Caring},
+  journaltitle = {American Psychologist},
+  volume =	 45,
+  date = 	 {1990-03},
+  pages =	 {336--346}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=beattie:crime]
+*\adlnbackref{Article}{beattie:crime}*,
+  author = 	 {Beattie, J.~M.},
+  title = 	 {The Pattern of Crime in {England}, 1660--1800},
+  journaltitle = {Past and Present},
+  year = 	 1974,
+  number = 	 62,
+  pages = 	 {47--95}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=beethoven:sonata29]
+*\adlnbackref{Music}{beethoven:sonata29}*,
+  title = 	 {Piano Sonata \bibstring{number} 29 \mkbibquote{Hammerklavier}},
+  author = 	 {Beethoven},
+  editor = 	 {Peter Serkin},
+  editortype = 	 {none},
+  number = 	 {CDD 270},
+  series = 	 {Proarte Digital}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=bernstein:shostakovich]
+*\adlnbackref{Music}{bernstein:shostakovich}*,
+  title = 	 {Symphony \bibstring{number} 5},
+  author = 	 {Shostakovich, Dmitri},
+  editor = 	 {Bernstein, Leonard},
+  editortype = 	 {conductor},
+  editora = 	 {{New York Philharmonic}},
+  editoratype =  {none},
+  number = 	 {IM 35854},
+  series = 	 {CBS},
+  options = 	 {useauthor=false}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=boxer:china]
+*\adlnbackref{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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=browning:aurora]
+*\adlnbackref{Book}{browning:aurora}*,
+  title =	 {{Aurora Leigh}},
+  subtitle =	 {Authoritative Text, Backgrounds and Contexts, Criticism},
+  year =	 1996,
+  author =	 {Browning, Elizabeth Barrett},
+  editor =	 {Reynolds, Margaret},
+  publisher =	 {Norton},
+  series =	 {Norton Critical Editions},
+  location =	 {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=bsi:abbreviation]
+*\adlnbackref{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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=chaucer:alt]
+*\adlnbackref{Book}{chaucer:alt}*,
+  title = 	 {Chaucer Life-Records},
+  year = 	 1966,
+  editor = 	 {Crow, Martin~M. and Olson, Clair~C.},
+  namec = 	 {Manly, John~M. and Richert, Edith},
+  publisher = oup,
+  note = 	 {with the assistance of Lilian~J. Redstone and others},
+  location =  {London}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=chicago:comment]
+*\adlnbackref{CustomC}{chicago:comment}[chicago:manual]*,
+  title = 	 {the most recent edition},
+  entrysubtype = {classical},
+  options = 	 {skipbib},
+  annotation = 	 {An example of how to use a CustomC entry to insert a comment inside another parenthetical citation.}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=chicago:manual]
+*\adlnbackref{Book}{chicago:manual}*,
+  title = 	 {The {Chicago} Manual of Style},
+  year = 	 2010,
+  author = 	 {{University of Chicago Press}},
+  publisher = uchp,
+  edition = 	 16,
+  location =  {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=clark:mesopot]
+*\adlnbackref{Booklet}{clark:mesopot}*,
+  title = 	 {Mesopotamia},
+  subtitle = 	 {Between Two Rivers},
+  author = 	 {Hazel V. Clark},
+  howpublished = {End of the Commons General Store},
+  year = 	 {\mkbibbrackets{1957?}},
+  location =  {Mesopotamia, OH}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=conley:fifthgrade]
+*\adlnbackref{Article}{conley:fifthgrade}*,
+  author =	 {Conley, Alice},
+  title =	 {Fifth-Grade Boys' Decisions about Participation in Sports Activities},
+  issuetitle =	 {Non-subject-matter Outcomes of Schooling},
+  journaltitle = {Elementary School Journal},
+  note = 	 {special issue},
+  year =	 1999,
+  volume =	 99,
+  editor =       {Good, Thomas~L.},
+  number =	 5,
+  pages =	 {131--146}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=connell:chronic]
+*\adlnbackref{Article}{connell:chronic}*,
+  author = 	 {Connell, A.~D. and Airey, D.~D.},
+  title = 	 {The Chronic Effects of Fluoride on the Estuarine Amphipods \mkbibemph{Grandidierella lutosa} and \mkbibemph{G. lignorum}},
+  journaltitle = {Water Research},
+  date = 	 1982,
+  volume = 	 16,
+  pages = 	 {1313--1317}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=contrib:contrib]
+*\adlnbackref{InCollection}{contrib:contrib}*,
+  author = 	 {Contributor, Anna},
+  title = 	 {Contribution},
+  booktitle = 	 {Edited Volume},
+  publisher = {Publisher},
+  year = 	 {\autocap{f}orthcoming},
+  editor = 	 {Editor, Ellen},
+  location =  {Place}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=conway:evolution]
+*\adlnbackref{Article}{conway:evolution}*,
+  author = 	 {Conway, M.~S.},
+  title = 	 {The Evolution of Diversity in Ancient Ecosystems},
+  subtitle = 	 {A Review},
+  journaltitle = {Philosophical Transactions of the Royal Society},
+  date = 	 1998,
+  volume = 	 {B 353},
+  pages = 	 {327--345}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=cook:sotweed]
+*\adlnbackref{Book}{cook:sotweed}*,
+  title = 	 {Sotweed Redivivus, or The Planter's Looking-Glass},
+  year = 	 1730,
+  author = 	 {Cook, Ebenezer},
+  authortype = 	 {anon?},
+  note = 	 {\bibstring{by} \mkbibquote{E.~C. Gent}},
+  location =  {Annapolis}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=coolidge:speech]
+*\adlnbackref{Online}{coolidge:speech}*,
+  author = 	 {Coolidge, Calvin},
+  title = 	 {Equal Rights},
+  note = 	 {copy of an undated 78 rpm disc},
+  options = 	 {ptitleaddon=space},
+  titleaddon = 	 {(speech)},
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{loc:leaders}{anchor}{}}{\{\colorbox{Gainsboro}{loc:leaders}\}}*},
+  year = 	 {[1920?]},
+  relatedstring = {from}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=creel:house]
+*\adlnbackref{Misc}{creel:house}*,
+  author = 	 {Creel, George},
+  entrysubtype = {letter},
+  title = 	 {George Creel to Colonel House},
+  note = 	 {Edward~M. House Papers},
+  origdate = 	 {1918-09-25},
+  organization =  {Yale University Library}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=davenport:attention]
+*\adlnbackref{Book}{davenport:attention}*,
+  title =	 {The Attention Economy},
+  subtitle =	 {Understanding the New Currency of Business},
+  year =	 2001,
+  author =	 {Davenport, Thomas~H. and Beck, John~C.},
+  publisher =	 {Harvard Business School Press},
+  addendum =	 {TK3 Reader e-book},
+  location =	 {Cambridge, MA}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=dinkel:agassiz]
+*\adlnbackref{Misc}{dinkel:agassiz}*,
+  author = 	 {Dinkel, Joseph},
+  title = 	 {description of Louis Agassiz written at the request of Elizabeth Cary Agassiz},
+  year = 	 {\bibstring{nodate}},
+  entrysubtype = {yes},
+  note = 	 {Agassiz Papers},
+  location =  {Harvard University},
+  organization =  {Houghton Library}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=donne:var]
+*\adlnbackref{Book}{donne:var}*,
+  author =	 {Donne, John},
+  editor =	 {Stringer, Gary~A.},
+  title =	 {The \mkbibquote{Anniversaries} and the \mkbibquote{Epicedes and Obsequies}},
+  namea =	 {Stringer, Gary~A. and Pebworth, Ted-Larry},
+  publisher =	 {Indiana Univ. Press},
+  maintitle =	 {The Variorum Edition of the Poetry of {John Donne}},
+  year =	 1995,
+  volume =	 6,
+  location =	 {Bloomington}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=dunn:revolutions]
+*\adlnbackref{Book}{dunn:revolutions}*,
+  title = 	 {Sister Revolutions},
+  subtitle = 	 {French Lightning, {American} Light},
+  year = 	 1999,
+  author = 	 {Dunn, Susan},
+  publisher = {Faber \& Faber and Farrar, Straus \& Giroux},
+  location =  {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=dyna:browser]
+*\adlnbackref{Manual}{dyna:browser}*,
+  title = 	 {Dynatext, Electronic Book Indexer/Browser},
+  organization = {Electronic Book Technology Inc.},
+  address = 	 {Providence, RI},
+  year = 	 1991
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=eliot:pound]
+*\adlnbackref{Book}{eliot:pound}*,
+  title = 	 {Literary Essays},
+  options = {useauthor=false},
+  year = 	 1953,
+  author = 	 {Pound, Ezra},
+  editor =  {Eliot, T.~S.},
+  publisher = {New Directions},
+  location =  {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=emerson:nature]
+*\adlnbackref{Book}{emerson:nature}*,
+  title =	 {Nature},
+  year =	 1985,
+  origdate =	 1836,
+  location = 	 {Boston},
+  options = 	 {cmsdate=old},
+  author =	 {Emerson, Ralph Waldo},
+  publisher = 	 {Beacon},
+  note = 	 {a facsimile of the first \bibstring{edition} with an \bibstring{introduction} by Jaroslav Pelikan}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ency:britannica]
+*\adlnbackref{InReference}{ency:britannica}*,
+  title =        {Encyclopaedia Britannica},
+  edition =      {15},
+  shorttitle = 	 {Ency. {Brit}., \mkbibemph{15th ed}\adddot},
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=euripides:orestes]
+*\adlnbackref{BookInBook}{euripides:orestes}*,
+  title = 	 {Orestes},
+  year = 	 1958,
+  booktitle = 	 {Euripides},
+  maintitle = 	 {The Complete {Greek} Tragedies},
+  nameb = 	 {Arrowsmith, William},
+  volume = 	 4,
+  author = 	 {Euripides},
+  editor = 	 {Grene, David and Lattimore, Richmond},
+  publisher = uchp,
+  pages = 	 {185--288},
+  location =  {Chicago},
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=evanston:library]
+*\adlnbackref{Online}{evanston:library}*,
+  author = 	 {{Evanston Public Library Board of Trustees}},
+  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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=friends:leia]
+*\adlnbackref{Video}{friends:leia}*,
+  title = 	 {The One with the {Princess Leia} Fantasy},
+  date = 	 2003,
+  booktitle = 	 {Friends},
+  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},
+  type = 	 {DVD},
+  address = 	 {Burbank, CA}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=genesis]
+*\adlnbackref{Misc}{genesis}*,
+  shorttitle = 	 {Gen\adddot},
+  entrysubtype = {classical},
+  keywords = 	 {nosample},
+  title = 	 {Genesis},
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=gourmet:052006]
+*\adlnbackref{Review}{gourmet:052006}*,
+  journaltitle = {Gourmet},
+  entrysubtype = {magazine},
+  date = 	 {2000-05},
+  title =        {Kitchen {Notebook}}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=grove:sibelius]
+*\adlnbackref{InReference}{grove:sibelius}*,
+  title = 	 {The New {Grove} Dictionary of Music and Musicians},
+  author = 	 {Hepokoski, James},
+  shorttitle = 	 {New {Grove} Dict\adddot},
+  lista = {Sibelius, Jean},
+  url = 	 {http://www.grovemusic.com/},
+  urldate = 	 {2002-01-03},
+  sortkey = 	 {New Grove}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=handel:messiah]
+*\adlnbackref{Video}{handel:messiah}*,
+  title = 	 {Messiah},
+  date = 	 {1988},
+  eventdate = 	 {1987-12-19},
+  userd = 	 {performed},
+  type = 	 {videocassette (VHS), 141 min\adddot},
+  editor = 	 {{Atlanta Symphony Orchestra and Chamber Chorus}},
+  editortype = 	 {none},
+  editora = 	 {Shaw, Robert},
+  editoratype =  {none},
+  author = 	 {Handel, George Frederic},
+  publisher = {Video Artists International},
+  address = 	 {Ansonia Station, NY}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=hlatky:hrt]
+*\adlnbackref{Article}{hlatky:hrt}*,
+  author =	 {Hlatky, Mark~A. and Boothroyd, Derek and Vittinghoff, Eric and Sharp, Penny and Whooley, Mary~A.},
+  title =	 {Quality-of-Life and Depressive Symptoms in Postmenopausal Women after Receiving Hormone Therapy},
+  subtitle =	 {Results from the {Heart and Estrogen/Progestin Replacement Study (HERS)} Trial},
+  journaltitle = {Journal of the American Medical Association},
+  date = 	 {2002-02-06},
+  volume =	 287,
+  number =	 5,
+  url =   {http://jama.ama-assn.org/issues/ v287n5/rfull/joc10108.html#aainfo},
+  urldate =	 {2002-01-07}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=holiday:fool]
+*\adlnbackref{Music}{holiday:fool}*,
+  title = 	 {I'm a Fool to Want You},
+  eventdate = 	 {1958-02-20},
+  date = 	 {1960},
+  booktitle = 	 {Lady in Satin},
+  author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
+  editor = 	 {Holiday, Billie},
+  editortype = 	 {none},
+  number = 	 {CL 1157},
+  publisher = {Columbia},
+  type = 	 {33\onethird\ rpm},
+  note = 	 {with Ray Ellis},
+  options = 	 {useauthor=false}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=horowitz:youtube]
+*\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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=horsley:prosodies]
+*\adlnbackref{Book}{horsley:prosodies}*,
+  title =	 {On the Prosodies of the {Greek and Latin} Languages},
+  year =	 1796,
+  author =	 {Horsley, Samuel},
+  authortype =	 {anon}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=house:papers]
+*\adlnbackref{Misc}{house:papers}*,
+  author = 	 {House, Edward~M\adddot\addcomma},
+  title = 	 {Papers},
+  note = 	 {Yale University Library},
+  entrysubtype = {classical}
+}
+\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},
+  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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=james:ambassadors]
+*\adlnbackref{Book}{james:ambassadors}*,
+  title = 	 {The Ambassadors},
+  year = 	 1996,
+  origdate = 	 1909,
+  options = 	 {cmsdate=on},
+  author = 	 {James, Henry},
+  publisher = {Project Gutenberg},
+  url = 	 {ftp://ibiblio.org/pub/docs/ books/gutenberg/etext96/ambas10.txt}
+}
+\end{lstlisting}\clearpage
+\begin{lstlisting}[language=BibTeX,label=lakeforester:pushcarts]
+*\adlnbackref{Article}{lakeforester:pushcarts}*,
+  journaltitle = {Lake Forester},
+  date = 	 {2000-03-23},
+  entrysubtype = {magazine},
+  title = 	 {Pushcarts Evolve to Trendy Kiosks},
+  options = 	 {cmsdate=full},
+  location =  {Lake Forest, IL}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=loc:leaders]
+*\adlnbackref{Online}{loc:leaders}[coolidge:speech]*,
+  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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=maitland:canon]
+*\adlnbackref{Book}{maitland:canon}*,
+  title = 	 {Roman canon law in the {Church of England}},
+  date = 	 1998,
+  origdate = 	 1898,
+  author = 	 {Maitland, Frederic W.},
+  publisher = {Lawbook Exchange},
+  address = 	 {Union, NJ},
+  options = 	 {cmsdate=new},
+  pubstate = 	 {reprint}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=maitland:equity]
+*\adlnbackref{Book}{maitland:equity}*,
+  title = 	 {Equity, also the Forms of Action at Common Law},
+  subtitle = 	 {Two Courses of Lectures},
+  date = 	 1926,
+  origdate = 	 1909,
+  author = 	 {Maitland, Frederic W.},
+  editor = 	 {Chaytor, A.~H. and others},
+  publisher = cup,
+  address = 	 {Cambridge},
+  pubstate = 	 {reprint},
+  sortyear = 	 {2010}
+}
+\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)}},
+  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}
+\begin{lstlisting}[language=BibTeX,label=nyt:trevorobit]
+*\adlnbackref{Review}{nyt:trevorobit}*,
+  journaltitle = {New York Times},
+  entrysubtype = {magazine},
+  date = 	 {2000-04-10},
+  title = {obituary of {Claire Trevor}},
+  options = 	 {cmsdate=full},
+  pages = 	 {national edition}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=pirumova]
+*\adlnbackref{Book}{pirumova}*,
+  author =	 {Pirumova, N.~M.},
+  title =	 {The Zemstvo Liberal Movement},
+  subtitle =	 {Its Social Roots and Evolution to the Beginning of the Twentieth Century},
+  publisher =	 {Izdatel'stvo \mkbibquote{Nauka}},
+  year =	 1977,
+  language =	 {russian},
+  location =	 {Moscow}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=pirumova:russian]
+*\adlnbackref{Book}{pirumova:russian}*,
+  title = 	 {Zemskoe liberal'noe dvizhenie},
+  subtitle = 	 {Sotsial'nye korni i evoliutsiia do nachala XX veka},
+  date = 	 1977,
+  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}},
+  address = 	 {Moscow}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=plato:republic:gr]
+*\adlnbackref{BookInBook}{plato:republic:gr}*,
+  title = 	 {Republic},
+  shorttitle = 	 {Resp\adddot},
+  entrysubtype = {classical},
+  year = 	 1902,
+  volume = 	 4,
+  author = 	 {Plato},
+  editor = 	 {Burnet, J.},
+  shortauthor =  {Pl\adddot},
+  booktitle = 	 {{Clitophon, Republic, Timaeus, Critias}},
+  maintitle = 	 {Opera},
+  publisher = {Clarendon Press},
+  series = {Oxford Classical Texts},
+  pages = 	 {327--621},
+  location =  {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=pollan:plant]
+*\adlnbackref{Online}{pollan:plant}*,
+  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},
+  urldate = 	 {2008-02},
+  date = 	 {2007-03},
+  userd = 	 {posted}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ross:thesis]
+*\adlnbackref{MastersThesis}{ross:thesis}*,
+  author = 	 {Ross, Dorothy},
+  title = 	 {The {Irish-Catholic} Immigrant, 1880--1900},
+  subtitle = 	 {A Study in Social Mobility},
+  school = 	 {Columbia University},
+  year = 	 {\bibstring{nodate}}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=schubert:muellerin]
+*\adlnbackref{Audio}{schubert:muellerin}*,
+  title = 	 {{Das Wandern (Wandering)}},
+  date = 	 1895,
+  booktitle = 	 {{Die sch\"one M\"ullerin} ({The} Maid of the Mill)},
+  maintitleaddon = {(for high voice)},
+  maintitle = 	 {First Vocal Album},
+  options = 	 {ctitleaddon=space},
+  author = 	 {Schubert, Franz},
+  publisher = {G.~Schirmer},
+  address = 	 {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=schweitzer:bach]
+*\adlnbackref{Book}{schweitzer:bach}*,
+  title = 	 {{J. S. Bach}},
+  origdate = 	 1966,
+  date = 	 1911,
+  author = 	 {Schweitzer, Albert},
+  origlocation = {London},
+  origpublisher = {Breitkopf \&\ Härtel},
+  addendum = 	 {Citations refer to the Dover edition},
+  options = 	 {cmsdate=both},
+  translator = 	 {Newman, Ernest},
+  publisher = {Dover},
+  pubstate = 	 {reprint},
+  location =  {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=shapey:partita]
+*\adlnbackref{Misc}{shapey:partita}*,
+  author = 	 {Shapey, Ralph},
+  title = 	 {\mkbibquote{Partita for Violin and Thirteen Players}},
+  titleaddon = 	 {score},
+  entrysubtype = {music},
+  date = 	 1966,
+  note = 	 {Special Collections},
+  organization = {Joseph Regenstein Library},
+  institution =  {University of Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=silver:gawain]
+*\adlnbackref{Book}{silver:gawain}*,
+  title = 	 {Sir {Gawain} and the {Green Knight}},
+  publisher = 	 uchp,
+  year = 	 1974,
+  translator = 	 {Silverstein, Theodore},
+  location =  {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=spock:interview]
+*\adlnbackref{Misc}{spock:interview}*,
+  author = 	 {Spock, Benjamin},
+  entrysubtype = {letter},
+  title = 	 {interview by Milton J. E. Senn},
+  date = 	 {1974-11-20},
+  note = 	 {interview 67A, transcript},
+  organization = {Senn Oral History Collection},
+  institution =  {National Library of Medicine},
+  location =  {Bethesda, MD}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=stendhal:parma]
+*\adlnbackref{Book}{stendhal:parma}*,
+  title = 	 {The Charterhouse of {Parma}},
+  date = 	 1925,
+  author = 	 {Stendhal},
+  nameaddon = 	 {Marie Henri Beyle},
+  publisher = {Boni \& Liveright},
+  address = 	 {New York},
+  translator = 	 {Scott-Moncrieff, C.~K.}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=unsigned:ranke]
+*\adlnbackref{Review}{unsigned:ranke}*,
+  journaltitle = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
+  entrysubtype = {magazine},
+  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.}
+}
+\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},
+  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},
+  volumes = 	 2,
+  address = 	 {Chicago}
+}
+\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},
+  location = 	 {London},
+  sorttitle = 	 {True and Sincere},
+  shorttitle = 	 {True and Sincere Declaration},
+  year = 	 1610
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=white:ross:memo]
+*\adlnbackref{Letter}{white:ross:memo}*,
+  author = 	 {White, E.~B.},
+  title = 	 {EBW to Harold Ross},
+  titleaddon = 	 {memorandum},
+  xref = 	 {*\hyperlink{\getrefbykeydefault%
+{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*},
+  pages = 	 273,
+  origdate = 	 {1946-05-02}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=white:russ]
+*\adlnbackref{Letter}{white:russ}*,
+  author = 	 {White, E.~B.},
+  title = 	 {EBW to B.~Russell},
+  xref =  {*\hyperlink{\getrefbykeydefault%
+{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*},
+  pages = 	 283,
+  origdate = 	 {1946-09-02}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=white:total]
+*\adlnbackref{Book}{white:total}*,
+  title = 	 {{Letters of E.~B. White}},
+  year = 	 1976,
+  author = 	 {White, E.~B.},
+  editor = 	 {Guth, Dorothy Lobrano},
+  publisher = {Harper \&\ Row},
+  location =  {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=wikiped:bibtex]
+*\adlnbackref{InReference}{wikiped:bibtex}*,
+  title = 	 {Wikipedia},
+  lista =        {BibTeX},
+  userd = 	 {last modified},
+  url = 	 {http://en.wikipedia.org/wiki/ BibTeX},
+  urldate = 	 {2012-05-18}
+}
+\end{lstlisting}
+\end{document}
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
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 0fa4027fe80..2d998485b52 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 a21ef1cc008..83c67aa6b38 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
@@ -6,7 +6,7 @@
 \usepackage[german,french,american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
-\usepackage[authordate,backend=biber,autolang=hyphen,booklongxref=false,%
+\usepackage[authordate,backend=biber,autolang=none,booklongxref=false,%
 bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
@@ -15,36 +15,14 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-% \renewcommand*{\biburlsetup}{%
-%   \Urlmuskip=0mu plus 2mu\relax
-%   \mathchardef\UrlBreakPenalty=200\relax
-%   \mathchardef\UrlBigBreakPenalty=100\relax
-%   \mathchardef\UrlEmergencyPenalty=9000\relax
-%   \appto\UrlSpecials{%
-%     \do\0{\mathchar`\0\penalty\UrlEmergencyPenalty}%
-%     \do\1{\mathchar`\1\penalty\UrlEmergencyPenalty}%
-%     \do\2{\mathchar`\2\penalty\UrlEmergencyPenalty}%
-%     \do\3{\mathchar`\3\penalty\UrlEmergencyPenalty}%
-%     \do\4{\mathchar`\4\penalty\UrlEmergencyPenalty}%
-%     \do\5{\mathchar`\5\penalty\UrlEmergencyPenalty}%
-%     \do\6{\mathchar`\6\penalty\UrlEmergencyPenalty}%
-%     \do\7{\mathchar`\7\penalty\UrlEmergencyPenalty}%
-%     \do\8{\mathchar`\8\penalty\UrlEmergencyPenalty}%
-%     \do\9{\mathchar`\9\penalty\UrlEmergencyPenalty}}%
-%   \def\UrlBreaks{%
-%     \do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}%
-%     \do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}%
-%   \def\UrlBigBreaks{\do\:\do\-}}
 \usepackage{url}
 \urlstyle{rm}
 \appto\bibsetup{\sloppy}
+\providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
 \hyphenation{evans-ton clem-ens mc-hugh}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
-\setcounter{biburlnumpenalty}{9000}
-\setcounter{biburlucpenalty}{9000}
-\setcounter{biburllcpenalty}{9000}
 \protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
@@ -54,10 +32,10 @@ plainpages=false,breaklinks=true]{hyperref}
 %%\onehalfspacing
 \begin{document}
 
-\section*{The Chicago Author-Date Specification}
+\section*{The Chicago Author-Date Specification: Testing Only}
 \label{sec:spec}
 
-\subsection*{Important Note}
+\subsection*{Please see cms-dates-intro.pdf first}
 \label{bibernote}
 
 Starting with \textsf{biblatex} version 1.5, in order to adhere to the
@@ -65,7 +43,7 @@ author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features the style requires.
 For this release, you really need the current versions of
-\textsf{Biber} (1.9) and \textsf{biblatex} (2.9a), which contain
+\textsf{Biber} (2.5) and \textsf{biblatex} (3.4), 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
@@ -83,18 +61,16 @@ This edition implements significant changes to what the 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 new \textsf{authordate-trad} style, as
+marks.  For such users, the \textsf{authordate-trad} style, as
 envisaged by the \emph{Manual} \autocite*[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 \textsf{cms-trad-sample.pdf} to see how this looks in
-practice.  You can also still use the 15th-edition styles from
-\textsf{biblatex-chicago}, which have been updated with some
-improvements borrowed from the 16th edition, but which are now
-strongly deprecated.  (See \textsf{biblatex-chicago15.pdf} and
-\textsf{cms15-dates-sample.pdf}.)  I would encourage all users to
-switch to one of the 16th-edition styles as soon as possible, as I am
-concentrating all of my development time there.
+practice.  The 15th-edition styles are still in the package, but they
+have not been updated in some time, and are now officially obsolete.
+I would strongly encourage all users to switch to one of the
+16th-edition styles as soon as possible, as I am concentrating all of
+my development time there.
 
 \subsection*{Usage}
 \label{usage}
@@ -151,6 +127,15 @@ 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:
+\cmd{gentextcite[<ending>][][]\{entry:key\}}.  There is also a
+\cmd{gentextcites} command, modified thus:
+\cmd{gentextcites[<ending>]()()[][]\{key1\}\{key2\}}.
+
 \subsection*{Shorthands}
 \label{sec:shorthands}
 
@@ -165,13 +150,14 @@ 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{printshorthands}
-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.
+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
+document preamble.
 
 \subsection*{Mildly problematic entries}
 \label{sec:problematic}
@@ -285,11 +271,14 @@ i.e., without them appearing in the reference list
 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 journal (or
-organization) name only in citations, then the \textsf{shortauthor}
-field --- or in other cases the \textsf{shorthand} field --- is the
-place for it, making sure to include formatting:
-\autocite{unsigned:ranke}; \autocite{bsi:abbreviation}.
+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}.
 
 \subsubsection*{Misc entries with an entrysubtype}
 \label{sec:misc}
@@ -343,9 +332,9 @@ it will need to be separated by a semicolon
 \autocite[15.23]{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 now have two choices.  You can enable
-the new \texttt{postnotepunct} package option, which allows you simply
-to type \cmd{autocite[; the unrevised trans.]\{stendhal:parma\}}
+Without a \textsf{postnote}, you have two choices.  You can enable the
+\texttt{postnotepunct} package option, which allows you simply to type
+\cmd{autocite[; the unrevised trans.]\{stendhal:parma\}}
 \citereset\autocite[; the unrevised trans.]{stendhal:parma}, or you
 can continue to use a separate \textsf{Misc} or \textsf{CustomC} entry
 containing just the text of the comment in the \textsf{title} field,
@@ -370,7 +359,7 @@ Chicago author-date specification.  However, if \enquote{a reference
   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 new (\textsf{Biber}-only) \textsf{biblatex} option
+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
@@ -517,7 +506,7 @@ Video: \autocite{cleese:holygrail}; \autocite{hitchcock:nbynw}.
 
 % \printshorthands % No longer necessary in author-date.
 % \nocite{*}
-\printbibliography[title=References]
+\printbibliography[notkeyword=nosample,title=References]
 
 \end{document}
 %%% Local Variables: 
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
new file mode 100644
index 00000000000..f64cf609856
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..dc371daa6f2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
@@ -0,0 +1,826 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{endnotes}
+\usepackage[latin1]{inputenc}
+\usepackage[american]{babel}
+\usepackage[autostyle]{csquotes}
+%\usepackage[document]{ragged2e}
+\usepackage[notes,strict,backend=biber,autolang=other,%
+bibencoding=latin1,booklongxref=false,annotation]{biblatex-chicago}
+\usepackage{lmodern}
+%\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}
+\makeatletter 
+\renewcommand{\@makeenmark}{\textcolor{DarkSlateGrey}{\textsf{\@theenmark}}}
+\makeatother
+\usepackage{url}
+\urlstyle{rm}
+\appto\bibsetup{\sloppy}
+\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}
+\newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
+\usepackage{xr-hyper}
+\externaldocument[cms-]{../../Docs/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}
+\usepackage{cmsdocs}
+\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+\newcommand{\mylittlespace}{\vspace{5pt}}%.5\baselineskip}}
+\bibliography{notes-test}
+%%\onehalfspacing
+%\tracingstats=2
+\begin{document}
+
+\section*{The Chicago Notes \&\ Bibliography Specification}
+\label{sec:spec}
+  
+This file is intended as a brief introduction to the Chicago notes \&\
+bibliography specification (16th 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 two .pdf
+files in the recommended directories 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}
+\label{sec:standard}
+
+\begin{refsection}
+  These \cmssecref{cms-sec:entrytypes} should pose no particular
+  issues to those who have used \textsc{Bib}\TeX\ or \textsf{biblatex}
+  before, but here is an example of each of the following standard
+  entry types:
+  \endnote[\value{Article}]{\cite{garaud:gatine}.},
+  \endnote[\value{Book}]{\cite{mchugh:wake}.},
+  \endnote[\value{Booklet}]{\cite{clark:mesopot}.},
+  \endnote[\value{InBook}]{\cite{ashbrook:brain}.},
+  \endnote[\value{InCollection}]{\cite{contrib:contrib}.},
+  \endnote[\value{InProceedings}]{\cite{frede:inproc}.},
+  \endnote[\value{Manual}]{\cite{dyna:browser}.},
+  \endnote[\value{MastersThesis}]{\cite{ross:thesis}.},
+  \endnote[\value{TechReport}]{\cite{herwign:office}.}, and
+  \endnote[\value{Unpublished}]{\cite{nass:address}.}.
+
+  {\renewcommand{\notesname}{\normalsize Long-Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style (with
+  annotations)]
+\end{refsection}
+
+\subsection*{Other entry types}
+\label{sec:other}
+
+\begin{refsection}
+
+  These \cmssecref{cms-sec:entrytypes} entry types are
+  \textsf{biblatex} innovations, designed to cater for as large a
+  range of reference needs as possible.  The list here is by no means
+  exhaustive, but rather tries to exemplify some of the more
+  complicated or (possibly) unfamiliar entry types, including:
+  \endnote[\value{Artwork}]{\cite{leo:madonna}.},
+  \endnote[\value{Audio}]{\cite{schubert:muellerin}.},
+  \endnote[\value{BookInBook}]{\cite{euripides:orestes}.},
+  \endnote[\value{InReference}]{\cite{wikiped:bibtex}.},
+  \endnote[\value{Letter}]{\cite{jackson:paulina:letter}.},
+  \endnote[\value{Music}]{\cite{holiday:fool}.},
+  \endnote[\value{Review}]{\cite{ratliff:review}.},
+  \endnote[\value{SuppBook}]{\cite{polakow:afterw}.}, and
+  \endnote[\value{Video}]{\cite{friends:leia}.}.
+
+  {\renewcommand{\notesname}{\normalsize Long-Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style]
+\end{refsection}
+
+\subsection*{Short notes}
+\label{sec:short}
+
+\begin{refsection}
+
+  The \cmssecref[shortauthor]{cms-sec:shortauthor} note forms we've
+  seen so far are intended to appear on the first citation of a given
+  work, while subsequent citations use a shorter form, usually merely
+  \textsf{Author}, \textsf{Title}.  Both of these fields, of course,
+  have a \textsf{short} form to allow space-saving abridgements of
+  names and titles.  You can also use the option \texttt{short} when
+  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 the 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{InBook}]{\shortcite{ashbrook:brain}.},
+  \endnote[\value{InCollection}]{\shortcite{contrib:contrib}.},
+  \endnote[\value{InProceedings}]{\shortcite{frede:inproc}.},
+  \endnote[\value{InReference}]{\shortcite[Aristotle]{wikiped:bibtex}.},
+  \endnote[\value{Letter}]{\shortcite{jackson:paulina:letter}.},
+  \endnote[\value{Manual}]{\shortcite{dyna:browser}.},
+  \endnote[\value{MastersThesis}]{\shortcite{ross:thesis}.},
+  \endnote[\value{Music}]{\shortcite{holiday:fool}.},
+  \endnote[\value{Review}]{\shortcite{ratliff:review}.},
+  \endnote[\value{SuppBook}]{\shortcite{polakow:afterw}.},
+  \endnote[\value{TechReport}]{\shortcite{herwign:office}.},
+  \endnote[\value{Unpublished}]{\shortcite{nass:address}.}, and
+  \endnote[\value{Video}]{\shortcite{friends:leia}.}.
+
+  {\renewcommand{\notesname}{\normalsize Short-Note Style} \theendnotes}
+\end{refsection}
+
+\subsection*{The \textsf{entrysubtype} field}
+\label{sec:subtype}
+
+\begin{refsection}
+  The \cmssecref[entrysubtype]{cms-sec:entrysub} Chicago notes \&\
+  bibliography style covers a wide variety of source materials, so it
+  is perhaps no surprise that even the range of entry types offered by
+  \textsf{biblatex} isn't quite sufficient.  In many cases, the
+  \textsf{entrysubtype} field can further expand the repertoire
+  available to users.  Such cases include, in particular, the
+  periodical types, where the \emph{CMS} differentiates between
+  articles and reviews in scholarly journals and those in magazines
+  and newspapers aimed at a more general readership.  For the latter
+  two sorts of source, you place the string \texttt{magazine} in the
+  \textsf{entrysubtype} field, and the citation style changes
+  accordingly:
+  \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:
+  \endnote[\value{Misc}]{\headlesscite{creel:house}.}.
+
+  \mylittlespace The \textsf{entrysubtype} field is, finally, also
+  useful for presenting pre-Renaissance works by their traditional
+  divisions into books, sections, lines, etc., divisions which are
+  presumed to be the same across all editions.  For such citations,
+  you put the string \texttt{classical} into the \textsf{entrysubtype}
+  field, and though this has no effect on long notes or in the
+  bibliography, it changes the punctuation in short notes, as below:
+  \endnote[\value{BookInBook}]{\shortcite[360e--361b]{plato:republic:gr}.}.
+  (Were you citing such a work by the pages in a modern edition, the
+  \textsf{entrysubtype} would be unnecessary --- see the Euripides
+  citation above.)
+
+  {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style]
+\end{refsection}
+
+\subsection*{Abbreviated references }
+\label{sec:abbrev}
+
+\begin{refsection}
+
+  The \cmssecref[crossref]{cms-sec:crossref} \emph{CMS} suggests, as a
+  space-saving measure, that when multiple parts of a single
+  collection are present in a reference apparatus, then references
+  may, following certain rules, abbreviate the portion that refers to
+  the collection as a whole.  \textsf{Biblatex-chicago} implements
+  this recommendation using a combination of package options (both
+  entry and preamble) and the \textsf{crossref} and \textsf{xref}
+  fields.  In \textsf{InBook}, \textsf{InCollection},
+  \textsf{InProceedings}, and \textsf{Letter} entries, the option is
+  \texttt{longcrossref}, set to \texttt{false} by default, so if more
+  than one such entry cross-references the same parent entry, then the
+  abbreviated notes and bibliography entries will automatically
+  appear.  The first full note citing such a source is not
+  abbreviated, but all subsequent notes, and all bibliography entries,
+  are:
+  \endnote[\value{InCollection}]{\cite{ellet:galena}.},
+  \endnote[\value{InCollection}]{\cite{keating:dearborn}.},
+  \endnote[\value{Collection}]{\cite{prairie:state}.}.
+
+\mylittlespace The possible settings for the \texttt{longcrossref}
+option are \texttt{true} (no abbreviated references); \texttt{false}
+(abbreviated references in notes and bibliography); \texttt{notes}
+(abbreviated references only in the bibliography); \texttt{bib}
+(abbreviated references only in notes); and \texttt{none} (abbreviated
+references everywhere, including in the four entry types controlled by
+the \texttt{booklongxref} option).
+
+\mylittlespace The four entry types subject to the
+\texttt{booklongxref} option are \texttt{Book}, \texttt{BookInBook},
+\texttt{Collec\-tion}, and \texttt{Proceedings}.  The option has the
+same four settings as \texttt{longcrossref}, excluding the
+\texttt{none} switch, but it is set to \texttt{true} by default,
+because the \emph{CMS} isn't as explicit in condoning abbreviated
+references in such entry types, so you have to turn them on yourself,
+as I have in this document using \texttt{booklongxref=false} in the
+preamble when loading \texttt{biblatex-chi\-ca\-go}:
+  \endnote[\value{Collection}]{\cite{harley:ancient:cart}.},
+  \endnote[\value{Collection}]{\cite{harley:cartography}.},
+  \endnote[\value{MVCollection}]{\cite{harley:hoc}.}.
+
+  {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style]
+\end{refsection}
+
+\subsection*{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
+  \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
+  \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}.)
+
+  {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style]
+\end{refsection}
+
+\subsection*{Related entries}
+\label{sec:related}
+
+\begin{refsection}
+
+  \textsf{Biblatex} provides \cmssecref{cms-sec:related} a powerful
+  mechanism, using the \textsf{related} field, for grouping two (or
+  more) works together in a single entry in the bibliography and/or in
+  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}.}.
+
+  {\renewcommand{\notesname}{\normalsize Note Style} \theendnotes}
+  \printbibliography[title=\normalsize Bibliography Style]
+\end{refsection}
+
+\subsection*{Citation commands}
+\label{sec:citation}
+
+\begin{refsection}
+
+  Although \cmssecref{cms-sec:citecommands} \cmd{autocite} will no
+  doubt be the most commonly used citation command,
+  \textsf{biblatex-chicago}, following \textsf{biblatex}, does provide
+  a range of other commands for more specialized usages.  We have
+  already seen
+  \cmd{headlesscite},\footnote[1]{\headlesscite{creel:house}.} which
+  allows you to avoid, in notes, repetition of an \textsf{author's}
+  name when it appears in the \textsf{title} as well.  We have also
+  seen \cmd{full\-cite},\footnote{\fullcite{loc:leaders}.} to
+  guarantee a long note, and
+  \cmd{shortcite},\footnote{\shortcite{coolidge:speech}.} to guarantee
+  a short one.  (You can also use \cmd{footfullcite} to get a
+  \cmd{fullcite} in a footnote.)  There are a few others that may
+  occasionally be useful:
+  \cmd{surnamecite},\footnote{\surnamecite{harley:hoc}.} for when a
+  note follows a discussion where the presence of the
+  \textsf{authors'} (or \textsf{editors'}, etc.)\ full names makes
+  their full repetition in the note unnecessary;
+  \cmd{citejournal},\footnote{\citejournal{lakeforester:pushcarts}.}
+  which provides an alternative short form when citing
+  \textsf{Articles}; and the standard \cmd{textcite}, which inserts
+  the name of an author or other \textcite{contrib:contrib} into the
+  flow of text, with a footnote below.
+
+%  {\renewcommand{\notesname}{\large Note Style} \theendnotes}
+%  \printbibliography[title=\large Bibliography Style]
+\end{refsection}
+
+\subsection*{In conclusion}
+\label{sec:conclude}
+
+Allow me, finally, to emphasize just how multifarious are the sources
+illustrated in the \emph{CMS}, only a small selection of which have
+appeared in this introduction.  You will find significantly fuller
+guidance in \textsf{biblatex.pdf} and \textsf{biblatex-chicago.pdf},
+but the \emph{CMS} itself defines the specification and shall
+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.
+
+\printbibliography[title=\large References]
+
+\twocolumn[\Large \texttt{The Database File}]
+\vspace*{-6pt}
+\begin{lstlisting}[language=BibTeX,label=prologue]
+%% Database entries used to produce
+%% citations in this file, taken
+%% from briefintro.bib. I have
+%% removed the annotations to save
+%% room -- they can be viewed in the
+%% main text above. You can click on
+%% the entry type to return to the
+%% long-note formats, and you can
+%% click on text with a grey back-
+%% ground to switch to that entry
+%% within this .bib listing.
+
+@String{uchp = {University of Chicago Press}}
+\end{lstlisting}
+\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}}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ashbrook:brain]
+*\lnbackref{InBook}{1}*{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},
+  year = 	 1997,
+  chapter = 	 7,
+  location =  {Cleveland, OH},
+  shorttitle = {The Frontal Lobes}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=bundy:macneil]
+*\lnbackref{Review}{4}*{bundy:macneil,
+  journaltitle = {MacNeil/Lehrer NewsHour},
+  usera = 	 {PBS},
+  entrysubtype = {magazine},
+  date = 	 {1990-02-07},
+  author = 	 {Bundy, McGeorge},
+  title = 	 {interview by Robert MacNeil},
+  shorttitle = {interview}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=chicago:manual]
+*\hyperlink{Hfootnote.1}{\color{DarkBlue}@Book}*{chicago:manual,
+  title = 	 {The Chicago Manual of Style},
+  year = 	 2010,
+  author = 	 {{University of Chicago Press}},
+  publisher = uchp,
+  edition = 	 16,
+  location =  {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=clark:mesopot]
+*\lnbackref{Booklet}{1}*{clark:mesopot,
+  title = 	 {Mesopotamia},
+  subtitle = 	 {Between Two Rivers},
+  author = 	 {Hazel V. Clark},
+  howpublished = {End of the Commons General Store},
+  year = 	 {\mkbibbrackets{1957?}},
+  location =     {Mesopotamia, OH}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=contrib:contrib]
+*\lnbackref{InCollection}{1}*{contrib:contrib,
+  author = 	 {Contributor, Anna},
+  title = 	 {Contribution},
+  booktitle = 	 {Edited Volume},
+  publisher = {Publisher},
+  year = 	 {forthcoming},
+  editor = 	 {Editor, Ellen},
+  location =  {Place}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=coolidge:speech]
+*\lnbackref{Online}{6}*{coolidge:speech,
+  author = 	 {Coolidge, Calvin},
+  title = 	 {Equal Rights},
+  titleaddon =   {(speech)},
+  note = 	 {copy of an undated 78 rpm disc},
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{loc:leaders}{anchor}{}}{\colorbox{Gainsboro}{loc:leaders}}*},
+  options =      {related=true,ptitleaddon=
+        space,ctitleaddon=space},
+  year = 	 {ca.\,1920}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=creel:house]
+*\lnbackref{Misc}{4}*{creel:house,
+  author = 	 {Creel, George},
+  entrysubtype = {letter},
+  title = 	 {George Creel to Colonel House},
+  origdate = 	 {1918-09-25},
+  note = 	 {Edward~M. House Papers},
+  organization =  {Yale University Library}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=dyna:browser]
+*\lnbackref{Manual}{1}*{dyna:browser,
+  title = 	 {Dynatext, Electronic Book Indexer/Browser},
+  organization = {Electronic Book Technology Inc.},
+  address = 	 {Providence, RI},
+  year = 	 1991,
+  shorttitle = {Dynatext}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ellet:galena]
+*\lnbackref{InCollection}{5}*{ellet:galena,
+  author = 	 {Ellet, Elizabeth~F.~L.},
+  title = 	 {By Rail and Stage to Galena},
+  crossref =  *\hyperlink{\getrefbykeydefault{prairie:state}%
+{anchor}{}}{\{\colorbox{Gainsboro}{prairie:state}\}}*,
+  pages = 	 {271--79}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ellis:blog]
+*\lnbackref{Article}{6}*{ellis:blog,
+  author = 	 {Ellis, Rhian},
+  title = 	 {Squatters' Rights},
+  journaltitle = {Ward Six},
+  location = 	 {blog},
+  date = 	 {2008-06-30},
+  url = 	 {http://wardsix.blogspot.com/ 2008/06/sqatters-rights.html},
+  entrysubtype = {magazine}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=euripides:orestes]
+*\lnbackref{BookInBook}{2}*{euripides:orestes,
+  title = 	 {Orestes},
+  year = 	 1958,
+  booktitle = 	 {Euripides},
+  maintitle = 	 {The Complete Greek Tragedies},
+  nameb = 	 {Arrowsmith, William},
+  volume = 	 4,
+  author = 	 {Euripides},
+  editor = 	 {Grene, David and Lattimore, Richmond},
+  publisher = uchp,
+  pages = 	 {185--288},
+  location =  {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=frede:inproc]
+*\lnbackref{InProceedings}{1}*{frede:inproc,
+  author = {Dorothea Frede}, 
+  title = {\mkbibemph{Nicomachean Ethics} VII. 11--12},
+  subtitle = {Pleasure},
+  booktitle = {Aristotle},
+  booksubtitle = {\mkbibemph{Nicomachean Ethics}, Book VII},
+  series = {Symposium Aristotelicum},
+  editor = {Carlo Natali},
+  publisher = {Oxford University Press},
+  address  = {Oxford},
+  year = {2009},
+  pages = {183-207}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=friends:leia]
+*\lnbackref{Video}{2}*{friends:leia,
+  title = 	 {The One with the Princess Leia Fantasy},
+  date = 	 2003,
+  booktitle = 	 {Friends},
+  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},
+  type = 	 {DVD},
+  address = 	 {Burbank, CA}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=furet:passing:eng]
+*\lnbackref{Book}{7}*{furet:passing:eng,
+  title = 	 {The Passing of an Illusion},
+  year = 	 1999,
+  author = 	 {Furet, François},
+  userf = 	 {furet:passing:fr},
+  translator = 	 {Furet, Deborah},
+  publisher = uchp,
+  location =  {Chicago}
+}
+\end{lstlisting}%\enlargethispage{-\baselineskip}
+\begin{lstlisting}[language=BibTeX,label=furet:related]
+*\lnbackref{Book}{7}*{furet:related,
+  title = 	 {Le passé d'une illusion},
+  year = 	 1995,
+  related = 	 {*\hyperlink{\getrefbykeydefault%
+{furet:passing:eng}{anchor}{}}{\colorbox{Gainsboro}{furet:passing:eng}}*},
+  relatedtype =  {bytranslator},
+  author = 	 {Furet, François},
+  publisher = {Éditions Robert Laffont},
+  location =  {Paris}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=garaud:gatine]
+*\lnbackref{Article}{1}*{garaud:gatine,
+  author =	 {Garaud, Marcel},
+  title =	 {Recherches sur les défrichements dans la Gâtine poitevine aux XIe et XIIe siècles},
+  journaltitle = {Bulletin de la Société des antiquaires de l'Ouest},
+  year =	 1967,
+  volume =	 9,
+  series =	 4,
+  pages =	 {11--27},
+  shorttitle =	 {Recherches sur les défrichements}
+}
+\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},
+  crossref = 	 *\hyperlink{\getrefbykeydefault{harley:hoc}%
+{anchor}{}}{\{\colorbox{Gainsboro}{harley:hoc}\}}*,
+  date = 	 {1987},
+  volume = 	 1
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=harley:cartography]
+*\lnbackref{Collection}{5}*{harley:cartography,
+  title =	 {Cartography in the Traditional East and Southeast Asian Societies},
+  year =	 1994,
+  crossref = 	 *\hyperlink{\getrefbykeydefault{harley:hoc}%
+{anchor}{}}{\{\colorbox{Gainsboro}{harley:hoc}\}}*,
+  volume =	 {2},
+  part = 	 {2},
+  shorttitle =	 {Cartography in East and Southeast Asia}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=harley:hoc]
+*\lnbackref{MVCollection}{5}*{harley:hoc,
+  title = 	 {The History of Cartography},
+  date = 	 {1987/},
+  editor = 	 {Harley, J.~B. and Woodward, David},
+  volumes = 	 {3},
+  publisher = uchp,
+  location =  {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=herwign:office]
+*\lnbackref{TechReport}{1}*{herwign:office,
+  options = 	 {useprefix=true},
+  author = 	 {{van} Herwijnen, Eric},
+  title = 	 {Future Office Systems Requirements},
+  institution =  {CERN DD internal note},
+  year = 	 1988,
+  month = 	 11
+}
+\end{lstlisting}\enlargethispage{-\baselineskip}
+\begin{lstlisting}[language=BibTeX,label=holiday:fool]
+*\lnbackref{Music}{2}*{holiday:fool,
+  title = 	 {I'm a Fool to Want You},
+  eventdate = 	 {1958-02-20},
+  date = 	 {1960},
+  booktitle = 	 {Lady in Satin},
+  author = 	 {Herron, Joel and Sinatra, Frank and Wolf, Jack},
+  editor = 	 {Holiday, Billie},
+  editortype = 	 {none},
+  number = 	 {CL 1157},
+  publisher = {Columbia},
+  type = 	 {33\onethird~rpm},
+  note = 	 {with Ray Ellis},
+  options = 	 {useauthor=false}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=jackson:paulina:letter]
+*\lnbackref{Letter}{2}*{jackson:paulina:letter,
+  author =	 {Jackson, Paulina},
+  title =        {Paulina Jackson to John Pepys Junior},
+  booktitle =    {The Letters of Samuel Pepys and His Family Circle},
+  origdate = 	 {1676-10-03},
+  publisher =	 {Clarendon Press},
+  year =	 1955,
+  editor =	 {Heath, Helen Truesdell},
+  shorttitle =   {to John Pepys Junior},
+  pages =	 {\bibstring{number} 42},
+  location =	 {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=james:ambassadors]
+*\lnbackref{Book}{6}*{james:ambassadors,
+  title = 	 {The Ambassadors},
+  year = 	 1996,
+  origdate = 	 1909,
+  author = 	 {James, Henry},
+  publisher = {Project Gutenberg},
+  url = 	 {ftp://ibiblio.org/pub/docs/ books/gutenberg/etext96/ ambas10.txt}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=keating:dearborn]
+*\lnbackref{InCollection}{5}*{keating:dearborn,
+  author = 	 {Keating, William~H.},
+  title = 	 {Fort Dearborn and Chicago},
+  crossref =  *\hyperlink{\getrefbykeydefault{prairie:state}%
+{anchor}{}}{\{\colorbox{Gainsboro}{prairie:state}\}}*,
+  pages = 	 {84--87}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=lakeforester:pushcarts]
+*\lnbackref{Article}{4}*{lakeforester:pushcarts,
+  journaltitle = {Lake Forester},
+  date = 	 {2000-03-23},
+  entrysubtype = {magazine},
+  title = 	 {Pushcarts Evolve to Trendy Kiosks},
+  location =  {Lake Forest, IL},
+  shorttitle = {Pushcarts Evolve}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=leo:madonna]
+*\lnbackref{Artwork}{2}*{leo:madonna,
+  author = 	 {{Leonardo da Vinci}},
+  shortauthor =  {Leonardo},
+  title = 	 {Madonna of the Rocks},
+  type = 	 {oil on canvas},
+  institution =  {Louvre},
+  year = 	 {1480s},
+  note = 	 {78 x 48.5 in\adddot},
+  location =  {Paris}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=loc:leaders]
+*\hyperlink{Hendnote.623}{\color{DarkBlue}@Online}*{loc:leaders,
+  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},
+  options = 	 {skipbib}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=mchugh:wake]
+*\lnbackref{Book}{1}*{mchugh:wake,
+  title = 	 {Annotations to \mkbibquote{Finnegans Wake}},
+  year = 	 1980,
+  author = 	 {McHugh, Roland},
+  publisher = {Johns Hopkins University Press},
+  location =  {Baltimore}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=nass:address]
+*\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},
+  location = 	 {San Antonio, TX},
+  date = 	 {2000-05-06/2000-05-09}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=plato:republic:gr]
+*\lnbackref{BookInBook}{4}*{plato:republic:gr,
+  title = 	 {Republic},
+  entrysubtype = {classical},
+  year = 	 1902,
+  volume = 	 4,
+  author = 	 {Plato},
+  editor = 	 {Burnet, J.},
+  booktitle = 	 {Clitopho, Res Publica, Timaeus, Critias},
+  maintitle = 	 {Opera},
+  publisher = {Clarendon Press},
+  series = {Oxford Classical Texts},
+  pages = 	 {327--621},
+  location =  {Oxford}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=polakow:afterw]
+*\lnbackref{SuppBook}{2}*{polakow:afterw,
+  author =	 {Polakow, Valerie},
+  title =	 {Lives on the Edge},
+  subtitle = {Single Mothers and Their Children in the Other America},
+  pages = 	 {175--184},
+  afterword =	 {yes},
+  year =	 1993,
+  publisher =	 uchp,
+  location =	 {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=pollan:plant]
+*\lnbackref{Online}{6}*{pollan:plant,
+  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},
+  urldate = 	 {2008-02},
+  date = 	 {2007-03},
+  userd = 	 {posted}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=powell:email]
+*\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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=prairie:state]
+*\lnbackref{Collection}{5}*{prairie:state,
+  title = {Prairie State},
+  subtitle = {Impressions of Illinois, 1673--1967, by Travelers and Other Observers},
+  year = 1968,
+  editor = {Angle, Paul~M.},
+  publisher = uchp,
+  location = {Chicago}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ratliff:review]
+*\lnbackref{Review}{2}*{ratliff:review,
+  author =	 {Ratliff, Ben},
+  title =	 {\bibstring{reviewof} \mkbibemph{The Mystery of
+         Samba: Popular Music and
+         National Identity in Brazil},
+         \bibstring{by} Hermano Vianna,
+         \parteditandtrans John Charles
+         Chasteen},
+  journaltitle = {Lingua Franca},
+  date = 	 {1999-04},
+  volume =	 9,
+  pages =	 {B13--B14},
+  shorttitle =	 {\bibstring{reviewof} \mkbibemph{The Mystery of Samba}}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=ross:thesis]
+*\lnbackref{MastersThesis}{1}*{ross:thesis,
+  author = 	 {Ross, Dorothy},
+  title = 	 {The Irish-Catholic Immigrant, 1880--1900},
+  subtitle = 	 {A Study in Social Mobility},
+  school = 	 {Columbia University},
+  year = 	 {\bibstring{nodate}}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=schubert:muellerin]
+*\lnbackref{Audio}{2}*{schubert:muellerin,
+  title = 	 {Das Wandern (Wandering)},
+  date = 	 1895,
+  shorttitle = 	 {Das Wandern},
+  booktitle = 	 {Die sch\"one M\"ullerin (The Maid of the Mill)},
+  maintitle = 	 {First Vocal Album \mkbibemph{(for high voice)}},
+  author = 	 {Schubert, Franz},
+  publisher = {G.~Schirmer},
+  address = 	 {New York}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=stenger:privacy]
+*\lnbackref{Article}{6}*{stenger:privacy,
+  journaltitle = {CNN.com},
+  entrysubtype = {magazine},
+  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}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=wikiped:bibtex]
+*\lnbackref{InReference}{2}*{wikiped:bibtex,
+  title = 	 {Wikipedia},
+  lista = {BibTeX},
+  url = 	 {http://en.wikipedia.org/ wiki/BibTeX},
+  urldate = 	 {2011-09-03},
+  userd = 	 {last modified}
+}
+\end{lstlisting}
+
+%% \printshorthands
+
+\end{document}
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% TeX-trailer-start: "^[^%\n]*\\\\printshorthands"
+%%% End: 
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 228e3589edf..af1bc023d14 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 6fee4a42226..da555f98f96 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
@@ -8,36 +8,17 @@
 \usepackage[notes,strict,backend=biber,autolang=other,%
 bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago}
 %%\usepackage[osf]{mathpazo}
-\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
+%\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
 \renewcommand{\sfdefault}{phv}
 %\renewcommand{\ttdefault}{pcr}
-\renewcommand*{\biburlsetup}{%
-  \Urlmuskip=0mu plus 2mu\relax
-  \mathchardef\UrlBreakPenalty=200\relax
-  \mathchardef\UrlBigBreakPenalty=100\relax
-  \mathchardef\UrlEmergencyPenalty=9000\relax
-  \appto\UrlSpecials{%
-    \do\0{\mathchar`\0\penalty\UrlEmergencyPenalty}%
-    \do\1{\mathchar`\1\penalty\UrlEmergencyPenalty}%
-    \do\2{\mathchar`\2\penalty\UrlEmergencyPenalty}%
-    \do\3{\mathchar`\3\penalty\UrlEmergencyPenalty}%
-    \do\4{\mathchar`\4\penalty\UrlEmergencyPenalty}%
-    \do\5{\mathchar`\5\penalty\UrlEmergencyPenalty}%
-    \do\6{\mathchar`\6\penalty\UrlEmergencyPenalty}%
-    \do\7{\mathchar`\7\penalty\UrlEmergencyPenalty}%
-    \do\8{\mathchar`\8\penalty\UrlEmergencyPenalty}%
-    \do\9{\mathchar`\9\penalty\UrlEmergencyPenalty}}%
-  \def\UrlBreaks{%
-    \do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}%
-    \do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}%
-  \def\UrlBigBreaks{\do\:\do\-}}
 \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}}
 %\appto\biburlsetup{\Urlmuskip=0mu plus 4mu\relax}
@@ -244,7 +225,7 @@ 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:passing:fr,house:papers}
+\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
new file mode 100644
index 00000000000..ae614437286
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..ed4bb79d52e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
@@ -0,0 +1,99 @@
+\documentclass[a4paper,12pt]{report}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+%\usepackage{endnotes}
+\usepackage[latin1]{inputenc}
+\usepackage[german,french,american]{babel}
+\usepackage[autostyle]{csquotes}
+%\usepackage[document]{ragged2e}
+\usepackage[authordate-trad,backend=biber,autolang=none,booklongxref=false,%
+bibencoding=latin1,postnotepunct,compresspages,strict,%
+annotation]{biblatex-chicago}
+% \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
+% babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
+\usepackage{lmodern}
+%\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
+\usepackage{ifthen}
+\usepackage{setspace}
+\usepackage{vmargin} \setpapersize{A4}
+\setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
+\usepackage{url}
+\urlstyle{rm}
+\appto\bibsetup{\sloppy}
+\setlength{\dimen\footins}{9.5in}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{5pt}
+\providecommand{\theendnote}{}
+%\usepackage{listings}
+\protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
+    \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
+\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+\usepackage[pdftex,hyperref,svgnames]{xcolor}
+\usepackage[pdftex,colorlinks,urlcolor=DarkSlateGrey,citecolor=black,
+plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey]{hyperref}
+\usepackage{cmsdocs}
+\bibliography{dates-test}
+%%\onehalfspacing
+\begin{document}
+
+\nocite{barcott:review:15,donne:var:15,shapey:partita:15}
+\section*{Appendix: \texttt{authordate-trad} References}
+\label{sec:trad:appendix}
+\printbibliography[heading=none]
+
+\twocolumn%[\Large \texttt{The trad Database File}]
+\vspace*{-6pt}
+\begin{lstlisting}[language=BibTeX,label=prologue]
+%% Database entries used to produce
+%% citations in this file, taken
+%% from dates-test.bib, and designed
+%% to show some of the changes
+%% need to use the authordate-trad
+%% style, with its sentence-style
+%% capitalization of titles. I have
+%% removed the annotations to save
+%% room -- you can click on
+%% the entry type to return to the
+%% reference list entry, where you'll
+%% also find the annotations. 
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=barcott:review:15]
+*\adlnbackref{Article}{barcott:review:15}*,
+  journaltitle = {New York Times Book Review},
+  author =	 {Barcott, Bruce},
+  date = 	 {2000-04-16},
+  entrysubtype = {magazine},
+  title =	 {\bibstring{reviewof} \mkbibemph{The last marlin: The story of a family at sea}, \bibstring{by} {Fred Waitzkin}},
+  pages =	 7
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=donne:var:15]
+*\adlnbackref{Book}{donne:var:15}*,
+  author =	 {Donne, John},
+  editor =	 {Stringer, Gary~A.},
+  title =	 {The \mkbibquote{Anniversaries} and the \mkbibquote{Epicedes and obsequies}},
+  namea =	 {Stringer, Gary~A. and Pebworth, Ted-Larry},
+  publisher =	 {Indiana Univ.\ Press},
+  maintitle =	 {The Variorum Edition of the Poetry of {John Donne}},
+  year =	 1995,
+  volume =	 6,
+  location =	 {Bloomington}
+}
+\end{lstlisting}
+\begin{lstlisting}[language=BibTeX,label=shapey:partita:15]
+*\adlnbackref{Misc}{shapey:partita:15}*,
+  author = 	 {Shapey, Ralph},
+  title = 	 {Partita for violin and thirteen players},
+  titleaddon = 	 {score},
+  entrysubtype = {music},
+  date = 	 1966,
+  note = 	 {Special Collections},
+  organization = {Joseph Regenstein Library},
+  institution =  {University of Chicago}
+}
+\end{lstlisting}
+\end{document}
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
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 4fef21d6efd..1adf8bce28d 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 dbcbf724bb5..4664b72984c 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
@@ -6,7 +6,7 @@
 \usepackage[german,french,american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
-\usepackage[authordate-trad,backend=biber,autolang=hyphen,booklongxref=false,%
+\usepackage[authordate-trad,backend=biber,autolang=none,booklongxref=false,%
 bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
@@ -15,36 +15,14 @@ bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-% \renewcommand*{\biburlsetup}{%
-%   \Urlmuskip=0mu plus 2mu\relax
-%   \mathchardef\UrlBreakPenalty=200\relax
-%   \mathchardef\UrlBigBreakPenalty=100\relax
-%   \mathchardef\UrlEmergencyPenalty=9000\relax
-%   \appto\UrlSpecials{%
-%     \do\0{\mathchar`\0\penalty\UrlEmergencyPenalty}%
-%     \do\1{\mathchar`\1\penalty\UrlEmergencyPenalty}%
-%     \do\2{\mathchar`\2\penalty\UrlEmergencyPenalty}%
-%     \do\3{\mathchar`\3\penalty\UrlEmergencyPenalty}%
-%     \do\4{\mathchar`\4\penalty\UrlEmergencyPenalty}%
-%     \do\5{\mathchar`\5\penalty\UrlEmergencyPenalty}%
-%     \do\6{\mathchar`\6\penalty\UrlEmergencyPenalty}%
-%     \do\7{\mathchar`\7\penalty\UrlEmergencyPenalty}%
-%     \do\8{\mathchar`\8\penalty\UrlEmergencyPenalty}%
-%     \do\9{\mathchar`\9\penalty\UrlEmergencyPenalty}}%
-%   \def\UrlBreaks{%
-%     \do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}%
-%     \do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}%
-%   \def\UrlBigBreaks{\do\:\do\-}}
 \usepackage{url}
 \urlstyle{rm}
 \appto\bibsetup{\sloppy}
+\providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
 \hyphenation{evans-ton clem-ens mc-hugh}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
-\setcounter{biburlnumpenalty}{9000}
-\setcounter{biburlucpenalty}{9000}
-\setcounter{biburllcpenalty}{9000}
 \protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
@@ -54,10 +32,11 @@ plainpages=false,breaklinks=true]{hyperref}
 %%\onehalfspacing
 \begin{document}
 
-\section*{The Chicago authordate-trad Specification}
+\section*{The Chicago authordate-trad Specification:%
+  \ Testing Only}
 \label{sec:spec}
 
-\subsection*{Important Note}
+\subsection*{Please see cms-dates-intro.pdf first}
 \label{bibernote}
 
 Starting with \textsf{biblatex} version 1.5, in order to adhere to the
@@ -65,7 +44,7 @@ author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features the style requires.
 For this release, you really need the current versions of
-\textsf{Biber} (1.9) and \textsf{biblatex} (2.9a), which contain
+\textsf{Biber} (2.5) and \textsf{biblatex} (3.4), 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
@@ -410,19 +389,18 @@ 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:15}.  The dating of online materials has been
-enhanced: \autocite{coolidge:speech:trad};
-\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.
+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.
 
 \subsection*{Further examples (mainly for testing purposes)}
 \label{testing}
@@ -519,7 +497,7 @@ Video: \autocite{cleese:holygrail}; \autocite{hitchcock:nbynw}.
 
 % \printshorthands % No longer necessary in author-date.
 % \nocite{*}
-\printbibliography[title=References]
+\printbibliography[notkeyword=nosample,title=References]
 
 \end{document}
 %%% Local Variables: 
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 ffb02cb2e34..7b99b09a65c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -37,7 +37,7 @@
                   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_.}
+                  references. 15th Edition Only.}
 }
 
 @CustomC{abbrev:ISO,
@@ -49,8 +49,8 @@
                   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_.}
+                  the expansion elsewhere, e.g., in a footnote. 15th
+                  edition only.}
 }
 
 @Review{ac:comment,
@@ -59,6 +59,7 @@
   eventdate = 	 {2008-07-01},
   nameaddon = 	 {(10:18 a.m.)},
   crossref = 	 {ellis:blog},
+  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-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
@@ -78,8 +79,9 @@
   eventdate = 	 {2008-07-01},
   nameaddon = 	 {(10:18 a.m.)},
   crossref = 	 {ellis:blog},
+  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
   title = 	 {comment on Rhian Ellis, Squatters' rights},
-  annotation = 	 {_authordate-trad only_.  The 16th edition suggests a
+  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
@@ -98,10 +100,11 @@
   editor = 	 {Lonitz, Henri},
   translator = 	 {Nicholas Walker},
   location =  {Cambridge, MA},
-  annotation = 	 {A published collection of letters, in a Book entry
-                  rather than Letter.  Citations of it could provide
-                  details of the individual letter in the running
-                  text, and/or just cite by page number.}
+  annotation = 	 {A published collection of letters, in a
+                  \textsf{Book} entry rather than \textsf{Letter}.
+                  Citations of it could provide details of the
+                  individual letter in the running text, and/or just
+                  cite by page number.}
 }
 
 @Book{anon:stanze,
@@ -109,10 +112,9 @@
   date = 	 1547,
   address = 	 {Florence},
   shorttitle = 	 {Stanze},
-  annotation = 	 {The standard 16th-edition way to present this work,
-                  allowing it to be alphabetized by title, and
-                  providing a short title for in-text citations.  See
-                  next entry.}
+  annotation = 	 {The standard way to present this work, allowing it
+                  to be alphabetized by \textsf{title}, and providing
+                  a \textsf{shorttitle} for in-text citations.}
 }
 
 @Book{anon:stanze:15,
@@ -120,7 +122,7 @@
   date = 	 1547,
   author = 	 {Anon\adddot},
   address = 	 {Florence},
-  annotation = 	 {One _15th edition only_ solution for an anonymous
+  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.}
 }
@@ -138,28 +140,28 @@
   pubstate = 	 {reprint},
   volumes = 	 2,
   location =  {Oxford},
-  annotation = 	 {A work from classical antiquity, presented in a Book
-                  entry with "classical" entrysubtype, hence in-text
-                  citations will 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 don't need the entrysubtype.
-                  Putting "skipbib" in the options field means it
-                  won't be printed separately in the bibliography,
-                  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 pubstate
-                  field.  The absence of any cmsdate instruction in
-                  the options field means that the date of the reprint
-                  rather than the date of original publication will
-                  appear in citations and at the head of the entry in
-                  the list of references.  The shorttitle provides the
+  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
+                  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
+                  \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
+                  \texttt{cmsdate} instruction in the \textsf{options}
+                  field means that the reprint information is
+                  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
-                  abbreviations.  Finally, notice two publishers,
-                  separated by keyword "and."}
+                  abbreviations.}
 }
 
 @Book{aristotle:metaphy:trans,
@@ -176,20 +178,22 @@
   publisher = {Clarendon Press},
   edition = 	 2,
   location =  {Oxford},
-  annotation = 	 {Translation of the previous entry, in this case also
-                  using Book with "classical" entrysubtype, as
-                  citations will be by the pages of Bekker's edition.
-                  The userf field contains the entry key for the Greek
-                  original, which means the entry in the list of
-                  references will contain the translation followed by
-                  the Greek text.  The origlanguage field means that
-                  the connecting text between the two books in the
-                  list of references 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.}
+  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
+                  pages of Bekker's edition.  The \textsf{userf} field
+                  contains the entry key for the Greek original, which
+                  means the entry in the list of references will
+                  contain the translation followed by the Greek text.
+                  The \textsf{origlanguage} field means that the
+                  connecting text between the two books in the list of
+                  references will read \enquote{Greek edition:}
+                  instead of \enquote{Originally published as.}  Note
+                  also \textsf{nameb}, the translator of this
+                  particular volume of the \textsf{maintitle}, as
+                  distinct from the \textsf{editor} of the whole
+                  series, even though in this case they happen to be
+                  the same person.}
 }
 
 @InBook{ashbrook:brain,
@@ -200,9 +204,9 @@
   year = 	 1997,
   chapter = 	 7,
   location =  {Cleveland, OH},
-  annotation = 	 {A typical InBook entry, identified by title and
-                  also, in this case, by chapter number rather than
-                  page range.}
+  annotation = 	 {A typical \textsf{InBook} entry, identified by
+                  \textsf{title} and also, in this case, by
+                  \textsf{chapter} number rather than page range.}
 }
 
 @CustomC{ashe:creasey,
@@ -238,9 +242,12 @@
   series = 	 {Spoken Arts},
   type = 	 {audiocassette},
   note = 	 {read by the author},
-  annotation = 	 {For the 16th edition, a date has been found for this
-                  entry, and therefore you no longer need the
-                  entrysubtype. See next entry.}
+  annotation = 	 {A spoken-word recording, here presented as a
+                  \textsf{Music} entry, though the \emph{CMS}
+                  sometimes uses a more book-like presentation for
+                  such material, using an \textsf{Audio} entry, as
+                  with \texttt{twain:audio} in
+                  \textsf{dates-test.bib}.}
 }
 
 @Music{auden:reading:15,
@@ -258,8 +265,8 @@
                   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_.}
+                  source like this in the author-date style. 15th
+                  edition only.}
 }
 
 @Article{author:forthcoming,
@@ -268,10 +275,10 @@
   journaltitle = {Journal Name},
   year = 	 {\autocap{f}orthcoming},
   volume = 	 98,
-  annotation = 	 {An example of how to deal with a forthcoming article
-                  -- note the autocap command, which will ensure
-                  correct capitalization in reference list and
-                  citations.}
+  annotation = 	 {An example of how to deal with a forthcoming
+                  \textsf{Article} -- note the \cmd{autocap} command,
+                  which will ensure correct capitalization in
+                  reference list and citations.}
 }
 
 @Book{babb:peru,
@@ -282,8 +289,9 @@
   publisher = {University of Texas Press},
   edition = 	 {\bibstring{revisededition}},
   location =  {Austin},
-  annotation = 	 {A revised edition, with the bibstring revisededition
-                  in the edition field.}
+  annotation = 	 {A revised edition, with the \cmd{bibstring}
+                  \texttt{revisededition} in the \textsf{edition}
+                  field.}
 }
 
 @Review{barcott:review,
@@ -294,15 +302,17 @@
   title =	 {\bibstring{reviewof} \mkbibemph{The Last Marlin: The
                   Story of a Family at Sea}, \bibstring{by} Fred Waitzkin},
   pages =	 7,
-  annote = 	 {A Review entry presenting a review from a
-                  newspaper, with keyword "magazine" in entrysubtype,
-                  and with the bibstring reviewof in the title field.
-                  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, and the headline-style
-                  capitalization you have to provide by hand _for the
-                  16th edition only_. See next entry.}
+  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
+                  could just write \enquote{review of} instead, but
+                  the \cmd{bibstring} makes the entry portable across
+                  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
+                  incorrect for the \texttt{trad} style.}
 }
 
 @Article{barcott:review:15,
@@ -313,17 +323,26 @@
   title =	 {\bibstring{reviewof} \mkbibemph{The last marlin: The
                   story of a family at sea}, \bibstring{by} {Fred Waitzkin}},
   pages =	 7,
-  annotation = 	 {An Article entry presenting a review from a
-                  newspaper, with keyword "magazine" in entrysubtype,
-                  and with the bibstring reviewof in the title field.
-                  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, and the sentence-style
-                  capitalization you have to provide by hand _for the
-                  15th edition only_, because the curly brackets of
-                  mkbibemph protect the text from the automatic
-                  algorithms provided by the package.}
+  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
+                  review from a newspaper, with keyword
+                  \texttt{magazine} in \textsf{entrysubtype}, and with
+                  the \cmd{bibstring} \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 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} never modifies
+                  the capitalization of the \textsf{journaltitle}, so
+                  that field should always work properly across
+                  styles.}
 }
 
 @Book{barrows:reading,
@@ -346,15 +365,13 @@
   volume =	 45,
   date = 	 {1990-03},
   pages =	 {336--346},
-  annotation = 	 {Very typical Article entry, but notice the placement
-                  of the subtitle in the title field, in order to
-                  avoid the printing of the colon usually separating
-                  the two.  When the title proper ends with a question
-                  mark or exclamation point, and you haven't placed
-                  that title into quotation marks, this workaround is
-                  necessary.  Note also the curly braces around the
-                  first word of the subtitle, necessary _only for the
-                  15th edition_.}
+  annotation = 	 {A very typical \textsf{Article} entry, but notice
+                  the placement of the subtitle in the \textsf{title}
+                  field in order to avoid the printing of the colon
+                  usually separating the two.  When the title proper
+                  ends with a question mark or exclamation point, and
+                  you haven't placed that title into quotation marks,
+                  this workaround is necessary.}
 }
 
 @Article{beattie:crime,
@@ -364,7 +381,8 @@
   year = 	 1974,
   number = 	 62,
   pages = 	 {47--95},
-  annotation = 	 {Article entry with number instead of volume.}
+  annotation = 	 {An \textsf{Article} entry with a \textsf{number}
+                  instead of a \textsf{volume}.}
 }
 
 @Image{bedford:photo,
@@ -397,17 +415,17 @@
   series = 	 {Proarte Digital},
   annotation = 	 {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
-                  editortype "none" prevents any identifying string
-                  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
-                  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,
-                  particularly in the author-date style.)}
+                  Here, the composer goes in the \textsf{author}
+                  field, while the performer goes into the
+                  \textsf{editor} field.  The \textsf{editortype}
+                  \texttt{none} prevents any identifying string being
+                  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
+                  style provides the string \enquote{n.d\adddot} for
+                  citations, a situation generally frowned upon by the
+                  \emph{CMS}.}
 }
 
 @BookInBook{bernhard:boris,
@@ -469,18 +487,20 @@
   number = 	 {IM 35854},
   series = 	 {CBS},
   options = 	 {useauthor=false},
-  annotation = 	 {This is a rather abbreviated Music entry, lacking a
-                  date and a type.  It does, however, show the method
-                  for emphasizing the conductor instead of the
-                  composer, and also for identifying the conductor in
-                  the editortype field.  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.}
+  annotation = 	 {This is a rather abbreviated \textsf{Music} entry,
+                  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
+                  the conductor in the \textsf{editortype} field.
+                  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
+                  \textsf{series} and \textsf{number} give the label
+                  information.  The \emph{CMS} strongly encourages you
+                  to find a date for such an entry -- online resources
+                  should be able to help.}
 }
 
 @Book{boxer:china,
@@ -490,14 +510,17 @@
   number = 	 {2nd ser., 106},
   series = 	 {Hakluyt Society Publications},
   location =  {London},
-  annotation = 	 {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.}
+  annotation = 	 {A \textsf{Book} entry with a \textsf{series} and a
+                  \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{2nd ser.} in the \textsf{number} field may
+                  seem counter-intuitive, but it's necessary for
+                  getting the punctuation to work out right.}
 }
 
 @Article{brown:bremer,
@@ -533,7 +556,8 @@
   publisher =	 {Norton},
   series =	 {Norton Critical Editions},
   location =	 {New York},
-  annotation = 	 {A Book entry with a series field, but no number.}
+  annotation = 	 {A \textsf{Book} entry with a \textsf{series} field,
+                  but no \textsf{number}.}
 }
 
 @Collection{brush:ornithology,
@@ -557,14 +581,14 @@
   sortname = 	 {BSI},
   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 16th edition, the shorthand will be printed at
-                  the head of the entry, followed by the expansion in
-                  parentheses.  The sortname field ensures that the
-                  entry is correctly alphabetized by the first thing
-                  you see in the entry, i.e., the shorthand.  See next
-                  entry.}
+  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
+                  \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,
@@ -635,10 +659,11 @@
   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 date, so here the editors
-                  provide the heading. The compilers go in namec, and
-                  other information in note.  Cf. this entry in
-                  notes-test.bib.}
+                  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{notes-test.bib}.}
 }
 
 @CustomC{chicago:comment,
@@ -661,12 +686,19 @@
   title = 	 {The {Chicago} Manual of Style},
   year = 	 2010,
   author = 	 {{University of Chicago Press}},
+  shortauthor =  {\mkbibemph{CMS}},
   publisher = uchp,
   edition = 	 16,
   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.}
+  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
+                  \textsf{author} and \textsf{publisher}.  (I have
+                  also provided an unorthodox \textsf{shortauthor} for
+                  convenience in this package documentation.)  Cf.\
+                  \cmslink{chicago:comment} for an example of how to
+                  use a \textsf{CustomC} entry to provide a comment
+                  inside a parenthesized citation.}
 }
 
 @Book{chicago:manual:15,
@@ -724,11 +756,11 @@
   howpublished = {End of the Commons General Store},
   year = 	 {\mkbibbrackets{1957?}},
   location =  {Mesopotamia, OH},
-  annotation = 	 {A standard Booklet entry, though the same
-                  information could be presented in a Book entry,
-                  using publisher instead of howpublished.  Note
-                  brackets around year, as this is obviously a best
-                  guess.}
+  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.}
 }
 
 @Video{cleese:holygrail,
@@ -785,13 +817,14 @@
   editor =       {Good, Thomas~L.},
   number =	 5,
   pages =	 {131--146},
-  annotation = 	 {An Article that is part of a special issue of a
-                  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.}
+  annotation = 	 {An \textsf{Article} that is part of a special issue
+                  of a journal. The \textsf{title} of the issue goes
+                  in \textsf{issuetitle}, the editor of the issue in
+                  \textsf{editor}, and the sort of issue in
+                  \textsf{note}, with a lowercase initial letter.
+                  Cf.\ \texttt{good:wholeissue} for how to refer to
+                  the special issue as a whole, rather than to one
+                  article in it, using a \textsf{Periodical} entry.}
 }
 
 @Article{connell:chronic,
@@ -803,7 +836,8 @@
   date = 	 1982,
   volume = 	 16,
   pages = 	 {1313--1317},
-  annotation = 	 {An article with italicized words in the title.}
+  annotation = 	 {An \textsf{Article} with italicized words in the
+                  \textsf{title}.}
 }
 
 @InCollection{contrib:contrib,
@@ -814,8 +848,9 @@
   year = 	 {\autocap{f}orthcoming},
   editor = 	 {Editor, Ellen},
   location =  {Place},
-  annotation = 	 {A forthcoming essay in an InCollection entry.  Note
-                  the autocap command in the year field.}
+  annotation = 	 {A forthcoming essay in an \textsf{InCollection}
+                  entry.  Note the \cmd{autocap} command in the
+                  \textsf{year} field.}
 }
 
 @Article{conway:evolution,
@@ -826,9 +861,11 @@
   date = 	 1998,
   volume = 	 {B 353},
   pages = 	 {327--345},
-  annotation = 	 {An article in a journal which appears in different
-                  series, here "B" for Biological, which information
-                  can be given in the volume field.}}
+  annotation = 	 {An \textsf{Article} in a \textsf{journaltitle} which
+                  appears in different series, here \enquote{B} for
+                  Biological, which information can be given in the
+                  \textsf{volume} field.}
+}
 
 @Book{cook:sotweed,
   title = 	 {Sotweed Redivivus, or The Planter's Looking-Glass},
@@ -837,27 +874,38 @@
   authortype = 	 {anon?},
   note = 	 {\bibstring{by} \mkbibquote{E.~C. Gent}},
   location =  {Annapolis},
-  annotation = 	 {A complicated Book entry.  First, the author is
-                  unknown, but guessed at, hence the "anon?" in the
-                  authortype field.  The note field gives the author
-                  as printed in the book, presented inside quotation
-                  marks. If you remember to use mkbibquote here, then
+  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
+                  in the book, presented inside quotation marks. If
+                  you remember to use \cmd{mkbibquote} here, then
                   appropriate punctuation will automatically be
                   provided.}
 }
 
-@Misc{coolidge:speech,
+@Online{coolidge:speech,
   author = 	 {Coolidge, Calvin},
-  title = 	 {\mkbibquote{Equal Rights} (speech)},
+  title = 	 {Equal Rights},
   note = 	 {copy of an undated 78 rpm disc},
-  addendum = 	 {from \fullcite{loc:leaders}},
+  options = 	 {ptitleaddon=space},
+  titleaddon = 	 {(speech)},
+  related = 	 {loc:leaders},
   year = 	 {[1920?]},
-  entrysubtype = {speech},
-  annotation = 	 {This is a recording from an online archive, using a
-                  Misc entry with an entrysubtype.  The addendum cites
-                  the archive itself using an Online entry.
-                  Cp. weed:flatiron and loc:city, which cite a film
-                  from an online archive, both using a Video entry.}
+  relatedstring = {from},
+  annotation = 	 {This is a recording from an online archive, using an
+                  \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
+                  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.}
 }
 
 @Misc{coolidge:speech:trad,
@@ -869,7 +917,7 @@
   year = 	 {[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
+                  authordate-trad only.  The addendum cites the
                   archive itself using an Online entry.
                   Cp. weed:flatiron and loc:city, which cite a film
                   from an online archive, both using a Video entry.}}
@@ -947,22 +995,25 @@
   origdate = 	 {1918-09-25},
   organization =  {Yale University Library},
   annotation = 	 {An unpublished letter from an archive, presented in
-                  a Misc entry with an entrysubtype.  The cmsdate
-                  option is no longer needed in such an entry.  The
-                  manuscript collection is found in the note and
-                  organization fields -- depending on the entry, you
-                  can use note, organization, institution, and/or
-                  location, in ascending order of generality, though
-                  you should consistently put the most specific
-                  collection name in the note field.  If you are
-                  citing several items from the same collection, then
-                  the Manual suggests not having individual entries
-                  but only one for the collection (house:papers), with
-                  more specific information forming part of the flow
-                  of the text (15th ed, 17.233, 16th ed. 15.49).  If,
-                  however, you cite only one item from a collection,
-                  then you can use an entry like this one.
-                  Cf. dinkel:agassiz, spock:interview.}
+                  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
+                  \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
+                  several items from the same collection, then the
+                  \emph{CMS}, 15.49, 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.
+                  If, however, you cite only one item from a
+                  collection, then you can use an entry like this one.
+                  Cf.\ \cmslink{dinkel:agassiz},
+                  \cmslink{spock:interview}.}
 }
 
 @Book{davenport:attention,
@@ -973,8 +1024,9 @@
   publisher =	 {Harvard Business School Press},
   addendum =	 {TK3 Reader e-book},
   location =	 {Cambridge, MA},
-  annotation = 	 {Example of the use of addendum in a Book entry, in
-                  this case to identify that the work is an e-book.}
+  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.}
 }
 
 @Misc{dinkel:agassiz,
@@ -986,25 +1038,28 @@
   note = 	 {Agassiz Papers},
   location =  {Harvard University},
   organization =  {Houghton Library},
-  annotation = 	 {A manuscript presented in a Misc entry with a
-                  randomly-selected entrysubtype to distinguish it
-                  from a traditional Misc entry. The title begins with
-                  a generic term, hence the initial lowercase
-                  letters. This entry uses three fields to locate the
-                  manuscript, starting with note and ascending in
-                  generality through organization to location.  If you
-                  are citing several items from the same collection,
-                  then the Manual suggests not having individual
-                  entries but only one for the collection, with
-                  specific information forming part of the flow of the
-                  text (15th ed. 17.233, 16th ed. 15.49).  If,
-                  however, you cite only one item from a collection,
-                  then you can use an entry like this one.  Note that,
-                  in Misc entries and a few others, an empty year
-                  field will not automatically produce a no date
-                  ("n.d." in English) abbreviation, so if you want one
-                  to be present you'll have to provide it yourself, as
-                  here.  Cf. creel:house and house:papers.}
+  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}.}
 }
 
 @Book{donne:var,
@@ -1018,12 +1073,15 @@
   year =	 1995,
   volume =	 6,
   location =	 {Bloomington},
-  annote = 	 {A Book entry with a maintitle editor (editor field)
-                  and a title editor (namea field).  Also, inside an
+  annote = 	 {A \textsf{Book} entry with a \textsf{maintitle}
+                  editor (\textsf{editor} field) and a \textsf{title}
+                  editor (\textsf{namea} field).  Also, inside an
                   italicized title, all other titles are put in
-                  quotation marks, and using mkbibquote will
+                  quotation marks, and using \cmd{mkbibquote} will
                   automatically move appropriate punctuation inside
-                  the closing quotation mark.}
+                  the closing quotation mark.  It also, however, means
+                  that this entry won't be correctly presented for the
+                  \textsf{authordate-trad} style.}
 }
 
 @Book{donne:var:15,
@@ -1037,14 +1095,15 @@
   year =	 1995,
   volume =	 6,
   location =	 {Bloomington},
-  annotation = 	 {A Book entry with a maintitle editor (editor field)
-                  and a title editor (namea field).  Also, inside an
+  annotation = 	 {A \textsf{Book} entry with a \textsf{maintitle}
+                  editor (\textsf{editor} field) and a \textsf{title}
+                  editor (\textsf{namea} field).  Also, inside an
                   italicized title, all other titles are put in
-                  quotation marks, and using mkbibquote will
+                  quotation marks, and using \cmd{mkbibquote} will
                   automatically move appropriate punctuation inside
-                  the closing quotation mark.  In the _15th edition_
-                  only, you need to provide the sentence-style
-                  capitalization yourself inside the mkbibquote
+                  the closing quotation mark.  In the \texttt{trad}
+                  style, you need to provide the sentence-style
+                  capitalization yourself inside the \cmd{mkbibquote}
                   command.}
 }
 
@@ -1055,8 +1114,9 @@
   author = 	 {Dunn, Susan},
   publisher = {Faber \& Faber and Farrar, Straus \& Giroux},
   location =  {New York},
-  annotation = 	 {Book with two publishers, showing ampersands to
-                  prevent them being treated as four.}
+  annotation = 	 {A \textsf{Book} with two \textsf{publishers},
+                  showing ampersands to prevent them being treated as
+                  four.}
 }
 
 @Manual{dyna:browser,
@@ -1064,11 +1124,12 @@
   organization = {Electronic Book Technology Inc.},
   address = 	 {Providence, RI},
   year = 	 1991,
-  annotation = 	 {A technical manual presented in a Manual entry.  In
-                  absence of named author the organization is printed
-                  twice, as author and as publisher. Note that you no
-                  longer need a sortkey with the default Sorting
-                  Scheme.}
+  annotation = 	 {A technical manual presented in a \textsf{Manual}
+                  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
+                  scheme.}
 }
 
 @Book{eliot:pound,
@@ -1079,9 +1140,10 @@
   editor =  {Eliot, T.~S.},
   publisher = {New Directions},
   location =  {New York},
-  annotation = 	 {A Book listed by its (famous) editor rather than by
-                  its (equally-famous) author.  The options field
-                  makes it happen.}
+  annotation = 	 {A \textsf{Book} listed by its (famous)
+                  \textsf{editor} rather than by its (equally-famous)
+                  \textsf{author}.  The \textsf{options} field allows
+                  such presentation.}
 }
 
 @InCollection{ellet:galena,
@@ -1127,29 +1189,35 @@
   publisher = 	 {Beacon},
   note = 	 {a facsimile of the first \bibstring{edition} with an
                   \bibstring{introduction} by Jaroslav Pelikan},
-  annotation = 	 {A reprinted Book, in this case a facsimile, with the
-                  note field giving the relevant information.  The
-                  origdate field gives the date of original
-                  publication.  Note the use of a lowercase letter to
-                  start the note field.  With the amount of
-                  information given in the note field, it may be less
-                  awkward to use a cmsdate option rather than to put
-                  reprint into a pubstate field.  This cmsdate option
-                  will print both dates, in the format [1836] 1985.
-                  In the 16th edition, "old" is a synonym for "both,"
-                  which formats the dates in a similar but not
-                  identical fashion.}
+  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
+                  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
+                  \texttt{cmsdate} option rather than to put
+                  \texttt{reprint} into a \textsf{pubstate} field.
+                  This \texttt{cmsdate} option will print both dates,
+                  in the format (1836) 1985.}
 }
 
 @InReference{ency:britannica,
-  options = 	 {skipbib},
+  title = 	 {Encyclopaedia Britannica},
   shorttitle = 	 {Ency. {Brit}., \mkbibemph{15th ed}\adddot},
-  annotation = 	 {An InReference entry, citing a well-known reference
-                  work, and therefore not to appear in the list of
-                  references.  The Manual 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. }
+  keywords = 	 {nosample},
+  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.  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,
@@ -1170,8 +1238,8 @@
                   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
+                  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
@@ -1207,13 +1275,15 @@
   pages = 	 {185--288},
   location =  {Chicago},
   annotation = 	 {A work from antiquity, cited by pages in a modern
-                  edition, hence not needing "classical" in
-                  entrysubtype.  Since the titles of such works are
-                  uniformly italicized, we need to use a BookInBook
-                  entry with a title and a booktitle ("book within a
-                  book") and in this case also a maintitle. Note the
-                  editors of the maintitle (editor field), and the
-                  translator of the title (nameb field).}
+                  edition, hence not needing \texttt{classical} in
+                  \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}),
+                  and in this case also a \textsf{maintitle}. Note the
+                  editors of the \textsf{maintitle} (\textsf{editor}
+                  field), and the translator of the \textsf{title}
+                  (\textsf{nameb} field).}
 }
 
 @Online{evanston:library,
@@ -1224,11 +1294,12 @@
   organization = {Evanston Public Library},
   url = 	 {http://www.epl.org/library/strategic-plan-00.html},
   urldate = 	 {2002-07-18},
-  annotation = 	 {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
-                  page, while the organization field holds the title
-                  or owner of the site as a whole.}
+  annotation = 	 {An \textsf{Online} entry, with a corporate author,
+                  hence extra curly braces in \textsf{author} and
+                  \textsf{shortauthor}. The \textsf{title} field holds
+                  the title of the specific web page, while the
+                  \textsf{organization} field holds the title or owner
+                  of the site as a whole.}
 }
 
 @Book{feydeau:farces,
@@ -1250,7 +1321,7 @@
   number = 	 {CDP 7 46381 2},
   publisher = {Capitol},
   type = 	 {compact disc},
-  annotation = 	 {_16th edition only_ An example of a re-released
+  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.
@@ -1268,7 +1339,7 @@
     title = {\mkbibemph{Nicomachean Ethics} VII. 11--12},
     subtitle = {Pleasure},
     booktitle = {Aristotle},
-    booksubtitle = {\mkbibemph{Nicomachean Ethics}, Book VII},
+    booksubtitle = {\mkbibquote{Nicomachean Ethics}, Book VII},
     series = {Symposium Aristotelicum},
     editor = {Carlo Natali},
     publisher = {Oxford University Press},
@@ -1323,42 +1394,51 @@
   publisher = {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA},
-  annotation = 	 {_16th edition only_.  This is a template for citing
-                  television shows in the 16th edition.  The eventdate
-                  is the original broadcast date, while the date
-                  applies to the medium you are citing.  As in other
+  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 booktitleaddon.}
+                  goes in \textsf{booktitleaddon}.}
 }
 
 @Book{furet:passing:eng,
   title = 	 {The Passing of an Illusion},
   year = 	 1999,
   author = 	 {Furet, François},
-  userf = 	 {furet:passing:fr},
   translator = 	 {Furet, Deborah},
   publisher = uchp,
   location =  {Chicago},
-  annotation = 	 {A translation, with the userf field referring to the
-                  original.  In citations this has no effect, but in
-                  the list of references the translation and original
-                  are presented in the same entry, connected (in the
-                  absence of an origlanguage field) by the string
-                  "Originally published as".}
+  annotation = 	 {A translation, with the original presented in 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
+                  will not appear separately in the reference list
+                  unless you cite it directly.}
 }
 
 @Book{furet:passing:fr,
   title = 	 {Le passé d'une illusion},
   year = 	 1995,
-  options = 	 {skipbib},
+  related = 	 {furet:passing:eng},
+  relatedtype =  {bytranslator},
   author = 	 {Furet, François},
   publisher = {Éditions Robert Laffont},
   location =  {Paris},
-  annotation = 	 {The original of the previous entry. The "skipbib" in
-                  the options field prevents it being printed
-                  separately in the bibliography.}
+  annotation = 	 {The original of the previous entry. The related
+                  field calls that entry, and the relatedtype
+                  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
+                  show one of the two options suggested by the Manual
+                  for presenting an original and a translation in the
+                  same reference list entry.}
 }
 
 @Article{garaud:gatine,
@@ -1368,7 +1448,7 @@
   journaltitle = {Bulletin de la Société des antiquaires de l'Ouest},
   year =	 1967,
   volume =	 9,
-  hyphenation =  {french},
+  langid =  {french},
   series =	 4,
   pages =	 {11--27},
   annotation = 	 {An Article in a journaltitle which is into its 4th
@@ -1377,20 +1457,17 @@
                   preserving sentence-style capitalization in
                   languages that ordinarily use it, as here in both
                   title and journaltitle.  Because of the way the
-                  capitalization code works for the title field, you
-                  would need to use extra curly braces around words
-                  you wished to remain capitalized in the output.
-                  However, because I've identified the language of the
-                  entry as French using the hyphenation field, the
-                  code 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.  To preserve the
-                  bibliography strings (e.g., "4th ser.") in the
-                  document language rather than the entry language,
-                  you can set the biblatex option "babel=hyphen" when
-                  you load biblatex-chicago.}
+                  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
+                  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.}
 }
 
 @Article{garrett,
@@ -1429,15 +1506,18 @@
 }
 
 @Misc{genesis,
-  title = 	 {Gen\adddot},
+  shorttitle = 	 {Gen\adddot},
   entrysubtype = {classical},
-  options = 	 {skipbib},
-  annotation = 	 {A simple Misc entry that would allow you easily to
-                  cite books of the Bible, though of course you'd need
-                  a separate entry for each book.  It would also work
-                  well for the Qur'an, but some other sacred works may
-                  need italicized titles.  Cf. Manual, 15th
-                  ed. 17.247-49, 16th ed. 14.253-255.}
+  keywords = 	 {nosample},
+  title = 	 {Genesis},
+  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.}
 }
 
 @Article{gibbard,
@@ -1500,10 +1580,11 @@
   date = 	 {2000-05},
   title =        {Kitchen {Notebook}},
   annotation = 	 {A regular column in a magazine, presented in a
-                  Review entry (with "magazine" entrysubtype).  This
-                  name is capitalized headline style.  Since there is
-                  no author, the journaltitle will be used instead;
-                  there is no longer any need for a sortkey.}
+                  \textsf{Review} entry (with \texttt{magazine}
+                  \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}.}
 }
 
 @Audio{greek:filmstrip,
@@ -1513,7 +1594,7 @@
   type = 	 {filmstrip, 44 min\adddot},
   address = 	 {Chicago},
   sortkey = 	 {Greek and Roman},
-  annotation = 	 {For the _16th edition only_, the title will
+  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.}
@@ -1530,8 +1611,8 @@
                   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_}
+                  list doesn't start with the date. 15th edition
+                  only}
 }
 
 @InReference{grove:sibelius,
@@ -1542,22 +1623,23 @@
   url = 	 {http://www.grovemusic.com/},
   urldate = 	 {2002-01-03},
   sortkey = 	 {New Grove},
-  annotation = 	 {An example of an online InReference entry, which I
-                  have allowed, as an example, to appear in the list
-                  of references.  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.  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 the sortkey, needed
-                  because otherwise the author's name will be used for
-                  sorting in the list of references.  Note also that
-                  in citations you can put an alphabetized article
-                  title in the postnote field, and it will be
-                  formatted for you automatically in InReference
-                  entries.}
+  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
+                  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
+                  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.}
 }
 
 @Video{handel:messiah,
@@ -1573,18 +1655,19 @@
   author = 	 {Handel, George Frederic},
   publisher = {Video Artists International},
   address = 	 {Ansonia Station, NY},
-  annotation = 	 {_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, which will provide the date for the head
-                  of the entry and for citations, identifies when the
-                  performance took place, and the new userd field
-                  allows you to specify just what sort of eventdate it
-                  is.  Cf. next entry.}
+  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{author}, the performers and conductor in
+                  \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
+                  the medium. The \textsf{eventdate}, which will
+                  provide the date for the head of the entry and for
+                  citations, identifies when the performance took
+                  place, and the \textsf{userd} field allows you to
+                  specify just what sort of \textsf{eventdate} it is.}
 }
 
 @Video{handel:messiah:15,
@@ -1599,7 +1682,7 @@
   author = 	 {Handel, George Frederic},
   publisher = {Video Treasures},
   address = 	 {Batavia, OH},
-  annotation = 	 {_15th edition only_ This is a videotape of an
+  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.
@@ -1726,11 +1809,13 @@
   number =	 5,
   url =   {http://jama.ama-assn.org/issues/v287n5/rfull/joc10108.html#aainfo},
   urldate =	 {2002-01-07},
-  annotation = 	 {Standard Article entry with url provided. 5 authors
-                  provokes use of et al. in text citations, though not
-                  in list of references, because the settings for
-                  maxbibnames and minbibnames have been changed in
-                  biblatex-chicago.sty}
+  annotation = 	 {A standard \textsf{Article} entry with a
+                  \textsf{url} provided. The presence of 5 authors
+                  provokes use of \enquote{et al\adddot} in text
+                  citations, though not in the list of references,
+                  because the settings for \texttt{maxbibnames} and
+                  \texttt{minbibnames} have been changed in
+                  \textsf{biblatex-chicago.sty}.}
 }
 
 @Music{holiday:fool,
@@ -1746,20 +1831,18 @@
   type = 	 {33\onethird\ rpm},
   note = 	 {with Ray Ellis},
   options = 	 {useauthor=false},
-  annotation = 	 {_16th edition only_ This entry illustrates some of
-                  the changes made to Music entries for the 16th
-                  edition.  It cites a song (title) from an album
-                  (booktitle).  The writers of the song go in author,
-                  while the options field prevents these writers from
-                  appearing in citations or at the head of the entry
-                  in the list of references.  The performer goes in
-                  editor, with the editortype ensuring that no
-                  identifying string appears.  So far, then, this
-                  isn't different from the 15th edition.  The
-                  eventdate gives the recording date of a song -- you
-                  would use origdate if the recording date applied to
-                  the album as a whole.  The date gives the release
-                  date of the album.}
+  annotation = 	 {This entry illustrates how to cite a song
+                  (\textsf{title}) from an album (\textsf{booktitle}).
+                  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
+                  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.}
 }
 
 @Book{hopp:attalid,
@@ -1788,16 +1871,17 @@
   note = 	 {from a performance televised by CBS on\nopunct},
   date = 	 {1968-09-22},
   shorttitle = {HOROWITZ},
-  annotation = 	 {A YouTube video, presented in an Online entry.  The
-                  new 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
+  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
-                  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.}
+                  \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.}
 }
 
 @Book{horsley:prosodies,
@@ -1805,9 +1889,10 @@
   year =	 1796,
   author =	 {Horsley, Samuel},
   authortype =	 {anon},
-  annotation = 	 {An anonymous Book, with the author known, though not
-                  named on the title page.  The string "anon" goes in
-                  the authortype field.}
+  annotation = 	 {An anonymous \textsf{Book}, with the \textsf{author}
+                  known, though not named on the title page.  The
+                  string \texttt{anon} goes in the \textsf{authortype}
+                  field.}
 }
 
 @Misc{house:papers,
@@ -1815,25 +1900,26 @@
   title = 	 {Papers},
   note = 	 {Yale University Library},
   entrysubtype = {classical},
-  annotation = 	 {An example of a Misc entry (with an entrysubtype)
-                  specifically for a reference list, assuming that
-                  more than one item has been cited from this same
-                  collection.  If you cite just one item from such a
-                  collection, then the entry might look like
-                  creel:house.  In this entry type the absence of a
-                  date field does not trigger the automatic provision
-                  of the n.d. bibstring for "no date," which means
+  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
+                  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
+                  \enquote{n.d\adddot} \cmd{bibstring}, which means
                   that the reference list entry will not contain one
-                  if it isn't wanted.  The entrysubtype "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. Manual, 15th
-                  ed. 17.231, 16th ed 14.241.  The \adddot and
-                  \addcomma commands you see here are the most
+                  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.}
 }
 
@@ -1869,19 +1955,21 @@
   sortname = 	 {ISO},
   address = 	 {Ottawa},
   url = 	 {http://www.nlc-bnc.ca/iso/tc46sc9/standard/690-2e.htm},
-  annote = 	 {A book with a maintitle and an organizational
-                  author.  You can now use the part field on its own
-                  to define how the title relates to the maintitle,
-                  assuming that the usual volume and part fields don't
-                  provide an appropriate solution.  Any non-numeric
-                  part field will be printed as-is.  The shorthand for
-                  the organization will appear in the in-text
-                  citations, and in the 16th edition will also appear
-                  at the head of the reference list entry, followed by
-                  its expansion (the author) in parentheses.  The
-                  sortname ensures that the entry is alphabetized by
-                  the first thing that appears there, that is, the
-                  shorthand.  See next entry.}
+  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
+                  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}.}
 }
 
 @Book{iso:electrodoc:15,
@@ -1919,15 +2007,16 @@
   author = 	 {James, Henry},
   publisher = {Project Gutenberg},
   url = 	 {ftp://ibiblio.org/pub/docs/books/gutenberg/etext96/ambas10.txt},
-  annotation = 	 {Presents an online edition of a book which, not
-                  being inherently an online text, still uses a Book
-                  entry.  The origyear field is the date of the print
-                  publication of the text that is now online, and the
-                  cmsdate=on option tells the style to use the
-                  origdate in both reference list and citations,
-                  something that is no longer part of the
-                  specification for the 16th edition -- you would
-                  probably use "both" here -- but which still works.}
+  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.}
 }
 
 @Collection{kamrany:economic,
@@ -1976,8 +2065,8 @@
   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,
+                  use of the location field. For the 16th edition
+                  only, Note also the quoted phrase inside the title,
                   with headline-style capitalization.}
 }
 
@@ -1992,8 +2081,8 @@
   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,
+                  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.}
 }
@@ -2040,18 +2129,19 @@
   title = 	 {Pushcarts Evolve to Trendy Kiosks},
   options = 	 {cmsdate=full},
   location =  {Lake Forest, IL},
-  annotation = 	 {An Article entry from a newspaper, using "magazine"
-                  in entrysubtype.  The article doesn't have an
-                  author, hence the journaltitle will be used at the
-                  head of the entry and in citations.  The newspaper
-                  might not be well known, so the location field helps
+  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 sortkey.  Finally, note the new
-                  "full" key for the 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 there for
-                  exemplification purposes.}
+                  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,
@@ -2110,7 +2200,7 @@
   year =	 1998,
   volume =	 37,
   pages =	 {26--53},
-  annote = 	 {_16th edition only_ An Article entry showing a
+  annote = 	 {16th edition only An Article entry showing a
                   quotation inside a title.  Note the headline-style
                   capitalization inside the formatting.}
 }
@@ -2125,7 +2215,7 @@
   year =	 1998,
   volume =	 37,
   pages =	 {26--53},
-  annotation = 	 {_15th edition only_ An Article entry showing a
+  annotation = 	 {15th edition only An Article entry showing a
                   quotation inside a title.  Note the sentence-style
                   capitalization inside the formatting.}
 }
@@ -2145,19 +2235,16 @@
   title = 	 {The Life of a City},
   subtitle = 	 {Early Films of {New York}, 1898--1906},
   author = 	 {{Library of Congress}},
-  options = 	 {skipbib},
   type = 	 {MPEG},
   url = 	 {http://lcweb2.loc.gov/ammem/papr/nychome.html},
-  year = 	 {\isdot},
   urldate = 	 {2001-08-14},
-  annotation = 	 {This Video entry provides the online location of the
-                  weed:flatiron film, providing it as an MPEG file for
-                  download.  Here, the options field prevents this
-                  from printing independently of the other entry,
-                  which contains a manual citation of this entry in
-                  its addendum field.  The year entry is a kludge to
-                  keep the urldate from appearing at the head of the
-                  entry where it's not needed.}
+  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
+                  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
+                  urldate where it should be.}
 }
 
 @Online{loc:leaders,
@@ -2165,18 +2252,15 @@
   title = 	 {American Leaders Speak},
   subtitle = 	 {Recordings from {World War I} and the 1920 Election,
                   1918--1920},
-  year = 	 {\isdot},
   url = 	 {http://memory.loc.gov/ammem/nfhtml/nforSpeakers01.html},
   note = 	 {RealAudio and WAV formats},
-  options = 	 {skipbib},
-  annotation = 	 {This Online entry provides the online archive
-                  location of the coolidge:speech entry.  Here, the
-                  options field prevents this from printing
-                  independently of the other entry, which contains a
-                  manual citation of this entry in its addendum field.
-                  The year entry is a kludge to keep "n.d." from
-                  appearing here where it's not needed.  Cp. loc:city
-                  and weed:flatiron.}
+  annotation = 	 {This \textsf{Online} entry provides the online
+                  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.}
 }
 
 @Article{loften:hamlet,
@@ -2198,7 +2282,7 @@
   date = 	 1960,
   volume = 	 75,
   pages = 	 {149--151},
-  annote = 	 {_16th edition only_ An article entry with a quoted
+  annote = 	 {16th edition only An article entry with a quoted
                   title within its title}
 }
 
@@ -2209,7 +2293,7 @@
   date = 	 1960,
   volume = 	 75,
   pages = 	 {149--51},
-  annotation = 	 {_15th edition only_ An article entry with a quoted
+  annotation = 	 {15th edition only An article entry with a quoted
                   title within its title}
 }
 
@@ -2243,14 +2327,15 @@
   address = 	 {Union, NJ},
   options = 	 {cmsdate=new},
   pubstate = 	 {reprint},
-  annotation = 	 {A reprint edition.  The Manual 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 -- cmsdate=new,
-                  which in the 16th edition is a synonym for
-                  cmsdate=both -- and identifies it as a reprint with
-                  the pubstate field.  Cf. james:ambassadors and
-                  maitland:equity for other alternatives.}
+  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.\
+                  \cmslink{james:ambassadors} and
+                  \cmslink{maitland:equity} for other alternatives.}
 }
 
 @Book{maitland:equity,
@@ -2266,19 +2351,23 @@
   sortyear = 	 {2010},
   annotation = 	 {Another reprint edition, showing an alternative way
                   of presenting the information.  This example
-                  provides just the date of the reprint at the head of
-                  the reference list and in the citation -- no cmsdate
-                  option which means cmsdate=off -- and then gives the
-                  date of the original, identified as such by a
-                  string, after the publication data.  The string
-                  "reprint" in the pubstate field, even though it
-                  isn't printed in the entry, is necessary to make
-                  this original publication information appear.  Also,
-                  the sortyear field is necessary here because
-                  biblatex always sorts automatically by the year
-                  rather than the origyear, and this entry from 1926
-                  should come after maitland:canon which prints its
-                  origdate (1898) first.  Cf. james:ambassadors}
+                  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
+                  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}
+                  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.\
+                  \cmslink{james:ambassadors}}
 }
 
 @Book{mchugh:wake,
@@ -2288,7 +2377,7 @@
   publisher = {Johns Hopkins University Press},
   location =  {Baltimore},
   type = 	 {plain},
-  annote = 	 {_16th edition only_ A Book with a quoted title
+  annote = 	 {16th edition only A Book with a quoted title
                   inside an italicized one.  Remember to use
                   \mkbibquote.  See next entry.}
 }
@@ -2300,7 +2389,7 @@
   publisher = {Johns Hopkins Univ.\ Press},
   location =  {Baltimore},
   type = 	 {plain},
-  annotation = 	 {_15th edition only_ A Book with a quoted title
+  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.}
@@ -2422,7 +2511,7 @@
   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
+  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
@@ -2435,7 +2524,7 @@
   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
+  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
@@ -2484,21 +2573,21 @@
   title = {obituary of {Claire Trevor}},
   options = 	 {cmsdate=full},
   pages = 	 {national edition},
-  annotation = 	 {An obituary in a Review entry (entrysubtype
-                  "magazine"), though in the _15th edition only_ it
-                  would work fine as an Article entry.  Here, without
-                  an author, the journaltitle will head the entry and
-                  appear in citations.  The lowercase letter beginning
-                  the title field isn't strictly necessary in the
+  annotation = 	 {An obituary in a \textsf{Review} entry
+                  (\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 sortkey field is no longer
-                  needed.  Finally, note the new "full" key for the
-                  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 there for
-                  exemplification purposes.}
+                  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.}
 }
 
 @Music{nytrumpet:art,
@@ -2513,19 +2602,18 @@
   userd = 	 {recorded at the Madeira Festival,},
   sortkey = 	 {New York Trumpet},
   type = 	 {compact disc},
-  annotation = 	 {_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 here.  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.  See next entry.}
+  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,
+                  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.}
 }
 
 @Music{nytrumpet:art:15,
@@ -2541,7 +2629,7 @@
                   \textsf{\small\textcopyright}},
   sortkey = 	 {New York Trumpet},
   type = 	 {compact disc},
-  annotation = 	 {_15th edition only_ This can be considered an
+  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
@@ -2579,7 +2667,7 @@
                   \bibstring{by} Alice Kaplan},
   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
+  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
@@ -2599,7 +2687,7 @@
                   \bibstring{by} Alice Kaplan},
   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
+  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
@@ -2682,14 +2770,15 @@
   year =	 1977,
   language =	 {russian},
   location =	 {Moscow},
-  annotation = 	 {A Book entry presenting a Russian work, but giving
-                  the English translation of the title 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 language
-                  field. Also note the quotation marks around part of
-                  the publisher's name, with biblatex providing the
-                  punctuation.}
+  annotation = 	 {A \textsf{Book} entry presenting a Russian work, but
+                  giving the English translation of the \textsf{title}
+                  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.}
 }
 
 @Book{pirumova:russian,
@@ -2698,16 +2787,17 @@
   date = 	 1977,
   usere = 	 {The zemstvo liberal movement: Its social roots and
                   evolution to the beginning of the twentieth century},
-  hyphenation =  {russian},
+  langid =  {russian},
   author = 	 {Pirumova, N.~M.},
   publisher = {Izdatel'stvo \mkbibquote{Nauka}},
   address = 	 {Moscow},
   annotation = 	 {The same work as the preceding entry, but giving the
-                  transliteration of the Russian title rather than the
-                  translation.  In such a case, the translation of the
-                  title goes in the usere field.  The hyphenation
-                  field means that the subtitle doesn't require any
-                  additional curly braces in the 15th edition.}
+                  transliteration of the Russian \textsf{title} rather
+                  than the translation.  In such a case, the
+                  translation of the \textsf{title} goes in the
+                  \textsf{usere} field.  The \textsf{langid} field
+                  means that the \textsf{subtitle} doesn't require any
+                  additional curly braces in the \texttt{trad} style.}
 }
 
 @BookInBook{plato:republic:gr,
@@ -2727,12 +2817,14 @@
   location =  {Oxford},
   annotation = 	 {A work from antiquity, which will be cited by the
                   traditional divisions, and which therefore requires
-                  the "classical" entrysubtype.  The title of such a
-                  work being italicized, it needs a BookInBook entry,
-                  and it has all three sorts of title, plus a series
-                  to boot.  The shortauthor and shorttitle fields
-                  provide the officially-sanctioned abbreviations for
-                  use in citations.}
+                  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,
@@ -2762,10 +2854,11 @@
   urldate = 	 {2008-02},
   date = 	 {2007-03},
   userd = 	 {posted},
-  annotation = 	 {Another online video, presented in an Online entry.
-                  Note the userd field to modify the string printed
-                  before the urldate.  Cf. harwood:biden,
-                  horowitz:youtube.}
+  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},
+                  \cmslink{horowitz:youtube}.}
 }
 
 @Online{powell:email,
@@ -2834,7 +2927,7 @@
   date = 	 {1999-04},
   volume =	 9,
   pages =	 {B13--B14},
-  annote = 	 {_16th_edition only_ A Review entry presenting a
+  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
@@ -2862,7 +2955,7 @@
   date = 	 {1999-04},
   volume =	 9,
   pages =	 {B13--B14},
-  annotation = 	 {_15th edition only_ An Article entry presenting a
+  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
@@ -2932,7 +3025,7 @@
   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
+                  authordate-trad only.  Note the formatting of the
                   title.  Cp. coolidge:speech.}
 }
 
@@ -2942,12 +3035,13 @@
   subtitle = 	 {A Study in Social Mobility},
   school = 	 {Columbia University},
   year = 	 {\bibstring{nodate}},
-  annotation = 	 {A Thesis entry with its type pre-defined by the
-                  alias MastersThesis.  The nodate bibstring (which
-                  gives n.d. in English) may be used in almost any
-                  entry type if you can't find a date, though the
-                  author-date style automatically provides it in most
-                  types if you don't.}
+  annotation = 	 {A \textsf{Thesis} entry with its \textsf{type}
+                  pre-defined by the alias \textsf{MastersThesis}.
+                  The \texttt{nodate} \cmd{bibstring} (which gives
+                  \enquote{n.d\adddot} in English) may be used in
+                  almost any entry type if you can't find a date,
+                  though the author-date style automatically provides
+                  it in most types if you don't.}
 }
 
 @Article{rozner:liberation,
@@ -2973,7 +3067,7 @@
   number = 	 {60822-2-RG},
   type = 	 {11 compact discs},
   origdate = 	 {1946/1967},
-  annotation = 	 {_16 edition only_.  A Music entry giving the
+  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
@@ -3011,13 +3105,17 @@
   title = 	 {{Das Wandern (Wandering)}},
   date = 	 1895,
   booktitle = 	 {{Die sch\"one M\"ullerin} ({The} Maid of the Mill)},
-  maintitle = 	 {First Vocal Album \mkbibemph{(for high voice)}},
+  maintitleaddon = {(for high voice)},
+  maintitle = 	 {First Vocal Album},
+  options = 	 {ctitleaddon=space},
   author = 	 {Schubert, Franz},
   publisher = {G.~Schirmer},
   address = 	 {New York},
-  annotation = 	 {An Audio entry presenting a published musical score.
-                  Note the presence of all three sorts of title, and
-                  the "reverse italics" in the maintitle.}
+  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
+                  parenthesized \textsf{maintitleaddon}.}
 }
 
 @Book{schweitzer:bach,
@@ -3033,22 +3131,22 @@
   publisher = {Dover},
   pubstate = 	 {reprint},
   location =  {New York},
-  annotation = 	 {A reprinted Book, showing how to present this
-                  information by putting "reprint" in the pubstate
-                  field, the origdate into the date field, and the
-                  date into 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 "cmsdate=both" option prints both dates,
-                  and in the 15th edition is a synonym for
-                  "cmsdate=old."  The new origlocation and
-                  origpublisher fields allow you to present further
-                  information about the original edition, if you
-                  should so wish, and the addendum clarifies which
-                  edition will be providing the page references for
+  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
+                  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}
+                  fields allow you to present further information
+                  about the original edition, if you should so wish,
+                  and the \textsf{addendum} clarifies which edition
+                  will be providing the page references for
                   citations.}
 }
 
@@ -3099,10 +3197,13 @@
   organization = {Joseph Regenstein Library},
   institution =  {University of Chicago},
   annotation = 	 {An example of an unpublished musical score,
-                  presented in a Misc (with entrysubtype) rather than
-                  an Audio entry.  Quotation marks are now necessary
-                  in the title in the author-date style, _16th edition
-                  only_.  See next entry.}
+                  presented in a \textsf{Misc} (with
+                  \textsf{entrysubtype}) rather than an \textsf{Audio}
+                  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}
+                  style.}
 }
 
 @Misc{shapey:partita:15,
@@ -3115,10 +3216,15 @@
   organization = {Joseph Regenstein Library},
   institution =  {University of Chicago},
   annotation = 	 {An example of an unpublished musical score,
-                  presented in a Misc (with entrysubtype) rather than
-                  an Audio entry.  No quotation marks are necessary in
-                  the title in the author-date style, _15th edition
-                  only_}
+                  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
+                  \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}}
 }
 
 @Book{silver:gawain,
@@ -3127,9 +3233,9 @@
   year = 	 1974,
   translator = 	 {Silverstein, Theodore},
   location =  {Chicago},
-  annotation = 	 {Here, neither author nor editor are available, so
-                  the reference list entry and citations will start
-                  with the translator.}
+  annotation = 	 {Here, neither \textsf{author} nor \textsf{editor}
+                  are available, so the reference list entry and
+                  citations will start with the \textsf{translator}.}
 }
 
 @InCollection{sirosh:visualcortex,
@@ -3170,19 +3276,22 @@
   institution =  {National Library of Medicine},
   location =  {Bethesda, MD},
   annotation = 	 {An unpublished interview from an archive, hence
-                  requiring the Misc entry type with an entrysubtype.
-                  The interview is dated, but isn't letter-like, so
-                  you put the date in date.  The interviewee is the
-                  author, and the title, with its initial lowercase
-                  letter, names the interviewer.  This Misc entry has
-                  all 4 locating fields in increasing generality:
-                  note, organization, institution, and location. The
-                  first of these also starts with a lowercase letter.
-                  The Manual 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. creel:house and house:papers.}
+                  requiring the \textsf{Misc} entry type with an
+                  \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{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
+                  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.\
+                  \cmslink{creel:house} and \cmslink{house:papers}.}
 }
 
 @Book{stendhal:parma,
@@ -3193,9 +3302,10 @@
   publisher = {Boni \& Liveright},
   address = 	 {New York},
   translator = 	 {Scott-Moncrieff, C.~K.},
-  annotation = 	 {Book entry with the real name of the author given,
-                  in the nameaddon field, after the pseudonym, in the
-                  author field.}}
+  annotation = 	 {A \textsf{Book} entry with the real name of the
+                  author given, in the \textsf{nameaddon} field, after
+                  the pseudonym, in the \textsf{author} field.}
+}
 
 @Article{stenger:privacy,
   journaltitle = {CNN.com},
@@ -3213,7 +3323,7 @@
 
 @Book{suangtho:tectona,
   title = 	 {Flowering and Seed Production in \mkbibemph{Tectona
-                  grandis} {L.f.}},
+                  grandis} {L.f\adddot}},
   subtitle = 	 {Report on the {DANIDA Training Course on Tree
                   Improvement Program}},
   date = 	 1990,
@@ -3324,16 +3434,18 @@
                   Ranke}},
   number =	 {23--24},
   sortkey = 	 {Erg},
-  shortauthor =  {\mkbibemph{Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.}},
-  annotation = 	 {A rather unusual Review entry (entrysubtype
-                  "magazine"), without an author.  In the author-date
-                  style we allow the journaltitle to come first in the
-                  reference-list entry and provide a formatted and
-                  abbreviated shortauthor for citations.  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)
+  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
+                  \textsf{journaltitle} to come first in the
+                  reference-list entry and provide an abbreviated
+                  \textsf{shortjournal} for citations.  Note the
+                  formatting of the reviewed title in the
+                  \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)
                   bibstring.}
 }
 
@@ -3348,11 +3460,13 @@
   publisher = {University of Chicago Press; Milan: G.\ Ricordi},
   volumes = 	 2,
   address = 	 {Chicago},
-  annotation = 	 {An Audio entry presenting a published operatic
-                  score.  Note the "reverse italics" in the title, and
-                  also the titleaddon, which identifies the
+  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.}
+                  places of publication, presented in a modified
+                  \textsf{publisher} field.}
 }
 
 @Book{virginia:plantation,
@@ -3364,12 +3478,12 @@
   sorttitle = 	 {True and Sincere},
   shorttitle = 	 {True and Sincere Declaration},
   year = 	 1610,
-  annote = 	 {_16th edition only_ An anonymous Book entry with a
-                  very long title.  The 16th edition of the Manual
-                  prefers such entries generally to appear under their
-                  titles rather than under "Anon."  Here, the
-                  shorttitle removes the article, and the sorttitle
-                  does the same.  See next entry.}
+  annote = 	 {An anonymous \textsf{Book} entry with a very long
+                  \textsf{title}.  The \emph{CMS} prefers such entries
+                  generally to appear under their titles rather than
+                  under \enquote{Anon.}  Here, the \textsf{shorttitle}
+                  removes the indefinite article, and the
+                  \textsf{sorttitle} does the same.}
 }
 
 @Book{virginia:plantation:15,
@@ -3381,8 +3495,8 @@
   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_}
+                  presentation in the author-date style.  15th
+                  edition only}
 }
 
 @Book{walker:columbia,
@@ -3460,26 +3574,23 @@
                   extra curly braces.}
 }
 
-@Audio{weed:flatiron,
+@Video{weed:flatiron,
   title = 	 {At the Foot of the {Flatiron}},
   date = 	 1903,
-  addendum = 	 {from \fullcite{loc:city}},
+  related = 	 {loc:city},
+  relatedstring = {from},
   author = 	 {Weed, A.~E.},
   publisher = {American Mutoscope {and} Biograph Company},
   type = 	 {35~mm; 2 min., 19 sec.},
-  annotation = 	 {The Manual, for some reason, has chosen a rather
-                  more book-like presentation for this film, so
-                  instead of a Video entry I have here used Audio,
-                  though in all fairness it makes no difference in the
-                  author-date style.  In any case note the creator of
-                  the film in the author field, and the medium w/
-                  running length in the type field.  The addendum
-                  cites another (Video) entry, containing information
-                  about the online location of the MPEG version of the
-                  original 35mm film.  These two entries will be
-                  presented together in the reference list, as
-                  suggested by the Manual, 15th edition 17.270, 16th
-                  edition 14.280.}
+  annotation = 	 {This complete film taken from an online archive uses
+                  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
+                  (Video) entry, containing information about the
+                  online location of the MPEG version of the original
+                  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.}
 }
 
 @Book{weresz,
@@ -3514,25 +3625,26 @@
   xref = 	 {white:total},
   pages = 	 273,
   origdate = 	 {1946-05-02},
-  annotation = 	 {In the author-date style, the Manual recommends that
-                  the list of references contain only the whole
-                  collection of published letters (white:total below),
-                  with any further information being provided as part
-                  of the running text.  (If you follow this method,
-                  then the Letter entry type needn't ever be used.
-                  See 15th edition 17.77, 16th edition 15.40.)  If,
-                  for some reason, you still want to cite individual
-                  letters in the list of references, this and the
-                  following entry demonstrate how to do so.  Chicago's
-                  mechanism for shortened cross-references is
-                  operative in Letter entries using crossref or xref
-                  (as in InCollection and InProceedings entries), so
-                  the information printed in the list of references
-                  will be abbreviated.  You can now simply use the
-                  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 letters
-                  from the same year.}
+  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
+                  (\cmslink{white:total}, below), with any further
+                  information being provided as part of the running
+                  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
+                  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
+                  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
+                  letters from the same year.}
 }
 
 @Letter{white:russ,
@@ -3542,8 +3654,9 @@
   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 Letter
-                  entries.  See white:ross above for the details.}
+                  the cross-referencing mechanism at work in
+                  \textsf{Letter} entries.  See
+                  \cmslink{white:ross:memo} for the details.}
 }
 
 @Book{white:total,
@@ -3554,9 +3667,10 @@
   publisher = {Harper \&\ Row},
   location =  {New York},
   annotation = 	 {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.}
+                  Note that it is a \textsf{Book} entry, and will
+                  appear in the reference list if more than one child
+                  inherits from it, even though it isn't cited
+                  itself.}
 }
 
 @Periodical{whittington:water,
@@ -3593,17 +3707,17 @@
   userd = 	 {last modified},
   url = 	 {http://en.wikipedia.org/wiki/BibTeX},
   urldate = 	 {2012-05-18},
-  annotation =       {An online InReference entry, usually not
+  annotation =   {An online \textsf{InReference} entry, usually not
                   presented in a list of references.  Here is how you
-                  might do so, with the urldate, in the absence of the
-                  other three kinds of date, providing the year for
-                  citations and list of references.  It is strongly
-                  recommended that you at least have a urldate field,
-                  as such sources change rather rapidly, though the
-                  16th edition would prefer that you use a revision
-                  date or the like instead of an access date.  Here,
-                  the new userd field identifies which sort of date is
-                  at stake.}
+                  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.}
 }
 
 @InBook{will:cohere,
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 0025e7aa68a..a08c5150931 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
@@ -24,19 +24,20 @@
   date = 	 {2008-06-30},
   author = 	 {AC},
   eventdate = 	 {2008-07-01},
+  url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-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
-                  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.}
+                  \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
+                  \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.}
 }
 
 @Book{adorno:benj,
@@ -123,9 +124,10 @@
   chapter = 	 7,
   location =  {Cleveland, OH},
   shorttitle = {The Frontal Lobes},
-  annote = 	 {A typical InBook entry, identified by title and
-                  also, in this case, by chapter number rather than
-                  page range.}
+  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}
+                  range.}
 }
 
 @CustomC{ashe:creasey,
@@ -413,13 +415,21 @@
   author = 	 {Bundy, McGeorge},
   title = 	 {interview by Robert MacNeil},
   shorttitle = {interview},
-  annote = 	 {A television interview presented in a Review entry,
-                  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 lowercase letters to start both
-                  title and shorttitle, allowing automatic contextual
-                  capitalization of a generic title in a Review entry.}
+  annote = 	 {A television interview, with a generic title,
+                  presented in a \textsf{Review} entry, with
+                  \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
+                  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{shorttitle}, allowing automatic contextual
+                  capitalization of a generic title in a
+                  \textsf{Review} entry.}
 }
 
 @InCollection{centinel:letters,
@@ -443,8 +453,7 @@
 
 @Book{chaucer:alt,
   title = 	 {Chaucer Life-Records},
-  options = 	 {useauthor=false,useeditor=false,usetranslator=false,
-                 usecompiler=false},
+  options = 	 {useeditor=false,usenamec=false},
   year = 	 1966,
   editor = 	 {Crow, Martin~M. and Olson, Clair~C.},
   namec = 	 {Manly, John~M. and Richert, Edith},
@@ -492,12 +501,14 @@
   title = 	 {The Chicago Manual of Style},
   year = 	 2010,
   author = 	 {{University of Chicago Press}},
+  shorthand = 	 {\mkbibemph{CMS}},
   publisher = uchp,
   edition = 	 16,
   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.}
+  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,
@@ -519,11 +530,11 @@
   howpublished = {End of the Commons General Store},
   year = 	 {\mkbibbrackets{1957?}},
   location =  {Mesopotamia, OH},
-  annote = 	 {A standard Booklet entry, though the same
-                  information could be presented in a Book entry,
-                  using publisher instead of howpublished.  Note
-                  brackets around year, as this is obviously a best
-                  guess.}
+  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.}
 }
 
 @Video{cleese:holygrail,
@@ -598,7 +609,9 @@
   year = 	 {forthcoming},
   editor = 	 {Editor, Ellen},
   location =  {Place},
-  annote = 	 {A forthcoming essay in an InCollection entry.}
+  annote = 	 {A fabricated \textsf{InCollection} entry, showing
+                  how to present a \texttt{forthcoming} essay using
+                  the \textsf{year} field.}
 }
 
 @Book{cook:sotweed,
@@ -624,18 +637,25 @@
                   "plain" in the type field.}
 }
 
-@Misc{coolidge:speech,
+@Online{coolidge:speech,
   author = 	 {Coolidge, Calvin},
-  title = 	 {\mkbibquote{Equal Rights} (speech)},
+  title = 	 {Equal Rights},
+  titleaddon = 	 {(speech)},
+  related = 	 {loc:leaders},
   note = 	 {copy of an undated 78 rpm disc},
-  addendum = 	 {from \fullcite{loc:leaders}},
-  year = 	 {[1920?]},
-  entrysubtype = {speech},
-  annote = 	 {This is a recording from an online archive, using a
-                  Misc entry with an entrysubtype.  The addendum cites
-                  the archive itself using an Online entry.
-                  Cp. weed:flatiron and loc:city, which cite a film
-                  from an online archive, both using a Video entry.}
+  options = 	 {related=true,ptitleaddon=space,ctitleaddon=space},
+  year = 	 {ca.\,1920},
+  annote = 	 {This is a recording from an online archive, using an
+                  \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
+                  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.}
 }
 
 @Book{cotton:manufacture,
@@ -727,20 +747,26 @@
   note = 	 {Edward~M. House Papers},
   organization =  {Yale University Library},
   annote = 	 {An unpublished letter from an archive, presented in
-                  a Misc entry with an entrysubtype.  You can avoid
-                  the awkward repetition of the author's name in notes
-                  by using \headlessfullcite and/or \headlesscite
-                  instead of the usual citation commands.  The
-                  manuscript collection is found in the note and
-                  organization fields -- depending on the entry, you
-                  can use note, organization, institution, and/or
-                  location, in ascending order of generality, though
-                  you should consistently put the most specific
-                  collection name in the note field.  The date of the
-                  letter goes in origdate, and in the short note form
-                  you can use the macro \letterdatelong in the
-                  postnote field to identify the letter by this date,
-                  if it helps disambiguate.}
+                  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},
+                  \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
+                  \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
+                  non-letter-like \textsf{Misc} entries, you would use
+                  the \textsf{date} field instead of
+                  \textsf{origdate}.)}
 }
 
 @Book{davenport:attention,
@@ -812,12 +838,14 @@
   address = 	 {Providence, RI},
   year = 	 1991,
   shorttitle = {Dynatext},
-  annote = 	 {A technical manual presented in a Manual entry.  In
-                  absence of named author the organization is printed
-                  twice, as author and as publisher.  If you are using
-                  Biber, you no longer need a sortkey to help with
-                  alphabetization, though with BibTeX it would still
-                  be necessary.}
+  annote = 	 {A technical manual presented in a \textsf{Manual}
+                  entry.  In the absence of a named author the
+                  \textsf{organization} is printed twice, as
+                  \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
+                  necessary.}
 }
 
 @Book{eliot:pound,
@@ -843,19 +871,22 @@
   title = 	 {By Rail and Stage to Galena},
   crossref =  {prairie:state},
   pages = 	 {271--279},
-  annote = 	 {First of three InCollection entries
-                  cross-referencing the same Collection.  Since it is
-                  cited first in my example file, its long note
+  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 Collection entry, whereas the subsequent two
-                  long notes contain abbreviated references to the
-                  Collection.  Cf. keating:dearborn and
-                  lippincott:chicago.  All three have an abbreviated
+                  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
                   this space-saving measure, then 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 parent entry.}
+                  example, set \texttt{longcrossref=true} in the
+                  \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
+                  become a \textsf{booktitle} in its children.}
 }
 
 @Article{ellis:blog,
@@ -866,13 +897,14 @@
   date = 	 {2008-06-30},
   url = 	 {http://wardsix.blogspot.com/2008/06/sqatters-rights.html},
   entrysubtype = {magazine},
-  annote = 	 {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.}
+  annote = 	 {The 16th edition of the \emph{CMS} specifies 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.}
 }
 
 @Book{emerson:nature,
@@ -941,13 +973,16 @@
   pages = 	 {185--288},
   location =  {Chicago},
   annote = 	 {A work from antiquity, cited by pages in a modern
-                  edition, hence not needing "classical" in
-                  entrysubtype.  Since the titles of such works are
-                  uniformly italicized, we need to use a BookInBook
-                  entry with a title and a booktitle ("book within a
-                  book") and in this case also a maintitle. Note the
-                  editors of the maintitle (editor field), and the
-                  translator of the title (nameb field).}
+                  edition, hence not needing \texttt{classical} in the
+                  \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
+                  book}) and in this case also a \textsf{maintitle}, a
+                  multi-volume collection of \textsf{booktitles}.
+                  Note also the editors of the \textsf{maintitle}
+                  (\textsf{editor} field), and the translator of the
+                  \textsf{title} (\textsf{nameb} field).}
 }
 
 @Online{evanston:library,
@@ -990,7 +1025,7 @@
   number = 	 {CDP 7 46381 2},
   publisher = {Capitol},
   type = 	 {compact disc},
-  annote = 	 {_16th edition only_.  An example of a re-released
+  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
@@ -1009,14 +1044,17 @@
     title = {\mkbibemph{Nicomachean Ethics} VII. 11--12},
     subtitle = {Pleasure},
     booktitle = {Aristotle},
-    booksubtitle = {\mkbibemph{Nicomachean Ethics}, Book VII},
+    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 standard inproceedings entry.}
+    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.}
 }
 
 @Article{friedman:learning,
@@ -1046,12 +1084,24 @@
   publisher = {Warner Home Video},
   type = 	 {DVD},
   address = 	 {Burbank, CA},
-  annote = 	 {_16th edition only_.  This is a template for citing
-                  television shows in the 16th edition.  The eventdate
-                  is the original broadcast date, while the date
-                  applies to the medium you are citing.  Note that
-                  information about the season and episode numbers
-                  goes in booktitleaddon.}
+  annote = 	 {This is a template for citing an episode of a
+                  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
+                  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{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
+                  \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}.}
 }
 
 @Book{furet:passing:eng,
@@ -1062,12 +1112,24 @@
   translator = 	 {Furet, Deborah},
   publisher = uchp,
   location =  {Chicago},
-  annote = 	 {A translation, with the userf field referring to the
-                  original.  In notes, this has no effect, but in the
-                  bibliography the translation and original are
-                  presented in the same entry, connected (in the
-                  absence of an origlanguage field) by the string
-                  "Originally published as".}
+  annote = 	 {A translation, serving as the target of the
+                  \textsf{related} field of \cmslink{furet:related}.
+                  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
+                  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
+                  \textsf{relatedstring} field, respectively) by the
+                  string \enquote{Originally published as.}}
 }
 
 @Book{furet:passing:fr,
@@ -1082,6 +1144,23 @@
                   bibliography.}
 }
 
+@Book{furet:related,
+  title = 	 {Le passé d'une illusion},
+  year = 	 1995,
+  related = 	 {furet:passing:eng},
+  relatedtype =  {bytranslator},
+  author = 	 {Furet, François},
+  publisher = {Éditions Robert Laffont},
+  location =  {Paris},
+  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
+                  for presenting a text and its translation together
+                  in a single bibliography entry.  Cp.\
+                  furet:passing:eng.}
+}
+
 @Article{garaud:gatine,
   author =	 {Garaud, Marcel},
   title =	 {Recherches sur les défrichements dans la Gâtine
@@ -1092,9 +1171,11 @@
   series =	 4,
   pages =	 {11--27},
   shorttitle =	 {Recherches sur les défrichements},
-  annote = 	 {An Article in a journaltitle which is into its 4th
-                  series.  Note preservation of French
-                  capitalization.}
+  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.}
 }
 
 @Article{garrett,
@@ -1217,7 +1298,7 @@
   author = 	 {Handel, George Frederic},
   publisher = {Video Artists International},
   address = 	 {Ansonia Station, NY},
-  annote = 	 {_16th edition only_.  This is a videotape of an
+  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.
@@ -1235,12 +1316,14 @@
   crossref = 	 {harley:hoc},
   date = 	 {1987},
   volume = 	 1,
-  annote = 	 {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
-                  abbreviated references in the bibliography and in
-                  long notes (after the first).  Cf. lach:asia.},
+  annote = 	 {A \textsf{Collection} entry, with the
+                  \textsf{maintitle} coming from the
+                  \textsf{MVCollection} entry cited in the
+                  \textsf{crossref} field.  With the
+                  \texttt{booklongxref} option set properly, and not
+                  by default, this and \cmslink{harley:cartography}
+                  will produce abbreviated references in the
+                  bibliography and in long notes (after the first).}
 }
 
 @Collection{harley:cartography,
@@ -1251,15 +1334,16 @@
   volume =	 {2},
   part = 	 {2},
   shorttitle =	 {Cartography in East and Southeast Asia},
-  annote = 	 {A Collection entry, with its maintitle's logical
-                  volumes published in separate physical parts, hence
-                  a volume and a part number.  The maintitle itself
-                  comes from the MVCollection entry cited in the
-                  crossref field.  With the booklongxref option set
-                  properly, and not by default, this and the previous
-                  entry will now produce abbreviated references in the
+  annote = 	 {A second \textsf{Collection} entry cross-referencing
+                  the same \textsf{MVCollection}.  With the
+                  \texttt{booklongxref} option set to \texttt{false}
+                  in the preamble, this and the previous entry will
+                  now produce abbreviated references in the
                   bibliography and in long notes (after the first).
-                  Cf. lach:asia.}
+                  Since its \textsf{maintitle's} logical volumes are
+                  sometimes published in separate physical parts, it
+                  has both a \textsf{volume} and a \textsf{part}
+                  number.}
 }
 
 @MVCollection{harley:hoc,
@@ -1269,20 +1353,17 @@
   volumes = 	 {3},
   publisher = uchp,
   location =  {Chicago},
-  annote = 	 {This entry shows the new MVCollection type used as
-                  the parent to two child Collection entries --
-                  harley:ancient:cart and harley:cartography.  It will
-                  be presented in the bibliography when more than one
-                  of its children are cited, and those children's
-                  entries will be abbreviated in the bibliography and
-                  in long notes (after the first), assuming the option
-                  booklongxref is set properly (it won't be by
-                  default).  Please note that this treatment isn't
-                  explicitly allowed in the Chicago specification, and
-                  also that this style of cross-referencing, where the
-                  title of the MVCollection automatically becomes the
-                  maintitle of the Collection, is only available with
-                  Biber as your backend.}
+  annote = 	 {This entry shows the \textsf{MVCollection} type used
+                  as the parent to two child \textsf{Collection}
+                  entries --- \cmslink{harley:ancient:cart} and
+                  \cmslink{harley:cartography}.  It will be presented
+                  in the bibliography when more than one of its
+                  children are cited, even if it isn't itself
+                  independently cited.  Please note that this style of
+                  cross-referencing, where the \textsf{title} of the
+                  \textsf{MVCollection} automatically becomes the
+                  \textsf{maintitle} of the \textsf{Collection}, is
+                  only available with \textsf{Biber} as your backend.}
 }
 
 @Online{harwood:biden,
@@ -1303,9 +1384,11 @@
   institution =  {CERN DD internal note},
   year = 	 1988,
   month = 	 11,
-  annote = 	 {A Report entry, the type already set by using the
-                  TechReport alias instead of Report. The institution
-                  field identifies the issuer of the report.}
+  annote = 	 {A \textsf{Report} entry, with the \textsf{type}
+                  field automatically set by using the
+                  \textsf{TechReport} alias instead of
+                  \textsf{Report}.  The \textsf{institution} field
+                  identifies the issuer of the report.}
 }
 
 @Video{hitchcock:nbynw,
@@ -1365,20 +1448,23 @@
   type = 	 {33\onethird\ rpm},
   note = 	 {with Ray Ellis},
   options = 	 {useauthor=false},
-  annote = 	 {_16th edition only_ This entry illustrates some of
-                  the changes made to Music entries for the 16th
-                  edition.  It cites a song (title) from an album
-                  (booktitle).  The writers of the song go in author,
-                  while the options field prevents these writers from
-                  appearing at the head of notes or of the entry in
-                  the bibliography.  The performer goes in editor,
-                  with the editortype ensuring that no identifying
-                  string appears.  So far, then, this isn't different
-                  from the 15th edition.  The eventdate gives the
-                  recording date of a song -- you would use origdate
-                  if the recording date applied to the album as a
-                  whole.  The date gives the release date of the
-                  album.}
+  annote = 	 {This entry illustrates some of the peculiarities of
+                  \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.}
 }
 
 @Online{horowitz:youtube,
@@ -1446,27 +1532,25 @@
   pages =	 {\bibstring{number} 42},
   location =	 {Oxford},
   annote = 	 {An individual letter from a published collection,
-                  hence the Letter entry, designed specifically for
-                  this sort of reference.  The title field should
-                  always look like this, and the author won't be
-                  printed in notes, as this field already specifies
-                  it.  The shorttitle is specific to this entry form,
-                  eventually printing the author's surname followed by
-                  the contents of this field, which again is specified
-                  for this type of reference.  The origdate field
-                  holds the date of the original letter, while the
-                  year (or date) holds the date of the publication of
-                  the collection as a whole.  The pages field in this
-                  example holds not the page, but the number in the
-                  collection -- notice the bibstring -- while the
-                  booktitle is the title of that published collection.
-                  If you refer to more than one letter from such a
-                  collection, then only the name of the collection
-                  appears in the bibliography, and you could use the
-                  keywords field to suppress the printing of each
-                  individual letter there.  Cf. white:ross:memo,
-                  white:russ, and white:total to see how this might
-                  look.}
+                  hence the \textsf{Letter} entry, designed
+                  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
+                  \textsf{shorttitle's} form is specific to this entry
+                  type, eventually printing the \textsf{author's}
+                  surname followed by the contents of this field,
+                  which again is specified for this type of reference.
+                  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
+                  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
+                  letter from such a collection, then only the name of
+                  the collection need appear in the bibliography.}
 }
 
 @Book{james:ambassadors,
@@ -1476,10 +1560,11 @@
   author = 	 {James, Henry},
   publisher = {Project Gutenberg},
   url = 	 {ftp://ibiblio.org/pub/docs/books/gutenberg/etext96/ambas10.txt},
-  annote = 	 {Presents an online edition of a book which, not
-                  being inherently an online text, still uses a Book
-                  entry.  The origdate field is the date of the print
-                  publication of the text that is now online.}
+  annote = 	 {This cites an online edition of a book which, not
+                  being inherently an online text, uses a
+                  \textsf{Book} entry.  The \textsf{origdate} field is
+                  the date of the print publication of the text that
+                  is now online.}
 }
 
 @InCollection{keating:dearborn,
@@ -1487,11 +1572,13 @@
   title = 	 {Fort Dearborn and Chicago},
   crossref =  {prairie:state},
   pages = 	 {84--87},
-  annote = 	 {Second of three InCollection pieces from the same
-                  Collection, using the crossref field.  Even in the
+  annote = 	 {Second of the \textsf{InCollection} pieces from the
+                  same \textsf{Collection}, the latter identified
+                  using the \textsf{crossref} field.  Even in the
                   first, long note, the data for the whole collection
                   will be presented in abbreviated form, since
-                  ellet:galena (which see) has already been cited.}
+                  \cmslink{ellet:galena} (which see) has already been
+                  cited.}
 }
 
 @Article{kern,
@@ -1567,18 +1654,23 @@
   entrysubtype = {magazine},
   title = 	 {Pushcarts Evolve to Trendy Kiosks},
   location =  {Lake Forest, IL},
-  sortkey = 	 {Lake Forester},
   shorttitle = {Pushcarts Evolve},
-  annote = 	 {An Article entry from a newspaper, using "magazine"
-                  in entrysubtype.  The article doesn't have an
-                  author, hence the journaltitle will be used at the
-                  head of the entry in notes, short notes, and
-                  bibliography.  The newspaper might not be well
-                  known, so the location field helps your readers out
-                  in this case.  If you are using Biber with the 16th
-                  edition style, a sortkey field is no longer
-                  necessary to alphabetize by journaltitle rather than
-                  by title.}
+  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
+                  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
+                  \textsf{Biber}, a \textsf{sortkey} field isn't
+                  necessary to alphabetize by \textsf{journaltitle}
+                  rather than by \textsf{title}.}
 }
 
 @CustomC{lecarre:cornwell,
@@ -1619,10 +1711,12 @@
   year = 	 {1480s},
   note = 	 {78 x 48.5 in\adddot},
   location =  {Paris},
-  annote =       {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.}
+  annote = 	 {This is a typical \textsf{Artwork} entry, with the
+                  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.}
 }
 
 @Book{levistrauss:savage,
@@ -1675,16 +1769,15 @@
   title = 	 {The Life of a City},
   subtitle = 	 {Early Films of New York, 1898--1906},
   author = 	 {{Library of Congress}},
-  options = 	 {skipbib},
   type = 	 {MPEG},
   url = 	 {http://lcweb2.loc.gov/ammem/papr/nychome.html},
   urldate = 	 {2001-08-14},
   annote = 	 {This Video entry provides the online location of the
                   weed:flatiron film, providing it as an MPEG file for
-                  download.  Here, the options field prevents this
-                  from printing independently of the other entry,
-                  which contains a manual citation of this entry in
-                  its addendum field.}
+                  download.  It is referenced in the other entry by a
+                  related field, so you don't need a skipbib option
+                  here, as entries referenced only in such fields are
+                  by default never presented separately.}
 }
 
 @Online{loc:leaders,
@@ -1694,13 +1787,23 @@
                   1918--1920},
   url = 	 {http://memory.loc.gov/ammem/nfhtml/nforSpeakers01.html},
   note = 	 {RealAudio and WAV formats},
-  options = 	 {skipbib},
   annote = 	 {This Online entry provides the online archive
-                  location of the coolidge:speech entry.  Here, the
-                  options field prevents this from printing
-                  independently of the other entry, which contains a
-                  manual citation of this entry in its addendum field.
-                  Cp. loc:city and weed:flatiron.}
+                  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
+                  provides the online archive location of the
+                  \cmslink{coolidge:speech} entry, which references it
+                  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}.}
 }
 
 @Article{loften:hamlet,
@@ -1734,10 +1837,10 @@
   author = 	 {McHugh, Roland},
   publisher = {Johns Hopkins University Press},
   location =  {Baltimore},
-  annote = 	 {A Book with a quoted title inside an italicized one.
-                  If you use \mkbibquote, the package will
-                  automatically do the right thing with punctuation
-                  inside the quotation marks.}
+  annote = 	 {A \textsf{Book} with a quoted \textsf{title} inside
+                  an italicized one.  If you use \cmd{mkbibquote} the
+                  package will automatically do the right thing,
+                  moving punctuation inside the quotation marks.}
 }
 
 @Article{mcmillen:antebellum,
@@ -1881,13 +1984,13 @@
                   Science Editors},
   location = 	 {San Antonio, TX},
   date = 	 {2000-05-06/2000-05-09},
-  annote = 	 {A typical Unpublished entry, presenting an
+  annote = 	 {An \textsf{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, and begins
-                  with a lowercase letter.  Note the date range in the
-                  date field.}
+                  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
+                  \textsf{biblatex-chicago} can automatically
+                  capitalize it when the context demands.}
 }
 
 @Book{natrecoff:camera,
@@ -1964,7 +2067,7 @@
   userd = 	 {recorded at the Madeira Festival,},
   sortkey = 	 {New York Trumpet},
   type = 	 {compact disc},
-  annote = 	 {_16th edition only_ This entry is a good example of
+  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
@@ -2131,11 +2234,12 @@
   pages = 	 {327--621},
   location =  {Oxford},
   annote = 	 {A work from antiquity, which will be cited by the
-                  traditional divisions, and which therefore requires
-                  the "classical" entrysubtype. The title of such a
-                  work being italicized, it needs a BookInBook entry,
-                  and it has all three sorts of title, plus a series
-                  to boot.}
+                  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.}
 }
 
 @SuppBook{polakow:afterw,
@@ -2148,27 +2252,41 @@
   year =	 1993,
   publisher =	 uchp,
   location =	 {Chicago},
-  annote = 	 {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 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.}
+  annote = 	 {The \textsf{SuppBook} entry type is rather like the
+                  \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
+                  \textsf{SuppBook} type in \textsf{biblatex-chicago}
+                  is a little anomolous with respect to general
+                  \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.}
 }
 
 @Online{pollan:plant,
   author = 	 {Pollan, Michael},
   title = 	 {Michael Pollan Gives a Plant's-Eye View},
   organization = {TED video, 17:31},
+  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},
-  annote = 	 {Another online video, presented in an Online entry.
-                  Note the userd field to modify the string printed
-                  before the urldate.  Cf. harwood:biden,
-                  horowitz:youtube.}
+  annote = 	 {An online video, presented in an \textsf{Online}
+                  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}.}
 }
 
 @Online{powell:email,
@@ -2177,13 +2295,17 @@
   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 Online entry without a specific title, hence with
-                  no title field, only a titleaddon.  Note the initial
-                  lowercase letter in the titleaddon, and the
-                  \autocap macro in shorttitle, because the Online
-                  type doesn't automate this for you in title or
-                  shorttitle. Note also the absence of any
-                  organization or owner of the site as whole.}
+  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.}
 }
 
 @Collection{prairie:state,
@@ -2197,14 +2319,17 @@
   editor =	 {Angle, Paul~M.},
   publisher =	 uchp,
   location =	 {Chicago},
-  annote = 	 {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.}
+  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
+                  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
+                  the two previous notes), thus producing a short
+                  note.}
 }
 
 @SuppBook{prose:intro,
@@ -2245,15 +2370,24 @@
   pages =	 {B13--B14},
   shorttitle =	 {\bibstring{reviewof} \mkbibemph{The Mystery of
                   Samba}},
-  annote = 	 {A Review entry, this time from a scholarly
-                  journaltitle, hence no entrysubtype needed.  Note
-                  the bibstrings in title and shorttitle -- you could
-                  also start them with lowercase letters -- and the
-                  formatting in both fields of the title of the book
-                  reviewed. Most especially note the use of
-                  \parteditandtrans, which allows the editor and
-                  translator of the reviewed book to be identified by
-                  the correct strings in notes and bibliography.}
+  annote = 	 {The \textsf{Review} entry type functions much like
+                  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
+                  \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.}
 }
 
 @Article{reaves:rosen,
@@ -2295,8 +2429,12 @@
   url = 	 {http://libx.bsu.edu/cdm4/item_viewer.php?CISOROOT=/ElRoos&CISOPTR=0&CISOBOX=1&REC=2},
   date = 	 {1959-05-06},
   annote = 	 {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.  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.}
 }
 
 @MastersThesis{ross:thesis,
@@ -2305,9 +2443,10 @@
   subtitle = 	 {A Study in Social Mobility},
   school = 	 {Columbia University},
   year = 	 {\bibstring{nodate}},
-  annote = 	 {A Thesis entry with its type pre-defined by the
-                  alias MastersThesis.  The nodate bibstring (which
-                  gives n.d. in English) may be used in almost any
+  annote = 	 {A \textsf{Thesis} entry with its type automatically
+                  set by using the alias \textsf{MastersThesis}.  The
+                  \texttt{nodate} \cmd{bibstring} (which gives
+                  \enquote{n.d.} in English) may be used in almost any
                   entry type if you can't find a date.}
 }
 
@@ -2335,7 +2474,7 @@
   number = 	 {60822-2-RG},
   type = 	 {11 compact discs},
   origdate = 	 {1946/1967},
-  annote = 	 {_16 edition only_.  A Music entry giving the
+  annote = 	 {16th edition only.  A Music entry giving the
                   original recording dates of a later compilation.
                   Cf. floyd:atom.}
 }
@@ -2373,13 +2512,28 @@
   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},
   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.}
+                  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
+                  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}.}
 }
 
 @Book{schweitzer:bach,
@@ -2529,10 +2683,11 @@
   url = 	 {http://www.cnn.com/1999/TECH/ptech/12/20/implant.device/},
   shorttitle = {Tiny Human-Borne Monitoring Device},
   annote = 	 {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 we use the
+                  \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.}
 }
 
 @Book{tillich:system,
@@ -2710,26 +2865,25 @@
                   series alone goes in series, the rest in number.}
 }
 
-@Audio{weed:flatiron,
+@Video{weed:flatiron,
   title = 	 {At the Foot of the Flatiron},
   date = 	 1903,
-  addendum = 	 {from \fullcite{loc:city}},
+  related = 	 {loc:city},
+  relatedstring = {from},
+  options = 	 {related=true},
   author = 	 {Weed, A.~E.},
   publisher = {American Mutoscope {and} Biograph Company},
   type = 	 {35~mm; 2 min., 19 sec.},
-  annote = 	 {The Manual, for some reason, has chosen a rather
-                  more book-like presentation for this film, so
-                  instead of a Video entry I have here used Audio.  To
-                  be more consistent, I would have chosen Video for
-                  this, but in any case note the creator of the film
-                  in the author field, and the medium w/ running
-                  length in the type field.  The addendum cites
-                  another (Video) entry, containing information about
-                  the online location of the MPEG version of the
-                  original 35mm film.  These two entries will be
-                  presented together in both notes and bibliography,
-                  as suggested by the Manual, 15th edition 17.270,
-                  16th edition 14.280.}
+  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.}
 }
 
 @Book{weresz,
@@ -2833,13 +2987,20 @@
   url = 	 {http://en.wikipedia.org/wiki/BibTeX},
   urldate = 	 {2011-09-03},
   userd = 	 {last modified},
-  annote =       {An online InReference entry.  You must have the
-                  urldate field, as such sources change rather
-                  rapidly, though the 16th edition would prefer that
-                  you use a revision date or the like instead of an
-                  access date.  Here, the new, 16th-edition userd
-                  field identifies which sort of date is at stake.
-                  The entry will not be printed in the bibliography.}
+  annote = 	 {\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, 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.}
 }
 
 @InBook{will:cohere,
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 86f8a1d82f4..364211e22d5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.57 2016/05/08 19:58:55 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.59 2016/06/01 12:49:51 dfussner Exp $
 
 % Copyright (c) 2009-2016 David Fussner.  This package is
 % author-maintained.
@@ -13,7 +13,7 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2016/03/15 v 3.3 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2016/06/01 v 3.4 biblatex style]
 
 \RequirePackage{etoolbox}
 
@@ -51,7 +51,7 @@
   \RequirePackage[style=chicago-authordate]{biblatex}%
   \ExecuteBibliographyOptions{%
     pagetracker=true,autocite=inline,alldates=comp,
-    uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
+    uniquename=minfull,useeditor=true,usetranslator=true,usenamec=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
     abbreviate=false,dateabbrev=false,avdate=true}}
@@ -61,14 +61,14 @@
   \ExecuteBibliographyOptions{%
     pagetracker=true,autocite=footnote,abbreviate=false,alldates=comp,
     citetracker=true,ibidtracker=constrict,usetranslator=true,
-    usecompiler=true,loccittracker=constrict,dateabbrev=false,
+    usenamec=true,loccittracker=constrict,dateabbrev=false,
     maxbibnames=10,minbibnames=7,sorting=\cms@choose,sortcase=false}}
 
 \def\cms@authordatetrad{%
   \RequirePackage[style=chicago-authordate-trad]{biblatex}%
   \ExecuteBibliographyOptions{%
     pagetracker=true,autocite=inline,alldates=comp,
-    uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
+    uniquename=minfull,useeditor=true,usetranslator=true,usenamec=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
     abbreviate=false,dateabbrev=false,avdate=true}}
@@ -101,6 +101,10 @@
 \setlength{\bibhang}{2em}
 \setlength{\lositemsep}{0.25\baselineskip plus 0.25\baselineskip}
 
+\setcounter{biburllcpenalty}{5000}
+\setcounter{biburlucpenalty}{9000}
+\setcounter{biburlnumpenalty}{9000}
+
 \renewcommand*{\bibnamedash}{\rule[.4ex]{3em}{.6pt}}
 
 \iftoggle{cms@nomark}
@@ -139,6 +143,7 @@
 \DeclareLanguageMapping{icelandic}{cms-icelandic}
 \DeclareLanguageMapping{norsk}{cms-norsk}
 \DeclareLanguageMapping{nynorsk}{cms-nynorsk}
+\DeclareLanguageMapping{swedish}{cms-swedish}
 
 \ifundef\bbl@loaded{\let\bbl@loaded\@empty}{}% For old versions of babel
 
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 77f95a52929..296810b80e9 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,1316 +1,19 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.2.5 2016/03/18 18:46:43 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.3.9 2016/06/07 09:29:05 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
-% author-date style of the Chicago Manual of Style, 16th edition.
+% author-date (trad) style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate-trad.cbx}[2016/03/18 v 2.9a biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2016/06/07 v 3.4 biblatex
 citation style]
 
-%%%% Biblatex initialization + Chicago options + Toggles %%%%
-
-\newbool{cbx:parens}
-
-\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@oneyear}
-\providetoggle{cms@avdate}
-\providetoggle{cms@ordate}
-\providetoggle{cms@nodates}
-\providetoggle{cms@authorparens}
-\providetoggle{cms@datedash}
-\providetoggle{cms@modpostnote}
-
-\providetoggle{cms@url}% These are for the field-exclusion options
-\providetoggle{cms@doi}
-\providetoggle{cms@doionly}
-\providetoggle{cms@eprint}
-\providetoggle{cms@isbn}
-\providetoggle{cms@numbermonth}
-\providetoggle{cms@bookpages}
-\providetoggle{cms@hidevolumes}% Modify Volume fix
-\providetoggle{cms@comprange}
-
-\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
-
-\providetoggle{cms@headlessnote}% Keep
-\providetoggle{cms@noibid}% Keep
-\providetoggle{cms@usecompiler}% Keep
-\providetoggle{cms@origpublished}% Keep
-\providetoggle{cms@annotation}% Keep
-\providetoggle{cms@postposit}% Keep
-\providetoggle{cms@fullshhand}%
-\providetoggle{cms@vol}%
-\providetoggle{cms@crossref}%
-\providetoggle{cms@bookcrossref}
-
-\AtEveryCitekey{%
-  \iffieldundef{userc}%
-  {}%
-  {\nocite{\thefield{userc}}}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
-
-\DeclareBibliographyOption{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,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}%
-    {\DeclareLabelyear[music,review,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}}%
-  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
-  \toggletrue{cms@avdate}}%
-\def\cms@opt@avdate@false{%
-  \togglefalse{cms@avdate}}
-
-\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
-  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
-  {\csuse{cms@global@cmsdate@#1}}
-  {\blx@err@invopt{cmsdate=#1}{}}}
-\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{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{origyear} \field{year}%
-        \field{eventyear} \field{urlyear}}%
-      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
-        \field{origyear} \field{urlyear}}}%
-    {\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}}%
-  \global\toggletrue{cms@ordate}}%
-\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
-
-\DeclareEntryOption{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}{}}}
-\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{}
-
-\DeclareBibliographyOption{annotation}[true]{%
-  \global\toggletrue{cms@annotation}}
-
-\DeclareBibliographyOption{cmslos}[true]{%
-  \global\settoggle{cms@los}{#1}}
-
-\DeclareBibliographyOption{noibid}[true]{%
-  \global\toggletrue{cms@noibid}}
-
-\DeclareBibliographyOption{compresspages}[true]{%
-  \ifcsdef{cms@opt@crange@#1}%
-  {\csuse{cms@opt@crange@#1}}%
-  {\blx@err@invopt{compresspages=#1}{}}}%
-\def\cms@opt@crange@true{%
-  \global\toggletrue{cms@comprange}%
-  \setcounter{mincomprange}{100}%
-  \setcounter{mincompwidth}{10}%
-}%
-\def\cms@opt@crange@false{}%
-
-\DeclareBibliographyOption{postnotepunct}[true]{%
-  \ifcsdef{cms@opt@ppunct@#1}%
-  {\csuse{cms@opt@ppunct@#1}}%
-  {\blx@err@invopt{postnotepunct=#1}{}}}%
-\def\cms@opt@ppunct@true{%
-  \global\toggletrue{cms@modpostnote}}%
-\def\cms@opt@ppunct@false{}%
-
-\DeclareBibliographyOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareBibliographyOption{nodates}[true]{%
-  \settoggle{cms@nodates}{#1}}
-
-\DeclareEntryOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareBibliographyOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareEntryOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareBibliographyOption{shorthandfull}[true]{%
-  \settoggle{cms@fullshhand}{#1}}
+\RequireCitationStyle{chicago-dates-common}
+
+%%%% Trad-only Option %%%%
 
 \DeclareBibliographyOption{headline}[true]{%
   \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
 
-\DeclareBibliographyOption{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}}%
-
-\DeclareEntryOption{longcrossref}[false]{%
-  \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}
-  {\blx@err@invopt{longcrossref=#1}{}}}
-
-\DeclareBibliographyOption{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}}%
-
-\DeclareEntryOption{booklongxref}[true]{%
-  \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}
-  {\blx@err@invopt{booklongxref=#1}{}}}%
-
-% The field-exclusion options %
-
-\DeclareBibliographyOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}
-\DeclareBibliographyOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
-\DeclareBibliographyOption{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}}
-\DeclareBibliographyOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}
-\DeclareBibliographyOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
-\DeclareBibliographyOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
-\DeclareBibliographyOption{includeall}[true]{%
-  \settoggle{cms@isbn}{#1}%
-  \settoggle{cms@url}{#1}%
-  \settoggle{cms@doi}{#1}%
-  \settoggle{cms@eprint}{#1}%
-  \settoggle{cms@numbermonth}{#1}%
-  \settoggle{cms@bookpages}{#1}}
-\DeclareBibliographyOption{hidevolumes}[true]{%
-  \settoggle{cms@hidevolumes}{#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}}
-
-\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}%
-
-\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldate=true}}%
-{\ExecuteBibliographyOptions{labelyear=true}}%
-
-\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
-{\global\toggletrue{cms@datedash}}%
-{\global\togglefalse{cms@datedash}}%
-
-\DeclareDataInheritance{collection}{suppcollection}{%
-  \inherit{title}{title}
-  \inherit{subtitle}{subtitle}
-  \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}}
-
-\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
-{*}{% ???
-  \noinherit{year}
-  \noinherit{month}
-  \noinherit{day}
-  \noinherit{endyear}
-  \noinherit{endmonth}
-  \noinherit{endday}
-  \noinherit{origyear}
-  \noinherit{origmonth}
-  \noinherit{origday}
-  \noinherit{origendyear}
-  \noinherit{origendmonth}
-  \noinherit{origendday}}
-
-% More authordate options %
-
-\DeclareSortingScheme{cms}{
-  \sort{
-    \field{presort}
-  }
-  \sort[final]{
-    \field{sortkey}
-  }
-  \sort{
-    \name{sortname}
-    \name{author}
-    \name{namea}
-    \name{editor}
-    \name{nameb}
-    \name{translator}
-    \name{namec}
-    \field{sorttitle}
-    \field{journaltitle}
-    \list{organization}
-    \field{title}
-  }
-  \sort{
-    \field{sortyear}
-    \field{labelyear}
-    \field{year}
-    \field{origyear}
-  }
-  \sort{
-    \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field[padside=left,padwidth=4,padchar=0]{volume}
-    \literal{0000}
-  }
-}
-
-\@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}}
-
-\DeclareEntryOption{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}%
-  }}
-
-\protected\def\blx@newcunit{%
-  \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}{*!?}}
-
-%%%% Initialize and define bibstrings %%%%
-
-% \NewBibliographyString{origpubyear} % Already in .lbx files?
-
-% \DefineBibliographyStrings{american}{%
-%   origpubyear = {first published\addspace},}
-
-%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
-
-%%%% 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{\addspace}%
-          \usebibmacro{cite:reinit}}
-        {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\iffieldundef{postnote}%
-            {\setunit{\compcitedelim}}%
-            {}%
-            \usebibmacro{cite:label}}
-          {\iffieldequals{namehash}{\cbx@lastyear}%
-            {}%
-            {\usebibmacro{cmsbracketname}% For names in []
-              \ifentrytype{customc}%
-              {\newcunit}%
-              {\setunit{\addspace}}}%
-            \usebibmacro{cite:label}%
-            \iffieldundef{postnote}%
-            {\savefield{namehash}{\cbx@lasthash}}%
-            {\savefield{namehash}{\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{\addspace}%
-          \usebibmacro{cmscitesortdate}%
-          \usebibmacro{cite:reinit}}
-        {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\iffieldundef{postnote}%
-            {\setunit{\compcitedelim}}%
-            {}%
-            \usebibmacro{cmscitesortdate}}
-          {\iffieldequals{namehash}{\cbx@lastyear}% Is this right?
-            {}%
-            {\usebibmacro{cmsbracketname}%
-              \setunit{\nameyeardelim}}%
-            \usebibmacro{cmscitesortdate}%
-            \iffieldundef{postnote}%
-            {\savefield{namehash}{\cbx@lasthash}}%
-            {\savefield{namehash}{\cbx@lastyear}}}}}%
-      {\usebibmacro{cite:shorthand}}}}%
-  \setunit{\multicitedelim}}% ???
-
-\newbibmacro*{cmsbracketname}{%
-  \iffieldequalstr{authortype}{anon}%
-  {\bibleftbracket\printnames{labelname}%
-    \bibrightbracket}%
-  {\iffieldequalstr{authortype}{anon?}%
-    {\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{namehash}{\cbx@lasthash}%
-    {\iffieldundef{postnote}%
-      {\setunit{\compcitedelim}}%
-      {}%
-      \usebibmacro{cite:label}}
-    {\usebibmacro{cite:label}%
-      \iffieldundef{postnote}%
-      {\savefield{namehash}{\cbx@lasthash}}%
-      {}}}
-  {\iffieldequals{namehash}{\cbx@lasthash}%
-    {\iffieldundef{postnote}%
-      {\setunit{\compcitedelim}}%
-      {}%
-      \usebibmacro{cmscitesortdate}}
-    {\usebibmacro{cmscitesortdate}%
-      \iffieldundef{postnote}%
-      {\savefield{namehash}{\cbx@lasthash}}%
-      {}}}}%
-
-\newbibmacro*{textcite}{%
-  \iftoggle{cms@los}%
-  {\usebibmacro{textcite:authshort}}%
-  {\usebibmacro{textcite:citeshort}}}
-
-\newbibmacro*{textcite:authshort}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-  {\iffieldundef{postnote}%
-    {\iffieldequals{namehash}{\cbx@lastyear}%
-      {\setunit{\multicitedelim}%
-        \global\undef\cbx@lastyear}%
-      {\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}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}
-          {}%
-          \usebibmacro{cite:label}}
-        {\usebibmacro{cite:label}%
-          \setunit{%
-            \global\booltrue{cbx:parens}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
-          {}%
-          \usebibmacro{cmscitesortdate}}}
-      {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-        {\usebibmacro{prenote}}
-        {}%
-        \iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}
-        {\usebibmacro{cmscitesortdate}}%
-        \savefield{namehash}{\cbx@lasthash}}}
-    {\printfield{shorthand}%
-      \setunit{%
-        \global\booltrue{cbx:parens}%
-        \addspace\bibopenparen}%
-      \ifnumequal{\value{citecount}}{1}%
-      {\usebibmacro{prenote}}%
-      {}%
-      \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}
-      {\usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}%
-    \stepcounter{textcitecount}}% Added ???
-  \setunit{%
-    \ifbool{cbx:parens}%
-    {\bibcloseparen\global\boolfalse{cbx:parens}}%
-    {}%
-    \textcitedelim}}% Not \multicitedelim ???
-
-\newbibmacro*{textcite:citeshort}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-  {\iffieldundef{shorthand}
-    {\iffieldundef{postnote}%
-      {\iffieldequals{namehash}{\cbx@lastyear}%
-        {\setunit{\multicitedelim}%
-          \global\undef\cbx@lastyear}%
-        {\setunit{\compcitedelim}}}%
-      {\setunit{\multicitedelim}}%
-      \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}%
-      {\usebibmacro{cmscitesortdate}}}
-    {\iffieldundef{postnote}%
-      {\iffieldequals{namehash}{\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}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}
-          {}%
-          \usebibmacro{cite:label}}
-        {\usebibmacro{cite:label}%
-          \setunit{%
-            \global\booltrue{cbx:parens}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
-          {}%
-          \usebibmacro{cmscitesortdate}}}
-      {\printtext[bibhyperref]{%
-          \printfield{shorthand}}}}
-    {\printnames{labelname}%
-      \setunit{%
-        \global\booltrue{cbx:parens}%
-        \addspace\bibopenparen}%
-      \ifnumequal{\value{citecount}}{1}
-      {\usebibmacro{prenote}}
-      {}%
-      \iffieldundef{shorthand}
-      {\iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}
-        {\usebibmacro{cmscitesortdate}}}%
-      {\printtext[bibhyperref]{%
-          \printfield{shorthand}}}%
-      \savefield{namehash}{\cbx@lasthash}}%
-    \stepcounter{textcitecount}}% Added ???
-  \setunit{%
-    \ifbool{cbx:parens}
-    {\bibcloseparen\global\boolfalse{cbx:parens}}%
-    {}%
-    \textcitedelim}}% Not \multicitedelim ???
-
-\newbibmacro*{textcite:postnote}{%
-  \iffieldundef{postnote}%
-  {}%
-  {\savefield{namehash}{\cbx@lastyear}%
-    \setunit{\postnotewrapper}%
-    \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{namehash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
-        \setunit{\compcitedelim}%
-        \usebibmacro{cmscitesortdate}}}
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
-        \setunit{\nameyeardelim}%
-        \usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
-  {\printtext[bibhyperref]{\printfield{shorthand}}%
-    \usebibmacro{cite:reinit}}}
-
-\newbibmacro*{cite:shorthand+title}{%
-  \iftoggle{cms@los}%
-  {\iffieldequals{namehash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
-        \setunit{\compcitedelim}%
-        \usebibmacro{cite:label}}}
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
-        \setunit{\nameyeardelim}%
-        \usebibmacro{cite:label}}%
-      \savefield{namehash}{\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
-    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\ifentrytype{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}}}%
-      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
-  {\printtext[bibhyperref]{\printfield{label}}}}
-
-\newbibmacro*{cite:labelyear+extrayear}{%
-  \ifboolexpr{ (
-    test {\ifentrytype{music}}%
-    or
-    test {\ifentrytype{review}}%
-    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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{year}%
-      {\iffieldundef{eventyear}
-        {\iffieldundef{origyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{origendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{origendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{eventendyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{endyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{origyear}%
-      {\iffieldundef{year}
-        {\iffieldundef{eventyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{eventendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{eventendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{endyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{endyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{origendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{origendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{eventyear}%
-      {\iffieldundef{origyear}
-        {\iffieldundef{year}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{endyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{endyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{origendyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{origendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{eventendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{eventendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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}{%
-  \iftoggle{cms@origlabel}%
-  {\usebibmacro{cite:origyear+labelyear}}%
-  {\iftoggle{cms@bothlabelnew}%
-    {\usebibmacro{cite:bothyear+oldstyle}}%
-    {\iftoggle{cms@bothlabelold}%
-      {\usebibmacro{cite:bothyear+oldstyle}}%
-      {\iftoggle{cms@fulldate}%
-        {\newcunit\printdate}%
-        {\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{video}}%
-    )
-    and
-    togl {cms@avdate}%
-  }
-  {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\iftoggle{cms@switchdates}%
-    {\usebibmacro{cite:labelyear+extrayear}}
-    {\iffieldundef{origyear}%
-      {\iftoggle{cms@ordate}% ???
-        {}%
-        {\clearfield{extrayear}}%
-        \usebibmacro{cite:standard+labelyear+extrayear}}%
-      {\iftoggle{cms@ordate}%
-        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-        {\printtext[bibhyperref]{%
-            \usebibmacro{origyear+endyear}}}}}}}
-
-\newbibmacro*{cite:bothyear+oldstyle}{%
-  \ifboolexpr{ (
-    test {\ifentrytype{music}}%
-    or
-    test {\ifentrytype{review}}%
-    or
-    test {\ifentrytype{video}}%
-    )
-    and
-    togl {cms@avdate}%
-  }
-  {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\iftoggle{cms@switchdates}%
-    {\printtext[bibhyperref]{%
-        \bibopenparen%
-        \usebibmacro{cite:labelyear+extrayear}%
-        \bibcloseparen%
-        \addspace\usebibmacro{origyear+endyear}}}%
-    {\iffieldundef{origyear}% ???
-      {\iftoggle{cms@ordate}%
-        {}%
-        {\clearfield{extrayear}}%
-        \usebibmacro{cite:standard+labelyear+extrayear}}%
-      {\iftoggle{cms@ordate}% Added test for year field ???
-        {\iffieldundef{year}%
-          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-          {\printtext[bibhyperref]{%
-              \bibopenparen%
-              \usebibmacro{cite:origfirst+labelyear+extrayear}%
-              \bibcloseparen%
-              \setunit{\addspace}%\addspace% ???
-              \usebibmacro{year+endyear}}}}%
-        {\printtext[bibhyperref]{%
-            \bibopenparen%
-            \usebibmacro{origyear+endyear}%
-            \bibcloseparen%
-            \clearfield{extrayear}\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}}
-
-%%% 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{namehash}{\cbx@lasthash}
-     {}
-     {\stepcounter{textcitetotal}%
-      \savefield{namehash}{\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}{}{}
-
-\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%
-  \savebibmacro{cmsbibsortdate}%
-  \renewbibmacro*{cmsbibsortdate}{}}%
-  {\usedriver
-    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
-      \usebibmacro{clearpublin}%
-      \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}
-  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
-  {\ifthenelse{\value{listcount}=1}%
-    {s\adddot vv\adddot\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{\MakeSentenceCase*{#1}}\isdot}
@@ -1319,6 +22,8 @@ citation style]
 
 \DeclareFieldFormat{lostitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
+\DeclareFieldFormat{subtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
 \DeclareFieldFormat
 [article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
 {title}{%
@@ -1334,11 +39,23 @@ citation style]
 [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}
@@ -1349,6 +66,8 @@ citation style]
 
 \DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
 
+\DeclareFieldFormat[periodical]{subtitle}{\mkbibemph{#1}\isdot}
+
 \DeclareFieldAlias[image]{citetitle}[artwork]{title}
 
 \DeclareFieldAlias[image]{lostitle}[artwork]{title}
@@ -1359,54 +78,7 @@ citation style]
 
 \DeclareFieldFormat[letter]{lostitle}{#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}}}%
-  {}{}}{}%
-
-\DeclareFieldFormat{postnote}{% Changed for page compression option
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{pagination}%
-    {\mkcomprange{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {#1}%
-    {\mkpageprefix[pagination]{#1}}}}%
-
-\DeclareFieldFormat[inreference]{postnote}{%
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
-    {\mkpageprefix[pagination]{#1}}}}%
-
-\DeclareFieldFormat{pages}{%
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{bookpagination}%
-    {\mkcomprange{#1}\isdot}%
-    {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
-  {\iffieldundef{bookpagination}%
-    {#1\isdot}%
-    {\mkpageprefix[bookpagination]{#1}}}}%
-
-\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
-
-\DeclareFieldFormat{edlang}{%
-  \ifbibstring{#1}
-  {\bibstring{#1}}
-  {\ifbibstring{ed#1}
-    {\bibstring{ed#1}}
-    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+\DeclareFieldFormat[letter]{subtitle}{#1\isdot}
 
 \DeclareFieldFormat[suppbook,suppcollection]{title}{%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
@@ -1418,21 +90,8 @@ citation style]
   \addspace%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
-\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[suppbook,suppcollection]{subtitle}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
 \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
 
@@ -1445,6 +104,11 @@ citation style]
 
 \DeclareFieldAlias[misc]{lostitle}[misc]{title}
 
+\DeclareFieldFormat[misc]{subtitle}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
 \DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}%
   {#1\isdot}}
@@ -1457,10 +121,18 @@ citation style]
 
 \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}%
@@ -1478,729 +150,31 @@ citation style]
 
 \DeclareFieldAlias[audio]{lostitle}[video]{title}
 
-%%%% Other Field Formats %%%%
-
-\DeclareNumChars*{:}%
-
-\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
-
-\DeclareFieldFormat{note}{%
-  \ifcapital{\MakeCapital{#1}}{#1}}%
-
-\DeclareFieldFormat
-[audio,manual,music,patent,report,suppbook,suppcollection,video]
-{type}{%
-  \ifbibstring{#1}%
-  {\bibstring{#1}}%
-  {\ifcapital%
-    {\MakeCapital{#1}}%
-    {#1}}}
-
-\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{recorded}\space #1}%
-    {\printfield{userd}\addspace #1}}}
-
-\DeclareFieldFormat[music]{eventdate}{% 16th ed.
-  \iffieldundef{userd}%
-  {\bibstring{recorded}\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]{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[audio,music,video]{subtitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
 
 \DeclareFieldFormat{issuetitle}{\MakeSentenceCase*{#1\isdot}}
 
-\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}
-
-%%%% Commands, for users and internal %%%%
-
-\newcommand*{\cbytypeeditor}{% Needed?
-  \iffieldundef{editortype}
-    {\bibstring{cbytypeeditor}}
-    {\bibstring{cbytype\thefield{editortype}}}}
-
-\renewcommand*{\multicitedelim}{\addsemicolon\space}
-
-\renewcommand*{\iffinalcitedelim}{%
-  \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}%
-      {\addspace}
-      {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
-          \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
-        \iffieldnums{year}% This one works.
-        {\addspace}%
-        {\addcomma\addspace}}}% 16th ed. wants comma before n.d.
-    {\addspace}}}
-
-\newcommand{\classicpunct}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \ifentrytype{letter}}%
-  {\setunit*{\addspace}}%
-  {\setunit*{\addcomma\addspace}}}
-
-\newcommand{\postvolpunct}{\addcolon}%
-
-\newcommand{\parttrans}{%
-  {\bibstring{bytranslator}\space}}%
-
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\bibstring{byeditoralt}\addspace}%
-  {\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}{%
-  \iftoggle{cms@inlineibid}%
-  {\togglefalse{cms@inlineibid}%
-    \iffieldundef{prenote}% Bug fix
-    {}%
-    {\addspace}}%
-  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
-    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
-      \iffieldpages{postnote}%
-      {\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}{% Otherwise you get an inaccurate comma.
-  \iffieldequalstr{editortype}{none}%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
-
-\newcommand*{\lbx@cfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\bibstring{cfrom\thefield{origlanguage}}}}%
-  {\unspace}}
-
-\@ifpackagelater{biblatex}{2011/11/12}
-{\renewcommand*{\lbx@fromlang}{%
-    \iffieldundef{userf}
-    {\iffieldundef{origlanguage}
-      {\unspace}
-      {\bibstring{from\thefield{origlanguage}}}}%
-    {\unspace}}}
-{\@ifpackagelater{biblatex}{2011/07/28}
-  {\newcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
-        {\bibstring{from\thefield{origlanguage}}}}%
-      {\unspace}}}%
-  {\renewcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
-        {\bibstring{from\thefield{origlanguage}}}}%
-      {\unspace}}}}
-
-\renewcommand*{\lbx@lfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\biblstring{from\thefield{origlanguage}}}}%
-  {\unspace}}
-
-\renewcommand*{\lbx@sfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\bibsstring{from\thefield{origlanguage}}}}%
-  {\unspace}}
+\DeclareFieldFormat{issuesubtitle}{\MakeSentenceCase*{#1\isdot}}
 
 %%%% 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}{%
-  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
-    {\usebibmacro{italtitle+stitle}%
-      \savefield{title}{\bbx@lasthash}}}
-
-\newbibmacro*{mag+news+author}{%
-  \ifnameundef{author}%
-  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
-    {\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}}
-
-\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}%
-        }%
-        {\bibnamedash\addperiod\addspace}%
-        {\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}}%
-  \usebibmacro{cms-in:}}
-
-\newbibmacro*{chapincoll}{%
-  \iffieldundef{chapter}%
-  {}
-  {\printfield{chapter}\addspace}}
-
-\newbibmacro*{chapinscore}{%
-  \iffieldundef{chapter}%
-  {\ifthenelse{\ifentrytype{music}%
-      \AND\NOT\iffieldundef{booktitle}}%
-    {\bibstring{on}\setunit{\addspace}}%
-    {}}%
-  {\printfield{chapter}%
-    \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}}%
-      {}%
-      {\usebibmacro{cmsorigdate}}}%
-    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-      {}%
-      {\usebibmacro{cmsorigdate}}}}}%
-
-\newbibmacro*{music+eventdate}{% Date fix
-  \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
-  {}%
-  {\printeventdate}}
-
-\newbibmacro*{ser+num}{%
-  \printfield{series}%
-  \printfield[sernum]{number}%
-  \newunit}
-
 \newbibmacro*{video+title}{%
-  \printtext{%
+  \iffieldundef{title}%
+  {}%
+  {\printtext{%
     \printfield{title}%
     \setunit{\addcolon\addspace}%
-    \printfield[title]{subtitle}}}
+    \printfield[subtitle]{subtitle}}}}
 
 \newbibmacro*{italtitle+stitle}{%
   \printtext{%
     \printfield{title}%
     \setunit{\addcolon\addspace}%
-    \printfield[title]{subtitle}}%
-  \newunit\newblock%
+    \printfield[subtitle]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -2210,19 +184,14 @@ citation style]
   \printtext{%
        \printfield{title}%
        \setunit{\addcolon\addspace}%
-       \printfield[title]{subtitle}}%
-     \newunit%\setunit{\addcomma\addspace}
+       \printfield[subtitle]{subtitle}}%
+     \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
      \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
@@ -2231,384 +200,114 @@ citation style]
     \printtext{%
       \printfield{issuetitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[issuetitle]{issuesubtitle}}}}
-
-\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}%
-%  \setunit*{\addcomma\addspace}%
-%  \usebibmacro{cmsorigdate}%
-}
-
-\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}%
-    {}
-    {\bibstring{origpublin}%
-      \origpublcite{\thefield{reprinttitle}}%
-      \newunit}}
-  {\iffieldundef{origlanguage}%
-    {\bibstring{origpub}%
-      \origfullcite{\thefield{userf}}
-      \newunit}%
-    {\iftoggle{cms@postposit}%
-      {\bibstring{origedition}%
-        \setunit{\addspace}%
-        \printfield[edlang]{origlanguage}%
-        \addcolon%
-        \origfullcite{\thefield{userf}}%
-        \newunit}%
-      {\printfield[edlang]{origlanguage}%
-        \setunit{\addspace}%
-        \bibstring{origedition}%
-        \origfullcite{\thefield{userf}}
-        \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}}%
-    {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-    {}%
-    {\cms@datelong}}}
+      \printfield[issuesubtitle]{issuesubtitle}}}}
 
-\newbibmacro*{unpubl+letter+date}{% For the Misc type.
-  \iflistundef{origlocation}%
-  {}%
-  {\printlist{origlocation}%
-    \newcunit\newblock}%
-  \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
-    {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-    {\printdate}% For interviews and other dated non-letters
-    {\cms@datelong}}}
-
-\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}}%
-    {}%
-    {\printorigdate}}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}
-    \AND\iffieldundef{day}}%  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
-    {}%
-    {\iffieldundef{month}%
-      {\printfield{year}}%
-      {\printfield[letterday]{day}\setunit{\nobreakspace}%
-        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-        \printfield{year}}}}%
-  {\iffieldundef{origyear}%
-    {}%
-    {\iffieldundef{origmonth}%
-      {\printfield{origyear}}%
-      {\printfield[letterday]{origday}\setunit{\nobreakspace}%
-        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-        \printfield{origyear}}}}}%
-
-\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
-  \printtext{% article subtype
-    \printfield{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[title]{subtitle}}% 
-  \setunit*{\addspace}%
-  \printlist[periodplace]{location}%
-  \setunit*{\addspace}%
-  \iffieldundef{series}
-  {}
-  {\newcunit
-    \printfield[jourser]{series}%
-    \newcunit}%\setunit*{\addspace}?
-  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
-  {\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*{journal+sub}{%
-  \iffieldundef{journaltitle}
-    {}
-    {\printtext[journaltitle]{%
-       \printfield[noformat]{journaltitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{journalsubtitle}}}}
-
-\newbibmacro*{chap+pag}{%
-  \printfield{chapter}%
-  \setunit*{\addcomma\space}%
-  \printfield{pages}}
-
-\newbibmacro*{mag+news+date}{%
-  \ifnameundef{author}%
-  {\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}%
-  {\printfield{origyear}}%
-  {\printfield{year}}}
-
-\newbibmacro*{cmsorigdate}{% New for 0.9
-  \iftoggle{cms@switchdates}%
-  {\printdate}%
-  {\printorigdate}}
-
-\newbibmacro*{periodical+date+issue}{% For periodical type &
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{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}%
-  \printfield{postnote}}}
-
-\newbibmacro*{part+editor+translator}{%
-  \ifnameundef{namea}%
-  {\ifnameundef{nameb}%
-    {}
-    {\bibstring{bytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{byeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{byeditor}\space%
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newunit
-      \bibstring{bytranslator}\space%
-      \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{\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}}}}}%
-    \clearname{namea}}
-
-\newbibmacro*{clearpublin}{%
-  \clearname{author}%
-  \clearname{namea}%
-  \clearname{nameb}%
-  \clearfield{nameaddon}%
-  \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
-    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
-    \ifentrytype{mvreference}}%
-  {}%
-  {\clearfield{title}%
-    \clearfield{subtitle}%
-    \clearfield{titleaddon}}%
-  \clearfield{reprinttitle}%
-  \clearfield{usere}%
-  \clearlist{language}%
-}
+%%%% Related macros that can't reside in common.cbx %%%%
+
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat{jtitle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \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}{}%
+  \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 3db9745b33e..f864ea55b06 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,15 +1,20 @@
-% $Id: chicago-authordate.bbx,v 0.8.2.9 2016/03/21 18:06:54 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.22 2016/06/07 08:46:51 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style.
 
-\ProvidesFile{chicago-authordate.bbx}[2016/03/21 v 2.9a biblatex
+\ProvidesFile{chicago-authordate.bbx}[2016/06/07 v 3.4 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
+\providetoggle{cms@citejtabb}% Here for Sourcemap declaration
+\providetoggle{cms@bibjtabb}%
+
 \DeclareFieldFormat{shorthandwidth}{#1}
 
+\DeclareFieldFormat{shortjournalwidth}{\mkbibemph{\textbf{#1}}\isdot}
+
 \newlength{\lositemsep}
 
 \defbibenvironment{bibliography}% New for 0.9a
@@ -76,6 +81,62 @@ bibliography style]
   {\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
+  \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}}%
 
@@ -104,12 +165,12 @@ bibliography style]
     \usebibmacro{name:hook}{#3#1}%
     \ifblank{#3}{}{%
       \ifcapital
-      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+      {\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}}
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
   {\usebibmacro{name:delim}{#1}%
     \usebibmacro{name:hook}{#1}%
     \mkbibnamelast{#1}\isdot%
@@ -124,8 +185,8 @@ bibliography style]
   \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
   \ifblank{#3}{}{%
     \mkbibnameprefix{#3}\isdot
-    \ifpunctmark{'}
-    {}
+    \ifpunctmark{'}%
+    {}%
     {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
   \mkbibnamelast{#1}\isdot
   \ifblank{#4}{}{%
@@ -133,37 +194,37 @@ bibliography style]
     {\ifnumeral{#4}%
       {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
       {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
-        \ifboolexpr{
+        \ifboolexpr{%
           test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
           and
           test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
-        }
+        }%
         {\addcomma}%
         {}}}%
-    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}%
 
 \@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
 {\renewbibmacro*{name:family-given}[4]{%
-  \ifuseprefix%
+  \ifuseprefix
     {\usebibmacro{name:delim}{#3#1}%
      \usebibmacro{name:hook}{#3#1}%
      \ifdefvoid{#3}{}{%
-       \ifcapital%
-         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+       \ifcapital
+         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
          {\mkbibnameprefix{#3}\isdot}%
        \ifprefchar{}{\bibnamedelimc}}%
-     \mkbibnamefamily{#1}\isdot%
+     \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%
+     \mkbibnamefamily{#1}\isdot
      \ifboolexpr{%
        test {\ifdefvoid{#2}}%
        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}}}%
@@ -173,11 +234,11 @@ bibliography style]
   \usebibmacro{name:hook}{#2#3#1}%
   \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}%
   \ifdefvoid{#3}{}{%
-    \mkbibnameprefix{#3}\isdot%
-    \ifprefchar%
+    \mkbibnameprefix{#3}\isdot
+    \ifprefchar
       {}%
       {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
-  \mkbibnamefamily{#1}\isdot%
+  \mkbibnamefamily{#1}\isdot
   \ifdefvoid{#4}{}{%
     \iftoggle{cms@jrcomma}%
     {\ifnumeral{#4}%
@@ -187,93 +248,43 @@ bibliography style]
           test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
           and
           test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
-        }
+        }%
         {\revsdnamepunct}%
         {}}}%
     {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
 
-\newbibmacro*{author/editors/translators}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-    {\usebibmacro{author}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-       {\usebibmacro{parteditor}}%
-       {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-         {\usebibmacro{editor}}%
-         {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-           {\usebibmacro{parttranslator}}%
-           {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-             {\usebibmacro{translator}}%
-             {\ifnameundef{namec}%
-               {\let\bbx@lasthash\undefined}%
-               {\usebibmacro{compiler}}}}}}}}
-
 \renewbibmacro*{author/editor}{%
-  \ifuseauthor%
-    {\usebibmacro{author}}%
+  \ifboolexpr{%
+    test {\ifuseauthor}%
+    or
+    togl {cms@headlessnote}%
+  }%
+  {\usebibmacro{author}}%
+  {\ifusenamea%
+    {\usebibmacro{pickeditor}}%
     {\ifuseeditor%
-      {\ifnameundef{namea}%
-        {\usebibmacro{moreeditor}}%
-        {\usebibmacro{parteditor}}}%
-      {\ifusetranslator%
-        {\ifnameundef{nameb}%
+      {\usebibmacro{moreeditor}}%
+      {\ifusenameb%
+        {\usebibmacro{picktranslator}}%
+        {\ifusetranslator%
           {\usebibmacro{moretranslator}}%
-          {\usebibmacro{parttranslator}}}%
-        {\iftoggle{cms@usecompiler}%
-          {\usebibmacro{compiler}}%
-          {\let\bbx@lasthash\undefined%
-            \settoggle{cms@usecompiler}{true}}}}}}
+          {\ifusenamec%
+            {\usebibmacro{compiler}}%
+            {\let\bbx@lasthash\undefined}}}}}}}%
 
 \renewbibmacro*{author}{%
   \iftoggle{cms@headlessnote}%
   {\usebibmacro{justauthor}}%
   {\usebibmacro{moreauthor}}}
 
-\newbibmacro*{allauthor}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\ifnameundef{translator}%
-      {\ifnameundef{namec}%
-        {\let\bbx@lasthash\undefined}%
-        {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-            \iffirstonpage}
-               {\bibnamedash\addcomma\space}
-               {\printnames[sortname]{namec}\addcomma\space
-                 \savefield{namehash}{\bbx@lasthash}}%
-               \usebibmacro{compilestrg}}}%
-           {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-               \iffirstonpage}
-             {\bibnamedash\addcomma\space}
-             {\printnames[sortname]{translator}\addcomma\space
-               \savefield{namehash}{\bbx@lasthash}}%
-             \usebibmacro{transstrg}}}%
-         {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-             \iffirstonpage}
-           {\bibnamedash\addcomma\space}
-           {\printnames{editor}\addcomma\space
-             \savefield{namehash}{\bbx@lasthash}}%
-           \usebibmacro{editstrg}}}%
-       {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-           \iffirstonpage}
-         {\iffieldundef{nameaddon}%
-           {\bibnamedash\addperiod\addspace}
-           {\bibnamedash\addspace}}%
-         {\iffieldequalstr{authortype}{anon}%
-           {\bibleftbracket\printnames{author}\bibrightbracket%
-             \savefield{namehash}{\bbx@lasthash}}%
-           {\iffieldequalstr{authortype}{anon?}%
-             {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-               \savefield{namehash}{\bbx@lasthash}}%
-             {\printnames{author}%
-             \savefield{namehash}{\bbx@lasthash}}}}}}
-
 \newbibmacro*{justauthor}{%
-  \ifnameundef{author}
-  {\let\bbx@lasthash\undefined}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\let\bbx@lasthash\undefined}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
+      {\bibnamedash\addperiod\addspace}%
+      {\bibnamedash\addspace}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -284,7 +295,7 @@ bibliography style]
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
-  \ifnameundef{author}%
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\usebibmacro{pickeditor}}%
   {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
       \iffirstonpage}%
@@ -303,15 +314,15 @@ bibliography style]
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
-  \ifnameundef{namea}
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
   {\usebibmacro{moreeditor}}%
   {\usebibmacro{parteditor}}}
 
 \newbibmacro*{moreeditor}{%
-  \ifnameundef{editor}
-    {\usebibmacro{picktranslator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
+  \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+    {\usebibmacro{picktranslator}}%
+    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+                 \iffirstonpage}%
        {\bibnamedash\editordelim}%
        {\iftoggle{cms@authorparens}%
          {\bibopenparen\printnames{editor}%
@@ -321,74 +332,86 @@ bibliography style]
      \usebibmacro{editstrg}}}
 
 \renewbibmacro*{editor}{%
-  \ifnameundef{editor}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}
-       {\iftoggle{cms@authorparens}%
-         {\bibopenparen\printnames{editor}%
-           \bibcloseparen\editordelim}%
-         {\printnames{editor}\editordelim}%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+    {\ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
+      {\usebibmacro{picktranslator}}%
+      {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+          \iffirstonpage}%
+        {\bibnamedash\editordelim}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printnames{editor}%
+            \bibcloseparen\editordelim}%
+          {\printnames{editor}\editordelim}%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        \usebibmacro{editstrg}}}%
+    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+        \iffirstonpage}%
+      {\bibnamedash\nameadelim}%
+      {\iftoggle{cms@authorparens}%
+        {\bibopenparen\printnames[sortname]{namea}%
+          \bibcloseparen\nameadelim}%
+        {\printnames[sortname]{namea}\nameadelim}%
         \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
+      \usebibmacro{parteditstrg}}}}
 
 \newbibmacro*{parteditor}{%
-  \ifnameundef{namea}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\iftoggle{cms@authorparens}%
-         {\bibopenparen\printnames[sortname]{namea}%
-           \bibcloseparen\addcomma\space}%
-         {\printnames[sortname]{namea}\addcomma\space}%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parteditstrg}}}
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
+  {\usebibmacro{picktranslator}}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
+    {\bibnamedash\nameadelim}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{namea}%
+        \bibcloseparen\nameadelim}%
+      {\printnames[sortname]{namea}\nameadelim}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parteditstrg}}}
 
 \newbibmacro*{picktranslator}{%
-  \ifnameundef{nameb}
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
   {\usebibmacro{moretranslator}}%
   {\usebibmacro{parttranslator}}}
 
 \newbibmacro*{moretranslator}{%
-  \ifnameundef{translator}
-    {\usebibmacro{compiler}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\iftoggle{cms@authorparens}%
-         {\bibopenparen\printnames[sortname]{translator}%
-           \bibcloseparen\addcomma\space}%
-         {\printnames[sortname]{translator}\addcomma\space}%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{transstrg}}}
+  \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}%
+  {\usebibmacro{compiler}}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
+    {\bibnamedash\addcomma\addspace}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{translator}%
+        \bibcloseparen\addcomma\addspace}%
+      {\printnames[sortname]{translator}\addcomma\addspace}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{transstrg}}}
 
 \newbibmacro*{parttranslator}{%
-  \ifnameundef{nameb}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\iftoggle{cms@authorparens}%
-         {\bibopenparen\printnames[sortname]{nameb}%
-           \bibcloseparen\addcomma\space}%
-         {\printnames[sortname]{nameb}\addcomma\space}%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parttransstrg}}}
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
+  {\usebibmacro{compiler}}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
+    {\bibnamedash\addcomma\addspace}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{nameb}%
+        \bibcloseparen\addcomma\addspace}%
+      {\printnames[sortname]{nameb}\addcomma\addspace}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{parttransstrg}}}
 
 \newbibmacro*{compiler}{%
-  \ifnameundef{namec}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\iftoggle{cms@authorparens}%
-         {\bibopenparen\printnames[sortname]{namec}%
-           \bibcloseparen\addcomma\space}%
-         {\printnames[sortname]{namec}\addcomma\space}%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{compilestrg}}}
+  \ifthenelse{\ifnameundef{namec}\OR\NOT\ifusenamec}%
+  {\let\bbx@lasthash\undefined}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
+    {\bibnamedash\addcomma\addspace}%
+    {\iftoggle{cms@authorparens}%
+      {\bibopenparen\printnames[sortname]{namec}%
+        \bibcloseparen\addcomma\addspace}%
+      {\printnames[sortname]{namec}\addcomma\addspace}%
+      \savefield{fullhash}{\bbx@lasthash}}%
+    \usebibmacro{compilestrg}}}
 
 \renewcommand*{\revsdnamedelim}{\addcomma}
 
@@ -400,7 +423,7 @@ bibliography style]
 
 \DeclareBibliographyDriver{shorthand}{%
   \iftoggle{cms@los}%
-  {\ifnameundef{labelname}
+  {\ifnameundef{labelname}%
     {\mkbibemph{\bibstring{see}}%
       \addspace%
       \usebibmacro{shorthand:label}}%
@@ -412,14 +435,14 @@ bibliography style]
     {\usedriver{\frenchspacing}%
       {\thefield{entrytype}}%
       \finentry}%
-    {\ifnameundef{labelname}
+    {\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}%
@@ -427,7 +450,7 @@ bibliography style]
 
 \DeclareBibliographyDriver{shorthands}{% biblatex < 2.9
   \iftoggle{cms@los}%
-  {\ifnameundef{labelname}
+  {\ifnameundef{labelname}%
     {\mkbibemph{\bibstring{see}}%
       \addspace%
       \usebibmacro{shorthand:label}}%
@@ -439,19 +462,45 @@ bibliography style]
     {\usedriver{\frenchspacing}%
       {\thefield{entrytype}}%
       \finentry}%
-    {\ifnameundef{labelname}
+    {\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{shortjournal}{%
+  \iffieldundef{journaltitle}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\printtext[journaltitle]{%
+      \printfield[jtnoformat]{journaltitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[sjtnoformat]{journalsubtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  \finentry}%
+
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=shorttitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+  }
+}%
+
 \DeclareBibliographyDriver{article}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
@@ -465,6 +514,8 @@ bibliography style]
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
   \newunit\newblock%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock%
   \usebibmacro{bibreprint}%
@@ -490,6 +541,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
@@ -529,6 +585,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -571,6 +632,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -581,10 +647,20 @@ bibliography style]
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not test {\iffieldundef{title}}%
+  }%
+  {\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    or
+    test {\iffieldundef{title}}%
+  }%
+  {}{\usebibmacro{italtitle+stitle}}%
   \newunit\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
@@ -592,7 +668,7 @@ bibliography style]
   \newcunit%\setunit{\addperiod\addspace}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
@@ -602,27 +678,29 @@ bibliography style]
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
   \newunit\newblock
@@ -651,6 +729,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 
@@ -672,7 +755,7 @@ bibliography style]
     {\usebibmacro{edition}}}%
   {}%
   \newunit\newblock% 16th ed.
-  \usebibmacro{byauthor}
+  \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
@@ -724,32 +807,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -792,7 +890,7 @@ bibliography style]
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -820,32 +918,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -878,6 +991,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -893,6 +1011,8 @@ bibliography style]
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -909,7 +1029,7 @@ bibliography style]
   {}%
   {\usebibmacro{edition}}%
   \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
+  \usebibmacro{byeditor+others}%
   \newunit
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -934,32 +1054,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1011,6 +1146,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1029,16 +1169,16 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@crossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@crossref}%
-    }
+    }%
   {\setunit{\addperiod\addspace}%
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1073,32 +1213,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1117,16 +1272,16 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@crossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@crossref}%
-    }
+    }%
   {\setunit{\addperiod\addspace}% Moved here.
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1161,32 +1316,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1205,16 +1375,16 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@crossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@crossref}%
-    }
+    }%
   {\setunit{\addperiod\addspace}%
     \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1242,32 +1412,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1292,7 +1477,7 @@ bibliography style]
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -1329,6 +1514,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1343,7 +1533,7 @@ bibliography style]
   \newunit\newblock
   \printtext[title]{%
     \printfield[noformat]{title}}%
-  \newcunit\newblock%
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{letter+date}%
@@ -1352,16 +1542,16 @@ bibliography style]
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@crossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@crossref}%
-    }
+    }%
   {\usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1393,32 +1583,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1459,6 +1664,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1479,7 +1689,7 @@ bibliography style]
   {\printfield{title}%
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
+    \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
@@ -1515,6 +1725,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1525,10 +1740,20 @@ bibliography style]
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not test {\iffieldundef{title}}%
+  }%
+  {\usebibmacro{italtitle+stitle}}{}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    or
+    test {\iffieldundef{title}}%
+  }%
+  {}{\usebibmacro{italtitle+stitle}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
@@ -1538,7 +1763,7 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\newunit}% Fix customc?
   {\newcunit}%
   \iffieldundef{edition}%
@@ -1548,27 +1773,29 @@ bibliography style]
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
   \newunit\newblock
@@ -1604,6 +1831,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1657,6 +1889,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1675,8 +1912,8 @@ bibliography style]
   \printfield{type}%
   \setunit{\addspace}%
   \printfield{number}%
-  \iflistundef{location}
-    {}
+  \iflistundef{location}%
+    {}%
     {\setunit*{\addspace}%
      \printtext[parens]{%
        \printlist[][-\value{listtotal}]{location}}}%
@@ -1709,6 +1946,11 @@ bibliography style]
   \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
+  \iftoggle{cms@related}%
+  {\newunit%
+    \usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{periodical}{%
@@ -1718,11 +1960,15 @@ bibliography style]
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{%
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\printtext[title]{% magazine subtype
+    \printfield[tnoformat]{title}%
     \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+    \printfield[stnoformat]{subtitle}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \clearlist{location}%
@@ -1756,6 +2002,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
@@ -1763,11 +2014,15 @@ bibliography style]
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-  \ifundef\bbx@lasthash{%
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
+  \ifboolexpr{%
+    test {\ifundef{\bbx@lasthash}}%
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\printtext[title]{% magazine subtype
+    \printfield[tnoformat]{title}%
     \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+    \printfield[stnoformat]{subtitle}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \clearlist{location}%
@@ -1801,6 +2056,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1816,6 +2076,8 @@ bibliography style]
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -1827,6 +2089,8 @@ bibliography style]
       togl {cms@bookcrossref}%
     }%
   {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -1849,32 +2113,47 @@ bibliography style]
   \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}}
+  \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}}}
 
@@ -1899,7 +2178,7 @@ bibliography style]
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -1927,6 +2206,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1967,6 +2251,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1991,13 +2280,15 @@ bibliography style]
   {\printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}}%
-  \setunit{\addspace}%
+  \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}%
@@ -2007,7 +2298,7 @@ bibliography style]
   \usebibmacro{editorpunct}%\newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
-  \iffieldequalstr{entrysubtype}{magazine}
+  \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+date}%
   \newcunit\newblock
   \usebibmacro{chap+pag}}%
@@ -2025,6 +2316,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -2041,7 +2337,7 @@ bibliography style]
   \usebibmacro{italtitle+stitle}%
   \newcunit\newblock
   \usebibmacro{bybookauthor}%
-  \clearname{bookauthor}
+  \clearname{bookauthor}%
   \newunit\newblock}{}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
@@ -2091,6 +2387,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -2125,6 +2426,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -2161,6 +2467,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -2174,19 +2485,19 @@ bibliography style]
   \ifundef\bbx@lasthash{%
   \usebibmacro{video+title}% Simplifies trad style
   \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\newcunit}
-  {\newunit}%\setunit{\addspace}\newblock%
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
   \printfield{titleaddon}%\usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}
+  \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
-  {\newcunit}
-  {\newunit}%\setunit{\addspace}\newblock%
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
   \printfield{titleaddon}%\usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
   \usebibmacro{language+transtitle}}%
@@ -2197,7 +2508,7 @@ bibliography style]
   \setunit{\addperiod\addspace}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
@@ -2207,27 +2518,29 @@ bibliography style]
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
   \newunit\newblock
@@ -2255,6 +2568,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 
@@ -2273,20 +2591,32 @@ bibliography style]
     {\printfield{doi}%
       \setunit*{\addperiod\addspace}\newblock%
       \clearfield{url}}}%
-  {\iftoggle{cms@doi}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
     {\printfield{doi}%
       \setunit*{\addperiod\addspace}\newblock}%
     {}}%
-  \iftoggle{cms@eprint}%
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
   {\usebibmacro{eprint}%
     \setunit*{\addperiod\addspace}\newblock}%
   {}%
-  \iftoggle{cms@url}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
   {\printfield{url}}%
   {}}%
 
 \newbibmacro*{shorthand:author}{%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{shorthand}}%
     or
     not togl {cms@los}%
@@ -2312,6 +2642,8 @@ bibliography style]
     or
     test {\ifentrytype{review}}%
     or
+    test {\ifentrytype{suppperiodical}}%
+    or
     test {\ifentrytype{video}}%
     )
     and
@@ -2325,7 +2657,7 @@ bibliography style]
 \newbibmacro*{standard+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
     \iffieldequalstr{labelyear}{nodate}}% or new declaration ???
-    {\ifboolexpr{
+    {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
         test {\ifentrytype{inreference}}%
@@ -2338,7 +2670,7 @@ bibliography style]
       {}%
       {\bibstring{nodate}}}%
     {\iffieldundef{year}%
-      {\iffieldundef{eventyear}
+      {\iffieldundef{eventyear}%
         {\iffieldundef{origyear}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
@@ -2347,11 +2679,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{urlendyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{urlyear}}%
               {\iffieldundef{urlmonth}%
@@ -2366,11 +2698,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{origendyear}%
             {\clearfield{origyear}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{origendyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{origyear}}%
               {\iffieldundef{origmonth}%
@@ -2385,11 +2717,11 @@ bibliography style]
             \printfield{extrayear}}%
           \iffieldundef{eventendyear}%
           {\clearfield{eventyear}}%
-          {\ifboolexpr{
+          {\ifboolexpr{%
               test {\iffieldequalstr{eventendyear}{}}%
               and
               not togl {cms@datedash}%
-            }
+            }%
             {\mbox{\bibdatedash}%
               \clearfield{eventyear}}%
             {\iffieldundef{eventmonth}%
@@ -2404,23 +2736,23 @@ bibliography style]
           \printfield{extrayear}}%
         \iffieldundef{endyear}% DATE FIX
         {\clearfield{year}}%
-        {\ifboolexpr{
+        {\ifboolexpr{%
             test {\iffieldequalstr{endyear}{}}%
             and
             not togl {cms@datedash}%
-          }
+          }%
           {\mbox{\bibdatedash}%
             \clearfield{year}}%
           {\iffieldundef{month}%
             {\clearfield{year}}%
             {\iffieldsequal{year}{endyear}%
               {\clearfield{year}\clearfield{endyear}}%
-              {}}}}}}}
+              {}}}}}}}%
 
 \newbibmacro*{origfirst+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
     \iffieldequalstr{labelyear}{nodate}}%
-    {\ifboolexpr{
+    {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
         test {\ifentrytype{inreference}}%
@@ -2433,7 +2765,7 @@ bibliography style]
       {}%
       {\bibstring{nodate}}}%
     {\iffieldundef{origyear}%
-      {\iffieldundef{year}
+      {\iffieldundef{year}%
         {\iffieldundef{eventyear}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
@@ -2442,11 +2774,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{urlendyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{urlyear}}%
               {\iffieldundef{urlmonth}%
@@ -2461,11 +2793,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{eventendyear}%
             {\clearfield{eventyear}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{eventendyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{eventyear}}%
               {\iffieldundef{eventmonth}%
@@ -2480,11 +2812,11 @@ bibliography style]
             \printfield{extrayear}}%
           \iffieldundef{endyear}%
           {\clearfield{year}}%
-          {\ifboolexpr{
+          {\ifboolexpr{%
               test {\iffieldequalstr{endyear}{}}%
               and
               not togl {cms@datedash}%
-            }
+            }%
             {\mbox{\bibdatedash}%
               \clearfield{year}}%
             {\iffieldundef{month}%
@@ -2499,23 +2831,23 @@ bibliography style]
           \printfield{extrayear}}%
         \iffieldundef{origendyear}% DATE FIX
         {\clearfield{origyear}}%
-        {\ifboolexpr{
+        {\ifboolexpr{%
             test {\iffieldequalstr{origendyear}{}}%
             and
             not togl {cms@datedash}%
-          }
+          }%
           {\mbox{\bibdatedash}%
             \clearfield{origyear}}%
           {\iffieldundef{origmonth}%
             {\clearfield{origyear}}%
             {\iffieldsequal{origyear}{origendyear}%
               {\clearfield{origyear}\clearfield{origendyear}}%
-              {}}}}}}}
+              {}}}}}}}%
 
 \newbibmacro*{av+labelyear+extrayear}{%
   \ifthenelse{\iffieldundef{labelyear}\OR%
     \iffieldequalstr{labelyear}{nodate}}%
-    {\ifboolexpr{
+    {\ifboolexpr{%
         test {\ifentrytype{misc}}%
         or
         test {\ifentrytype{inreference}}%
@@ -2528,7 +2860,7 @@ bibliography style]
       {}%
       {\bibstring{nodate}}}%
     {\iffieldundef{eventyear}%
-      {\iffieldundef{origyear}
+      {\iffieldundef{origyear}%
         {\iffieldundef{year}%
           {\printfield{labelyear}%
             \iffieldundef{extrayear}%
@@ -2537,11 +2869,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{urlendyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{urlyear}}%
               {\iffieldundef{urlmonth}%
@@ -2556,11 +2888,11 @@ bibliography style]
               \printfield{extrayear}}%
             \iffieldundef{endyear}%
             {\clearfield{year}}%
-            {\ifboolexpr{
+            {\ifboolexpr{%
                 test {\iffieldequalstr{endyear}{}}%
                 and
                 not togl {cms@datedash}%
-              }
+              }%
               {\mbox{\bibdatedash}%
                 \clearfield{year}}%
               {\iffieldundef{month}%
@@ -2575,11 +2907,11 @@ bibliography style]
             \printfield{extrayear}}%
           \iffieldundef{origendyear}%
           {\clearfield{origyear}}%
-          {\ifboolexpr{
+          {\ifboolexpr{%
               test {\iffieldequalstr{origendyear}{}}%
               and
               not togl {cms@datedash}%
-            }
+            }%
             {\mbox{\bibdatedash}%
               \clearfield{origyear}}%
             {\iffieldundef{origmonth}%
@@ -2594,18 +2926,18 @@ bibliography style]
           \printfield{extrayear}}%
         \iffieldundef{eventendyear}% DATE FIX
         {\clearfield{eventyear}}%
-        {\ifboolexpr{
+        {\ifboolexpr{%
             test {\iffieldequalstr{eventendyear}{}}%
             and
             not togl {cms@datedash}%
-          }
+          }%
           {\mbox{\bibdatedash}%
             \clearfield{eventyear}}%
           {\iffieldundef{eventmonth}%
             {\clearfield{eventyear}}%
             {\iffieldsequal{eventyear}{eventendyear}%
               {\clearfield{eventyear}\clearfield{eventendyear}}%
-              {}}}}}}}
+              {}}}}}}}%
 
 \newbibmacro*{origyear+endyear}{%
   \printfield{origyear}%
@@ -2660,7 +2992,7 @@ bibliography style]
       {\usebibmacro{labelyear+extrayear}}}}%
   \ifcsdef{@cms@tempdate}%
   {\toggletrue{\@cms@tempdate}}%
-  {}}
+  {}}%
 
 \newbibmacro*{origyear+labelyear}{%
   \ifboolexpr{ (
@@ -2668,11 +3000,13 @@ bibliography style]
     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}}%
@@ -2684,7 +3018,7 @@ bibliography style]
       {\iftoggle{cms@ordate}%
         {\usebibmacro{origfirst+labelyear+extrayear}}%
         {\usebibmacro{origyear+endyear}%
-          \clearfield{origyear}}}}}}
+          \clearfield{origyear}}}}}}%
 
 \newbibmacro*{bothyear+oldstyle}{%
   \ifboolexpr{ (
@@ -2692,11 +3026,13 @@ bibliography style]
     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{%
@@ -2706,7 +3042,7 @@ bibliography style]
         \setunit{\addspace}\usebibmacro{origyear+endyear}}%
       \clearfield{year}%
       \clearfield{origyear}}%
-    {\iffieldundef{origyear}
+    {\iffieldundef{origyear}%
       {\iftoggle{cms@ordate}%
         {}%
         {\clearfield{extrayear}}%
@@ -2727,7 +3063,7 @@ bibliography style]
             \clearfield{extrayear}\setunit*{\addspace}%
             \usebibmacro{standard+labelyear+extrayear}}}%
         \clearfield{origyear}%
-        \clearfield{year}}}}}
+        \clearfield{year}}}}}%
 
 \newbibmacro*{pubstate}{%
   \iftoggle{cms@reprint}%
@@ -2736,19 +3072,19 @@ bibliography style]
       {}%
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
-          \printdate\addperiod}\nopunct}}
+          \printdate}}}% Need \addperiod & \nopunct ??
     {\iffieldundef{origyear}%
       {}%
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
-          \printorigdate\addperiod}\nopunct}}}%
-  {\printfield{pubstate}}}
+          \printorigdate}}}}% Need \addperiod & \nopunct ??
+  {\printfield{pubstate}}}%
 
 \newbibmacro*{choosepubstring}{%
   \ifthenelse{\ifentrytype{video}\OR%
     \ifentrytype{music}}%
   {\bibstring{origreleaseyear}}%
-  {\bibstring{origpubyearalt}}}%
+  {\bibstring{origpubyear}}}%
 
 \newbibmacro*{bibreprint}{%
   \iftoggle{cms@reprint}%
@@ -2757,14 +3093,14 @@ bibliography style]
     {\iftoggle{cms@switchdates}%
       {\bibstring{reprint}\newcunit}% 16th ed.
       {}}}%
-  {}}
+  {}}%
 
 \newbibmacro*{volume+pages}{% Volume fix (modified)
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{maintitle}}%
     or
     togl {cms@vol}%
-  }
+  }%
   {\global\togglefalse{cms@vol}%
     \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\printfield{pages}%
@@ -2785,7 +3121,7 @@ bibliography style]
         \printfield{part}%
         \newcunit%
         \printfield{pages}}}}%
-  {\ifboolexpr{
+  {\ifboolexpr{%
       togl {cms@hidevolumes}%
       and
       (
@@ -2809,14 +3145,14 @@ bibliography style]
       {\iffieldundef{part}%
         {}%
         {\newcunit\printfield{part}}}%
-      {\ifboolexpr{
+      {\ifboolexpr{%
           test {\ifcsdef{cbx@incollvol}}%
           and
           test {\iffieldequalcs{volume}{cbx@incollvol}}%
         }%
         {\iffieldundef{part}%
           {}%
-          {\ifboolexpr{
+          {\ifboolexpr{%
               test {\ifcsdef{cbx@incollpart}}%
               and
               test {\iffieldequalcs{part}{cbx@incollpart}}%
@@ -2830,14 +3166,14 @@ bibliography style]
       {\iffieldundef{part}%
         {\newcunit\printfield{pages}}%
         {\newcunit\printfield{part}\newcunit\printfield{pages}}}%
-      {\ifboolexpr{
+      {\ifboolexpr{%
           test {\ifcsdef{cbx@incollvol}}%
           and
           test {\iffieldequalcs{volume}{cbx@incollvol}}%
         }%
         {\iffieldundef{part}%
           {\newcunit\printfield{pages}}%
-          {\ifboolexpr{
+          {\ifboolexpr{%
               test {\ifcsdef{cbx@incollpart}}%
               and
               test {\iffieldequalcs{part}{cbx@incollpart}}%
@@ -2858,12 +3194,16 @@ bibliography style]
             \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}%
@@ -2871,7 +3211,7 @@ bibliography style]
     {\printfield{volumes}}%
     {\printfield{volume}%
       \printfield{part}}}%
-  {\ifboolexpr{
+  {\ifboolexpr{%
       togl {cms@hidevolumes}%
       and
       (
@@ -2884,31 +3224,33 @@ bibliography style]
     {\printfield{volumes}}}}
 
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% Test ???
-    {\usebibmacro{cms-in:}% Volume-less treatment?
+    {\iffieldundef{title}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}% Volume-less treatment?
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}}
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}}%
 
 \newbibmacro*{btitle+bstitle}{% InIn fix from N&B
-  \iffieldundef{booktitle}
-  {}
+  \iffieldundef{booktitle}%
+  {}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {}%
@@ -2916,44 +3258,44 @@ bibliography style]
     \printtext{%
       \printfield{booktitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[booktitle]{booksubtitle}}%
-    \newcunit
+      \printfield[booksubtitle]{booksubtitle}}%
+    \setunit{\ctitleaddonpunct}%
     \printfield{booktitleaddon}%
-    \setunit*{\addcomma\addspace}}}
+    \setunit*{\addcomma\addspace}}}%
 
 \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{maintitle}
-  {}
+  \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{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
+        \printfield[mainsubtitle]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}%
-      \toggletrue{cms@vol}}
+      \toggletrue{cms@vol}}%
     {\printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}}
+        \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}
-    {}
+  \iffieldundef{series}%
+    {}%
     {\newcunit
       \printfield[jourser]{series}%
       \newcunit}%\setunit*{\addspace}?
@@ -2962,7 +3304,7 @@ bibliography style]
     {\newcunit%
       \printfield[journum]{number}%
       \clearfield{number}%
-      \setunit{\addcomma\addspace}}
+      \setunit{\addcomma\addspace}}%
     {\printfield[jourvol]{volume}%
       \setunit{\addcomma\addspace}}}%
   {\printfield[jourvol]{volume}%
@@ -2971,78 +3313,78 @@ bibliography style]
     \clearfield{number}%
     \setunit{\addcomma\addspace}}% need * here?
   \printfield{eid}%
-  \newunit}
+  \newunit}%
 
 \newbibmacro*{journal+issue+year+pages}{%
   \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
   \usebibmacro{cjournal+ser+vol+num}%
   \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
-    \AND\iffieldundef{number}}%
-  {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
+  \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?
     {\setunit{\postvolpunct}}%
     {\setunit{\addcolon\addspace}}}% This may not be universally correct.
   {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{date}%
         \printfield{number}}%
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}
-  \printfield{pages}}
+    \setunit{\addcolon\addspace}}%
+  \printfield{pages}}%
 
 \newbibmacro*{periodical+issue+year+pages}{%
   \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
   \usebibmacro{cperiodical+ser+vol+num}%
   \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
-    \AND\iffieldundef{number}}%
+  \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 ???
     {\setunit{\postvolpunct}}%
     {\setunit{\addcolon\addspace}}}%
   {\printtext[parens]{%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{date}%
         \printfield{number}}%
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}
-  \printfield{pages}}
+    \setunit{\addcolon\addspace}}%
+  \printfield{pages}}%
 
 \newbibmacro*{bycompiler}{%
-  \ifnameundef{namec}
-    {}
+  \ifnameundef{namec}%
+    {}%
     {\bibstring{bycompiler}\addspace
      \printnames[bycompiler]{namec}}}
 
 \renewbibmacro*{byeditor}{%
-  \ifnameundef{editor}
-    {}
+  \ifnameundef{editor}%
+    {}%
     {\usebibmacro{cbytypestrg}{editor}{editor}%
      \setunit{\addspace}%
      \printnames[byeditor]{editor}%
      \usebibmacro{editorpunct}}%
-  \usebibmacro{byeditorx}}
+  \usebibmacro{byeditorx}}%
 
 \renewbibmacro*{byeditorx}{%
-  \ifnameundef{editora}
-    {}
+  \ifnameundef{editora}%
+    {}%
     {\usebibmacro{cbytypestrg}{editora}{editor}%
      \setunit{\addspace}%
      \printnames[byeditora]{editora}%
      \usebibmacro{editorpunct}}%
-  \ifnameundef{editorb}
-    {}
+  \ifnameundef{editorb}%
+    {}%
     {\usebibmacro{cbytypestrg}{editorb}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorb]{editorb}%
      \usebibmacro{editorpunct}}%
-  \ifnameundef{editorc}
-    {}
+  \ifnameundef{editorc}%
+    {}%
     {\usebibmacro{cbytypestrg}{editorc}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorc]{editorc}%
@@ -3051,32 +3393,32 @@ bibliography style]
 \renewbibmacro*{byeditor+others}{%
   \ifthenelse{\NOT\ifnameundef{editor}\AND
     \(\iffieldundef{editortype}\OR
-    \iffieldequalstr{editortype}{editor}\)}
+    \iffieldequalstr{editortype}{editor}\)}%
     {\def\@tempa{byeditor}%
-     \ifnamesequal{editor}{translator}
+     \ifnamesequal{editor}{translator}%
        {\edef\@tempa{\@tempa tr}%
-        \clearname{translator}}
+        \clearname{translator}}%
        {}%
-       \ifnamesequal{editor}{namec}
+       \ifnamesequal{editor}{namec}%
        {\edef\@tempa{\@tempa cp}%
-         \clearname{namec}}
+         \clearname{namec}}%
        {}%
-     \ifnamesequal{editor}{commentator}
+     \ifnamesequal{editor}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{editor}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{editor}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{editor}{introduction}
+     \ifnamesequal{editor}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{editor}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{editor}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{editor}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{editor}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
      \bibstring{\@tempa}%
      \setunit{\addspace}%
@@ -3085,65 +3427,65 @@ bibliography style]
      \usebibmacro{editorpunct}%
      \usebibmacro{byeditorx}}%
    {\usebibmacro{byeditor}}%
-  \usebibmacro{bytranslator+others}}
+  \usebibmacro{bytranslator+others}}%
 
 \renewbibmacro*{bytranslator+others}{%
-  \ifnameundef{translator}
-    {}
+  \ifnameundef{translator}%
+    {}%
     {\def\@tempa{bytranslator}%
-      \ifnamesequal{translator}{namec}
+      \ifnamesequal{translator}{namec}%
       {\edef\@tempa{\@tempa cp}%
-        \clearname{namec}}
+        \clearname{namec}}%
       {}%
-     \ifnamesequal{translator}{commentator}
+     \ifnamesequal{translator}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{translator}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{translator}{introduction}
+     \ifnamesequal{translator}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{translator}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{translator}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
      \bibstring{\@tempa}\space
      \printnames[bytranslator]{translator}%
      \clearname{translator}%
      \usebibmacro{editorpunct}}%
-  \usebibmacro{bycompiler+others}}
+  \usebibmacro{bycompiler+others}}%
 
 \newbibmacro*{bycompiler+others}{%
-  \ifnameundef{namec}
-    {}
+  \ifnameundef{namec}%
+    {}%
     {\def\@tempa{bycompiler}%
-     \ifnamesequal{namec}{commentator}
+     \ifnamesequal{namec}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{namec}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{namec}{introduction}
+     \ifnamesequal{namec}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{namec}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{namec}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
      \bibstring{\@tempa}\space
      \printnames[bycompiler]{namec}%
      \clearname{namec}%
      \usebibmacro{editorpunct}}%
-  \usebibmacro{byothers}}
+  \usebibmacro{byothers}}%
 
 \newbibmacro*{byothers}{% Changed for 0.9
   \usebibmacro{cbytranslator}%
@@ -3160,6 +3502,83 @@ bibliography style]
   \usebibmacro{editorpunct}%
   \usebibmacro{withforeword}%
   \usebibmacro{editorpunct}%
-  \usebibmacro{withafterword}}
+  \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}{}
+
+\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} }%
+    {}%
+    {\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}%
+            {\printtext{\relateddelim}}%
+            {}}%
+        \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}}}%
 
 \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 bea3e54af0b..df02300309f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,1312 +1,13 @@
-% $Id: chicago-authordate.cbx,v 0.8.2.7 2016/03/18 18:46:17 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.3.12 2016/06/07 09:26:22 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate.cbx}[2016/03/18 v 2.9a biblatex
+\ProvidesFile{chicago-authordate.cbx}[2016/06/07 v 3.4 biblatex
 citation style]
 
-%%%% Biblatex initialization + Chicago options + Toggles %%%%
-
-\newbool{cbx:parens}
-
-\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@oneyear}
-\providetoggle{cms@avdate}
-\providetoggle{cms@ordate}
-\providetoggle{cms@nodates}
-\providetoggle{cms@authorparens}
-\providetoggle{cms@datedash}
-\providetoggle{cms@modpostnote}
-
-\providetoggle{cms@url}% These are for the field-exclusion options
-\providetoggle{cms@doi}
-\providetoggle{cms@doionly}
-\providetoggle{cms@eprint}
-\providetoggle{cms@isbn}
-\providetoggle{cms@numbermonth}
-\providetoggle{cms@bookpages}
-\providetoggle{cms@hidevolumes}% Modify Volume fix
-\providetoggle{cms@comprange}
-
-\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
-
-\providetoggle{cms@headlessnote}% Keep
-\providetoggle{cms@noibid}% Keep
-\providetoggle{cms@usecompiler}% Keep
-\providetoggle{cms@origpublished}% Keep
-\providetoggle{cms@annotation}% Keep
-\providetoggle{cms@postposit}% Keep
-\providetoggle{cms@fullshhand}%
-\providetoggle{cms@vol}%
-\providetoggle{cms@crossref}%
-\providetoggle{cms@bookcrossref}
-
-\AtEveryCitekey{%
-  \iffieldundef{userc}%
-  {}%
-  {\nocite{\thefield{userc}}}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
-
-\DeclareBibliographyOption{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,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}%
-    {\DeclareLabelyear[music,review,video]{\field{eventyear}%
-        \field{origyear} \field{year} \field{urlyear}}}}%
-  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
-  \toggletrue{cms@avdate}}%
-\def\cms@opt@avdate@false{%
-  \togglefalse{cms@avdate}}
-
-\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
-  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
-  {\csuse{cms@global@cmsdate@#1}}
-  {\blx@err@invopt{cmsdate=#1}{}}}
-\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{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{origyear} \field{year}%
-        \field{eventyear} \field{urlyear}}%
-      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
-        \field{origyear} \field{urlyear}}}%
-    {\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}}%
-  \global\toggletrue{cms@ordate}}%
-\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
-
-\DeclareEntryOption{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}{}}}
-\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{}
-
-\DeclareBibliographyOption{annotation}[true]{%
-  \global\toggletrue{cms@annotation}}
-
-\DeclareBibliographyOption{cmslos}[true]{%
-  \global\settoggle{cms@los}{#1}}
-
-\DeclareBibliographyOption{noibid}[true]{%
-  \global\toggletrue{cms@noibid}}
-
-\DeclareBibliographyOption{compresspages}[true]{%
-  \ifcsdef{cms@opt@crange@#1}%
-  {\csuse{cms@opt@crange@#1}}%
-  {\blx@err@invopt{compresspages=#1}{}}}%
-\def\cms@opt@crange@true{%
-  \global\toggletrue{cms@comprange}%
-  \setcounter{mincomprange}{100}%
-  \setcounter{mincompwidth}{10}%
-}%
-\def\cms@opt@crange@false{}%
-
-\DeclareBibliographyOption{postnotepunct}[true]{%
-  \ifcsdef{cms@opt@ppunct@#1}%
-  {\csuse{cms@opt@ppunct@#1}}%
-  {\blx@err@invopt{postnotepunct=#1}{}}}%
-\def\cms@opt@ppunct@true{%
-  \global\toggletrue{cms@modpostnote}}%
-\def\cms@opt@ppunct@false{}%
-
-\DeclareBibliographyOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareBibliographyOption{nodates}[true]{%
-  \settoggle{cms@nodates}{#1}}
-
-\DeclareEntryOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareBibliographyOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareEntryOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareBibliographyOption{shorthandfull}[true]{%
-  \settoggle{cms@fullshhand}{#1}}
-
-\DeclareBibliographyOption{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}}%
-
-\DeclareEntryOption{longcrossref}[false]{%
-  \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}
-  {\blx@err@invopt{longcrossref=#1}{}}}
-
-\DeclareBibliographyOption{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}}%
-
-\DeclareEntryOption{booklongxref}[true]{%
-  \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}
-  {\blx@err@invopt{booklongxref=#1}{}}}%
-
-% The field-exclusion options %
-
-\DeclareBibliographyOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}
-\DeclareBibliographyOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
-\DeclareBibliographyOption{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}}
-\DeclareBibliographyOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}
-\DeclareBibliographyOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
-\DeclareBibliographyOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
-\DeclareBibliographyOption{includeall}[true]{%
-  \settoggle{cms@isbn}{#1}%
-  \settoggle{cms@url}{#1}%
-  \settoggle{cms@doi}{#1}%
-  \settoggle{cms@eprint}{#1}%
-  \settoggle{cms@numbermonth}{#1}%
-  \settoggle{cms@bookpages}{#1}}
-\DeclareBibliographyOption{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}}
-
-\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}%
-
-\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldate=true}}%
-{\ExecuteBibliographyOptions{labelyear=true}}%
-
-\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
-{\global\toggletrue{cms@datedash}}%
-{\global\togglefalse{cms@datedash}}%
-
-\DeclareDataInheritance{collection}{suppcollection}{%
-  \inherit{title}{title}
-  \inherit{subtitle}{subtitle}
-  \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}}
-
-\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
-{*}{% ???
-  \noinherit{year}
-  \noinherit{month}
-  \noinherit{day}
-  \noinherit{endyear}
-  \noinherit{endmonth}
-  \noinherit{endday}
-  \noinherit{origyear}
-  \noinherit{origmonth}
-  \noinherit{origday}
-  \noinherit{origendyear}
-  \noinherit{origendmonth}
-  \noinherit{origendday}}
-
-% More authordate options %
-
-\DeclareSortingScheme{cms}{
-  \sort{
-    \field{presort}
-  }
-  \sort[final]{
-    \field{sortkey}
-  }
-  \sort{
-    \name{sortname}
-    \name{author}
-    \name{namea}
-    \name{editor}
-    \name{nameb}
-    \name{translator}
-    \name{namec}
-    \field{sorttitle}
-    \field{journaltitle}
-    \list{organization}
-    \field{title}
-  }
-  \sort{
-    \field{sortyear}
-    \field{labelyear}
-    \field{year}
-    \field{origyear}
-  }
-  \sort{
-    \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field[padside=left,padwidth=4,padchar=0]{volume}
-    \literal{0000}
-  }
-}
-
-\@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}}
-
-\DeclareEntryOption{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}%
-  }}
-
-\protected\def\blx@newcunit{%
-  \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}{*!?}}
-
-%%%% Initialize and define bibstrings %%%%
-
-% \NewBibliographyString{origpubyear} % Already in .lbx files?
-
-% \DefineBibliographyStrings{american}{%
-%   origpubyear = {first published\addspace},}
-
-%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
-
-%%%% 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{\addspace}%
-          \usebibmacro{cite:reinit}}
-        {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\iffieldundef{postnote}%
-            {\setunit{\compcitedelim}}%
-            {}%
-            \usebibmacro{cite:label}}
-          {\iffieldequals{namehash}{\cbx@lastyear}%
-            {}%
-            {\usebibmacro{cmsbracketname}% For names in []
-              \ifentrytype{customc}%
-              {\newcunit}%
-              {\setunit{\addspace}}}%
-            \usebibmacro{cite:label}%
-            \iffieldundef{postnote}%
-            {\savefield{namehash}{\cbx@lasthash}}%
-            {\savefield{namehash}{\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{\addspace}%
-          \usebibmacro{cmscitesortdate}%
-          \usebibmacro{cite:reinit}}
-        {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\iffieldundef{postnote}%
-            {\setunit{\compcitedelim}}%
-            {}%
-            \usebibmacro{cmscitesortdate}}
-          {\iffieldequals{namehash}{\cbx@lastyear}% Is this right?
-            {}%
-            {\usebibmacro{cmsbracketname}%
-              \setunit{\nameyeardelim}}%
-            \usebibmacro{cmscitesortdate}%
-            \iffieldundef{postnote}%
-            {\savefield{namehash}{\cbx@lasthash}}%
-            {\savefield{namehash}{\cbx@lastyear}}}}}%
-      {\usebibmacro{cite:shorthand}}}}%
-  \setunit{\multicitedelim}}% ???
-
-\newbibmacro*{cmsbracketname}{%
-  \iffieldequalstr{authortype}{anon}%
-  {\bibleftbracket\printnames{labelname}%
-    \bibrightbracket}%
-  {\iffieldequalstr{authortype}{anon?}%
-    {\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{namehash}{\cbx@lasthash}%
-    {\iffieldundef{postnote}%
-      {\setunit{\compcitedelim}}%
-      {}%
-      \usebibmacro{cite:label}}
-    {\usebibmacro{cite:label}%
-      \iffieldundef{postnote}%
-      {\savefield{namehash}{\cbx@lasthash}}%
-      {}}}
-  {\iffieldequals{namehash}{\cbx@lasthash}%
-    {\iffieldundef{postnote}%
-      {\setunit{\compcitedelim}}%
-      {}%
-      \usebibmacro{cmscitesortdate}}
-    {\usebibmacro{cmscitesortdate}%
-      \iffieldundef{postnote}%
-      {\savefield{namehash}{\cbx@lasthash}}%
-      {}}}}%
-
-\newbibmacro*{textcite}{%
-  \iftoggle{cms@los}%
-  {\usebibmacro{textcite:authshort}}%
-  {\usebibmacro{textcite:citeshort}}}
-
-\newbibmacro*{textcite:authshort}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-  {\iffieldundef{postnote}%
-    {\iffieldequals{namehash}{\cbx@lastyear}%
-      {\setunit{\multicitedelim}%
-        \global\undef\cbx@lastyear}%
-      {\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}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cite:label}}
-        {\usebibmacro{cite:label}%
-          \setunit{%
-            \global\booltrue{cbx:parens}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cmscitesortdate}}}
-      {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-        {\usebibmacro{prenote}}%
-        {}%
-        \iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}%
-        {\usebibmacro{cmscitesortdate}}%
-        \savefield{namehash}{\cbx@lasthash}}}%
-    {\printfield{shorthand}%
-      \setunit{%
-        \global\booltrue{cbx:parens}%
-        \addspace\bibopenparen}%
-      \ifnumequal{\value{citecount}}{1}%
-      {\usebibmacro{prenote}}%
-      {}%
-      \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}%
-      {\usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}%
-    \stepcounter{textcitecount}}% Added ???
-  \setunit{%
-    \ifbool{cbx:parens}%
-    {\bibcloseparen\global\boolfalse{cbx:parens}}%
-    {}%
-    \textcitedelim}}% Not \multicitedelim ???
-
-\newbibmacro*{textcite:citeshort}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-  {\iffieldundef{shorthand}
-    {\iffieldundef{postnote}%
-      {\iffieldequals{namehash}{\cbx@lastyear}%
-        {\setunit{\multicitedelim}%
-          \global\undef\cbx@lastyear}%
-        {\setunit{\compcitedelim}}}%
-      {\setunit{\multicitedelim}}%
-      \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}%
-      {\usebibmacro{cmscitesortdate}}}%
-    {\iffieldundef{postnote}%
-      {\iffieldequals{namehash}{\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}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cite:label}}
-        {\usebibmacro{cite:label}%
-          \setunit{%
-            \global\booltrue{cbx:parens}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}%
-          {}%
-          \usebibmacro{cmscitesortdate}}}%
-      {\printtext[bibhyperref]{%
-          \printfield{shorthand}}}}
-    {\printnames{labelname}%
-      \setunit{%
-        \global\booltrue{cbx:parens}%
-        \addspace\bibopenparen}%
-      \ifnumequal{\value{citecount}}{1}
-      {\usebibmacro{prenote}}%
-      {}%
-      \iffieldundef{shorthand}
-      {\iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}%
-        {\usebibmacro{cmscitesortdate}}}%
-      {\printtext[bibhyperref]{%
-          \printfield{shorthand}}}%
-      \savefield{namehash}{\cbx@lasthash}}%
-    \stepcounter{textcitecount}}% Added ???
-  \setunit{%
-    \ifbool{cbx:parens}
-    {\bibcloseparen\global\boolfalse{cbx:parens}}%
-    {}%
-    \textcitedelim}}% Not \multicitedelim ???
-
-\newbibmacro*{textcite:postnote}{%
-  \iffieldundef{postnote}%
-  {}%
-  {\savefield{namehash}{\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{namehash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
-        \setunit{\compcitedelim}%
-        \usebibmacro{cmscitesortdate}}}
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
-        \setunit{\nameyeardelim}%
-        \usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
-  {\printtext[bibhyperref]{\printfield{shorthand}}%
-    \usebibmacro{cite:reinit}}}
-
-\newbibmacro*{cite:shorthand+title}{%
-  \iftoggle{cms@los}%
-  {\iffieldequals{namehash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
-        \setunit{\compcitedelim}%
-        \usebibmacro{cite:label}}}
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
-        \setunit{\nameyeardelim}%
-        \usebibmacro{cite:label}}%
-      \savefield{namehash}{\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
-    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\ifentrytype{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}}}%
-      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
-  {\printtext[bibhyperref]{\printfield{label}}}}
-
-\newbibmacro*{cite:labelyear+extrayear}{%
-  \ifboolexpr{ (
-    test {\ifentrytype{music}}%
-    or
-    test {\ifentrytype{review}}%
-    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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{year}%
-      {\iffieldundef{eventyear}
-        {\iffieldundef{origyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{origendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{origendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{eventendyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{endyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{origyear}%
-      {\iffieldundef{year}
-        {\iffieldundef{eventyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{eventendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{eventendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{endyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{endyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{origendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{origendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
-  {\printtext[bibhyperref]{%
-      \iffieldundef{eventyear}%
-      {\iffieldundef{origyear}
-        {\iffieldundef{year}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{endyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{endyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{origendyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{origendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{eventendyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{eventendyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}}%
-          {}}}}}}
-
-\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}{%
-  \iftoggle{cms@origlabel}%
-  {\usebibmacro{cite:origyear+labelyear}}%
-  {\iftoggle{cms@bothlabelnew}%
-    {\usebibmacro{cite:bothyear+oldstyle}}%
-    {\iftoggle{cms@bothlabelold}%
-      {\usebibmacro{cite:bothyear+oldstyle}}%
-      {\iftoggle{cms@fulldate}%
-        {\newcunit\printdate}%
-        {\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{video}}%
-    )
-    and
-    togl {cms@avdate}%
-  }
-  {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\iftoggle{cms@switchdates}%
-    {\usebibmacro{cite:labelyear+extrayear}}%
-    {\iffieldundef{origyear}%
-      {\iftoggle{cms@ordate}% ???
-        {}%
-        {\clearfield{extrayear}}%
-        \usebibmacro{cite:standard+labelyear+extrayear}}%
-      {\iftoggle{cms@ordate}%
-        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-        {\printtext[bibhyperref]{%
-            \usebibmacro{origyear+endyear}}}}}}}
-
-\newbibmacro*{cite:bothyear+oldstyle}{%
-  \ifboolexpr{ (
-    test {\ifentrytype{music}}%
-    or
-    test {\ifentrytype{review}}%
-    or
-    test {\ifentrytype{video}}%
-    )
-    and
-    togl {cms@avdate}%
-  }
-  {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\iftoggle{cms@switchdates}%
-    {\printtext[bibhyperref]{%
-        \bibopenparen%
-        \usebibmacro{cite:labelyear+extrayear}%
-        \bibcloseparen%
-        \addspace\usebibmacro{origyear+endyear}}}%
-    {\iffieldundef{origyear}% ???
-      {\iftoggle{cms@ordate}%
-        {}%
-        {\clearfield{extrayear}}%
-        \usebibmacro{cite:standard+labelyear+extrayear}}%
-      {\iftoggle{cms@ordate}% Added test for year field ???
-        {\iffieldundef{year}%
-          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
-          {\printtext[bibhyperref]{%
-              \bibopenparen%
-              \usebibmacro{cite:origfirst+labelyear+extrayear}%
-              \bibcloseparen%
-              \setunit{\addspace}%\addspace% ???
-              \usebibmacro{year+endyear}}}}%
-        {\printtext[bibhyperref]{%
-            \bibopenparen%
-            \usebibmacro{origyear+endyear}%
-            \bibcloseparen%
-            \clearfield{extrayear}\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}}
-
-%%% 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{namehash}{\cbx@lasthash}
-     {}
-     {\stepcounter{textcitetotal}%
-      \savefield{namehash}{\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}{}{}
-
-\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%
-    \savebibmacro{cmsbibsortdate}%
-    \renewbibmacro*{cmsbibsortdate}{}}%
-  {\usedriver
-    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
-      \usebibmacro{clearpublin}%
-      \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}
-  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
-  {\ifthenelse{\value{listcount}=1}%
-    {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
-    {\ifthenelse{\value{listcount}<\value{listtotal}}%
-      {\addspace\mkbibquote{#1\isdot}\addcomma}%
-      {\addspace\mkbibquote{#1\isdot}}}}}
+\RequireCitationStyle{chicago-dates-common}
 
 %%%% Field Formats -- Title, Citetitle, Lostitle %%%%
 
@@ -1356,55 +57,6 @@ citation style]
 
 \DeclareFieldFormat[letter,patent]{lostitle}{#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}}}%
-  {}{}}{}%
-
-\DeclareFieldFormat{postnote}{% Changed for page compression option
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{pagination}%
-    {\mkcomprange{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {#1}%
-    {\mkpageprefix[pagination]{#1}}}}%
-
-\DeclareFieldFormat[inreference]{postnote}{%
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
-    {\mkpageprefix[pagination]{#1}}}}%
-
-\DeclareFieldFormat{pages}{%
-  \iftoggle{cms@comprange}%
-  {\iffieldundef{bookpagination}%
-    {\mkcomprange{#1}\isdot}%
-    {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
-  {\iffieldundef{bookpagination}%
-    {#1\isdot}%
-    {\mkpageprefix[bookpagination]{#1}}}}%
-
-\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
-
-\DeclareFieldFormat{edlang}{%
-  \ifbibstring{#1}
-  {\bibstring{#1}}
-  {\ifbibstring{ed#1}
-    {\bibstring{ed#1}}
-    {\ifcapital{\MakeCapital{#1}}{#1}}}}
-
 \DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
@@ -1414,22 +66,6 @@ citation style]
   \addspace%
   \mkbibemph{#1}\isdot}
 
-\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}}}
-
 \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
 
 \DeclareFieldFormat[misc]{title}{%
@@ -1457,6 +93,10 @@ citation style]
 
 \DeclareFieldFormat{maintitle}{\mkbibemph{#1}}
 
+\DeclareFieldFormat{booksubtitle}{\mkbibemph{#1}}
+
+\DeclareFieldFormat{mainsubtitle}{\mkbibemph{#1}}
+
 \DeclareFieldFormat[audio,music,video]{title}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{#1}\isdot}%
@@ -1474,729 +114,24 @@ citation style]
 
 \DeclareFieldAlias[audio]{lostitle}[audio]{title}
 
-%%%% Other Field Formats %%%%
-
-\DeclareNumChars*{:}%
-
-\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{recorded}\space #1}%
-    {\printfield{userd}\addspace #1}}}
-
-\DeclareFieldFormat[music]{eventdate}{% 16th ed.
-  \iffieldundef{userd}%
-  {\bibstring{recorded}\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]{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{issuetitle}{\mkbibquote{#1\isdot}}
 
-\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}
-
-%%%% Commands, for users and internal %%%%
-
-\newcommand*{\cbytypeeditor}{% Needed?
-  \iffieldundef{editortype}
-    {\bibstring{cbytypeeditor}}
-    {\bibstring{cbytype\thefield{editortype}}}}
-
-\renewcommand*{\multicitedelim}{\addsemicolon\space}
-
-\renewcommand*{\iffinalcitedelim}{%
-  \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}%
-      {\addspace}
-      {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
-          \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
-        \iffieldnums{year}% This one works.
-        {\addspace}%
-        {\addcomma\addspace}}}% 16th ed. wants comma before n.d.
-    {\addspace}}}
-
-\newcommand{\classicpunct}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \ifentrytype{letter}}%
-  {\setunit*{\addspace}}%
-  {\setunit*{\addcomma\addspace}}}
-
-\newcommand{\postvolpunct}{\addcolon}%
-
-\newcommand{\parttrans}{%
-  {\bibstring{bytranslator}\space}}%
-
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\bibstring{byeditoralt}\addspace}%
-  {\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}{%
-  \iftoggle{cms@inlineibid}%
-  {\togglefalse{cms@inlineibid}%
-    \iffieldundef{prenote}% Bug fix
-    {}%
-    {\addspace}}%
-  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
-    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
-      \iffieldpages{postnote}%
-      {\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}{% Otherwise you get an inaccurate comma.
-  \iffieldequalstr{editortype}{none}%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
-
-\newcommand*{\lbx@cfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\bibstring{cfrom\thefield{origlanguage}}}}%
-  {\unspace}}
-
-\@ifpackagelater{biblatex}{2011/11/12}
-{\renewcommand*{\lbx@fromlang}{%
-    \iffieldundef{userf}
-    {\iffieldundef{origlanguage}
-      {\unspace}
-      {\bibstring{from\thefield{origlanguage}}}}%
-    {\unspace}}}
-{\@ifpackagelater{biblatex}{2011/07/28}
-  {\newcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
-        {\bibstring{from\thefield{origlanguage}}}}%
-      {\unspace}}}%
-  {\renewcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
-        {\bibstring{from\thefield{origlanguage}}}}%
-      {\unspace}}}}
-
-\renewcommand*{\lbx@lfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\biblstring{from\thefield{origlanguage}}}}%
-  {\unspace}}
-
-\renewcommand*{\lbx@sfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
-    {\bibsstring{from\thefield{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}{%
-  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
-    {\usebibmacro{italtitle+stitle}%
-      \savefield{title}{\bbx@lasthash}}}
-
-\newbibmacro*{mag+news+author}{%
-  \ifnameundef{author}%
-  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}%
-    {\bibnamedash\addperiod\addspace}%
-    {\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}}
-
-\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}%
-        }%
-        {\bibnamedash\addperiod\addspace}%
-        {\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}}%
-  \usebibmacro{cms-in:}}
-
-\newbibmacro*{chapincoll}{%
-  \iffieldundef{chapter}%
-  {}
-  {\printfield{chapter}\addspace}}
-
-\newbibmacro*{chapinscore}{%
-  \iffieldundef{chapter}%
-  {\ifthenelse{\ifentrytype{music}%
-      \AND\NOT\iffieldundef{booktitle}}%
-    {\bibstring{on}\setunit{\addspace}}%
-    {}}%
-  {\printfield{chapter}%
-    \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}}%
-      {}%
-      {\usebibmacro{cmsorigdate}}}%
-    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-      {}%
-      {\usebibmacro{cmsorigdate}}}}}%
-
-\newbibmacro*{music+eventdate}{% Date fix
-  \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
-  {}%
-  {\printeventdate}}
-
-\newbibmacro*{ser+num}{%
-  \printfield{series}%
-  \printfield[sernum]{number}%
-  \newunit}
-
 \newbibmacro*{video+title}{% Simplifies trad style.
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}}
+  \iffieldundef{title}%
+  {}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}}}
 
 \newbibmacro*{italtitle+stitle}{%
   \printtext[title]{%
-    \printfield[noformat]{title}%
+    \printfield[tnoformat]{title}%
     \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newunit\newblock%
+    \printfield[stnoformat]{subtitle}}%
+  \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -2207,404 +142,123 @@ citation style]
        \printfield[noformat]{title}%
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{subtitle}}%
-     \newunit%\setunit{\addcomma\addspace}
+     \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
      \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[noformat]{issuetitle}%
+      \printfield[itnoformat]{issuetitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[noformat]{issuesubtitle}}}}
-
-\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}%
-%  \setunit*{\addcomma\addspace}%
-%  \usebibmacro{cmsorigdate}%
-}
-
-\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}%
-    {}
-    {\bibstring{origpublin}%
-      \origpublcite{\thefield{reprinttitle}}%
-      \newunit}}
-  {\iffieldundef{origlanguage}%
-    {\bibstring{origpub}%
-      \origfullcite{\thefield{userf}}
-      \newunit}%
-    {\iftoggle{cms@postposit}%
-      {\bibstring{origedition}%
-        \setunit{\addspace}%
-        \printfield[edlang]{origlanguage}%
-        \addcolon%
-        \origfullcite{\thefield{userf}}%
-        \newunit}%
-      {\printfield[edlang]{origlanguage}%
-        \setunit{\addspace}%
-        \bibstring{origedition}%
-        \origfullcite{\thefield{userf}}
-        \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}}%
-    {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-    {}%
-    {\cms@datelong}}}
-
-\newbibmacro*{unpubl+letter+date}{% For the Misc type.
-  \iflistundef{origlocation}%
-  {}%
-  {\printlist{origlocation}%
-    \newcunit\newblock}%
-  \iftoggle{cms@switchdates}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
-    {}%
-    {\cms@datelongalt}}%
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
-    {\printdate}% For interviews and other dated non-letters
-    {\cms@datelong}}}
-
-\newbibmacro*{cmsbookdate}{%
-  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{origyear}}%
-  {\newunit}%
-  {\iftoggle{cms@switchdates}%
-    {\iffieldundef{origyear}%
-      {\newunit}%
-      {\newcunit\printorigdate}}%
-    {\iffieldundef{year}%
-      {\newunit}%
-      {\newcunit\printdate}}}}
+      \printfield[sitnoformat]{issuesubtitle}}}}
 
-\renewbibmacro*{date}{% Adding the test solved some issues in 0.9 with
-  \iftoggle{cms@switchdates}
-  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}
-    \AND\iffieldundef{origday}}%
-    {}%
-    {\printorigdate}}%
-  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}
-    \AND\iffieldundef{day}}%  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
-    {}%
-    {\iffieldundef{month}%
-      {\printfield{year}}%
-      {\printfield[letterday]{day}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
-        \printfield{year}}}}%
-  {\iffieldundef{origyear}%
-    {}%
-    {\iffieldundef{origmonth}%
-      {\printfield{origyear}}%
-      {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
-        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
-        \printfield{origyear}}}}}%
-
-\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
-  \printtext[title]{% article subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}% 
-  \setunit*{\addspace}%
-  \printlist[periodplace]{location}%
-  \setunit*{\addspace}%
-  \iffieldundef{series}
-  {}
-  {\newcunit
-    \printfield[jourser]{series}%
-    \newcunit}%\setunit*{\addspace}?
-  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
-  {\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*{journal+sub}{%
-  \iffieldundef{journaltitle}
-    {}
-    {\printtext[journaltitle]{%
-       \printfield[noformat]{journaltitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{journalsubtitle}}}}
-
-\newbibmacro*{chap+pag}{%
-  \printfield{chapter}%
-  \setunit*{\addcomma\space}%
-  \printfield{pages}}
-
-\newbibmacro*{mag+news+date}{%
-  \ifnameundef{author}%
-  {\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}%
-  {\printfield{origyear}}%
-  {\printfield{year}}}
-
-\newbibmacro*{cmsorigdate}{% New for 0.9
-  \iftoggle{cms@switchdates}%
-  {\printdate}%
-  {\printorigdate}}
-
-\newbibmacro*{periodical+date+issue}{% For periodical type &
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{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}}}
+%%%% Related macros that can't reside in common.cbx %%%%
 
-\newbibmacro*{part+editor+translator}{%
-  \ifnameundef{namea}%
-  {\ifnameundef{nameb}%
-    {}
-    {\bibstring{bytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{byeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{byeditor}\space%
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newunit
-      \bibstring{bytranslator}\space%
-      \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{\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}}}}}%
-    \clearname{namea}}
-
-\newbibmacro*{clearpublin}{%
-  \clearname{author}%
-  \clearname{namea}%
-  \clearname{nameb}%
-  \clearfield{nameaddon}%
-  \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
-    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
-    \ifentrytype{mvreference}}%
-  {}%
-  {\clearfield{title}%
-    \clearfield{subtitle}%
-    \clearfield{titleaddon}}%
-  \clearfield{reprinttitle}%
-  \clearfield{usere}%
-  \clearlist{language}%
-}
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibquote{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \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}{}%
+  \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
new file mode 100644
index 00000000000..c0b4b338168
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
@@ -0,0 +1,3075 @@
+% $Id: chicago-dates-common.cbx,v 0.9.1.21 2016/06/07 09:00:02 dfussner Exp $
+% This is a biblatex citation style file, adapted from Lehman's
+% authoryear-comp.cbx.  It is heavily modified, and contains the
+% common code for providing inline citations (and a reference list)
+% for the two author-date styles of the Chicago Manual of Style, 16th
+% edition.
+
+\ProvidesFile{chicago-dates-common.cbx}[2016/06/07 v 3.4 biblatex
+citation style]
+
+%%%% Biblatex initialization + Chicago options + Toggles %%%%
+
+\newbool{cbx:parens}
+
+\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@oneyear}
+\providetoggle{cms@avdate}
+\providetoggle{cms@ordate}
+\providetoggle{cms@nodates}
+\providetoggle{cms@authorparens}
+\providetoggle{cms@datedash}
+\providetoggle{cms@modpostnote}
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@doi}
+\providetoggle{cms@doionly}
+\providetoggle{cms@eprint}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+\providetoggle{cms@hidevolumes}% Modify Volume fix
+\providetoggle{cms@comprange}
+
+\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
+
+\providetoggle{cms@headlessnote}% Keep
+\providetoggle{cms@noibid}% Keep
+\providetoggle{cms@usecompiler}% Keep
+\providetoggle{cms@origpublished}% Keep
+\providetoggle{cms@annotation}% Keep
+\providetoggle{cms@postposit}% Keep
+\providetoggle{cms@fullshhand}%
+\providetoggle{cms@vol}%
+\providetoggle{cms@crossref}%
+\providetoggle{cms@bookcrossref}
+\providetoggle{cms@gencite}
+\providetoggle{cms@genallnames}
+\providetoggle{cms@xrefurl}
+\providetoggle{cms@related}
+
+\AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
+  \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{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{eventyear}%
+        \field{origyear} \field{year} \field{urlyear}}}%
+    {\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}}%
+\def\cms@opt@avdate@false{%
+  \togglefalse{cms@avdate}}%
+
+\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@global@cmsdate@#1}}%
+  {\blx@err@invopt{cmsdate=#1}{}}}%
+\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{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{origyear} \field{year}%
+        \field{eventyear} \field{urlyear}}%
+      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
+        \field{origyear} \field{urlyear}}}%
+    {\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}}%
+  \global\toggletrue{cms@ordate}}%
+\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
+
+\DeclareEntryOption{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}{}}}%
+\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{}%
+
+\DeclareBibliographyOption[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}%
+
+\DeclareEntryOption[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}%
+
+\DeclareBibliographyOption[boolean]{annotation}[true]{%
+  \global\settoggle{cms@annotation}{#1}}%
+
+\DeclareBibliographyOption[boolean]{cmslos}[true]{%
+  \global\settoggle{cms@los}{#1}}%
+
+\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{postnotepunct}[true]{%
+  \ifcsdef{cms@opt@ppunct@#1}%
+  {\csuse{cms@opt@ppunct@#1}}%
+  {\blx@err@invopt{postnotepunct=#1}{}}}%
+\def\cms@opt@ppunct@true{%
+  \global\toggletrue{cms@modpostnote}}%
+\def\cms@opt@ppunct@false{}%
+
+\DeclareBibliographyOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}%
+
+\DeclareBibliographyOption{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}%
+
+\DeclareEntryOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}%
+
+\DeclareBibliographyOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}%
+
+\DeclareEntryOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}%
+
+\DeclareBibliographyOption{shorthandfull}[true]{%
+  \settoggle{cms@fullshhand}{#1}}%
+
+\DeclareBibliographyOption{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}}%
+
+\DeclareEntryOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}%
+  {\blx@err@invopt{longcrossref=#1}{}}}%
+
+\DeclareBibliographyOption{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}}%
+
+\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]{%
+  \settoggle{cms@xrefurl}{#1}}%
+
+\DeclareBibliographyOption[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}}%
+
+\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}}}%
+
+\DeclareBibliographyOption[boolean]{related}[true]{%
+  \settoggle{cms@related}{#1}}%
+
+\DeclareEntryOption[boolean]{related}[true]{%
+  \settoggle{cms@related}{#1}}%
+
+% Controlling punctuation before titleaddon fields %
+
+\DeclareBibliographyOption[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}}%
+
+\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]{%
+  \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}}%
+
+\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]{%
+  \settoggle{cms@isbn}{#1}}%
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{cms@url}{#1}}%
+\DeclareBibliographyOption{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}}%
+\DeclareBibliographyOption{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}%
+\DeclareBibliographyOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}%
+\DeclareBibliographyOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBibliographyOption{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@eprint}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}%
+\DeclareBibliographyOption{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}}%
+
+\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
+  ctitleaddon,ptitleaddon,journalabbrev=notes}%
+
+\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldate=true}}%
+{\ExecuteBibliographyOptions{labelyear=true}}%
+
+\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+{\global\toggletrue{cms@datedash}}%
+{\global\togglefalse{cms@datedash}}%
+
+\DeclareDataInheritance{collection}{suppcollection}{%
+  \inherit{title}{title}
+  \inherit{subtitle}{subtitle}
+  \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{doi}
+  \noinherit{eprint}
+  \noinherit{eprinttype}
+  \noinherit{url}}
+
+\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
+{*}{% ???
+  \noinherit{year}
+  \noinherit{month}
+  \noinherit{day}
+  \noinherit{endyear}
+  \noinherit{endmonth}
+  \noinherit{endday}
+  \noinherit{origyear}
+  \noinherit{origmonth}
+  \noinherit{origday}
+  \noinherit{origendyear}
+  \noinherit{origendmonth}
+  \noinherit{origendday}}
+
+% More authordate options %
+
+\DeclareSortingScheme{cms}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \name{sortname}
+    \name{author}
+    \name{namea}
+    \name{editor}
+    \name{nameb}
+    \name{translator}
+    \name{namec}
+    \field{sorttitle}
+    \field{journaltitle}
+    \list{organization}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{labelyear}
+    \field{year}
+    \field{origyear}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field[padside=left,padwidth=4,padchar=0]{volume}
+    \literal{0000}
+  }
+}
+
+\DeclareSortingScheme{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}}%
+
+\DeclareEntryOption{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}%
+  }}%
+
+\protected\def\blx@newcunit{%
+  \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{\cms@testspace}%
+          \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}%
+  {\bibleftbracket\printnames{labelname}%
+    \bibrightbracket}%
+  {\iffieldequalstr{authortype}{anon?}%
+    {\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 {\iflastcitekey}%
+            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 {\iflastcitekey}%
+          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 {\iflastcitekey}%
+        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 {\iflastcitekey}%
+          }%
+          {\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 {\iflastcitekey}%
+      }%
+      {\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[bibhyperref]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cmscitesortdate}}}%
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \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[bibhyperref]{%
+        \setunit{\multicitedelim}%
+        \usebibmacro{cite:label}}}%
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \setunit{\cms@testspace}% FIXME
+        \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[bibhyperref]{\printfield[shortjournal]{shortjournal}}}%
+      {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}}%
+    {\ifentrytype{manual}%
+      {\printtext[bibhyperref]{\printlist{organization}}}%
+      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
+  {\printtext[bibhyperref]{\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{year}%
+      {\iffieldundef{eventyear}%
+        {\iffieldundef{origyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{urlendyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{origendyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{origendyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}}%
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{eventendyear}%
+          {}%
+          {\ifboolexpr{%
+              test {\iffieldequalstr{eventendyear}{}}%
+              and
+              not togl {cms@datedash}%
+            }%
+            {\mbox{\bibdatedash}}%
+            {}}}}%
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{endyear}% DATE FIX
+        {}%
+        {\ifboolexpr{%
+            test {\iffieldequalstr{endyear}{}}%
+            and
+            not togl {cms@datedash}%
+          }%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}%
+
+\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{origyear}%
+      {\iffieldundef{year}%
+        {\iffieldundef{eventyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{urlendyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{eventendyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{eventendyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}}%
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{endyear}%
+          {}%
+          {\ifboolexpr{%
+              test {\iffieldequalstr{endyear}{}}%
+              and
+              not togl {cms@datedash}%
+            }%
+            {\mbox{\bibdatedash}}%
+            {}}}}%
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{origendyear}% DATE FIX
+        {}%
+        {\ifboolexpr{%
+            test {\iffieldequalstr{origendyear}{}}%
+            and
+            not togl {cms@datedash}%
+          }%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}%
+
+\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[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{eventyear}%
+      {\iffieldundef{origyear}%
+        {\iffieldundef{year}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{urlendyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{endyear}%
+            {}%
+            {\ifboolexpr{%
+                test {\iffieldequalstr{endyear}{}}%
+                and
+                not togl {cms@datedash}%
+              }%
+              {\mbox{\bibdatedash}}%
+              {}}}}%
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{origendyear}%
+          {}%
+          {\ifboolexpr{%
+              test {\iffieldequalstr{origendyear}{}}%
+              and
+              not togl {cms@datedash}%
+            }%
+            {\mbox{\bibdatedash}}%
+            {}}}}%
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{eventendyear}% DATE FIX
+        {}%
+        {\ifboolexpr{%
+            test {\iffieldequalstr{eventendyear}{}}%
+            and
+            not togl {cms@datedash}%
+          }%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}%
+
+\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}{%
+  \iftoggle{cms@origlabel}%
+  {\usebibmacro{cite:origyear+labelyear}}%
+  {\iftoggle{cms@bothlabelnew}%
+    {\usebibmacro{cite:bothyear+oldstyle}}%
+    {\iftoggle{cms@bothlabelold}%
+      {\usebibmacro{cite:bothyear+oldstyle}}%
+      {\iftoggle{cms@fulldate}%
+        {\newcunit\printdate}%
+        {\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{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+        {\printtext[bibhyperref]{%
+            \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[bibhyperref]{%
+        \bibopenparen%
+        \usebibmacro{cite:labelyear+extrayear}%
+        \bibcloseparen%
+        \addspace\usebibmacro{origyear+endyear}}}%
+    {\iffieldundef{origyear}% ???
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% Added test for year field ???
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[bibhyperref]{%
+              \bibopenparen%
+              \usebibmacro{cite:origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit{\addspace}%\addspace% ???
+              \usebibmacro{year+endyear}}}}%
+        {\printtext[bibhyperref]{%
+            \bibopenparen%
+            \usebibmacro{origyear+endyear}%
+            \bibcloseparen%
+            \clearfield{extrayear}\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}}
+
+%%% 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}%
+  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
+  {\ifthenelse{\value{listcount}=1}%
+    {s\adddot vv\adddot\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}
+
+\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange
+{\patchcmd{\blx@comprange@check}%
+  {\blx@comprange@comp{#1}{#2}}%
+  {\blx@tempcnta=#1%
+    \divide\blx@tempcnta100%
+    \multiply\blx@tempcnta100%
+    \ifnumequal{\blx@tempcnta}{#1}%
+    {\blx@range@out@value{#1\bibrangedash#2}}%
+    {\blx@comprange@comp{#1}{#2}}}%
+  {}{}}{}%
+
+\DeclareFieldFormat{postnote}{% Changed for page compression option
+  \iftoggle{cms@comprange}%
+  {\iffieldundef{pagination}%
+    {\mkcomprange{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {#1}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat[inreference]{postnote}{%
+  \iftoggle{cms@comprange}%
+  {\iffieldundef{pagination}%
+    {s\adddot v\adddot\addnbspace\mkbibquote{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {s\adddot v\adddot\addnbspace\mkbibquote{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat{pages}{%
+  \iftoggle{cms@comprange}%
+  {\iffieldundef{bookpagination}%
+    {\mkcomprange{#1}\isdot}%
+    {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}%
+  {\iffieldundef{bookpagination}%
+    {#1\isdot}%
+    {\mkpageprefix[bookpagination]{#1}}}}%
+
+\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
+
+\DeclareFieldFormat{edlang}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifbibstring{ed#1}%
+    {\bibstring{ed#1}}%
+    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+
+\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 %%%%
+
+\DeclareNumChars*{:}%
+
+\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{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{recorded}\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}
+
+%%%% 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}}%
+  \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}{%
+  \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.
+        {\cms@testspace}%
+        {\addcomma\addspace}}}% 16th ed. wants comma before n.d. (!)
+    {\cms@testspace}}}
+
+\newcommand{\classicpunct}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
+    \ifentrytype{letter}}%
+  {\setunit*{\addspace}}%
+  {\setunit*{\addcomma\addspace}}}
+
+\newcommand{\postvolpunct}{\addcolon}%
+
+\newcommand{\parttrans}{%
+  {\bibstring{bytranslator}\space}}%
+
+\newcommand{\partedit}{%
+  \iftoggle{cms@postposit}% Kludge to make it work in French.
+  {\bibstring{byeditoralt}\addspace}%
+  {\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}{%
+  \iftoggle{cms@inlineibid}%
+  {\togglefalse{cms@inlineibid}%
+    \iffieldundef{prenote}% Bug fix
+    {}%
+    {\cms@testspace}}%
+  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
+    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
+      \iffieldpages{postnote}%
+      {\cms@testspace}%
+      {\addcomma\addspace}}%
+    {\addcomma\addspace}}}
+
+\newcommand*{\postnotewrapper}{%
+  \iftoggle{cms@modpostnote}%
+  {\ifboolexpr{%
+      test {\iffieldstart{postnote}{,}}%
+      or
+      test {\iffieldstart{postnote}{\bibrangessep}}%
+    }%
+    {\addcomma}% w/ or w/o \addspace?
+    {\ifboolexpr{%
+        test {\iffieldstart{postnote}{;}}%
+        or
+        test {\iffieldstart{postnote}{:}}%
+        or
+        test {\iffieldstart{postnote}{.}}%
+      }%
+      {}{\postnotedelim}}}%
+  {\postnotedelim}}%
+
+\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
+  \begingroup%                     comp.text.tex
+  \edef\@tempa{%
+    \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+  \@tempa\@nil{\endgroup\ifblank{##1}}%
+  \savefield*{#1}{\@tempa}%
+  \expandafter\iffieldstart@i\detokenize
+  \expandafter\expandafter\expandafter{%
+    \expandafter\@tempa\detokenize{#2}}\@nil}
+
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{editortype}{none}%
+  {\addperiod\addspace}%
+  {\addcomma\addspace}}
+
+\newcommand*{\nameadelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{nameatype}{none}%
+  {\addperiod\addspace}%
+  {\addcomma\addspace}}
+
+\newcommand*{\lbx@cfromlang}{%
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
+    {\bibstring{cfrom\thefield{origlanguage}}}}%
+  {\unspace}}
+
+\@ifpackagelater{biblatex}{2011/11/12}%
+{\renewcommand*{\lbx@fromlang}{%
+    \iffieldundef{userf}%
+    {\iffieldundef{origlanguage}%
+      {\unspace}%
+      {\bibstring{from\thefield{origlanguage}}}}%
+    {\unspace}}}%
+{\@ifpackagelater{biblatex}{2011/07/28}%
+  {\newcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}%
+      {\iffieldundef{origlanguage}%
+        {\unspace}%
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}%
+  {\renewcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}%
+      {\iffieldundef{origlanguage}%
+        {\unspace}%
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}}%
+
+\renewcommand*{\lbx@lfromlang}{%
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
+    {\biblstring{from\thefield{origlanguage}}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@sfromlang}{%
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
+    {\bibsstring{from\thefield{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}{%
+  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\usebibmacro{italtitle+stitle}%
+      \savefield{title}{\bbx@lasthash}}}
+
+\newbibmacro*{mag+news+author}{%
+  \ifboolexpr{%
+    (
+    test {\ifnameundef{author}}%
+    or
+    not test {\ifuseauthor}%
+    )
+    and
+    not togl {cms@origpublished}%
+  }%
+  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\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}}
+
+\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}%
+        }%
+        {\bibnamedash\addperiod\addspace}%
+        {\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}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}%
+    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+      {}%
+      {\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}%
+%  \setunit*{\addcomma\addspace}%
+%  \usebibmacro{cmsorigdate}%
+}%
+
+\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}%
+    \iffieldundef{origlanguage}%
+    {\bibstring{origpub}%
+      \origfullcite{\thefield{userf}}%
+      \usebibmacro{endrelated}%
+      \newunit}%
+    {\iftoggle{cms@postposit}%
+      {\bibstring{origedition}%
+        \setunit{\addspace}%
+        \printfield[edlang]{origlanguage}%
+        \addcolon%
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
+        \newunit}%
+      {\printfield[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}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {}%
+    {\cms@datelong}}}
+
+\newbibmacro*{unpubl+letter+date}{% For the Misc type.
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\printdate}% For interviews and other dated non-letters
+    {\cms@datelong}}}
+
+\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}}%
+    {}%
+    {\printorigdate}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}%
+    \AND\iffieldundef{day}}%  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
+    {}%
+    {\iffieldundef{month}%
+      {\printfield{year}}%
+      {\printfield[letterday]{day}\setunit*{\nobreakspace}%
+        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
+        \printfield{year}}}}%
+  {\iffieldundef{origyear}%
+    {}%
+    {\iffieldundef{origmonth}%
+      {\printfield{origyear}}%
+      {\printfield[letterday]{origday}\setunit*{\nobreakspace}%
+        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
+        \printfield{origyear}}}}}%
+
+\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{\addcolon\addspace}%
+          \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}%
+  {\printfield{origyear}}%
+  {\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{\addcolon\addspace}%
+        \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}}%
+  {\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{\addcolon\addspace}%
+        \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}%
+  \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{letter}%
+  {\iftoggle{cms@switchdates}%
+    {\clearfield{year}\clearfield{month}}%
+    {\clearfield{origyear}\clearfield{origmonth}}%
+    \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}}}}
+
+\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 66907a36043..e0d5e5a59af 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,15 +1,20 @@
-% $Id: chicago-notes.bbx,v 0.9.7.64 2016/03/21 18:06:34 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.8.28 2016/06/07 07:43:24 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style.
 
 
-\ProvidesFile{chicago-notes.bbx}[2016/03/21 v 2.9a biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2016/06/07 v 3.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
+\providetoggle{cms@citejtabb}% Here for Sourcemap declaration
+\providetoggle{cms@bibjtabb}%
+
 \DeclareFieldFormat{shorthandwidth}{#1}
 
+\DeclareFieldFormat{shortjournalwidth}{\mkbibemph{\textbf{#1}}\isdot}
+
 \newlength{\lositemsep}
 
 \defbibenvironment{bibliography}% New for 0.9a
@@ -37,8 +42,8 @@
 
 \defbibenvironment{shorthands}% For biblatex < 2.9
   {\list
-    {\printfield[shorthandwidth]{shorthand}}%
-    {\setlength{\labelwidth}{\shorthandwidth}%
+     {\printfield[shorthandwidth]{shorthand}}%
+     {\setlength{\labelwidth}{\shorthandwidth}%
       \setlength{\leftmargin}{\labelwidth}%
       \setlength{\labelsep}{\biblabelsep}%
       \addtolength{\leftmargin}{\labelsep}%
@@ -76,6 +81,62 @@
   {\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
+  \iffieldundef{shortjournal}%
+  {\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}%
@@ -154,12 +215,12 @@
     \usebibmacro{name:hook}{#3#1}%
     \ifblank{#3}{}{%
       \ifcapital
-      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+      {\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}}
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
   {\usebibmacro{name:delim}{#1}%
     \usebibmacro{name:hook}{#1}%
     \mkbibnamelast{#1}\isdot%
@@ -174,8 +235,8 @@
   \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
   \ifblank{#3}{}{%
     \mkbibnameprefix{#3}\isdot
-    \ifpunctmark{'}
-    {}
+    \ifpunctmark{'}%
+    {}%
     {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
   \mkbibnamelast{#1}\isdot
   \ifblank{#4}{}{%
@@ -183,51 +244,51 @@
     {\ifnumeral{#4}%
       {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
       {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
-        \ifboolexpr{
+        \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/3.4
+\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3
 {\renewbibmacro*{name:family-given}[4]{%
-  \ifuseprefix%
+  \ifuseprefix
     {\usebibmacro{name:delim}{#3#1}%
      \usebibmacro{name:hook}{#3#1}%
      \ifdefvoid{#3}{}{%
-       \ifcapital%
+       \ifcapital
          {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
          {\mkbibnameprefix{#3}\isdot}%
        \ifprefchar{}{\bibnamedelimc}}%
-     \mkbibnamefamily{#1}\isdot%
+     \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}}}%
+      \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%
+    \mkbibnameprefix{#3}\isdot
+    \ifprefchar
       {}%
       {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
-  \mkbibnamefamily{#1}\isdot%
+  \mkbibnamefamily{#1}\isdot
   \ifdefvoid{#4}{}{%
     \iftoggle{cms@jrcomma}%
     {\ifnumeral{#4}%
@@ -242,88 +303,38 @@
         {}}}%
     {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}%
 
-\newbibmacro*{author/editors/translators}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-    {\usebibmacro{author}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-       {\usebibmacro{parteditor}}%
-       {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-         {\usebibmacro{editor}}%
-         {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-           {\usebibmacro{parttranslator}}%
-           {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-             {\usebibmacro{translator}}%
-             {\ifnameundef{namec}%
-               {\let\bbx@lasthash\undefined}%
-               {\usebibmacro{compiler}}}}}}}}
-
 \renewbibmacro*{author/editor}{%
-  \ifuseauthor%
-    {\usebibmacro{author}}%
+  \ifboolexpr{%
+    test {\ifuseauthor}%
+    or
+    togl {cms@headlessnote}
+  }%
+  {\usebibmacro{author}}%
+  {\ifusenamea%
+    {\usebibmacro{pickeditor}}%
     {\ifuseeditor%
-      {\ifnameundef{namea}%
-        {\usebibmacro{moreeditor}}%
-        {\usebibmacro{parteditor}}}%
-      {\ifusetranslator%
-        {\ifnameundef{nameb}%
+      {\usebibmacro{moreeditor}}%
+      {\ifusenameb%
+        {\usebibmacro{picktranslator}}%
+        {\ifusetranslator%
           {\usebibmacro{moretranslator}}%
-          {\usebibmacro{parttranslator}}}%
-        {\iftoggle{cms@usecompiler}%
-          {\usebibmacro{compiler}}%
-          {\let\bbx@lasthash\undefined%
-            \settoggle{cms@usecompiler}{true}}}}}}
+          {\ifusenamec%
+            {\usebibmacro{compiler}}%
+            {\let\bbx@lasthash\undefined}}}}}}}%
 
 \renewbibmacro*{author}{%
   \iftoggle{cms@headlessnote}%
   {\usebibmacro{justauthor}}%
   {\usebibmacro{moreauthor}}}
 
-\newbibmacro*{allauthor}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\ifnameundef{translator}%
-      {\ifnameundef{namec}%
-        {\let\bbx@lasthash\undefined}%
-        {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-            \iffirstonpage}
-               {\bibnamedash\addcomma\space}
-               {\printnames[sortname]{namec}\addcomma\space
-                 \savefield{namehash}{\bbx@lasthash}}%
-               \usebibmacro{compilestrg}}}%
-           {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-               \iffirstonpage}
-             {\bibnamedash\addcomma\space}
-             {\printnames[sortname]{translator}\addcomma\space
-               \savefield{namehash}{\bbx@lasthash}}%
-             \usebibmacro{transstrg}}}%
-         {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-             \iffirstonpage}
-           {\bibnamedash\addcomma\space}
-           {\printnames{editor}\addcomma\space
-             \savefield{namehash}{\bbx@lasthash}}%
-           \usebibmacro{editstrg}}}%
-       {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-           \iffirstonpage}
-         {\iffieldundef{nameaddon}%
-           {\bibnamedash\addperiod\addspace}
-           {\bibnamedash\addspace}}%
-         {\iffieldequalstr{authortype}{anon}%
-           {\bibleftbracket\printnames{author}\bibrightbracket%
-             \savefield{namehash}{\bbx@lasthash}}%
-           {\iffieldequalstr{authortype}{anon?}%
-             {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-               \savefield{namehash}{\bbx@lasthash}}%
-             {\printnames{author}%
-             \savefield{namehash}{\bbx@lasthash}}}}}}
-
 \newbibmacro*{justauthor}{%
-  \ifnameundef{author}
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
   {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}%
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
+      {\bibnamedash\addperiod\addspace}%
+      {\bibnamedash\addspace}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -334,13 +345,13 @@
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
-  \ifnameundef{author}
-  {\usebibmacro{pickeditor}}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
+  \ifthenelse{\ifnameundef{author}\OR\NOT\ifuseauthor}%
+  {\usebibmacro{pickeditor}}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
     {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
+      {\bibnamedash\addperiod\addspace}%
+      {\bibnamedash\addspace}}%
     {\iffieldequalstr{authortype}{anon}%
       {\bibleftbracket\printnames{author}\bibrightbracket%
         \savefield{fullhash}{\bbx@lasthash}}%
@@ -351,76 +362,81 @@
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
-  \ifnameundef{namea}
+  \ifthenelse{\ifnameundef{namea}\OR\NOT\ifusenamea}%
   {\usebibmacro{moreeditor}}%
   {\usebibmacro{parteditor}}}
 
 \newbibmacro*{moreeditor}{%
   \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}%
-    {\usebibmacro{picktranslator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
+    {\usebibmacro{picktranslator}}%
+    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+                 \iffirstonpage}%
        {\bibnamedash\editordelim}%
        {\printnames{editor}\editordelim%
         \savefield{fullhash}{\bbx@lasthash}}%
      \usebibmacro{editstrg}}}
 
 \renewbibmacro*{editor}{%
-  \ifnameundef{editor}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}%
-       {\printnames{editor}\editordelim%
+  \iftoggle{cms@headlessnote}%
+  {}%
+  {\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%
+          \savefield{fullhash}{\bbx@lasthash}}%
+        \usebibmacro{editstrg}}}%
+    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+        \iffirstonpage}%
+      {\bibnamedash\nameadelim}%
+      {\printnames[sortname]{namea}\nameadelim%
         \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
+      \usebibmacro{parteditstrg}}}}%
 
 \newbibmacro*{parteditor}{%
-  \ifnameundef{namea}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{namea}\addcomma\space
+  \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}}}
 
 \newbibmacro*{picktranslator}{%
-  \ifnameundef{nameb}
+  \ifthenelse{\ifnameundef{nameb}\OR\NOT\ifusenameb}%
   {\usebibmacro{moretranslator}}%
   {\usebibmacro{parttranslator}}}
 
 \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\space
+    {\usebibmacro{compiler}}%
+    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+                 \iffirstonpage}%
+       {\bibnamedash\addcomma\addspace}%
+       {\printnames[sortname]{translator}\addcomma\addspace%
         \savefield{fullhash}{\bbx@lasthash}}%
      \usebibmacro{transstrg}}}
 
 \newbibmacro*{parttranslator}{%
-  \ifnameundef{nameb}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{nameb}\addcomma\space
+  \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}}}
 
 \newbibmacro*{compiler}{%
-  \ifboolexpr{
-    test  {\ifnameundef{namec}}%
-    or
-    not togl {cms@usecompiler}%
-  }%
-  {\let\bbx@lasthash\undefined}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
-    {\bibnamedash\addcomma\addspace}
-    {\printnames[sortname]{namec}\addcomma\space
+  \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%
       \savefield{fullhash}{\bbx@lasthash}}%
     \usebibmacro{compilestrg}}}
 
@@ -446,10 +462,36 @@
         {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
         {}}}%
     {\usebibmacro{author/editor}%
-      \setunit{\addcomma\space}}%
+      \setunit{\addcomma\addspace}}%
     \printfield[lostitle]{title}%
     \finentry}}
 
+\DeclareBibliographyDriver{shortjournal}{%
+  \iffieldundef{journaltitle}%
+  {\printtext[title]{%
+      \printfield[tnoformat]{title}%
+      \setunit{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\printtext[journaltitle]{%
+      \printfield[jtnoformat]{journaltitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[sjtnoformat]{journalsubtitle}}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  \finentry}%
+
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=shorttitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+  }
+}%
+
 \DeclareBibliographyDriver{shorthands}{% For biblatex < 2.9
   \iftoggle{cms@fullshhand}%
   {\usedriver{\frenchspacing}%
@@ -464,7 +506,7 @@
         {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
         {}}}%
     {\usebibmacro{author/editor}%
-      \setunit{\addcomma\space}}%
+      \setunit{\addcomma\addspace}}%
     \printfield[lostitle]{title}%
     \finentry}}
 
@@ -501,6 +543,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
@@ -534,6 +581,12 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
+  \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -569,6 +622,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -586,7 +644,7 @@
   \newcunit%\setunit{\addperiod\addspace}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
@@ -596,15 +654,15 @@
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\printfield{volume}%
       \printfield{part}%
@@ -615,7 +673,7 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit\newblock
   \usebibmacro{volume+pages}%
@@ -642,6 +700,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 
@@ -710,32 +773,47 @@
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -759,16 +837,16 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bookbibxref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@bookbibxref}%
-    }
+    }%
   {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -776,7 +854,7 @@
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -801,32 +879,47 @@
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -852,6 +945,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -865,6 +963,8 @@
   \setunit{\addspace}%
   \usebibmacro{bib:xref+date}%
   \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -881,7 +981,7 @@
   {}%
   {\usebibmacro{edition}}%
   \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
+  \usebibmacro{byeditor+others}%
   \newunit
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -903,32 +1003,47 @@
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -973,6 +1088,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -989,16 +1109,16 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@bibcrossref}%
-    }
+    }%
   {\setunit{\addperiod\addspace}%
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1030,13 +1150,18 @@
   \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{xrefprenote}% Volume fix
@@ -1044,13 +1169,18 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
@@ -1058,6 +1188,11 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1074,16 +1209,16 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@bibcrossref}%
-    }
+    }%
   {\newunit\newblock
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -1115,13 +1250,18 @@
   \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{xrefprenote}% Volume fix
@@ -1129,13 +1269,18 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
@@ -1143,6 +1288,11 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1159,20 +1309,22 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\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}%
@@ -1191,13 +1343,18 @@
   \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{xrefprenote}% Volume fix
@@ -1205,13 +1362,18 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
@@ -1219,6 +1381,11 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1241,7 +1408,7 @@
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -1275,6 +1442,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1286,7 +1458,7 @@
   \newunit\newblock
   \printtext[title]{%
     \printfield[noformat]{title}}%
-  \newcunit\newblock%
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{letter+date}%
@@ -1295,16 +1467,16 @@
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     togl {cms@bibcrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       togl {cms@bibcrossref}%
-    }
+    }%
   {\usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1333,13 +1505,18 @@
   \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{xrefprenote}% Volume fix
@@ -1347,13 +1524,18 @@
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
@@ -1361,6 +1543,11 @@
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1394,6 +1581,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1408,7 +1600,7 @@
   {\printfield{title}%
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
+    \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
@@ -1441,6 +1633,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1460,7 +1657,7 @@
   \newunit\newblock
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\newunit}% Fix customc?
   {\newcunit}%
   \iffieldundef{edition}%
@@ -1470,15 +1667,15 @@
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\printfield{volume}%
       \printfield{part}%
@@ -1489,7 +1686,7 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit\newblock
   \usebibmacro{volume+pages}%
@@ -1526,6 +1723,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1555,8 +1757,8 @@
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \iffieldundef{urlyear}
-  {}
+  \iffieldundef{urlyear}%
+  {}%
   {\printurldate}% Date fix
   \newunit\newblock
   \iftoggle{cms@doionly}%
@@ -1574,6 +1776,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1590,8 +1797,8 @@
   \printfield{type}%
   \setunit{\addspace}%
   \printfield{number}%
-  \iflistundef{location}
-    {}
+  \iflistundef{location}%
+    {}%
     {\setunit*{\addspace}%
      \printtext[parens]{%
        \printlist[][-\value{listtotal}]{location}}}%
@@ -1613,6 +1820,12 @@
   \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{periodical}{%
@@ -1673,6 +1886,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1686,6 +1904,8 @@
   \setunit{\addspace}%
   \usebibmacro{bib:xref+date}%
   \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -1697,6 +1917,8 @@
       togl {cms@bookbibxref}%
     }%
   {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \usebibmacro{editorpunct}%
+  \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -1716,32 +1938,47 @@
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
   \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{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}}
 
@@ -1764,7 +2001,7 @@
   {\usebibmacro{edition}}%
   \newcunit
   \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
+  \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{chapter}%
@@ -1789,6 +2026,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1822,6 +2064,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1838,7 +2085,7 @@
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
-  \setunit{\addspace}%
+  \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -1851,7 +2098,7 @@
   \usebibmacro{editorpunct}%\newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
-  \iffieldequalstr{entrysubtype}{magazine}
+  \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+date}%
   \newcunit\newblock
   \usebibmacro{chap+pag}}%
@@ -1867,6 +2114,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1918,6 +2170,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1947,6 +2204,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1978,6 +2240,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newunit}%
+  {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
@@ -1992,8 +2259,8 @@
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}}%
   \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\newcunit}
-  {\newunit}%\setunit{\addspace}\newblock%
+  {\setunit{\ctitleaddonpunct}}%
+  {\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
   \printfield{titleaddon}%\usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
   \usebibmacro{language+transtitle}%
@@ -2004,7 +2271,7 @@
   \setunit{\addperiod\addspace}%
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
+  \iffieldundef{booktitle}%
   {\setunit{\addperiod\addspace}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
@@ -2014,16 +2281,16 @@
   \usebibmacro{bybookauthor}%
   \usebibmacro{byeditor+others}%
   \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
@@ -2033,8 +2300,8 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
   \newunit\newblock
@@ -2060,14 +2327,19 @@
   \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.
-  \iffieldundef{urlyear}
-  {}
+  \iffieldundef{urlyear}%
+  {}%
   {\printurldate}% Date fix
   \iffieldundef{addendum}% Punctuation fixes in 0.9.9c
   {\newunit\newblock}%
@@ -2078,20 +2350,32 @@
     {\printfield{doi}%
       \setunit*{\addperiod\addspace}\newblock%
       \clearfield{url}}}%
-  {\iftoggle{cms@doi}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
     {\printfield{doi}%
       \setunit*{\addperiod\addspace}\newblock}%
     {}}%
-  \iftoggle{cms@eprint}%
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
   {\usebibmacro{eprint}%
     \setunit*{\addperiod\addspace}\newblock}%
   {}%
-  \iftoggle{cms@url}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
   {\printfield{url}}%
   {}}%
 
 \newbibmacro{bib:xref+date}{% Experiment for xrefs
-  \ifboolexpr{
+  \ifboolexpr{%
     togl {cms@omitxrefdate}%
     or
     togl {cms@bookbibxref}%
@@ -2110,8 +2394,8 @@
     or
     not togl {cms@switchdates}%
     ))
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       togl {cms@omitxrefdate}%
       or
       togl {cms@bookbibxref}%
@@ -2130,13 +2414,13 @@
       or
       not togl {cms@switchdates}%
       ))
-    }
+    }%
     {}%
     {\printtext[parens]{\usebibmacro{date}}}}%
   {\printtext[parens]{\usebibmacro{date}}}}
 
 \newbibmacro*{volume+pages}{% Volume fix (modified)
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{maintitle}}%
     or
     togl {cms@vol}%
@@ -2161,7 +2445,7 @@
         \printfield{part}%
         \newcunit%
         \printfield{pages}}}}%
-  {\ifboolexpr{
+  {\ifboolexpr{%
       togl {cms@hidevolumes}%
       and
       (
@@ -2176,15 +2460,15 @@
       \printfield{volumes}}}}%
 
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}% 16th ed (Also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\printfield{volume}%
       \printfield{part}%
@@ -2195,12 +2479,12 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
 \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{maintitle}
+  \iffieldundef{maintitle}%
   {}%
   {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
       \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% ???
@@ -2209,7 +2493,7 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}
       \printfield{maintitleaddon}%
       \toggletrue{cms@vol}}% InIn fix
     {\printfield{volume}%
@@ -2221,7 +2505,7 @@
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
 \newbibmacro*{journal+issue+year+pages}{%
@@ -2241,7 +2525,7 @@
     {\newcunit\printfield{pages}}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -2249,7 +2533,7 @@
       \newcunit\printfield{pages}}%
     {\setunit{\addspace}%
     \printtext[parens]{%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -2274,7 +2558,7 @@
     {\newcunit\printfield{pages}}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -2282,7 +2566,7 @@
       \newcunit\printfield{pages}}%
     {\setunit{\addspace}%
     \printtext[parens]{%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -2291,14 +2575,14 @@
     \printfield{pages}}}}
 
 \newbibmacro*{bycompiler}{%
-  \ifnameundef{namec}
-    {}
-    {\bibstring{bycompiler}\addspace
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{bycompiler}\addspace%
      \printnames[bycompiler]{namec}}}
 
 \renewbibmacro*{byeditor}{%
-  \ifnameundef{editor}
-    {}
+  \ifnameundef{editor}%
+    {}%
     {\usebibmacro{bytypestrg}{editor}{editor}%
      \setunit{\addspace}%
      \printnames[byeditor]{editor}%
@@ -2306,20 +2590,20 @@
   \usebibmacro{byeditorx}}
 
 \renewbibmacro*{byeditorx}{%
-  \ifnameundef{editora}
-    {}
+  \ifnameundef{editora}%
+    {}%
     {\usebibmacro{bytypestrg}{editora}{editor}%
      \setunit{\addspace}%
      \printnames[byeditora]{editora}%
      \usebibmacro{editorpunct}}%
-  \ifnameundef{editorb}
-    {}
+  \ifnameundef{editorb}%
+    {}%
     {\usebibmacro{bytypestrg}{editorb}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorb]{editorb}%
      \usebibmacro{editorpunct}}%
-  \ifnameundef{editorc}
-    {}
+  \ifnameundef{editorc}%
+    {}%
     {\usebibmacro{bytypestrg}{editorc}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorc]{editorc}%
@@ -2328,32 +2612,32 @@
 \renewbibmacro*{byeditor+others}{%
   \ifthenelse{\NOT\ifnameundef{editor}\AND
     \(\iffieldundef{editortype}\OR
-    \iffieldequalstr{editortype}{editor}\)}
+    \iffieldequalstr{editortype}{editor}\)}%
     {\def\@tempa{byeditor}%
-     \ifnamesequal{editor}{translator}
+     \ifnamesequal{editor}{translator}%
        {\edef\@tempa{\@tempa tr}%
-        \clearname{translator}}
+        \clearname{translator}}%
        {}%
-       \ifnamesequal{editor}{namec}
+       \ifnamesequal{editor}{namec}%
        {\edef\@tempa{\@tempa cp}%
-         \clearname{namec}}
+         \clearname{namec}}%
        {}%
-     \ifnamesequal{editor}{commentator}
+     \ifnamesequal{editor}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{editor}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{editor}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{editor}{introduction}
+     \ifnamesequal{editor}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{editor}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{editor}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{editor}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{editor}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
      \bibstring{\@tempa}%
      \setunit{\addspace}%
@@ -2365,62 +2649,62 @@
   \usebibmacro{bytranslator+others}}
 
 \renewbibmacro*{bytranslator+others}{%
-  \ifnameundef{translator}
-    {}
+  \ifnameundef{translator}%
+    {}%
     {\def\@tempa{bytranslator}%
-      \ifnamesequal{translator}{namec}
+      \ifnamesequal{translator}{namec}%
       {\edef\@tempa{\@tempa cp}%
-        \clearname{namec}}
+        \clearname{namec}}%
       {}%
-     \ifnamesequal{translator}{commentator}
+     \ifnamesequal{translator}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{translator}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{translator}{introduction}
+     \ifnamesequal{translator}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{translator}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{translator}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
-     \bibstring{\@tempa}\space
+     \bibstring{\@tempa}\addspace%
      \printnames[bytranslator]{translator}%
      \clearname{translator}%
      \usebibmacro{editorpunct}}%
   \usebibmacro{bycompiler+others}}
 
 \newbibmacro*{bycompiler+others}{%
-  \ifnameundef{namec}
-    {}
+  \ifnameundef{namec}%
+    {}%
     {\def\@tempa{bycompiler}%
-     \ifnamesequal{namec}{commentator}
+     \ifnamesequal{namec}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{namec}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{namec}{introduction}
+     \ifnamesequal{namec}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{namec}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{namec}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
-     \bibstring{\@tempa}\space
+     \bibstring{\@tempa}\addspace%
      \printnames[bycompiler]{namec}%
      \clearname{namec}%
      \usebibmacro{editorpunct}}%
-  \usebibmacro{byothers}}
+  \usebibmacro{byothers}}%
 
 \newbibmacro*{byothers}{% Changed for 0.9
   \usebibmacro{bytranslator}%
@@ -2439,4 +2723,81 @@
   \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}{}
+
+\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} }%
+    {}%
+    {\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}%
+            {\printtext{\relateddelim}}%
+            {}}%
+        \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}}}
+
 \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 32e03299a05..140f6cb6310 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.cbx,v 0.9.7.115 2016/03/18 17:16:53 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.8.36 2016/06/07 08:17:10 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authortitle-cverb.cbx.  It is heavily modified, with the intention
 % of providing footnote citations and a bibliography formatted
 % according to the specifications of the Chicago Manual of Style.
 
-\ProvidesFile{chicago-notes.cbx}[2016/03/18 v 2.9a biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2016/06/07 v 3.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -36,6 +36,7 @@
 \providetoggle{cms@shortnote}
 \providetoggle{cms@allshort}
 \providetoggle{cms@noibid}
+\providetoggle{cms@noidem}
 \providetoggle{cms@usecompiler}
 \providetoggle{cms@shorthandibid}
 \providetoggle{cms@printshhand}
@@ -55,6 +56,11 @@
 \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}%
@@ -88,6 +94,18 @@
       {\toggletrue{cms@switchdates}}%
       {}}}}%
 
+\protected\def\cms@warning@noline#1{%
+  \begingroup
+  \blx@safe@actives
+  \PackageWarningNoLine{biblatex-chicago}{#1}%
+  \endgroup}
+
+\DeclareBibliographyOption[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}
+
+\DeclareEntryOption[boolean]{genallnames}[true]{%
+  \settoggle{cms@genallnames}{#1}}
+
 \DeclareBibliographyOption{annotation}[true]{%
   \global\toggletrue{cms@annotation}}
 
@@ -110,7 +128,7 @@
   \inherit{shorthand}{shorthand}
   \inherit{shorthandintro}{shorthandintro}
   }}%
-  {}}
+  {}}%
 
 \DeclareBibliographyOption{compresspages}[true]{%
   \ifcsdef{cms@opt@crange@#1}%
@@ -131,11 +149,11 @@
   \global\toggletrue{cms@modpostnote}}%
 \def\cms@opt@ppunct@false{}%
 
-\DeclareBibliographyOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
+\DeclareBibliographyOption[boolean]{usecompiler}[true]{%
+  \settoggle{blx@usenamec}{#1}}
 
-\DeclareEntryOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
+\DeclareEntryOption[boolean]{usecompiler}[true]{%
+  \settoggle{blx@usenamec}{#1}}
 
 \DeclareBibliographyOption{juniorcomma}[true]{%
   \settoggle{cms@jrcomma}{#1}}
@@ -151,13 +169,13 @@
 
 \DeclareBibliographyOption{longcrossref}[false]{%
   \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}
-  {\blx@err@invopt{longcrossref=#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}}
+  \togglefalse{cms@bookbibxref}}%
 \def\cms@opt@lxref@true{%
   \toggletrue{cms@citecrossref}%
   \toggletrue{cms@bibcrossref}}%
@@ -173,12 +191,12 @@
 
 \DeclareEntryOption{longcrossref}[false]{%
   \ifcsdef{cms@opt@lxref@#1}%
-  {\csuse{cms@opt@lxref@#1}}
-  {\blx@err@invopt{longcrossref=#1}{}}}
+  {\csuse{cms@opt@lxref@#1}}%
+  {\blx@err@invopt{longcrossref=#1}{}}}%
 
 \DeclareBibliographyOption{booklongxref}[true]{%
   \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}
+  {\csuse{cms@opt@bklxref@#1}}%
   {\blx@err@invopt{booklongxref=#1}{}}}%
 \def\cms@opt@bklxref@true{%
   \toggletrue{cms@bookcitexref}%
@@ -195,62 +213,98 @@
 
 \DeclareEntryOption{booklongxref}[true]{%
   \ifcsdef{cms@opt@bklxref@#1}%
-  {\csuse{cms@opt@bklxref@#1}}
+  {\csuse{cms@opt@bklxref@#1}}%
   {\blx@err@invopt{booklongxref=#1}{}}}%
 
 \DeclareBibliographyOption{omitxrefdate}[true]{%
-  \settoggle{cms@omitxrefdate}{#1}}
+  \settoggle{cms@omitxrefdate}{#1}}%
 
 \DeclareEntryOption{omitxrefdate}[true]{%
-  \settoggle{cms@omitxrefdate}{#1}}
+  \settoggle{cms@omitxrefdate}{#1}}%
+
+\DeclareBibliographyOption[boolean]{xrefurl}[true]{%
+  \settoggle{cms@xrefurl}{#1}}%
+
+\DeclareEntryOption[boolean]{xrefurl}[true]{%
+  \settoggle{cms@xrefurl}{#1}}%
+
+\DeclareBibliographyOption[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}}%
+
+\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}}}%
 
 % The field-exclusion options %
 
 \DeclareBibliographyOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}
+  \settoggle{cms@isbn}{#1}}%
 \DeclareBibliographyOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
+  \settoggle{cms@url}{#1}}%
 \DeclareBibliographyOption{doi}[true]{%
   \ifcsdef{cms@opt@doi@#1}%
-  {\csuse{cms@opt@doi@#1}}
-  {\blx@err@invopt{doi=#1}{}}}
+  {\csuse{cms@opt@doi@#1}}%
+  {\blx@err@invopt{doi=#1}{}}}%
 \def\cms@opt@doi@true{%
-  \toggletrue{cms@doi}}
+  \toggletrue{cms@doi}}%
 \def\cms@opt@doi@false{%
-  \togglefalse{cms@doi}}
+  \togglefalse{cms@doi}}%
 \def\cms@opt@doi@only{%
-  \toggletrue{cms@doionly}}
+  \toggletrue{cms@doionly}}%
 \DeclareBibliographyOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}
+  \settoggle{cms@eprint}{#1}}%
 \DeclareBibliographyOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
+  \settoggle{cms@numbermonth}{#1}}%
 \DeclareBibliographyOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
+  \settoggle{cms@bookpages}{#1}}%
 \DeclareBibliographyOption{includeall}[true]{%
   \settoggle{cms@isbn}{#1}%
   \settoggle{cms@url}{#1}%
   \settoggle{cms@doi}{#1}%
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
-  \settoggle{cms@bookpages}{#1}}
+  \settoggle{cms@bookpages}{#1}}%
 \DeclareBibliographyOption{hidevolumes}[true]{%
-  \settoggle{cms@hidevolumes}{#1}}
+  \settoggle{cms@hidevolumes}{#1}}%
 
 \DeclareBibliographyOption{addendum}[true]{%
-  \settoggle{cms@addendum}{#1}}
+  \settoggle{cms@addendum}{#1}}%
 \DeclareBibliographyOption{bookseries}[true]{%
-  \settoggle{cms@bookseries}{#1}}
+  \settoggle{cms@bookseries}{#1}}%
 \DeclareBibliographyOption{notefield}[true]{%
-  \settoggle{cms@notefield}{#1}}
+  \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}}
+  \settoggle{cms@isbn}{#1}}%
 \DeclareEntryOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
+  \settoggle{cms@url}{#1}}%
 \DeclareEntryOption{doi}[true]{%
   \ifcsdef{cms@opt@doi@#1}%
   {\iftoggle{cms@doi}%
@@ -259,30 +313,159 @@
       {\togglefalse{cms@doionly}}% !!
       {}}%
     {\toggletrue{cms@doi}}% !!
-    \csuse{cms@opt@doi@#1}}
-  {\blx@err@invopt{doi=#1}{}}}
+    \csuse{cms@opt@doi@#1}}%
+  {\blx@err@invopt{doi=#1}{}}}%
 \DeclareEntryOption{eprint}[true]{%
-  \settoggle{cms@eprint}{#1}}
+  \settoggle{cms@eprint}{#1}}%
 \DeclareEntryOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
+  \settoggle{cms@numbermonth}{#1}}%
 \DeclareEntryOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
+  \settoggle{cms@bookpages}{#1}}%
 \DeclareEntryOption{hidevolumes}[true]{%
-  \settoggle{cms@hidevolumes}{#1}}
+  \settoggle{cms@hidevolumes}{#1}}%
 
 \DeclareEntryOption{addendum}[true]{%
-  \settoggle{cms@addendum}{#1}}
+  \settoggle{cms@addendum}{#1}}%
 \DeclareEntryOption{bookseries}[true]{%
-  \settoggle{cms@bookseries}{#1}}
+  \settoggle{cms@bookseries}{#1}}%
 \DeclareEntryOption{notefield}[true]{%
-  \settoggle{cms@notefield}{#1}}
+  \settoggle{cms@notefield}{#1}}%
 
-\ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,booklongxref}
+\DeclareBibliographyOption[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}}%
+
+\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}}}%
+
+% Controlling punctuation before titleaddon fields %
+
+\DeclareBibliographyOption[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}}%
+
+\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]{%
+  \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}}%
+
+\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]{%
+  \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}}%
+
+\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}
 
 % For author-date compatibility %
 
 \DeclareEntryOption{switchdates}[true]{%
-  \settoggle{cms@switchdates}{#1}}
+  \settoggle{cms@switchdates}{#1}}%
 
 \DeclareEntryOption{cmsdate}{}%
 
@@ -312,13 +495,13 @@
 \appto\blx@blxinit{%
   \let\newcunit\blx@newcunit}
 
-\newcommand*{\newcunitpunct}{\addcomma\space}
+\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
@@ -344,11 +527,15 @@
   \global\let\cbx@lastkey\undefined}
 
 \newbibmacro*{cite:save}{%
-  \savefield{entrykey}{\cbx@lastkey}}
+  \savefield{entrykey}{\cbx@lastkey}%
+  \ifthenelse{\ifentrytype{inreference}\OR\ifentrytype{reference}\OR%
+    \ifentrytype{mvreference}}%
+  {\global\toggletrue{cms@noidem}}%
+  {\global\togglefalse{cms@noidem}}}%
 
 \newbibmacro*{cite}{%
   \ifciteseen%
-    {\ifboolexpr{
+    {\ifboolexpr{%
         test {\iffieldundef{shorthand}}%
         or
         (
@@ -358,20 +545,24 @@
         and
         not test {\iffieldundef{crossref}}%
         )
-      }
+      }%
        {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-          {\usebibmacro{cite:ibid}}%
+         {\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:ibid}%
+             \usebibmacro{cite:save}}%
            {\usebibmacro{cite:shorthand}%
-             \usebibmacro{cite:save}}}%
+             \usebibmacro{cite:save}%
+             \global\toggletrue{cms@noidem}}}%
          {\usebibmacro{cite:shorthand}%
-           \usebibmacro{cite:save}}}}%
+           \usebibmacro{cite:save}%
+           \global\toggletrue{cms@noidem}}}}%
     {\iftoggle{cms@allshort}%
       {\global\toggletrue{cms@shortnote}%
         \global\togglefalse{cms@fullnote}%
@@ -386,29 +577,60 @@
 \newbibmacro*{cite:full}{%
   \printtext[bibhypertarget]{%
     \usedriver
-      {\DeclareNameAlias{sortname}{default}\frenchspacing}
+      {\DeclareNameAlias{sortname}{default}\frenchspacing}%
       {cite:\thefield{entrytype}}}}%
 
 \newbibmacro*{cite:short}{%
+  \usebibmacro{allshort+firstcite+xref}%
   \ifthenelse{\ifnameundef{labelname}\OR%
     \ifentrytype{inreference}\OR%
     \ifentrytype{reference}\OR%
     \ifentrytype{mvreference}}%
-  {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation
+  {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+      \ifentrytype{periodical}}% Simplify .bib creation
     {\ifuseauthor%
-      {\printfield[journaltitle]{journaltitle}\isdot\newcunit}%
+      {\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}%
       {}}}%
-  {\iffieldequalstr{authortype}{anon}%
-    {\bibleftbracket\printnames{labelname}%
-      \bibrightbracket\classicpunct}%
-    {\iffieldequalstr{authortype}{anon?}%
-      {\bibleftbracket\printnames{labelname}?%
+  {\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}%
-      {\usebibmacro{choose+labelname}%\printnames{labelname}%
-        \isdot\classicpunct}}}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\classicpunct}%
+        {\printnames{labelname}%\usebibmacro{choose+labelname}%
+          \isdot\classicpunct}}}}%
   \ifboolexpr{%
     togl {cms@allshort}%
     or
@@ -420,9 +642,10 @@
     \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
 
 \newbibmacro*{cite:shorthand}{%
+  \usebibmacro{allshort+firstcite+xref}%
   \iftoggle{cms@allshort}%
   {\printtext[bibhyperref]{%
-      \printfield{shorthand}}}
+      \printfield{shorthand}}}%
   {\printtext[cmshyperlink]{%
       \printfield{shorthand}}}}
 
@@ -432,7 +655,7 @@
   {\iffieldundef{shorthandintro}%
     {%\addspace%\setunit{\addspace}% Fix for after postnote field
       \printtext[parens]{%
-        \bibstring{citedas}\space%
+        \bibstring{citedas}\addspace%
         \printfield{shorthand}}}%
     {%\addspace%\setunit{\addspace}% Ditto
       \printfield{shorthandintro}}}}
@@ -464,15 +687,31 @@
       )
     }%
     {\global\toggletrue{cms@loccit}}%
-    {}}}
+    {}}}%
 
 \newbibmacro*{cite:journal}{%
   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
   {\iffieldundef{prenote}%
     {\bibsentence\usebibmacro{cite:ibid}}%
-    {\usebibmacro{cite:ibid}}}%
+    {\usebibmacro{cite:ibid}}%
+    \usebibmacro{cite:save}}%
   {\iffieldundef{journaltitle}%
-    {\usebibmacro{cite:short}}%
+    {\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}%
@@ -480,59 +719,104 @@
         {\bibleftbracket\printnames{labelname}?%
           \bibrightbracket\newcunit}%
         {\printnames{labelname}%
-          \isdot\newcunit}}%
-      \iftoggle{cms@allshort}%
+          \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}}}%
+          \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[journaltitle]{journaltitle}}}%
-      \iffieldundef{volume}%
-      {\iffieldundef{number}%
-        {\iffieldundef{issue}
-          {\newcunit%
-            \usebibmacro{number+or+month}}%
-          {\newcunit%
-            \printfield{issue}%
-            \setunit{\addspace}%
-            \usebibmacro{cmsyear}}}%
+          \printfield[shortjournal]{shortjournal}}}%
+      {\printtext[bibhyperlink]{%
+          \printfield[journaltitle]{journaltitle}}}}%
+    \iffieldundef{volume}%
+    {\iffieldundef{number}%
+      {\iffieldundef{issue}%
         {\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}}}}}}
+          \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}}}
+  \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}
-    {}}
+    {\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}}}
-          {}}}}
+  \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 %%%%
 
@@ -558,14 +842,14 @@
     {}%
     \toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
-    \ifboolexpr{
+    \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}
@@ -669,10 +953,17 @@
     \ifhyperref%
     {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
     {}%
-    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
+    \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}}%
@@ -684,9 +975,9 @@
   {\usebibmacro{hlprenote}}%
   {\printtext[bibhypertarget]{%
       \usedriver
-      {\DeclareNameAlias{sortname}{default}\clearname{author}%
+      {\DeclareNameAlias{sortname}{default}\usebibmacro{cite:save}%
         \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
-        \usebibmacro{cite:save}}%
+        \usebibmacro{clear+labelname}\global\toggletrue{cms@noidem}}%
       {cite:\thefield{entrytype}}}}%
   {\multicitedelim}%
   {}%\usebibmacro{finentry}}
@@ -695,10 +986,10 @@
   {\usebibmacro{hlcprenote}}
   {\usebibmacro{citeindex}%
     \toggletrue{cms@headlessnote}%
-    \clearname{author}%
-    \clearname{shortauthor}%
+    \usebibmacro{clear+labelname}%
     \clearname{labelname}%
-    \usebibmacro{cite}}
+    \usebibmacro{cite}%
+    \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
@@ -706,10 +997,10 @@
   {\usebibmacro{hlcprenote}}
   {\usebibmacro{citeindex}%
     \toggletrue{cms@headlessnote}%
-    \clearname{author}%
-    \clearname{shortauthor}%
+    \usebibmacro{clear+labelname}%
     \clearname{labelname}%
-    \usebibmacro{cite}}
+    \usebibmacro{cite}%
+    \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
@@ -719,10 +1010,9 @@
     \toggletrue{cms@headlessnote}%
     \toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
-    \clearname{author}%
-    \clearname{shortauthor}%
     \clearname{labelname}%
-    \usebibmacro{cite:short}}
+    \usebibmacro{cite:short}%
+    \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
@@ -735,8 +1025,9 @@
       togl {cms@allshort}%
     }%
     {\usebibmacro{cite:short}}
-    {\toggletrue{cms@headlessnote}%
-      \usebibmacro{choose+surname}%
+    {\renewbibmacro*{author/editor}{\usebibmacro{choose+surname}}%
+      \renewbibmacro*{editor}{\usebibmacro{choose+surname}}%
+      \renewbibmacro*{author}{\usebibmacro{choose+surname}}%
       \usebibmacro{cite}}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
@@ -748,7 +1039,8 @@
   {\toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
     \usebibmacro{citeindex}%
-    \usebibmacro{cite:short}}
+    \usebibmacro{cite:short}%
+    \usebibmacro{cite:save}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -757,11 +1049,14 @@
   {\usebibmacro{citeindex}%
     \iftoggle{cms@shorthandibid}%
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-      {\usebibmacro{cite:ibid}}%
+      {\usebibmacro{cite:ibid}%
+        \usebibmacro{cite:save}}%
       {\usebibmacro{cite:shorthand}%
-        \usebibmacro{cite:save}}}%
+        \usebibmacro{cite:save}%
+        \global\toggletrue{cms@noidem}}}%
     {\usebibmacro{cite:shorthand}%
-      \usebibmacro{cite:save}}}
+      \usebibmacro{cite:save}%
+      \global\toggletrue{cms@noidem}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -771,7 +1066,8 @@
     \togglefalse{cms@fullnote}%
     \clearfield{pages}%
     \usebibmacro{citeindex}%
-    \usebibmacro{cite:journal}}
+    \usebibmacro{cite:journal}%
+    \usebibmacro{cite:save}}
   {\multicitedelim}
   {\iftoggle{cms@loccit}%
     {}%
@@ -805,9 +1101,9 @@
 \DeclareCiteCommand{\cbx@textcite}
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
-     {}
+     {}%
      {\iffirstcitekey
-        {}
+        {}%
         {\textcitedelim}%
       \stepcounter{textcitecount}%
       \usebibmacro{textcite}%
@@ -819,16 +1115,16 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}%
      {\protected@xappto\cbx@footcite@args{%
-        (\thefield{multiprenote})(\thefield{multipostnote})}}
+        (\thefield{multiprenote})(\thefield{multipostnote})}}%
      {}%
    \xappto\cbx@savedkeys{\thefield{entrykey},}%
-   \iffieldequals{namehash}{\cbx@lasthash}
-     {}
+   \iffieldequals{namehash}{\cbx@lasthash}%
+     {}%
      {\usebibmacro{textcite:count}%
       \savefield{namehash}{\cbx@lasthash}}%
-   \ifnumequal{\value{citecount}}{\value{citetotal}}
+   \ifnumequal{\value{citecount}}{\value{citetotal}}%
      {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
       \protected@xappto\cbx@footcite@args{%
         [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
@@ -862,13 +1158,13 @@
     \renewbibmacro{multipostnote}{}}}{}{}
 
 \renewcommand*{\textcitedelim}{%
-  \iffinalcitedelim
-  {\ifnumgreater{\value{textcitetotal}}{2}
+  \iffinalcitedelim%
+  {\ifnumgreater{\value{textcitetotal}}{2}%
     {\addcomma}%
     {}%
-    \addspace\bibstring{and}}
+    \addspace\bibstring{and}}%
   {\addcomma}%
-  \space}
+  \addspace}%
 
 \newrobustcmd{\cms@textcite@i}{%
   \iffootnote{\foottextcite}{\footcite}}
@@ -880,6 +1176,97 @@
 
 \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}{%
@@ -911,10 +1298,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -945,10 +1338,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:artwork}{%
@@ -980,10 +1379,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:audio}{%
@@ -1009,15 +1414,17 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\toggletrue{cms@usedvol}%
       \printfield{volume}%
@@ -1026,10 +1433,10 @@
       \bibstring{ofseries}%
       \setunit{\addspace}
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}
       \printfield{maintitleaddon}}}
   \newcunit
   \usebibmacro{volume+or+volumes}%
@@ -1052,10 +1459,16 @@
   {}%
   \newcunit\newblock%
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:book}{%
@@ -1078,20 +1491,20 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \newcunit
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@bookcitexref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\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}%
@@ -1120,10 +1533,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \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.
@@ -1157,20 +1576,20 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@bookcitexref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       not test {\ifentryseen{\thefield{xref}}}%
       or
       togl {cms@bookcitexref}%
-    }
+    }%
   {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1195,10 +1614,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \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.
@@ -1236,10 +1661,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:collection}{%
@@ -1252,27 +1683,29 @@
   \setunit{\addspace}
   \usebibmacro{cite:xref+date}%
   \newcunit
-  \ifboolexpr{
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@bookcitexref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\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{cbytranslator+others}%
+  \usebibmacro{cbyeditor+others}%
   \newcunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newcunit\newblock
@@ -1289,10 +1722,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \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.
@@ -1350,10 +1789,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:inbook}{%
@@ -1370,20 +1815,20 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@citecrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       not test {\ifentryseen{\thefield{xref}}}%
       or
       togl {cms@citecrossref}%
-    }
+    }%
   {\usebibmacro{chapincoll}%
   \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1409,10 +1854,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \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.
@@ -1442,20 +1893,20 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@citecrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       not test {\ifentryseen{\thefield{xref}}}%
       or
       togl {cms@citecrossref}%
-    }
+    }%
     {\usebibmacro{chapincoll}%
       \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
       \newcunit
@@ -1481,10 +1932,16 @@
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
-      \setunit{\addspace}%
+      \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.
@@ -1514,23 +1971,25 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@citecrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\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}%
@@ -1547,10 +2006,16 @@
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
-      \setunit{\addspace}%
+      \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.
@@ -1609,10 +2074,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:letter}{%
@@ -1620,7 +2091,7 @@
   \savefield{fullhash}{\bbx@lasthash}%
   \printtext[title]{%
     \printfield[noformat]{title}}%
-  \newcunit\newblock%
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{letter+date}%
@@ -1629,20 +2100,20 @@
   \newcunit\newblock%
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@citecrossref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       test {\iffieldundef{xref}}%
       or
       not test {\ifentryseen{\thefield{xref}}}%
       or
       togl {cms@citecrossref}%
-    }
+    }%
     {\usebibmacro{chapincoll}%
       \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
       \newcunit
@@ -1668,10 +2139,16 @@
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
-      \setunit{\addspace}%
+      \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.
@@ -1715,10 +2192,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:misc}{%
@@ -1732,11 +2215,11 @@
   {\printfield{title}%
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
+    \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
-    \newcunit\newblock
+    \newcunit%
     \usebibmacro{unpubl+letter+date}}%
   \newcunit
   \usebibmacro{byauthor}%
@@ -1762,10 +2245,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:music}{%
@@ -1791,15 +2280,17 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{addspace}}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\toggletrue{cms@usedvol}%
       \printfield{volume}%
@@ -1808,10 +2299,10 @@
       \bibstring{ofseries}%
       \setunit{\addspace}
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit
   \usebibmacro{volume+or+volumes}%
@@ -1846,10 +2337,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyAlias{cite:mvbook}{cite:book}
@@ -1895,10 +2392,16 @@
   \printfield{url}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:patent}{%
@@ -1915,8 +2418,8 @@
   \printfield{type}%
   \setunit*{\addspace}%
   \printfield{number}%
-  \iflistundef{location}
-    {}
+  \iflistundef{location}%
+    {}%
     {\setunit*{\addspace}%
      \printtext[parens]{%
        \printlist[][-\value{listtotal}]{location}}}%
@@ -1937,10 +2440,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:periodical}{%
@@ -1968,10 +2477,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}%
   {\usebibmacro{bibindex}%
   \usebibmacro{editor}%
@@ -1998,10 +2513,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:proceedings}{%
@@ -2014,21 +2535,25 @@
   \setunit{\addspace}
   \usebibmacro{cite:xref+date}%
   \newcunit
-  \ifboolexpr{
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
     not test {\ifentryseen{\thefield{crossref}}}%
     or
     togl {cms@bookcitexref}%
-  }
-  {\ifboolexpr{
+  }%
+  {\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
@@ -2046,10 +2571,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \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.
@@ -2105,10 +2636,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:report}{%
@@ -2139,15 +2676,21 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:review}{%
   \usebibmacro{bibindex}%
-  \iffieldequalstr{entrysubtype}{magazine}
+  \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{cmag+news+author}}%
   {\usebibmacro{author/editor}}%
   \newcunit\newblock
@@ -2158,7 +2701,7 @@
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
-  \newcunit\newblock
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -2171,7 +2714,7 @@
   \setunit{\addcomma\addspace}%
   \printfield{note}%
   \setunit{\addcomma\addspace}%
-  \iffieldequalstr{entrysubtype}{magazine}
+  \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+date}}%
   {\usebibmacro{cjournal+issue+year+pages}}%
   \usebibmacro{fullpostnote}%
@@ -2183,10 +2726,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:suppbook}{%
@@ -2231,10 +2780,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyAlias{cite:suppcollection}{cite:suppbook}
@@ -2261,10 +2816,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:unpublished}{%
@@ -2293,10 +2854,16 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:video}{%
@@ -2322,15 +2889,17 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\ifthenelse{\iffieldundef{title}\AND\iffieldundef{booktitle}}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
     {\toggletrue{cms@usedvol}%
       \printfield{volume}%
@@ -2339,10 +2908,10 @@
       \bibstring{ofseries}%
       \setunit{\addspace}
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit
   \usebibmacro{volume+or+volumes}%
@@ -2365,10 +2934,16 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
-  \setunit{\addspace}%
+  \setunit{\shorthandpunct}%
   \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
   \usebibmacro{finentry}}
 
 %%%% List Formats %%%%
@@ -2376,27 +2951,27 @@
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
   {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
-    \ifbibstring{#1}
-    {\bibstring{#1}}
-    {\ifbibstring{lang#1}
-      {\bibstring{lang#1}}
+    \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}}
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
         {#1}}%
       \bibrightbracket}%
     {\multilangdelim%
-      \ifbibstring{#1}
-      {\bibstring{#1}}
-      {\ifbibstring{lang#1}
-        {\bibstring{lang#1}}
+      \ifbibstring{#1}%
+      {\bibstring{#1}}%
+      {\ifbibstring{lang#1}%
+        {\bibstring{lang#1}}%
         {#1}}}}%
   \usebibmacro{langlist:andothers}}
 
@@ -2410,7 +2985,7 @@
 \DeclareListFormat{periodplace}{\mkbibparens{#1}}
 
 \DeclareListFormat{lista}{% 
-  \ifthenelse{\value{listtotal}<2}
+  \ifthenelse{\value{listtotal}<2}%
   {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
   {\ifthenelse{\value{listcount}=1}%
     {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
@@ -2509,10 +3084,10 @@
     {\mkpageprefix[bookpagination]{#1}}}}%
 
 \DeclareFieldFormat{edlang}{%
-  \ifbibstring{#1}
-  {\bibstring{#1}}
-  {\ifbibstring{ed#1}
-    {\bibstring{ed#1}}
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifbibstring{ed#1}%
+    {\bibstring{ed#1}}%
     {\ifcapital{\MakeCapital{#1}}{#1}}}}
 
 \DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
@@ -2630,42 +3205,42 @@
 
 \DeclareFieldFormat{urldate}{% 16th ed.
   \iffieldundef{userd}%
-  {\bibstring{urlseen}\space #1}%
+  {\bibstring{urlseen}\addspace #1}%
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[video]{urldate}{% 16th ed.
   \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-  {\bibstring{urlseen}\space #1}%
+  {\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}\space #1}%
+  {\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{recorded}\space #1}%
+    {\bibstring{recorded}\addspace #1}%
     {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
-  {\bibstring{recorded}\space #1}%
+  {\bibstring{recorded}\addspace #1}%
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[video]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
-  {\bibstring{broadcast}\space #1}%
+  {\bibstring{broadcast}\addspace #1}%
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldAlias{userd}{titleaddon}% 16th ed.
 
 \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
 
-\DeclareFieldFormat[review]{nameaddon}{#1\bibsentence}
+\DeclareFieldFormat[review,suppperiodical]{nameaddon}{#1\bibsentence}
 
 \DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
   \ifbibstring{#1}%
@@ -2706,14 +3281,20 @@
 
 \DeclareFieldAlias{maintitleaddon}{titleaddon}
 
+\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}}}
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
 
 \DeclareFieldFormat{journum}{% Revised for 0.9.5
   \ifboolexpr{%
@@ -2722,7 +3303,9 @@
     not test {\ifnumeral{#1}}%
   }%
   {\bibstring{numbers}\addspace #1}%
-  {\bibstring{number}\addspace #1}}
+  {\bibstring{number}\addspace #1}}%
+
+\DeclareFieldFormat{jourvol}{#1}
 
 \DeclareFieldFormat{sernum}{%
   \ifnumeral{#1}%
@@ -2817,14 +3400,44 @@
 
 \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}}%
+  \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}}}}
+  \iffieldundef{editortype}%
+    {\bibstring{cbytypeeditor}}%
+    {\bibstring{cbytype\thefield{editortype}}}}%
 
-\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 
 \renewcommand*{\iffinalcitedelim}{%
   \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
@@ -2832,12 +3445,12 @@
 \newcommand{\custpunct}{%
   \iftoggle{cms@fullnote}%
   {\iffieldequalstr{type}{plain}%
-    {}
+    {}%
     {\addcomma}}%
-  {\iftoggle{cms@shortnote}
+  {\iftoggle{cms@shortnote}%
     {\iffieldundef{postnote}%
       {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}
+        {}%
         {\addperiod}}%
       {\addcomma}}%
     {\addperiod}}}
@@ -2845,12 +3458,12 @@
 \newcommand{\custpunctb}{%
   \iftoggle{cms@fullnote}%
   {\iffieldequalstr{userb}{plain}%
-    {}
+    {}%
     {\addcomma}}%
-  {\iftoggle{cms@shortnote}
+  {\iftoggle{cms@shortnote}%
     {\iffieldundef{postnote}%
       {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}
+        {}%
         {\addperiod}}%
       {\addcomma}}%
     {\addperiod}}}
@@ -2888,14 +3501,14 @@
     {\addperiod}%
     {\ifnameundef{author}%
       {\addperiod}%
-      {}}}}
+      {}}}}%
 
 \newcommand{\postvolpunct}{\addcolon}% For vol:page customization
 
 \newcommand{\parttrans}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbytranslator}\space}%
-  {\bibstring{bytranslator}\space}}
+  {\bibstring{cbytranslator}\addspace}%
+  {\bibstring{bytranslator}\addspace}}%
 
 \newcommand{\partedit}{%
   \iftoggle{cms@postposit}% Kludge to make it work in French.
@@ -2904,37 +3517,37 @@
     {\bibstring{byeditoralt}\addspace}}%
   {\iftoggle{cms@fullnote}%
     {\bibstring{cbyeditor}\addspace}%
-    {\bibstring{byeditor}\addspace}}}
+    {\bibstring{byeditor}\addspace}}}%
 
 \newcommand{\partcomp}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbycompiler}\space}%
-  {\bibstring{bycompiler}\space}}
+  {\bibstring{cbycompiler}\addspace}%
+  {\bibstring{bycompiler}\addspace}}%
 
 \newcommand{\parteditandcomp}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditorcp}\space}%
-  {\bibstring{byeditorcp}\space}}
+  {\bibstring{cbyeditorcp}\addspace}%
+  {\bibstring{byeditorcp}\addspace}}%
 
 \newcommand{\parttransandcomp}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbytranslatorcp}\space}%
-  {\bibstring{bytranslatorcp}\space}}
+  {\bibstring{cbytranslatorcp}\addspace}%
+  {\bibstring{bytranslatorcp}\addspace}}%
 
 \newcommand{\partedittransandcomp}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditortrcp}\space}%
-  {\bibstring{byeditortrcp}\space}}
+  {\bibstring{cbyeditortrcp}\addspace}%
+  {\bibstring{byeditortrcp}\addspace}}%
 
 \newcommand{\parteditandtrans}{%
   \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditortr}\space}%
-  {\bibstring{byeditortr}\space}}
+  {\bibstring{cbyeditortr}\addspace}%
+  {\bibstring{byeditortr}\addspace}}%
 
 \newcommand{\reprint}{%
   \iftoggle{cms@fullnote}%
   {\bibsstring{reprint}}%
-  {\bibstring{reprint}}}
+  {\bibstring{reprint}}}%
 
 \newcommand*{\multipubsdelim}{\addnbspace/\addspace}
 
@@ -2945,14 +3558,14 @@
        {\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}}}
+    {\addcomma\addspace\bibstring{and}\addspace}}}%
 
 \renewcommand*{\postnotedelim}{%
   \iftoggle{cms@shortnote}%
@@ -3009,45 +3622,54 @@
   {\addperiod\addspace}%
   {\addcomma\addspace}}
 
+\newcommand*{\nameadelim}{%
+  \ifboolexpr{%
+    test {\iffieldequalstr{nameatype}{none}}%
+    and
+    not togl {cms@fullnote}%
+  }%
+  {\addperiod\addspace}%
+  {\addcomma\addspace}}
+
 \newcommand*{\lbx@cfromlang}{% Needed to eliminate "by" after "trans."
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
     {\bibstring{cfrom\thefield{origlanguage}}}}%
-  {\unspace}}
+  {\unspace}}%
 
 \@ifpackagelater{biblatex}{2011/11/12}
 {\renewcommand*{\lbx@fromlang}{%
-    \iffieldundef{userf}
-    {\iffieldundef{origlanguage}
-      {\unspace}
+    \iffieldundef{userf}%
+    {\iffieldundef{origlanguage}%
+      {\unspace}%
       {\bibstring{from\thefield{origlanguage}}}}%
-    {\unspace}}}
+    {\unspace}}}%
 {\@ifpackagelater{biblatex}{2011/07/28}
   {\newcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
+      \iffieldundef{userf}%
+      {\iffieldundef{origlanguage}%
+        {\unspace}%
         {\bibstring{from\thefield{origlanguage}}}}%
       {\unspace}}}%
   {\renewcommand*{\lbx@fromlang}{%
-      \iffieldundef{userf}
-      {\iffieldundef{origlanguage}
-        {\unspace}
+      \iffieldundef{userf}%
+      {\iffieldundef{origlanguage}%
+        {\unspace}%
         {\bibstring{from\thefield{origlanguage}}}}%
       {\unspace}}}}
 
 \renewcommand*{\lbx@lfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
     {\biblstring{from\thefield{origlanguage}}}}%
   {\unspace}}
 
 \renewcommand*{\lbx@sfromlang}{%
-  \iffieldundef{userf}
-  {\iffieldundef{origlanguage}
-    {\unspace}
+  \iffieldundef{userf}%
+  {\iffieldundef{origlanguage}%
+    {\unspace}%
     {\bibsstring{from\thefield{origlanguage}}}}%
   {\unspace}}
 
@@ -3056,86 +3678,93 @@
 \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
   \togglefalse{cms@switchdates}%
   \ifbibliography
-    {\usebibmacro{entrytail}}
+    {\usebibmacro{entrytail}}%
     {}%
   \finentry}
 
-\newbibmacro*{book:xref+finentry}{%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+\newbibmacro*{book:xref+finentry}{% FIXME
+  \ifthenelse{\iffieldundef{crossref}\OR\ifbibliography}%
+  {\ifthenelse{\iffieldundef{xref}\OR\ifbibliography}%
     {}%
     {\iftoggle{cms@bookcitexref}%
-      {\cmsnoopcite{\thefield{xref}}}%
-      {\ifboolexpr{
-          test {\ifpunct}%
-          or
-          test {\ifpunctmark{*}}%
-        }%
-        {\bibhypertarget{\thefield{xref}}%
-          {\cmsnoopcite{\thefield{xref}}}\nopunct}%
-        {\bibhypertarget{\thefield{xref}}%
-          {\cmsnoopcite{\thefield{xref}}}}}}}%
+      {\cms@citetracker@xref}%
+      {\bibhypertarget{\thefield{xref}}%
+        {\cms@citetracker@xref}}}}%
   {\iftoggle{cms@bookcitexref}%
-    {\cmsnoopcite{\thefield{crossref}}}%
-    {\ifboolexpr{
-        test {\ifpunct}%
-        or
-        test {\ifpunctmark{*}}%
-      }%
-      {\bibhypertarget{\thefield{crossref}}%
-        {\cmsnoopcite{\thefield{crossref}}}\nopunct}%
-      {\bibhypertarget{\thefield{crossref}}%
-        {\cmsnoopcite{\thefield{crossref}}}}}}}
+    {\cms@citetracker@crossref}%
+    {\bibhypertarget{\thefield{crossref}}%
+      {\cms@citetracker@crossref}}}}%
 
-\newbibmacro*{cite:xref+finentry}{%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+\newbibmacro*{cite:xref+finentry}{% FIXME
+  \ifthenelse{\iffieldundef{crossref}\OR\ifbibliography}%
+  {\ifthenelse{\iffieldundef{xref}\OR\ifbibliography}%
     {}%
     {\iftoggle{cms@citecrossref}%
-      {\cmsnoopcite{\thefield{xref}}}%
-      {\ifboolexpr{
-          test {\ifpunct}%
-          or
-          test {\ifpunctmark{*}}%
-        }%
-        {\bibhypertarget{\thefield{xref}}%
-          {\cmsnoopcite{\thefield{xref}}}\nopunct}%
-        {\bibhypertarget{\thefield{xref}}%
-          {\cmsnoopcite{\thefield{xref}}}}}}}%
+      {\cms@citetracker@xref}%
+      {\bibhypertarget{\thefield{xref}}%
+        {\cms@citetracker@xref}}}}%
   {\iftoggle{cms@citecrossref}%
-    {\cmsnoopcite{\thefield{crossref}}}%
-    {\ifboolexpr{
-        test {\ifpunct}%
-        or
-        test {\ifpunctmark{*}}%
-      }%
-      {\bibhypertarget{\thefield{crossref}}%
-        {\cmsnoopcite{\thefield{crossref}}}\nopunct}%
-      {\bibhypertarget{\thefield{crossref}}%
-        {\cmsnoopcite{\thefield{crossref}}}}}}}
+    {\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}
+     \newunit\newblock}%
     {}}%
 
 \newbibmacro*{author+holder}{%
-  \ifnameundef{author}
-    {}
+  \ifnameundef{author}%
+    {}%
     {\printnames{author}%
-     \ifthenelse{\ifnameundef{holder}\OR
-                 \ifnamesequal{author}{holder}}
-       {}
+     \ifthenelse{\ifnameundef{holder}\OR%
+                 \ifnamesequal{author}{holder}}%
+       {}%
        {\setunit{\addspace}%
         \printtext[parens]{\printnames{holder}}}}}
 
 \renewbibmacro*{byauthor}{%
-  \ifthenelse{\ifuseauthor\OR
-              \ifnameundef{author}}
-    {}
-    {\bibstring{by}\addspace
+  \ifthenelse{\ifuseauthor\OR%
+              \ifnameundef{author}}%
+    {}%
+    {\bibstring{by}\addspace%
      \printnames[byauthor]{author}}}
 
 \newbibmacro*{byauthorpunct}{%
@@ -3144,10 +3773,10 @@
   {\newcunit}}
 
 \renewbibmacro*{bybookauthor}{%
-  \ifnameundef{bookauthor}
-    {}
-    {\ifnamesequal{author}{bookauthor}
-      {}
+  \ifnameundef{bookauthor}%
+    {}%
+    {\ifnamesequal{author}{bookauthor}%
+      {}%
       {\bibstring{by}\addspace\printnames[default]{bookauthor}%
      \newcunit\newblock}}}
 
@@ -3178,11 +3807,11 @@
     \clearname{introduction}}}
 
 \newbibmacro*{langlist:andothers}{%
-  \ifthenelse{\value{listcount}=\value{liststop}\AND
-              \ifmoreitems}
-    {\ifnum\value{liststop}>1 \finalandcomma\fi
-     \andmoredelim\bibstring{andmore}\bibrightbracket}
-    {}}
+  \ifthenelse{\value{listcount}=\value{liststop}\AND%
+              \ifmoreitems}%
+    {\ifnum\value{liststop}>1 \finalandcomma\fi%
+     \andmoredelim\bibstring{andmore}\bibrightbracket}%
+    {}}%
 
 \newbibmacro*{mag+news+author}{%
   \ifnameundef{author}%
@@ -3195,20 +3824,20 @@
       \savefield{journaltitle}{\bbx@lasthash}}}%
   {\ifuseauthor%
     {\usebibmacro{author}}%
-    {}}}
+    {}}}%
 
 \newbibmacro*{cmag+news+author}{%
   \ifnameundef{author}%
   {}% 16th ed.
   {\ifuseauthor%
     {\usebibmacro{author}}%
-    {}}}
+    {}}}%
 
 \newbibmacro*{type+inst+year}{%
-  \printfield{type}
+  \printfield{type}%
   \newcunit
   \printlist{institution}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\addcomma\addspace}%
   \usebibmacro{cmsyear}}
 
 \newbibmacro*{institution+organization}{%
@@ -3225,7 +3854,7 @@
   {\ifnameundef{editor}%
     {\iflistundef{organization}%
       {}%
-      {\ifboolexpr{
+      {\ifboolexpr{%
           test {\iflistequals{organization}{\bbx@lasthash}}%
           and
           not test {\iffirstonpage}%
@@ -3246,13 +3875,13 @@
   {\usebibmacro{author/editor}}}
 
 \newbibmacro*{cbytypestrg}[2]{%
-  \iffieldundef{#1type}
-    {\bibstring{cby#2}}
-    {\bibstring{cby\thefield{#1type}}}}
+  \iffieldundef{#1type}%
+    {\bibstring{cby#2}}%
+    {\bibstring{cby\thefield{#1type}}}}%
 
 \newbibmacro*{cbyeditor}{%
-  \ifnameundef{editor}
-    {}
+  \ifnameundef{editor}%
+    {}%
     {\usebibmacro{cbytypestrg}{editor}{editor}%
      \setunit{\addspace}%
      \printnames[byeditor]{editor}%
@@ -3260,105 +3889,105 @@
   \usebibmacro{cbyeditorx}}
 
 \newbibmacro*{cbyeditorx}{%
-  \ifnameundef{editora}
-    {}
+  \ifnameundef{editora}%
+    {}%
     {\usebibmacro{cbytypestrg}{editora}{editor}%
      \setunit{\addspace}%
      \printnames[byeditora]{editora}%
      \newcunit}%
-  \ifnameundef{editorb}
-    {}
+  \ifnameundef{editorb}%
+    {}%
     {\usebibmacro{cbytypestrg}{editorb}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorb]{editorb}%
      \newcunit}%
-  \ifnameundef{editorc}
-    {}
+  \ifnameundef{editorc}%
+    {}%
     {\usebibmacro{cbytypestrg}{editorc}{editor}%
      \setunit{\addspace}%
      \printnames[byeditorc]{editorc}%
      \newcunit}}
 
 \newbibmacro*{cbytranslator}{%
-  \ifnameundef{translator}
-  {}
+  \ifnameundef{translator}%
+  {}%
   {\bibstring{cbytranslator}%
-    \addspace
+    \addspace%
     \printnames[bytranslator]{translator}}}
 
 \newbibmacro*{cbycompiler}{%
-  \ifnameundef{namec}
-    {}
-    {\bibstring{cbycompiler}\addspace
+  \ifnameundef{namec}%
+    {}%
+    {\bibstring{cbycompiler}\addspace%
      \printnames[bycompiler]{namec}}}
 
 \newbibmacro*{cbyredactor}{%
-  \ifnameundef{redactor}
-    {}
-    {\bibstring{cbyredactor}\addspace
+  \ifnameundef{redactor}%
+    {}%
+    {\bibstring{cbyredactor}\addspace%
      \printnames[byredactor]{redactor}}}
 
 \newbibmacro*{cwithcommentator}{%
-  \ifnameundef{commentator}
-    {}
-    {\bibsstring{withcommentator}\addspace
+  \ifnameundef{commentator}%
+    {}%
+    {\bibsstring{withcommentator}\addspace%
      \printnames[withcommentator]{commentator}}}
 
 \newbibmacro*{cwithannotator}{%
-  \ifnameundef{annotator}
-    {}
-    {\bibsstring{withannotator}\addspace
+  \ifnameundef{annotator}%
+    {}%
+    {\bibsstring{withannotator}\addspace%
      \printnames[withannotator]{annotator}}}
 
 \newbibmacro*{cwithintroduction}{%
-  \ifnameundef{introduction}
-    {}
-    {\bibstring{withintroduction}\addspace
+  \ifnameundef{introduction}%
+    {}%
+    {\bibstring{withintroduction}\addspace%
      \printnames[withintroduction]{introduction}}}
 
 \newbibmacro*{cwithforeword}{%
-  \ifnameundef{foreword}
-    {}
-    {\bibstring{withforeword}\addspace
+  \ifnameundef{foreword}%
+    {}%
+    {\bibstring{withforeword}\addspace%
      \printnames[withforeword]{foreword}}}
 
 \newbibmacro*{cwithafterword}{%
-  \ifnameundef{afterword}
-    {}
-    {\bibstring{withafterword}\addspace
+  \ifnameundef{afterword}%
+    {}%
+    {\bibstring{withafterword}\addspace%
      \printnames[withafterword]{afterword}}}
 
 \newbibmacro*{cbyeditor+others}{%
-  \ifthenelse{\NOT\ifnameundef{editor}\AND
-    \(\iffieldundef{editortype}\OR
-    \iffieldequalstr{editortype}{editor}\)}
+  \ifthenelse{\NOT\ifnameundef{editor}\AND%
+    \(\iffieldundef{editortype}\OR%
+    \iffieldequalstr{editortype}{editor}\)}%
   {\def\@tempa{cbyeditor}%
-    \ifnamesequal{editor}{translator}
+    \ifnamesequal{editor}{translator}%
     {\edef\@tempa{\@tempa tr}%
-      \clearname{translator}}
+      \clearname{translator}}%
     {}%
-    \ifnamesequal{editor}{namec}
+    \ifnamesequal{editor}{namec}%
     {\edef\@tempa{\@tempa cp}%
-      \clearname{namec}}
+      \clearname{namec}}%
     {}%
-    \ifnamesequal{editor}{commentator}
+    \ifnamesequal{editor}{commentator}%
     {\edef\@tempa{\@tempa co}%
-      \clearname{commentator}}
-    {\ifnamesequal{editor}{annotator}
+      \clearname{commentator}}%
+    {\ifnamesequal{editor}{annotator}%
       {\edef\@tempa{\@tempa an}%
-        \clearname{annotator}}
+        \clearname{annotator}}%
       {}}%
-    \ifnamesequal{editor}{introduction}
+    \ifnamesequal{editor}{introduction}%
     {\edef\@tempa{\@tempa in}%
-      \clearname{introduction}}
-    {\ifnamesequal{editor}{foreword}
+      \clearname{introduction}}%
+    {\ifnamesequal{editor}{foreword}%
       {\edef\@tempa{\@tempa fo}%
-        \clearname{foreword}}
-      {\ifnamesequal{editor}{afterword}
+        \clearname{foreword}}%
+      {\ifnamesequal{editor}{afterword}%
         {\edef\@tempa{\@tempa af}%
-          \clearname{afterword}}
+          \clearname{afterword}}%
         {}}}%
-    \bibstring{\@tempa}\space
+    \bibstring{\@tempa}\addspace%
     \printnames[byeditor]{editor}%
     \clearname{editor}%
     \newcunit%
@@ -3367,58 +3996,58 @@
   \usebibmacro{cbytranslator+others}}
 
 \newbibmacro*{cbytranslator+others}{%
-  \ifnameundef{translator}
-    {}
+  \ifnameundef{translator}%
+    {}%
     {\def\@tempa{cbytranslator}%
-      \ifnamesequal{translator}{namec}
+      \ifnamesequal{translator}{namec}%
       {\edef\@tempa{\@tempa cp}%
-        \clearname{namec}}
+        \clearname{namec}}%
       {}%
-     \ifnamesequal{translator}{commentator}
+     \ifnamesequal{translator}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{translator}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{translator}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{translator}{introduction}
+     \ifnamesequal{translator}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{translator}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{translator}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{translator}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{translator}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
-     \bibstring{\@tempa}\space
+     \bibstring{\@tempa}\addspace%
      \printnames[bytranslator]{translator}%
      \clearname{translator}%
      \newcunit}%
   \usebibmacro{cbycompiler+others}}
 
 \newbibmacro*{cbycompiler+others}{%
-  \ifnameundef{namec}
-    {}
+  \ifnameundef{namec}%
+    {}%
     {\def\@tempa{cbycompiler}%
-     \ifnamesequal{namec}{commentator}
+     \ifnamesequal{namec}{commentator}%
        {\edef\@tempa{\@tempa co}%
-        \clearname{commentator}}
-       {\ifnamesequal{namec}{annotator}
+        \clearname{commentator}}%
+       {\ifnamesequal{namec}{annotator}%
           {\edef\@tempa{\@tempa an}%
-           \clearname{annotator}}
+           \clearname{annotator}}%
           {}}%
-     \ifnamesequal{namec}{introduction}
+     \ifnamesequal{namec}{introduction}%
        {\edef\@tempa{\@tempa in}%
-        \clearname{introduction}}
-       {\ifnamesequal{namec}{foreword}
+        \clearname{introduction}}%
+       {\ifnamesequal{namec}{foreword}%
           {\edef\@tempa{\@tempa fo}%
-           \clearname{foreword}}
-          {\ifnamesequal{namec}{afterword}
+           \clearname{foreword}}%
+          {\ifnamesequal{namec}{afterword}%
              {\edef\@tempa{\@tempa af}%
-              \clearname{afterword}}
+              \clearname{afterword}}%
              {}}}%
-     \bibstring{\@tempa}\space
+     \bibstring{\@tempa}\addspace%
      \printnames[bycompiler]{namec}%
      \clearname{namec}%
      \newcunit}%
@@ -3441,6 +4070,60 @@
   \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}%
+      {}%
+      {\newunit%
+        \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
@@ -3465,7 +4148,7 @@
         \setunit{\addspace}%
         \bibstring{ofseries}%
         \setunit{\addspace}}%
-      {\usebibmacro{cms-in:}}}%
+      {\bibstring{in}\setunit{\addspace}}}%
     {\iffieldundef{part}%
       {\ifcsdef{cbx@incollpart}%
         {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3479,7 +4162,7 @@
         \setunit{\addspace}%
         \bibstring{ofseries}%
         \setunit{\addspace}}%
-      {\usebibmacro{cms-in:}}}}%
+      {\bibstring{in}\setunit{\addspace}}}}%
   {\iffieldundef{part}%
     {\ifcsdef{cbx@incollpart}%
       {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3496,29 +4179,35 @@
       \setunit{\addspace}%
       \bibstring{ofseries}%
       \setunit{\addspace}}%
-    {\usebibmacro{cms-in:}}}}%
+    {\bibstring{in}\setunit{\addspace}}}}%
 
 \newbibmacro*{chapincoll}{%
   \iffieldundef{chapter}%
-  {}
+  {}%
   {\printfield{chapter}\addspace%
-    \clearfield{chapter}}}
+    \clearfield{chapter}}}%
 
 \newbibmacro*{xrefchapincoll}{%
   \iffieldundef{chapter}%
-  {\printtext{\relax}}
+  {\printtext{\relax}}%
   {\printfield{chapter}\addspace%
-    \clearfield{chapter}}}
+    \clearfield{chapter}}}%
 
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
-  {\ifthenelse{\ifentrytype{music}% 16th ed.
-      \AND\NOT\iffieldundef{booktitle}}%
+  {\ifboolexpr{%
+      test {\ifentrytype{music}}% 16th ed.
+      and
+      not test {\iffieldundef{booktitle}}%
+      and
+      not togl {cms@origpublished}%
+    }%
     {\bibstring{on}\setunit{\addspace}}%
-    {}}
-  {\printfield{chapter}%
-    \addspace\bibstring{of}\setunit{\addspace}%
-    \clearfield{chapter}}}
+    {}}%
+  {\printfield{chapter}\clearfield{chapter}%
+    \iffieldundef{booktitle}%
+    {}%
+    {\addspace\bibstring{of}\setunit{\addspace}}}}%
 
 \newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
   \ifboolexpr{%
@@ -3556,23 +4245,27 @@
   {}%
   {\printeventdate}}% Date fix
 
-\newbibmacro*{ctitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \setunit{\addcomma\addspace}\newblock%
+\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{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}}%
 %  \setunit{\addspace}}%
 %  \usebibmacro{language+transtitle}%
 %  \setunit*{\addcomma}\newblock}
 
-\newbibmacro*{citaltitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newcunit\newblock%
+\newbibmacro*{citaltitle+stitle}{% New test, as above.
+  \iffieldundef{title}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[tnoformat]{title}%
+      \setunit{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}}%
+  \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -3583,7 +4276,7 @@
     \printfield[noformat]{title}%
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}}%
-  \newunit%\setunit{\addspace}\newblock%
+  \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}}%
 %  \setunit{\addspace}}%
 %  \usebibmacro{language+transtitle}%
@@ -3594,7 +4287,7 @@
     \printfield[noformat]{title}%
     \setunit{\addcolon\addspace}%
     \printfield[noformat]{subtitle}}%
-  \newunit\newblock%
+  \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
@@ -3605,7 +4298,7 @@
        \printfield[noformat]{title}%
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{subtitle}}%
-     \newunit%\setunit{\addcomma\addspace}
+     \setunit{\ptitleaddonpunct}%
      \printfield{titleaddon}%
      }%\newcunit\newblock}
 
@@ -3614,7 +4307,7 @@
        \printfield[noformat]{title}%
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{subtitle}}%
-     \setunit{\addcomma\addspace}%
+     \setunit{\ctitleaddonpunct}%
      \printfield{titleaddon}%
      }%\newcunit\newblock}
 
@@ -3625,34 +4318,34 @@
 
 \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[noformat]{issuetitle}%
+      \printfield[itnoformat]{issuetitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[noformat]{issuesubtitle}}}}
+      \printfield[sitnoformat]{issuesubtitle}}}}
 
 \newbibmacro*{btitle+bstitle}{%
-  \iffieldundef{booktitle}
-  {}
+  \iffieldundef{booktitle}%
+  {}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {}%
     {\usebibmacro{cms-in:}}%
     \printtext[booktitle]{%
-      \printfield[noformat]{booktitle}%
+      \printfield[btnoformat]{booktitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[noformat]{booksubtitle}}%
-    \newcunit
+      \printfield[sbtnoformat]{booksubtitle}}%
+    \setunit{\ctitleaddonpunct}%
     \printfield{booktitleaddon}%
     \setunit*{\addcomma\addspace}}}
 
 \newbibmacro*{publ+loc+year}{% Revised for reprint
-  \ifboolexpr{
+  \ifboolexpr{%
     togl {cms@reprint}%
     and
     not test {\ifentrytype{video}}%
@@ -3687,10 +4380,10 @@
   {}%
   \printlist{location}%
   \iffieldundef{howpublished}%
-  {\setunit*{\addcomma\space}}%
-  {\setunit*{\addcolon\space}}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
   \printfield{howpublished}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\addcomma\addspace}%
   \usebibmacro{date}%
 }
 
@@ -3702,15 +4395,15 @@
   {}%
   \printlist{location}%
   \iflistundef{institution}%
-  {\setunit*{\addcomma\space}}%
-  {\setunit*{\addcolon\space}}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
   \printlist{institution}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\addcomma\addspace}%
   \usebibmacro{date}%
 }%
 
 \newbibmacro*{cpubl+loc+year}{% Revised for reprint
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iflistundef{location}}%
     and
     test {\iflistundef{publisher}}%
@@ -3724,7 +4417,7 @@
     \printtext[parens]{%
       \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}%
       \setunit*{\addsemicolon\addspace}%
-      \ifboolexpr{
+      \ifboolexpr{%
         togl {cms@reprint}%
         and
         not test{\ifentrytype{video}}%
@@ -3733,15 +4426,15 @@
         \newcunit}%
       {}%
       \printlist{location}%
-      \iflistundef{publisher}
-      {\setunit*{\addspace}}
-      {\setunit*{\addcolon\space}}%
+      \iflistundef{publisher}%
+      {\setunit*{\addspace}}%
+      {\setunit*{\addcolon\addspace}}%
       \printlist{publisher}%
-      \setunit{\addcomma\space}%
+      \setunit{\addcomma\addspace}%
       \usebibmacro{date}}}}%
 
 \newbibmacro*{cpubletter+loc+year}{%
-  \ifboolexpr{
+  \ifboolexpr{%
     test {\iflistundef{location}}%
     and
     test {\iflistundef{publisher}}%
@@ -3752,23 +4445,27 @@
   {\setunit{\addspace}%
     \printtext[parens]{%
       \printlist{location}%
-      \iflistundef{publisher}
-      {\setunit*{\addspace}}
-      {\setunit*{\addcolon\space}}%
+      \iflistundef{publisher}%
+      {\setunit*{\addspace}}%
+      {\setunit*{\addcolon\addspace}}%
       \printlist{publisher}%
-      \setunit{\addcomma\space}%
+      \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}%
-    {}
-    {\bibstring{origpublin}%
+    {}%
+    {\usebibmacro{begrelated}%
+      \bibstring{reprintfrom}% ?
       \origpublcite{\thefield{reprinttitle}}%
-      \newunit}}
-  {\iffieldundef{origlanguage}%
+      \usebibmacro{endrelated}%
+      \newunit}}%
+  {\usebibmacro{begrelated}%
+    \iffieldundef{origlanguage}%
     {\bibstring{origpub}%
-      \origfullcite{\thefield{userf}}
+      \origfullcite{\thefield{userf}}%
+      \usebibmacro{endrelated}%
       \newunit}%
     {\iftoggle{cms@postposit}%
       {\bibstring{origedition}%
@@ -3776,11 +4473,13 @@
         \printfield[edlang]{origlanguage}%
         \addcolon%
         \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
         \newunit}%
       {\printfield[edlang]{origlanguage}%
         \setunit{\addspace}%
         \bibstring{origedition}%
-        \origfullcite{\thefield{userf}}
+        \origfullcite{\thefield{userf}}%
+        \usebibmacro{endrelated}%
         \newunit}}}}
 
 \newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
@@ -3796,7 +4495,7 @@
     {\setunit*{\addcolon\addspace}}}%
   {\setunit*{\addcolon\addspace}}%
   \printlist{organization}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\addcomma\addspace}%
   \printlist{publisher}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{date}}
@@ -3823,7 +4522,7 @@
     {\addcomma\addspace}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -3831,7 +4530,7 @@
       \addcomma\addspace}%
     {\setunit{\addspace}%
     \printtext[parens]{% parens is the default here
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -3854,7 +4553,7 @@
     {\addcomma\addspace}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -3862,7 +4561,7 @@
       \addcomma\addspace}%
     {\setunit{\addspace}%
     \printtext[parens]{% parens is the default here
-      \iffieldundef{issue}
+      \iffieldundef{issue}%
       {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
         \setunit{\addspace}%
@@ -3903,7 +4602,7 @@
           \usebibmacro{choosepubstring}%
           \printdate}}}%
     {\iffieldundef{origyear}%
-      {}
+      {}%
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
           \printorigdate}}}}%
@@ -3921,7 +4620,7 @@
   {\printdate}}
 
 \newbibmacro{cite:xref+date}{%
-  \ifboolexpr{
+  \ifboolexpr{%
     togl {cms@omitxrefdate}%
     or
     togl {cms@bookcitexref}%
@@ -3942,8 +4641,8 @@
     ))
     or
     not test {\ifentryseen{\thefield{crossref}}}%
-  }
-  {\ifboolexpr{
+  }%
+  {\ifboolexpr{%
       togl {cms@omitxrefdate}%
       or
       togl {cms@bookcitexref}%
@@ -3964,7 +4663,7 @@
       ))
       or
       not test {\ifentryseen{\thefield{xref}}}%
-    }
+    }%
     {}%
     {\printtext[parens]{\usebibmacro{date}}}}%
   {\printtext[parens]{\usebibmacro{date}}}}
@@ -4022,9 +4721,9 @@
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
-  \iffieldundef{series}
-    {}
-    {\newcunit
+  \iffieldundef{series}%
+    {}%
+    {\newcunit%
       \printfield[jourser]{series}%
       \newcunit}%\setunit*{\addspace}?
   \printfield[jourvol]{volume}%
@@ -4032,19 +4731,36 @@
   \printfield[journum]{number}%
   \setunit{\addcomma\addspace}%
   \printfield{eid}%
-  \newunit}
+  \newunit}%
 
 \newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
-  \printtext[title]{% article subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}% 
+  \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{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
-  \iffieldundef{series}
-    {}
-    {\newcunit
+  \iffieldundef{series}%
+    {}%
+    {\newcunit%
       \printfield[jourser]{series}%
       \newcunit}%\setunit*{\addspace}?
   \printfield[jourvol]{volume}%
@@ -4055,16 +4771,33 @@
   \newunit}
 
 \newbibmacro*{journal+sub}{%
-  \iffieldundef{journaltitle}
-    {}
-    {\printtext[journaltitle]{%
-       \printfield[noformat]{journaltitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{journalsubtitle}}}}
+  \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{\addcolon\addspace}%
+          \printfield[sjtnoformat]{journalsubtitle}}}}}%
 
 \newbibmacro*{cite+doi+url}{% 16th ed.
-  \iffieldundef{urlyear}
-  {}
+  \iffieldundef{urlyear}%
+  {}%
   {\printurldate}% Date fix
   \newcunit\newblock
   \iftoggle{cms@doionly}%
@@ -4072,21 +4805,33 @@
     {}%
     {\printfield{doi}%
       \clearfield{url}}}%
-  {\iftoggle{cms@doi}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
     {\printfield{doi}}%
     {}}%
   \newcunit\newblock
-  \iftoggle{cms@eprint}%
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
   {\usebibmacro{eprint}}%
   {}%
   \newcunit\newblock
-  \iftoggle{cms@url}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
   {\printfield{url}}%
   {}}%
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\addcomma\addspace}%
   \printfield{pages}}
 
 \newbibmacro*{mag+news+date}{% 16th ed.
@@ -4097,7 +4842,7 @@
     {\usebibmacro{mag+date+issue}}}}
 
 \newbibmacro*{date+issue}{%
-  \iffieldundef{issue}
+  \iffieldundef{issue}%
   {\iffieldundef{number}%
     {\usebibmacro{date}}%
     {\iftoggle{cms@numbermonth}% For exclusion of month
@@ -4119,10 +4864,27 @@
   \usebibmacro{date+issue}}
 
 \newbibmacro*{periodical+date+issue}{% For periodical type &
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+  \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{\addcolon\addspace}%
+      \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \newcunit\newblock
@@ -4131,56 +4893,58 @@
   \usebibmacro{date+issue}}
 
 \newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{maintitle}
-  {}
+  \iffieldundef{maintitle}%
+  {}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
-    {\usebibmacro{cms-in:}%
+    {\iffieldundef{title}%
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{maintitleaddon}}%
     {\toggletrue{cms@usedvol}%
       \printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
 \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{maintitle}
-  {}
+  \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[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}%
       \toggletrue{cms@vol}}% InIn fix
     {\toggletrue{cms@usedvol}%
       \printfield{volume}%
       \printfield{part}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}
+      \setunit{\addspace}%
       \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+        \printfield[mtnoformat]{maintitle}%
         \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
+        \printfield[smtnoformat]{mainsubtitle}}%
+      \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
 \newbibmacro*{backref+check}{%
@@ -4202,32 +4966,34 @@
 \renewbibmacro*{postnote}{%
   \iftoggle{cms@fullnote}%
   {\global\togglefalse{cms@shortnote}%
-    \global\togglefalse{cms@fullnote}}
-  {\iftoggle{cms@printshhand}
+    \global\togglefalse{cms@fullnote}}%
+  {\iftoggle{cms@printshhand}%
     {\iffieldundef{postnote}%
-      {\iffieldundef{shorthand}
+      {\iffieldundef{shorthand}%
         {\global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}
-        {\usebibmacro{cms:shorthandintro}%
+          \global\togglefalse{cms@fullnote}}%
+        {\setunit{\shorthandpunct}%
+          \usebibmacro{cms:shorthandintro}%
           \global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}}
-      {\iffieldundef{shorthand}
+          \global\togglefalse{cms@fullnote}}}%
+      {\iffieldundef{shorthand}%
         {\postnotewrapper%delim%
           \usebibmacro{semel:postnote}%
           \global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}
+          \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}}}}
+          \global\togglefalse{cms@fullnote}}}}%
     {\iffieldundef{postnote}%
       {\global\togglefalse{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}}
+        \global\togglefalse{cms@fullnote}}%
       {\postnotewrapper%delim%
         \usebibmacro{semel:postnote}%
         \global\togglefalse{cms@shortnote}%
@@ -4310,7 +5076,7 @@
     {\printfield{volumes}}%
     {\printfield{volume}%
       \printfield{part}}}%
-  {\ifboolexpr{
+  {\ifboolexpr{%
       togl {cms@hidevolumes}%
       and
       (
@@ -4381,7 +5147,7 @@
           {\newcunit\printfield{volume}\printfield{part}}%
           {\usebibmacro{pages+cref+print}}}}%
       {\usebibmacro{postnote+cref+print}}}%
-    {\ifboolexpr{
+    {\ifboolexpr{%
         test {\ifcsdef{cbx@incollvol}}%
         and
         (
@@ -4393,7 +5159,7 @@
       {\restorefield{volume}{\cbx@incollvol}%
         \iffieldundef{part}%
         {\ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}}%
-        {\ifboolexpr{
+        {\ifboolexpr{%
             test {\ifcsdef{cbx@incollpart}}%
             and
             (
@@ -4412,7 +5178,7 @@
             {\newcunit\printfield{volume}\printfield{part}}%
             {\usebibmacro{pages+cref+print}}}}%
         {\usebibmacro{postnote+cref+print}}}%
-      {\ifboolexpr{
+      {\ifboolexpr{%
           test {\ifcsdef{cbx@incollpart}}%
           and
           (
@@ -4420,7 +5186,7 @@
           or
           togl {cms@xrefpart}%
           )
-        }
+        }%
         {\iffieldundef{postnote}%
           {\ifcsdef{cbx@incollpages}%
             {\restorefield{pages}{\cbx@incollpages}%
@@ -4488,6 +5254,11 @@
   \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%
@@ -4501,11 +5272,11 @@
   \global\let\cbx@incollpages\undefined%
   \global\let\cbx@incollpart\undefined%
   \global\let\cbx@incollpgn\undefined%
-  \global\let\cbx@incollbkpgn\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?
 
@@ -4528,54 +5299,40 @@
 
 \newbibmacro*{choose+surname}{%
   \ifciteseen%
-  {}
-  {\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-    {\printnames{labelname}%
-      \clearname{author}}%
-  {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-    {\printnames[labelname]{namea}\newcunit%
-      \usebibmacro{parteditstrg}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-      {\printnames{labelname}\newcunit%
-        \usebibmacro{editstrg}}%
-      {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-        {\printnames[labelname]{nameb}\newcunit%
-          \usebibmacro{parttransstrg}}%
-        {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-          {\printnames{labelname}\newcunit%
-            \usebibmacro{transstrg}}%
-          {\ifboolexpr{%
-              not test {\ifnameundef{namec}}%
-              and
-              togl {cms@usecompiler}%
-            }%
-            {\printnames[labelname]{namec}\newcunit%
-              \usebibmacro{compilestrg}}%
-            {}}}}}}}}%
-
-\newbibmacro*{choose+labelname}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-  {\printnames{labelname}}%
-  {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-    {\printnames[labelname]{namea}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-      {\printnames{labelname}}%
-      {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-        {\printnames[labelname]{nameb}}%
-        {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-          {\printnames{labelname}}%
-          {\ifboolexpr{%
-              not test {\ifnameundef{namec}}%
-              and
-              togl {cms@usecompiler}%
-            }%
-            {\printnames[labelname]{namec}}%
-            {}}}}}}}%
+  {}%
+  {\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}}}
+    \field{nameb} \field{translator} \field{namec}}}%
 {\DeclareLabelname{shortauthor,author,shorteditor,namea,%
     editor,nameb,translator,namec}}
 
@@ -4627,9 +5384,17 @@
 \DeclareDataInheritance{*}{*}{%
   \noinherit{namea}
   \noinherit{nameb}
+  \noinherit{nameatype}
   \noinherit{sortyear}
   \noinherit{sortname}
-  \noinherit{sorttitle}}
+  \noinherit{sorttitle}
+  \noinherit{urlyear}
+  \noinherit{urlmonth}
+  \noinherit{urlday}
+  \noinherit{doi}
+  \noinherit{eprint}
+  \noinherit{eprinttype}
+  \noinherit{url}}
 
 \DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
 {*}{% ???
@@ -4680,48 +5445,20 @@
   }
 }
 
-\newbibmacro*{part+editor+translator}{%
-  \ifnameundef{namea}%
-  {\ifnameundef{nameb}%
-    {}
-    {\bibstring{bytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{byeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{byeditor}\space%
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newunit
-      \bibstring{bytranslator}\space%
-      \printnames[bytranslator]{nameb}}}}}
-
-\newbibmacro*{cpart+editor+translator}{%
-  \ifnameundef{namea}%
-  {\ifnameundef{nameb}%
-    {}
-    {\bibstring{cbytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{cbyeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{cbyeditor}\space% Need this \space here?
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newcunit
-      \bibstring{cbytranslator}\space%
-      \printnames[bytranslator]{nameb}}}}}
+\DeclareSortingScheme{shortjournal}{%
+  \sort{
+    \field{shortjournal}
+  }
+}
 
 \newbibmacro*{compilestrg}{%
-  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}
-  {\bibstring{compilers}}
-  {\bibstring{compiler}}
-  \clearname{namec}}
+  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}%
+  {\bibstring{compilers}}%
+  {\bibstring{compiler}}%
+  \clearname{namec}}%
 
 \newbibmacro*{transstrg}{%
-  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}
+  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}%
     {\ifnamesequal{translator}{namec}%
       {\bibstring{transcompilers}%
         \clearname{namec}}%
@@ -4729,11 +5466,11 @@
     {\ifnamesequal{translator}{namec}%
       {\bibstring{transcompiler}%
         \clearname{namec}}%
-      {\bibstring{translator}}}
-    \clearname{translator}}
+      {\bibstring{translator}}}%
+    \clearname{translator}}%
 
 \newbibmacro*{parttransstrg}{%
-  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}
+  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}%
     {\ifnamesequal{nameb}{namec}%
       {\bibstring{transcompilers}%
         \clearname{namec}}%
@@ -4741,15 +5478,15 @@
     {\ifnamesequal{nameb}{namec}%
       {\bibstring{transcompiler}%
         \clearname{namec}}%
-      {\bibstring{translator}}}
-    \clearname{nameb}}
+      {\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}}
+  \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}}%
@@ -4760,8 +5497,8 @@
           {\bibstring{editortranslators}%
             \clearname{translator}}%
           {\bibstring{editors}}}}}%
-    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
-        \ifnamesequal{editor}{namec}}
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND%
+        \ifnamesequal{editor}{namec}}%
       {\bibstring{editortranscompiler}%
         \clearname{translator}%
         \clearname{namec}}%
@@ -4772,15 +5509,17 @@
           {\bibstring{editortranslator}%
             \clearname{translator}}%
           {\bibstring{editor}}}}}}%
-  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
-    {\bibstring{\thefield{editortype}s}}
-    {\bibstring{\thefield{editortype}}}}
-  \clearname{editor}}
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
+    {\bibstring{\thefield{editortype}s}}%
+    {\bibstring{\thefield{editortype}}}}%
+  \clearname{editor}}%
 
 \newbibmacro*{parteditstrg}{%
-  \ifthenelse{\value{namea}>1\OR\ifandothers{namea}}
-    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
-        \ifnamesequal{namea}{namec}}
+  \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}}%
@@ -4791,8 +5530,8 @@
           {\bibstring{editortranslators}%
             \clearname{nameb}}%
           {\bibstring{editors}}}}}%
-    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
-        \ifnamesequal{namea}{namec}}
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND%
+        \ifnamesequal{namea}{namec}}%
       {\bibstring{editortranscompiler}%
         \clearname{nameb}%
         \clearname{namec}}%
@@ -4802,8 +5541,11 @@
         {\ifnamesequal{namea}{nameb}%
           {\bibstring{editortranslator}%
             \clearname{nameb}}%
-          {\bibstring{editor}}}}}%
-    \clearname{namea}}
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
+    {\bibstring{\thefield{nameatype}s}}%
+    {\bibstring{\thefield{nameatype}}}}%
+  \clearname{namea}}%
 
 \newbibmacro*{clearorigin}{%
   \toggletrue{cms@origcite}%
@@ -4832,19 +5574,305 @@
       {\savefield{fullhash}{\bbx@lasthash}%
         \clearname{author}}}}%
   {\clearname{author}}%
-  \clearname{namea}%
-  \clearname{nameb}%
+  \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%
+  \ifthenelse{\(\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
     \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
-    \ifentrytype{mvreference}}%
+    \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{titleaddon}%
+    \clearfield{usere}%
+    \clearlist{language}}%
+  \ifentrytype{letter}%
+  {\iftoggle{cms@switchdates}%
+    {\clearfield{year}\clearfield{month}}%
+    {\clearfield{origyear}\clearfield{origmonth}}%
+    \clearfield{origlocation}}%
+  {}%
   \clearfield{reprinttitle}%
-  \clearfield{usere}%
-  \clearlist{language}%
 }
 
+%%%% 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: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}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\DeclareFieldFormat{ititle:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibquote{#1}}
+
+\DeclareFieldFormat{chapter:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \ifboolexpr{%
+    togl {cms@otherlang}%
+    and
+    not test {\iffieldundef{langid}}%
+  }%
+  {\unspace}{}%
+  \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}{}%
+  \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 49f8987d745..7f20c9bff08 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,6 @@
-% $Id: cms-american.lbx,v 0.10.1.35 2013/10/29 14:13:10 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.36 2016/06/01 11:02:59 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -808,45 +808,45 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}
+  {}%
   {\printtext[#2date]{%
-    \iffieldsequal{#2year}{#2endyear}
+    \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}
-      {}
-      {\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}}}
+    \iffieldundef{#2endyear}%
+    {\iffieldundef{#2endmonth}%
+      {}%
+      {\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}}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{% Modify ???
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}
+  {}%
   {\printtext[#2date]{%
-      \iffieldsequal{#2year}{#2endyear}
+      \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}{}{#2month}{#2day}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -858,11 +858,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 20bca56a1d6..4e6e0927947 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-british.lbx,v 0.7 2013/10/29 14:13:55 dfussner Exp $	
+% $Id: cms-british.lbx,v 0.8 2016/06/01 11:06:59 dfussner Exp $	
 
-\ProvidesFile{cms-british.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-british.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 \InheritBibliographyExtras{british}
 
@@ -30,35 +30,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -70,11 +70,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
index e136fd56e1c..7383f84b5f8 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,6 @@
-% $Id: cms-finnish.lbx,v 0.6 2013/10/29 14:15:17 dfussner Exp $	
+% $Id: cms-finnish.lbx,v 0.7 2016/06/01 11:09:39 dfussner Exp $	
 
-\ProvidesFile{cms-finnish.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-finnish.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Antti-Juhani Kaijanaho).
@@ -826,35 +826,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -866,11 +866,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 fe046122525..e9447443c5f 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,6 @@
-% $Id: cms-french.lbx,v 0.9.5.27 2013/10/29 14:16:06 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.30 2016/06/01 17:16:43 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -15,6 +15,8 @@
   \toggletrue{cms@postposit}%
   \savecommand\mkbibnamelast
   \protected\def\mkbibnamelast#1{#1}% No small caps for Chicago (?)
+  \savecommand\mkbibnamefamily
+  \protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}%
   \savecommand\cms@datelong
   \savecommand\cms@datelongalt
   \savecommand\mkbibrangecomp
@@ -32,6 +34,7 @@
 \UndeclareBibliographyExtras{%
   \restorecommand\postvolpunct%
   \restorecommand\mkbibnamelast
+  \restorecommand\mkbibnamefamily
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
   \togglefalse{cms@postposit}%
@@ -359,8 +362,8 @@
       s\'er\adddot}},
   cbynone = {{}{}},
   cbyauthor = {{par}{par}},
-  cbyeditor = {{sous la dir\adddot\smartof}%
-    {sous la dir\adddot\smartof}},
+  cbyeditor = {{sous la dir\adddotspace\smartof}%
+    {sous la dir\adddotspace\smartof}},
   cbyeditoralt = {{sous la dir\adddot}{sous la dir\adddot}},
   byeditoralt  = {{sous la direction}{sous la dir\adddot}},
   cbytranslator     = {{trad\adddot\addspace\lbx@cfromlang}%
@@ -372,8 +375,8 @@
   % cbyfounder        = {{}{}}, % FIXME
   % cbycontinuator    = {{}{}}, % FIXME
   % cbycollaborator   = {{}{}}, % FIXME
-  cbyconductor = {{sous la dir\adddot\smartof}%
-    {sous la dir\adddot\smartof}},
+  cbyconductor = {{sous la dir\adddotspace\smartof}%
+    {sous la dir\adddotspace\smartof}},
   cbydirector = {{r\'eal\adddot}{r\'eal\adddot}},
   cbyproducer = {{prod\adddot}{prod\adddot}},
   cbyeditortr    = {{\'ed\adddotspace \'etablie et trad\adddot\
@@ -649,7 +652,7 @@
   bynone = {{}{}},
   bycompiler = {{compil\'e par}{comp\adddot}},
   byconductor = {{sous la direction \smartof}%
-    {sous la dir\adddot\smartof}},
+    {sous la dir\adddotspace\smartof}},
   bydirector = {{r\'ealis\'e par}{r\'eal\adddot}},
   byproducer = {{produit par}{prod\adddot}},
   byeditorcp = {{\'edition \'etablie et compil\'ee par}%
@@ -787,35 +790,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -827,11 +830,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 6697704de2a..ed7f10237df 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,6 @@
-% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -321,6 +321,17 @@
     {\"uberarb\adddot\space Aufl\adddot}},
   broadcast = {{\"ubertragen}{\"ubertragen}},
   recorded = {{aufgenommen}{aufgenommen}},
+  reprintfrom      = {{neu gedruckt nach}{neu gedruckt nach}},% FIXME
+% 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
+  astitle          = {{als}{als}},% FIXME
+  bypublisher      = {{von}{von}},% FIXME
   numbers = {{Nrn\adddot}{Nrn\adddot}},
   nodate = {{{}o\adddot Dat\adddot}{{}o\adddot Dat\adddot}},% ?
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
@@ -944,35 +955,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -984,11 +995,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 8ac97d571ed..05f0a826771 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,6 @@
-% $Id: cms-icelandic.lbx,v 0.10 2013/10/29 14:18:01 dfussner Exp $	
+% $Id: cms-icelandic.lbx,v 0.11 2016/06/01 11:19:41 dfussner Exp $	
 
-\ProvidesFile{cms-icelandic.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-icelandic.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Baldur Kristinsson).
@@ -455,35 +455,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -495,11 +495,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
index 6bbe9710ac1..101815445d5 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,6 @@
-% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -321,6 +321,17 @@
     {\"uberarb\adddot\space Aufl\adddot}},
   broadcast = {{\"ubertragen}{\"ubertragen}},
   recorded = {{aufgenommen}{aufgenommen}},
+  reprintfrom      = {{neu gedruckt nach}{neu gedruckt nach}},% FIXME
+% 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
+  astitle          = {{als}{als}},% FIXME
+  bypublisher      = {{von}{von}},% FIXME
   numbers = {{Nrn\adddot}{Nrn\adddot}},
   nodate = {{{}o\adddot Dat\adddot}{{}o\adddot Dat\adddot}},% ?
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
@@ -944,35 +955,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -984,11 +995,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 8e5dc4a2706..848884d4d30 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,6 @@
-% $Id: cms-norsk.lbx,v 1.6 2013/10/29 14:19:01 dfussner Exp $
+% $Id: cms-norsk.lbx,v 1.7 2016/06/01 11:22:00 dfussner Exp $
 
-\ProvidesFile{cms-norsk.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-norsk.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -712,35 +712,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -752,11 +752,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 11e05e73d0e..83de0f3ddd1 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,6 @@
-% $Id: cms-norwegian.lbx,v 1.6 2013/10/29 14:19:41 dfussner Exp $
+% $Id: cms-norwegian.lbx,v 1.7 2016/06/01 11:03:14 dfussner Exp $
 
-\ProvidesFile{cms-norwegian.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-norwegian.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -712,35 +712,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -752,11 +752,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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 46dd5d2cdd0..e58c034877f 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,6 @@
-% $Id: cms-nynorsk.lbx,v 1.6 2013/10/29 14:20:26 dfussner Exp $
+% $Id: cms-nynorsk.lbx,v 1.7 2016/06/01 11:25:40 dfussner Exp $
 
-\ProvidesFile{cms-nynorsk.lbx}[2013/10/29 v 2.8 biblatex localization]
+\ProvidesFile{cms-nynorsk.lbx}[2016/06/01 v 3.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -712,35 +712,35 @@
 
 \protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
   \iffieldundef{#2year}%
-  {\iffieldundef{#2month}
-    {}
+  {\iffieldundef{#2month}%
+    {}%
     {\printtext[#2date]{%
-        \iffieldsequal{#2month}{#2endmonth}
-        {\csuse{mkbibdate#1}{}{}{#2day}}
+        \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}}}}}}
+        \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}}
+      \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}{}{#2month}{#2day}}}}%
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-      \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \iffieldundef{#2endyear}%
+      {}%
+      {\iffieldequalstr{#2endyear}{}%
+        {\mbox{\bibdatedash}}%
+        {\bibdatedash%
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
@@ -752,11 +752,11 @@
     {}%
     \printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-        {\mbox{\bibdatedash}}
-        {\bibdatedash
+      \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
new file mode 100644
index 00000000000..6f9d26c70c8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
@@ -0,0 +1,762 @@
+% $Id$
+
+\ProvidesFile{cms-swedish.lbx}[2016/06/01 v 3.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (Stefan Bj\"{o}rk).
+% - Date handling modified by dfussner.
+
+\InheritBibliographyExtras{swedish}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\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}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \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{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\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{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\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{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 = {swedish},
+  afterwordto = {{efterord till}{efterord till}},
+  forewordto = {{f\"{o}rord till}{f\"{o}rord till}},
+  introductionto = {{inledning till}{inl\adddot\space till}},
+  partvolume = {{del}{del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{sammanst\adddot}{sammanst\adddot}},
+  compilers = {{sammanst\adddot}{sammanst\adddot}},
+  transcompiler = {{\"{o}vers\adddot\addspace och sammanst\adddot}%
+    {\"{o}vers\adddot\addspace och sammanst\adddot}},
+  transcompilers = {{\"{o}vers\adddot\addspace och sammanst\adddot}%
+    {\"{o}vers\adddot\addspace och sammanst\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      \"{o}vers\adddot\addcomma\addspace och sammanst\adddot}%
+    {red\adddot\addcomma\addspace
+      \"{o}vers\adddot\addcomma\addspace och sammanst\adddot}},
+  editorcompiler = {{red\adddot\addspace och sammanst\adddot}%
+    {red\adddot\addspace och sammanst\adddot}},
+  editortranslator = {{red\adddot\addspace och \"{o}vers\adddot}%
+    {red\adddot\addspace och \"{o}vers\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      \"{o}vers\adddot\addcomma\addspace och sammanst\adddot}%
+    {red\adddot\addcomma\addspace
+      \"{o}vers\adddot\addcomma\addspace och sammanst\adddot}},
+  editorcompilers = {{red\adddot\addspace och sammanst\adddot}%
+    {red\adddot\addspace och sammanst\adddot}},
+  editortranslators = {{red\adddot\addspace och \"{o}vers\adddot}%
+    {red\adddot\addspace och \"{o}vers\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{ibid\adddot}{ibid\adddot}},
+  origpub = {{ursprungligen publicerad som}%
+    {urspr\adddot\ pub\adddot\ som}},
+  origpublin = {{ursprungligen publicerad i\addspace}%
+    {urspr\adddot\ pub\adddot\addspace i\addspace}},
+  origpubyear = {{ursprungligen publicerad i\addspace}%
+    {urspr\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{f{\o}rst publicerad\addspace}%
+    {f{\o}rst pub\adddot\addspace}},
+  origreleaseyear = {{ursprungligen publicerad i\addspace}%
+    {urspr\adddot\ pub\adddotspace}},
+  origshownyear = {{ursprungligen visad i\addspace}%
+    {urspr\adddot\ visad\addspace}},
+  origedition ={{utg{\aa}va\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{reviderad utg{\aa}va\addspace}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkastet}{kringkastet}},
+  recorded = {{spilt inn}{spilt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meddelt}{meddelt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikanska}{amerikanska}},
+  edbrazilian    = {{brasilianska}{brasilianska}},
+  eddanish       = {{danska}{danska}},
+  eddutch        = {{nederlÀndska}{nederlÀndska}},
+  edenglish      = {{engelska}{engelska}},
+  edfrench       = {{franska}{franska}},
+  edgerman       = {{tyska}{tyska}},
+  edgreek        = {{grekiska}{grekiska}},
+  editalian      = {{italienska}{italienska}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norska}{norska}},
+  edportuguese   = {{portugisiska}{portugisiska}},
+  edrussian      = {{ryska}{ryska}}
+  edspanish      = {{spanska}{spanska}},
+  edswedish      = {{svenska}{svenska}},
+  translator       = {{\"{o}vers\adddot}{\"{o}vers\adddot}},
+  translators      = {{\"{o}vers\adddot}{\"{o}vers\adddot}},
+  redactor         = {{bearb\adddot}{bearb\adddot}},
+  redactors        = {{bearb\adddot}{bearb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{videref\adddot}{videref\adddot}},
+  continuators     = {{videref\adddot}{videref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{\"{o}vers\adddot\addspace\lbx@cfromlang}%
+    {\"{o}vers\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{sammanst\adddot}{sammanst\adddot}},
+  cbyredactor = {{bearb\adddot}{bearb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{videref\adddot}{videref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space och
+      \"{o}vers\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space och \"{o}vers\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space och sammanst\adddot}%
+    {red\adddot\space och sammanst\adddot}},
+  cbyeditorco    = {{red\adddot\space och komm\adddot}%
+    {red\adddot\space och komm\adddot}},
+  cbyeditoran = {{red\adddot\space och forkl\adddot}%
+    {red\adddot\space och forkl\adddot}},
+  cbyeditorin = {{red\adddot,\addabbrvspace med inl\adddot, av}%
+    {red\adddot,\addabbrvspace med inl\adddot, av}},
+  cbyeditorfo = {{red.,\addabbrvspace med f\"{o}rord, av}%
+    {red.,\addabbrvspace med f\"{o}rord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med efterord, av}%
+    {red.,\addabbrvspace med efterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och
+      sammanst\adddot}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    \"{o}vers\adddot\addspace\lbx@fromlang\space och
+    komm\adddot}%
+  {red.,\addabbrvspace
+    \"{o}vers\adddot\addspace\lbx@fromlang\space och komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    \"{o}vers\adddot\addspace\lbx@fromlang\space och
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med inl., av}%
+    {red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med inl., av}},
+  cbyeditortrfo = {{red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med f\"{o}rord, av}%
+    {red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med f\"{o}rord, av}},
+  cbyeditortraf = {{red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med efterord, av}%
+    {red\adddotspace och \"{o}vers\adddot\ \lbx@sfromlang, med efterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace sammanst. och komm\adddot}%
+    {red.,\addabbrvspace sammanst. och komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace sammanst. och forkl\adddot}%
+    {red.,\addabbrvspace sammanst. och forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space och sammanst., med inl., av}%
+    {red\adddot\space och sammanst., med inl., av}},
+  cbyeditorcpfo = {{red\adddot\space och sammanst., med f\"{o}rord, av}%
+    {red\adddot\space och sammanst., med f\"{o}rord, av}},
+  cbyeditorcpaf = {{red\adddot\space och sammanst., med efterord, av}%
+    {red\adddot\space och sammanst., med efterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace sammanst. och komm., med inl., av}%
+    {red.,\addabbrvspace sammanst. och komm., med inl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace sammanst. och komm., med f\"{o}rord, av}%
+    {red.,\addabbrvspace sammanst. och komm., med f\"{o}rord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace sammanst. och komm., med efterord, av}%
+    {red.,\addabbrvspace sammanst. och komm., med efterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace sammanst. och forkl., med inl., av}%
+    {red.,\addabbrvspace sammanst. och forkl., med inl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace sammanst. och forkl., med f\"{o}rord, av}%
+    {red.,\addabbrvspace sammanst. och forkl., med f\"{o}rord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace sammanst. och forkl., med efterord, av}%
+    {red.,\addabbrvspace sammanst. och forkl., med efterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och komm\adddot}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och forkl\adddot}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst., med inl., av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst.,
+      med inl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst., med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst.,
+      med f\"{o}rord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst., med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst.,
+      med efterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och komm., med inl., av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm., med inl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och komm., med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm., med f\"{o}rord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och komm., med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm., med efterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och forkl., med inl., av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl., med inl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och forkl., med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl., med f\"{o}rord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang,
+      sammanst. och forkl., med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl., med efterord, av}},
+  cbyeditorcoin = {{red\adddot\space och komm., med inl., av}%
+    {red\adddot\space och komm., med inl., av}},
+  cbyeditorcofo = {{red\adddot\space och komm., med f\"{o}rord, av}%
+    {red\adddot\space och komm., med f\"{o}rord, av}},
+  cbyeditorcoaf = {{red\adddot\space och komm., med efterord, av}%
+    {red\adddot\space och komm., med efterord, av}},
+  cbyeditoranin = {{red\adddot\space och forkl., med inl., av}%
+    {red\adddot\space och forkl., med inl., av}},
+  cbyeditoranfo = {{red\adddot\space och forkl., med f\"{o}rord, av}%
+    {red\adddot\space och forkl., med f\"{o}rord, av}},
+  cbyeditoranaf = {{red\adddot\space och forkl., med efterord, av}%
+    {red\adddot\space och forkl., med efterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med inl., av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med inl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med f\"{o}rord, av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med f\"{o}rord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med efterord, av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och komm., med efterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med inl., av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med inl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med f\"{o}rord, av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med f\"{o}rord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med efterord, av}%
+  {red.,\addabbrvspace \"{o}vers\adddot\addspace\lbx@fromlang\space och forkl., med efterord, av}},
+  cbytranslatorcp = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst\adddot}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst\adddot}},
+  cbytranslatorco = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och komm\adddot}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och komm\adddot}},
+  cbytranslatoran = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl\adddot}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl\adddot}},
+  cbytranslatorin = {{\"{o}vers\adddot\addspace\lbx@fromlang, med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, med inl., av}},
+  cbytranslatorfo = {{\"{o}vers\adddot\addspace\lbx@fromlang, med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, med f\"{o}rord, av}},
+  cbytranslatoraf = {{\"{o}vers\adddot\addspace\lbx@fromlang, med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, med efterord, av}},
+  cbytranslatorcoin = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och komm.,
+      med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och komm., med inl., av}},
+  cbytranslatorcofo = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och komm.,
+      med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och komm., med f\"{o}rord, av}},
+  cbytranslatorcoaf = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och komm.,
+      med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och komm., med efterord, av}},
+  cbytranslatoranin = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl.,
+      med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl., med inl., av}},
+  cbytranslatoranfo = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl.,
+      med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl., med f\"{o}rord, av}},
+  cbytranslatoranaf = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl.,
+      med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och forkl., med efterord, av}},
+  cbytranslatorcpco = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm\adddot}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm\adddot}},
+  cbytranslatorcpan = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl\adddot}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl\adddot}},
+  cbytranslatorcpin = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst.,
+      med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med inl., av}},
+  cbytranslatorcpfo = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst.,
+      med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med f\"{o}rord, av}},
+  cbytranslatorcpaf = {{\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst.,
+      med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med efterord, av}},
+  cbytranslatorcpcoin = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm., med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm.,
+      med inl., av}},
+  cbytranslatorcpcofo = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm., med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm.,
+      med f\"{o}rord, av}},
+  cbytranslatorcpcoaf = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm., med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm.,
+      med efterord, av}},
+  cbytranslatorcpanin = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl., med inl., av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl.,
+      med inl., av}},
+  cbytranslatorcpanfo = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl., med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl.,
+      med f\"{o}rord, av}},
+  cbytranslatorcpanaf = {{\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl., med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl.,
+      med efterord, av}},
+  cbycompilerco = {{sammanst\adddot\space och komm\adddot}%
+    {sammanst\adddot\space och komm\adddot}},
+  cbycompileran = {{sammanst\adddot\space och forkl\adddot}%
+    {sammanst\adddot\space och forkl\adddot}},
+  cbycompilerin = {{sammanst.,\addabbrvspace med inl., av}%
+    {sammanst.,\addabbrvspace med inl., av}},
+  cbycompilerfo = {{sammanst.,\addabbrvspace med f\"{o}rord, av}%
+    {sammanst.,\addabbrvspace med f\"{o}rord, av}},
+  cbycompileraf = {{sammanst.,\addabbrvspace med efterord, av}%
+    {sammanst.,\addabbrvspace med efterord, av}},
+  cbycompilercoin = {{sammanst\adddot\space och komm., med inl., av}%
+    {sammanst\adddot\space och komm., med inl., av}},
+  cbycompilercofo = {{sammanst\adddot\space och komm., med f\"{o}rord, av}%
+    {sammanst\adddot\space och komm., med f\"{o}rord, av}},
+  cbycompilercoaf = {{sammanst\adddot\space och komm., med efterord, av}%
+    {sammanst\adddot\space och komm., med efterord, av}},
+  cbycompileranin = {{sammanst\adddot\space och forkl., med inl., av}%
+    {sammanst\adddot\space och forkl., med inl., av}},
+  cbycompileranfo = {{sammanst\adddot\space och forkl., med f\"{o}rord, av}%
+    {sammanst\adddot\space och forkl., med f\"{o}rord, av}},
+  cbycompileranaf = {{sammanst\adddot\space och forkl., med efterord, av}%
+    {sammanst\adddot\space och forkl., med efterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  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}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fr{\aa}n engelska av}{fr{\aa}n engelska av}},
+  cfrombrazilian    = {{fr{\aa}n portugisiska av}{fr{\aa}n portugisiska av}},
+  cfromdanish       = {{fr{\aa}n danska av}{fr{\aa}n danska av}},
+  cfromdutch        = {{fr{\aa}n nederlÀndska av}{fr{\aa}n nederlÀndska av}},
+  cfromenglish      = {{fr{\aa}n engelska av}{fr{\aa}n engelska av}},
+  cfromfrench       = {{fr{\aa}n franska av}{fr{\aa}n franska av}},
+  cfromgerman       = {{fr{\aa}n tyska av}{fr{\aa}n tyska av}},
+  cfromgreek        = {{fr{\aa}n grekiska av}{fr{\aa}n grekiska av}},
+  cfromitalian      = {{fr{\aa}n italienska av}{fr{\aa}n italienska av}},
+  cfromlatin        = {{fr{\aa}n latin av}{fr{\aa}n latin av}},
+  cfromnorwegian    = {{fr{\aa}n norska av}{fr{\aa}n norska av}},
+  cfromportuguese   = {{fr{\aa}n portugisiska av}{fr{\aa}n portugisiska av}},
+  cfromrussian      = {{fr{\aa}n ryska av}{fr{\aa}n ryska av}},
+  cfromspanish      = {{fr{\aa}n spanska av}{fr{\aa}n spanska av}},
+  cfromswedish      = {{fr{\aa}n svenska av}{fr{\aa}n svenska av}},
+  bynone = {{}{}},
+  byconductor = {{dirigerad av}{dir\adddot}},
+  bydirector = {{regisserad av}{regi}},
+  byproducer = {{producerad av}{prod\adddot}},
+  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}},
+  byeditortrcpco = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm\adddot}},
+  byeditortrcpan = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl\adddot}},
+  byeditortrcpin = {{redigerad, \"{o}versatt \lbx@fromlang och sammanst\"{a}lld, med inledning, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst\adddot,
+      med inledning, av}},
+  byeditortrcpfo = {{redigerad, \"{o}versatt \lbx@fromlang och sammanst\"{a}lld, med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst\adddot,
+      med f\"{o}rord, av}},
+  byeditortrcpaf = {{redigerad, \"{o}versatt \lbx@fromlang och sammanst\"{a}lld, med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang och sammanst\adddot,
+      med efterord, av}},
+  byeditortrcpcoin = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad, med inledning, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm\adddot, med inledning, av}},
+  byeditortrcpcofo = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad, med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm\adddot, med f\"{o}rord, av}},
+  byeditortrcpcoaf = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad, med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och komm\adddot, med efterord, av}},
+  byeditortrcpanin = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad, med inledning, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl\adddot, med inledning, av}},
+  byeditortrcpanfo = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad, med f\"{o}rord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl\adddot, med f\"{o}rord, av}},
+  byeditortrcpanaf = {{redigerad, \"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad, med efterord, av}%
+    {red.,\addabbrvspace \"{o}vers.\addspace\lbx@fromlang, sammanst. och forkl\adddot, med efterord, av}},
+  byeditorcpco = {{redigerad, sammanst\"{a}lld och kommenterad av}%
+    {red.,\addabbrvspace sammanst. och komm\adddot}},
+  byeditorcpan = {{redigerad, sammanst\"{a}lld och f\"{o}rklarad av}%
+    {red.,\addabbrvspace sammanst. och forkl\adddot}},
+  byeditorcpin = {{redigerad och sammanst\"{a}lld, med inledning, av}%
+    {red\adddot\space och sammanst., med inledning, av}},
+  byeditorcpfo = {{redigerad och sammanst\"{a}lld, med f\"{o}rord, av}%
+    {red\adddot\space och sammanst., med f\"{o}rord, av}},
+  byeditorcpaf = {{redigerad och sammanst\"{a}lld, med efterord, av}%
+    {red\adddot\space och sammanst., med efterord, av}},
+  byeditorcpcoin = {{redigerad, sammanst\"{a}lld och kommenterad, med inledning, av}%
+    {red.,\addabbrvspace sammanst. och komm., med inledning, av}},
+  byeditorcpcofo = {{redigerad, sammanst\"{a}lld och kommenterad, med f\"{o}rord,
+      av}%
+    {red.,\addabbrvspace sammanst. och komm., med f\"{o}rord, av}},
+  byeditorcpcoaf = {{redigerad, sammanst\"{a}lld och kommenterad, med efterord, av}%
+    {red.,\addabbrvspace sammanst. och komm., med efterord, av}},
+  byeditorcpanin = {{redigerad, sammanst\"{a}lld och f\"{o}rklarad, med inledning, av}%
+    {red.,\addabbrvspace sammanst. och forkl., med inledning, av}},
+  byeditorcpanfo = {{redigerad, sammanst\"{a}lld och f\"{o}rklarad, med f\"{o}rord,
+      av}%
+    {red.,\addabbrvspace sammanst. och forkl., med f\"{o}rord, av}},
+  byeditorcpanaf = {{redigerad, sammanst\"{a}lld och f\"{o}rklarad, med efterord, av}%
+    {red.,\addabbrvspace sammanst. och forkl., med efterord, av}},
+  bytranslatorcp = {{\"{o}versatt \lbx@fromlang\ och sammanst\"{a}lld av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst\adddot}},
+  bytranslatorcpco = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm\adddot}},
+  bytranslatorcpan = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl\adddot}},
+  bytranslatorcpin = {{\"{o}versatt \lbx@fromlang\  och sammanst\"{a}lld, med inledning, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med inledning, av}},
+  bytranslatorcpfo = {{\"{o}versatt \lbx@fromlang\ och sammanst\"{a}lld, med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med f\"{o}rord, av}},
+  bytranslatorcpaf = {{\"{o}versatt \lbx@fromlang\ och sammanst\"{a}lld, med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang\ och sammanst., med efterord, av}},
+  bytranslatorcpcoin = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad,
+      med inledning, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm., med inledning, av}},
+  bytranslatorcpcofo = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad,
+      med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm.,
+      med f\"{o}rord, av}},
+  bytranslatorcpcoaf = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och kommenterad,
+      med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och komm., med efterord, av}},
+  bytranslatorcpanin = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad,
+      med inledning, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl., med inledning, av}},
+  bytranslatorcpanfo = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad,
+      med f\"{o}rord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl.,
+      med f\"{o}rord, av}},
+  bytranslatorcpanaf = {{\"{o}versatt \lbx@fromlang, sammanst\"{a}lld och f\"{o}rklarad,
+      med efterord, av}%
+    {\"{o}vers\adddot\addspace\lbx@fromlang, sammanst. och forkl.,
+      med efterord, av}},
+  bycompilerco = {{sammanst\"{a}lld och kommenterad av}%
+    {sammanst\adddot\space och komm\adddot}},
+  bycompileran = {{sammanst\"{a}lld och f\"{o}rklarad av}%
+    {sammanst\adddot\space och forkl\adddot}},
+  bycompilerin = {{sammanst\"{a}lld, med inledning, av}%
+    {sammanst\adddot, med inledning, av}},
+  bycompilerfo = {{sammanst\"{a}lld, med f\"{o}rord, av}%
+    {sammanst\adddot, med f\"{o}rord, av}},
+  bycompileraf = {{sammanst\"{a}lld, med efterord, av}%
+    {sammanst\adddot, med efterord, av}},
+  bycompilercoin = {{sammanst\"{a}lld och kommenterad, med inledning, av}%
+    {sammanst\adddot\space och komm\adddot, med inledning, av}},
+  bycompilercofo = {{sammanst\"{a}lld och kommenterad, med f\"{o}rord, av}%
+    {sammanst\adddot\space och komm\adddot, med f\"{o}rord, av}},
+  bycompilercoaf = {{sammanst\"{a}lld och kommenterad, med efterord, av}%
+    {sammanst\adddot\space och komm\adddot, med efterord, av}},
+  bycompileranin = {{sammanst\"{a}lld och f\"{o}rklarad, med inledning, av}%
+    {sammanst\adddot\space och forkl\adddot, med inledning, av}},
+  bycompileranfo = {{sammanst\"{a}lld och f\"{o}rklarad, med f\"{o}rord, av}%
+    {sammanst\adddot\space och forkl\adddot, med f\"{o}rord, av}},
+  bycompileranaf = {{sammanst\"{a}lld och f\"{o}rklarad, med efterord, av}%
+    {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
new file mode 100644
index 00000000000..5a7df2634a0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
@@ -0,0 +1,384 @@
+\ProvidesPackage{cmsdocs}
+
+\RequirePackage{refcount}
+\RequirePackage{listings}
+\RequirePackage[svgnames]{xcolor}
+\RequirePackage{hyperref}
+
+%%% This file contains kludges and hacks to enable the bespoke
+%%% cross-referencing system found in cms-notes-intro.pdf and
+%%% cms-dates-intro.pdf.  It contains code adapted from several
+%%% sources, especially from Ulrich Dirr's hyperendnotes.sty, found on
+%%% comp.text.tex.  Please don't load it unless you really mean to, as
+%%% it messes with the standard biblatex-chicago macros.
+
+%%% These counters are for the slightly more informative endnote marks
+%%% used in the notes intro.
+
+\newcounter{Article}\setcounter{Article}{1}
+\newcounter{Artwork}\setcounter{Artwork}{2}
+\newcounter{Audio}\setcounter{Audio}{3}
+\newcounter{Book}\setcounter{Book}{4}
+\newcounter{BookInBook}\setcounter{BookInBook}{5}
+\newcounter{Booklet}\setcounter{Booklet}{6}
+\newcounter{Collection}\setcounter{Collection}{7}
+\newcounter{CustomC}\setcounter{CustomC}{8}
+\newcounter{Image}\setcounter{Image}{9}
+\newcounter{InBook}\setcounter{InBook}{10}
+\newcounter{InCollection}\setcounter{InCollection}{11}
+\newcounter{InProceedings}\setcounter{InProceedings}{12}
+\newcounter{InReference}\setcounter{InReference}{13}
+\newcounter{Letter}\setcounter{Letter}{14}
+\newcounter{Manual}\setcounter{Manual}{15}
+\newcounter{MastersThesis}\setcounter{MastersThesis}{16}
+\newcounter{Misc}\setcounter{Misc}{17}
+\newcounter{Music}\setcounter{Music}{18}
+\newcounter{MVBook}\setcounter{MVBook}{19}
+\newcounter{MVCollection}\setcounter{MVCollection}{20}
+\newcounter{MVProceedings}\setcounter{MVProceedings}{21}
+\newcounter{MVReference}\setcounter{MVReference}{22}
+\newcounter{Online}\setcounter{Online}{23}
+\newcounter{Patent}\setcounter{Patent}{24}
+\newcounter{Periodical}\setcounter{Periodical}{25}
+\newcounter{Proceedings}\setcounter{Proceedings}{26}
+\newcounter{Reference}\setcounter{Reference}{27}
+\newcounter{Report}\setcounter{Report}{28}
+\newcounter{Review}\setcounter{Review}{29}
+\newcounter{SuppBook}\setcounter{SuppBook}{30}
+\newcounter{SuppCollection}\setcounter{SuppCollection}{31}
+\newcounter{SuppPeriodical}\setcounter{SuppPeriodical}{32}
+\newcounter{TechReport}\setcounter{TechReport}{33}
+\newcounter{Thesis}\setcounter{Thesis}{34}
+\newcounter{Unpublished}\setcounter{Unpublished}{35}
+\newcounter{Video}\setcounter{Video}{36}
+
+%%% Here starts the adaptation of hyperendnotes.sty
+
+\newif\ifenotelinks
+\newcounter{Hendnote}
+% Redefining portions of endnotes-package:
+\let\savedhref\href
+\let\savedurl\url
+\def\endnotemark{%
+  \@ifnextchar[\@xendnotemark{%
+    \stepcounter{endnote}%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+    \@endnotemark
+  }%
+}%
+\def\@xendnotemark[#1]{%
+  \begingroup\c@endnote#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+  \endgroup
+  \@endnotemark
+}%
+\def\endnotetext{%
+  \@ifnextchar[\@xendnotenext{%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+    \@endnotetext
+  }%
+}%
+\def\@xendnotenext[#1]{%
+  \begingroup
+  \c@endnote=#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+  \endgroup
+  \@endnotetext
+}%
+\def\endnote{%
+  \@ifnextchar[\@xendnote{%
+    \stepcounter{endnote}%
+    \protected@xdef\@theenmark{\theendnote}%
+    \protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+    \@endnotemark\@endnotetext
+  }%
+}%
+\def\@xendnote[#1]{%
+  \begingroup
+  \c@endnote=#1\relax
+  \unrestored@protected@xdef\@theenmark{\theendnote}%
+  \unrestored@protected@xdef\@theenvalue{\number\c@refsection\number\c@endnote}%
+  \show\@theenvalue
+  \endgroup
+  \@endnotemark\@endnotetext
+}%
+\def\@endnotemark{%
+  \leavevmode
+  \ifhmode
+  \edef\@x@sf{\the\spacefactor}\nobreak
+  \fi
+  \ifenotelinks
+  \expandafter\@firstofone
+  \else
+  \expandafter\@gobble
+  \fi
+  {%
+    \Hy@raisedlink{%
+      \hyper@@anchor{Hendnotepage.\@theenvalue}{\empty}%
+    }%
+  }%
+  \hyper@linkstart{link}{Hendnote.\@theenvalue}%
+  \makeenmark
+  \hyper@linkend
+  \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
+  }%
+}%
+\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
+%    \smallskip %<-small 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
+  \enoteheading
+  % font-size of endnotes
+  \enotesize
+  \input{\jobname.ent}%
+  \endgroup
+}%
+\def\enoteformat{%
+  \renewcommand{\makeenmark}%
+  {\color{DarkBlue}{\textsf{\theenmark:\,\,}}}%
+  \rightskip\z@
+  \leftskip\z@
+  \parindent=2.3em
+  \leavevmode\llap{%
+    \setcounter{Hendnote}{\@theenvalue}%
+    \addtocounter{Hendnote}{-1}%
+    \refstepcounter{Hendnote}%
+    \ifenotelinks
+    \expandafter\@secondoftwo
+    \else
+    \expandafter\@firstoftwo
+    \fi
+    {\@firstofone}%
+    {\hyperlink{Hendnotepage.\@theenvalue}}%
+    {\makeenmark}%
+  }%
+}%
+% stop redefining portions of endnotes-package:
+
+% Toggle switch in order to turn on/off back-links in the
+% endnote-section:
+\enotelinkstrue
+% \enotelinksfalse
+
+%%% Here we substitute entry types for the usual numbers for endnote
+%%% marks.
+
+\def\cmssymbol#1{\expandafter\@cmssymbol\csname c@#1\endcsname}
+ 
+\def\@cmssymbol#1{\ifcase#1\or Article\or Artwork\or Audio\or Book\or
+  BookInBook\or Booklet\or Collection\or CustomC\or Image\or InBook\or
+  InCollection\or InProceedings\or InReference\or Letter\or Manual\or
+  MastersThesis\or Misc\or Music\or MVBook\or MVCollection\or
+  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}
+
+\renewcommand{\theendnote}{\cmssymbol{endnote}}
+
+%%% Now we define parameters and a command for the lstlisting
+%%% environments, which print the .bib entries at the end of the .pdf.
+
+\lstset{%
+  basicstyle=\footnotesize\ttfamily,
+  breaklines=true,
+  breakatwhitespace=true,
+  breakautoindent=false,
+  breakindent=40pt,
+  escapechar=*,
+  keywordstyle=\color{DarkBlue},
+  columns=fullflexible,
+}%
+
+\lstdefinelanguage{BibTeX}
+{keywords={%
+    @string%
+  },
+  comment=[l][\itshape]{@comment},
+  sensitive=false,
+}%
+
+\newrobustcmd*{\lnbackref}[2]{%
+  \hyperlink{Hendnote.#2\the\value{#1}}{\color{DarkBlue}@#1}}
+
+\newrobustcmd*{\adlnbackref}[2]{%
+  \@ifnextchar[%]
+  {\adlnbackref@i{#1}{#2}}%
+  {\adlnbackref@i{#1}{#2}[{#2}]}}%
+
+\def\adlnbackref@i#1#2[#3]{%
+  \hyperlink{cite.0@#3}{\color{DarkBlue}@#1}\{#2}%
+
+%%% Here we renew some macros from chicago-notes.cbx, and add some
+%%% field formats to make navigating the intro easier.
+
+\renewbibmacro*{cite:full}{%
+  \ifnumequal{\the\value{refsection}}{8}%
+  {\printtext[cmsbiblink]{%
+      \usedriver
+      {\DeclareNameAlias{sortname}{default}\frenchspacing}
+      {cite:\thefield{entrytype}}}}
+  {\iffieldequalstr{entrykey}{loc:leaders}%
+    {\printtext{%
+        \usedriver
+        {\DeclareNameAlias{sortname}{default}\frenchspacing}
+        {cite:\thefield{entrytype}}}}%
+    {\printtext[bibhyperref]{%
+        \usedriver
+        {\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}?
+
+
+\renewbibmacro*{cite:journal}{%
+  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+  {\iffieldundef{prenote}%
+    {\bibsentence\usebibmacro{cite:ibid}}%
+    {\usebibmacro{cite:ibid}}}%
+  {\iffieldundef{journaltitle}%
+    {\usebibmacro{cite:short}}%
+    {\iffieldequalstr{authortype}{anon}%
+      {\bibleftbracket\printnames{labelname}%
+        \bibrightbracket\newcunit}%
+      {\iffieldequalstr{authortype}{anon?}%
+        {\bibleftbracket\printnames{labelname}?%
+          \bibrightbracket\newcunit}%
+        {\printnames{labelname}%
+          \isdot\newcunit}}%
+      \iftoggle{cms@allshort}%
+      {\printtext[cmsbiblink]{%
+          \printfield[journaltitle]{journaltitle}}}%
+      {\printtext[cmsbiblink]{%
+          \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}}}}}}
+
+\DeclareFieldFormat{cmsbiblink}{%
+  \hyperlink{\getrefbykeydefault{\abx@field@entrykey}{anchor}{}}{#1}}
+
+\def\cmsdocref@entry{%
+  \iffieldundef{clonesourcekey}%
+  {\printfield{entrykey}}%
+  {\printfield{clonesourcekey}}}
+
+\def\cmsdoc@entrykey{%
+  \iffieldundef{clonesourcekey}%
+  {\abx@field@entrykey}%
+  {\abx@field@clonesourcekey}}
+
+\newcommand*{\cmslink}[1]{%
+  \hyperlink{\getrefbykeydefault{#1}{anchor}{}}%
+  {\texttt{#1}}}
+
+\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep%
+  \hyperlink{\getrefbykeydefault{\cmsdoc@entrykey}{anchor}{}}%
+  {\small{\textbf{[\cmsdocref@entry]\addspace}}}\small#1}
+
+%%% These commands provide the hyperlinks to the external docs in
+%%% biblatex-chicago.pdf.
+
+\newrobustcmd*{\cmssecref}[2][]{\marginpar{\href{\@baseurl%
+      \getrefbykeydefault{#2}{anchor}{}}{\small §\,\getrefnumber{#2}}%
+      \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}
+\newrobustcmd*{\cmspagref}[1]{\marginpar{\href{\@baseurl%
+      page.\getpagerefnumber{#1}}{p.~\getpagerefnumber{#1}}}}