texlive[58715] Master/texmf-dist: biblatex-chicago (4apr21)

commits+preining at tug.org commits+preining at tug.org
Sun Apr 4 03:44:44 CEST 2021


Revision: 58715
          http://tug.org/svn/texlive?view=revision&revision=58715
Author:   preining
Date:     2021-04-04 03:44:43 +0200 (Sun, 04 Apr 2021)
Log Message:
-----------
biblatex-chicago (4apr21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-romanian.lbx

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,20 +1,21 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-is designed for use with the latest version (3.14) of biblatex.  The
+is designed for use with the latest version (3.16) of biblatex.  The
 package contains the 17th-edition Chicago style files, and I am also
 maintaining the 16th-edition files for those for whom they remain a
-necessity.  I strongly encourage all users to move to the 17th-edition
-styles, as they have received and will continue to receive many new
-features and fixes as compared with the older styles.  If you have
-used the package before, then you should be sure to consult the
-RELEASE file to find out what alterations you may need to make to your
-.bib files and document preambles to bring them up to date.  Most
-particularly please note that biber is now the required backend for
-all the included styles (version 2.14 is designed for use with the
-latest biblatex).
+necessity, though with this release I am deprecating these older
+files, and will remove them in a future release.  I strongly encourage
+all users to move to the 17th-edition styles, as they have received
+and will continue to receive many new features and fixes as compared
+with the older styles.  If you have used the package before, then you
+should be sure to consult the RELEASE file to find out what
+alterations you may need to make to your .bib files and document
+preambles to bring them up to date.  Most particularly please note
+that biber is now the required backend for all the included styles
+(version 2.16 is designed for use with the latest biblatex).
 
-README (version 2.0, 2020-04-20):
+README (version 2.1, 2021-03-27):
 
 Biblatex-chicago contains three biblatex styles implementing the
 specifications of the Chicago Manual of Style, 17th edition.  The
@@ -71,7 +72,7 @@
 in your working directory, I recommend the following, which should be
 familiar from other packages:
 
- - The thirty files biblatex-chicago.sty, cmsendnotes.sty,
+ - The thirty-one files biblatex-chicago.sty, cmsendnotes.sty,
    chicago-notes.cbx, chicago-notes.bbx, chicago-authordate.cbx,
    chicago-authordate.bbx, chicago-authordate-trad.cbx,
    chicago-authordate-trad.bbx, chicago-dates-common.cbx,
@@ -81,10 +82,10 @@
    cms-american.lbx, cms-brazilian.lbx, cms-british.lbx,
    cms-dutch.lbx, cms-finnish.lbx, cms-french.lbx, cms-german.lbx,
    cms-icelandic.lbx, cms-ngerman.lbx, cms-norsk.lbx,
-   cms-norwegian.lbx, cms-nynorsk.lbx, cms-swedish.lbx, and
-   cmsdocs.sty are located in the latex/ subdirectory.  The entire
-   contents of this latex/ directory can go in
-   <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago, where
+   cms-norwegian.lbx, cms-nynorsk.lbx, cms-romanian.lbx,
+   cms-swedish.lbx, and cmsdocs.sty are located in the latex/
+   subdirectory.  The entire contents of this latex/ directory can go
+   in <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago, where
    <TEXMFLOCAL> is the root of your local TeX installation -- for
    example, and depending on your system, /usr/share/texmf-local,
    /usr/local/texmf, or C:\Local TeX Files\.  You may need to create
@@ -106,7 +107,7 @@
 Changelog: See the RELEASE file, and also the end of
 biblatex-chicago.pdf.
 
-Copyright (c) 2008-2020 David Fussner.  This package is
+Copyright (c) 2008-2021 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
 modified under the conditions of the LaTeX Project Public License,
 either version 1.3 of this license or (at your option) any later

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,3 +1,118 @@
+Release notes for version 2.1 [2021-03-27]:
+
+This release contains several new features, some modifications for
+compatibility with the latest biblatex, and many bug fixes.  All
+styles require the latest biblatex (3.16) and biber (2.16).
+
+ - Patrick Danilevici has very generously provided a Romanian
+   localization for biblatex-chicago (cms-romanian.lbx) to go with the
+   romanian.lbx he wrote for biblatex itself.  The only hitch is that
+   the latter file won't be in the standard biblatex package until the
+   next release, so you'll have to grab it from GitHub
+   https://github.com/plk/biblatex/tree/dev/tex/latex/biblatex/lbx
+   until then.
+
+ - Moritz Wemheuer recommended that I include the standard biblatex
+   macro "begentry" at the start of all drivers in both Chicago
+   styles, with an empty definition by default.  This allows users to
+   redefine it in their preambles and thereby inject their code into
+   the driver before anything is printed.
+
+ - Moritz also drew my attention to a question on StackExchange which
+   suggested that I should expand the applicability of the
+   "annotation" field, so I've modified the "annotation" option in all
+   styles to allow the field to appear both in bibliography (reference
+   list) and in long notes, and also added two new options in all
+   styles, "bibannotesep" and "citeannotesep," which allow you to
+   define how the "annotation" field will relate to the main entry.
+   The options have different defaults, and although they have the
+   same pre-defined keys those keys may have slightly different
+   meanings depending on whether the "annotation" is to appear in
+   notes or bibliography.  Please see the docs of field and options in
+   sections 4.2, 4.4.2, 4.4.3, 5.2, 5.4.2, and 5.4.3 of
+   biblatex-chicago.pdf.
+
+ - On a related subject, I have included two new options in all styles
+   -- "formatbib" and "entrybreak" -- which provide fine-grained control
+   of page breaking in bibliographies and reference lists.  Some of
+   the values of these options are designed to be used with specific
+   values of the "bibannotesep" option, so please see the
+   documentation in sections 4.4.3 and 5.4.3.
+
+ - In the notes & bibliography style Fr. Norbert Keliher requested a
+   way to turn off the printing, in the first citation of a work, of
+   the introduction -- (hereafter cited as ...) -- of a "shorthand"
+   that will appear in subsequent citations.  The "shorthandintro"
+   option is now available globally, per type, and per entry to allow
+   you to control the (non)appearance of this clarifying notification.
+   By default, the first citation of a work will continue to present
+   the "shorthand" as it always has.  Please see section 4.4.3 for the
+   details.
+
+ - Philipp Immel requested a feature involving the "nameaddon" field,
+   and pointed to a discussion on StackExchange which suggested that
+   others were also unsatisfied with that field's functionality, so in
+   this release I've provided three new package options to allow users
+   to mould it to their needs.  The options are called "nameaddon,"
+   "nameaddonformat," and "nameaddonsep," and you can find all the
+   details in the "nameaddon" docs in sections 4.2. and 5.2.  Cf.
+   also the discussions of the options in sections 4.4.2, 4.4.3,
+   5.4.2, and 5.4.3.  Allow me to emphasize that the package defaults
+   remain exactly the same as before, so that if you don't set any of
+   the new options no changes to your documents or .bib databases are
+   necessary.
+
+ - Philipp Immel also requested a way to use the standard biblatex
+   option "datamodel" even when loading the Chicago styles with
+   \usepackage{biblatex-chicago}.  Implementing this allowed me to
+   regularize how the standard "mcite" and "natbib" options were
+   passed through to biblatex, and also to support the new biblatex
+   "casechanger" option, which can help solve a bug reported by Peter
+   Mukunda Pasedach.  See sections 4.4.3 and 5.4.3.
+
+ - The new "relatedtype" "short" is available in all styles to allow
+   the presentation of short references rather than full ones when
+   using the "related" mechanism.  See sections 4.2.1 and 5.2.1.
+
+ - In a similar vein, I have provided new \citeincite and
+   \fullciteincite commands to allow you, in some contexts, to cite a
+   related work inside the fields of another entry, something which,
+   although not recommended, is common practice, and which has
+   frequently not worked quite right.  The \citeincite and
+   \citeincites commands always present short citations, and are
+   available in several fields, while \fullciteincite and
+   \fullciteincites always present long references, and are designed
+   only to be used in the "annotation" field for cases where an
+   annotated bibliography or reference list includes references to
+   works not cited in the main text.  See sections 4.3.2 and 5.3.2 for
+   the details.  If I've missed yet further tricky corners in this
+   functionality please let me know.
+
+ - After a request by Patrick Danilevici, I have added the four fields
+   "eventdate," "eventtitle," "eventtitleaddon," and "venue" to the
+   InProceedings, MVProceedings, and Proceedings drivers in all
+   styles, for compatibility with standard biblatex usage.  See the
+   docs of those entry types in sections 4.1 and 5.1.
+   
+ - The "postnotepunct" option should generally work now, both in more
+   contexts and with arbitrary "postnote" field contents.
+
+ - The "dashed" option governing the use of the 3-em dash in
+   bibliographies and reference lists is now available globally, per
+   type, and per entry.
+
+Note on the 16th-edition files:
+
+ - These have been updated for compatibility with the latest biblatex
+   and biber, and there are also a number of bug fixes included.  I
+   haven't added any new functionality to the files, so for instance
+   if you want to use the new Romanian localization you'll need the
+   current 17th-edition styles.  With this release I am marking the
+   16th-edition files as deprecated, and will remove them in a future
+   release.  Please consider moving your documents to the current
+   specification, where all of my development time is now spent.
+
+
 Release notes for version 2.0 [2020-04-20]:
 
 With this release biblatex-chicago now by default follows the 17th

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -4,9 +4,10 @@
 % Chicago Manual of Style, 17th edition.
 %
 \documentclass[a4paper]{article}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% \usepackage[latin1]{inputenc}
+\usepackage{fontspec}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 \usepackage{tabularx}
@@ -14,30 +15,54 @@
 \usepackage{booktabs}
 \usepackage{afterpage}
 %\usepackage[showframe=true]{geometry}
-\usepackage{vmargin}
-\setpapersize{A4}
-\setmarginsrb{1.65in}{.9in}{1.75in}{.6in}{0pt}{0pt}{12pt}{24pt}
+% \usepackage{vmargin}
+% \setpapersize{A4}
+% \setmarginsrb{1.65in}{.9in}{1.75in}{.6in}{0pt}{0pt}{12pt}{24pt}
 \setlength{\marginparwidth}{1in}
 \setlength{\belowcaptionskip}{1em}
-\usepackage[pdftex,colorlinks,urlcolor=blue,linkcolor=blue,%
+\usepackage[colorlinks,urlcolor=blue,linkcolor=blue,%
 filecolor=Teal]{hyperref}
 % \usepackage{lmodern}
-\usepackage[scaled=0.9]{ClearSans}
-\usepackage[p]{zlmtt}
-\usepackage{gentium}
+% \usepackage[scaled=0.9]{ClearSans}
+% \usepackage[p]{zlmtt}
+% \usepackage{gentium}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 %\usepackage[osf]{mathpazo}
 %\usepackage[scaled]{helvet}
-\usepackage[pdftex,hyperref,svgnames]{xcolor}
+\usepackage[hyperref,svgnames]{xcolor}
 %\usepackage[dvips]{xcolor}
 \newcommand{\mycolor}[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{multicol}
 % Some generic settings.
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+\newcommand{\hc}{:\hspace{0pt}}
+\hyphenation{text-cites mit-tel-pleis-to-zae-ne har-ley cal-li-ma-chus
+  chi-ca-go au-to-cite case-changer beg-en-try note-ref-in-tro
+  cite-in-cite ores-tes post-script car-to-gra-phy da-ta-bases
+  ar-kan-sas pseu-do-nym head-less-cite da-ta-base bib-name-dash}
 \setlength{\parindent}{0pt}
+\usepackage{typearea}
+\areaset[current]{360pt}{712pt}
+%\special{dvipdfmx:config C 0x10}
 \newcommand{\mymarginpar}[1]{\marginpar{\flushright#1}}
 \newcommand{\colmarginpar}[1]{\mymarginpar{\mycolor{#1}}}
-\newcommand{\mybigspace}{\vspace{\baselineskip}}
-\newcommand{\mylittlespace}{\vspace{.5\baselineskip}}
+\newlength\myparskip
+\newlength\myhalfskip
+\myparskip=12pt plus 4pt minus 2pt
+\myhalfskip=6pt plus 2pt minus 1pt
+\newcommand{\mybigspace}{\vspace{\myparskip}}
+\newcommand{\mylittlespace}{\vspace{\myhalfskip}}
 \newcolumntype{L}{>{\raggedright}p}
 \newcolumntype{H}{>{\sffamily\bfseries}l}
 %\renewcommand{\textfraction}{0.0}
@@ -82,6 +107,9 @@
     \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
   \fi
   \vskip\belowcaptionskip}
+\def\ps at longtable{\setlength{\headsep}{36pt}\let\@mkboth\@gobbletwo
+     \let\@oddhead\@empty\def\@oddfoot{\reset at font\hfil\thepage
+     \hfil}\let\@evenhead\@empty\let\@evenfoot\@oddfoot}
 \makeatother
 \begin{document}
 \begin{center}
@@ -89,7 +117,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 2.0\\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 2.1\\
 \href{mailto:djf027 at googlemail.com}{djf027 at googlemail.com}\\ \today
 
 \end{center} 
@@ -105,15 +133,15 @@
 \label{sec:Notice}
 
 \textbf{This package is still under active development.  The
-  \textsf{biblatex} package by Philipp Lehman, Philip Kime, Audrey
-  Boruvka, and Joseph Wright is now quite stable, but my task of
-  incorporating the many enhancements it has accumulated in recent
-  releases is ongoing.  The \textsf{biblatex-chicago} package itself
-  now implements the 17th edition of the \emph{Chicago Manual of
-    Style}, though I have made it possible to continue to use the 16th
-  edition files if that is imperative for you.  The package relies
-  heavily, in all styles, on using \textsf{biber} as its backend;
-  other backends will not work properly.}
+  \textsf{biblatex} package by Philipp Lehman, Philip Kime, Moritz
+  Wemheuer, Audrey Boruvka, and Joseph Wright is now quite stable, but
+  my task of incorporating the many enhancements it has accumulated in
+  recent releases is ongoing.  The \textsf{biblatex-chicago} package
+  itself now implements the 17th edition of the \emph{Chicago Manual
+    of Style}, though I have made it possible to continue to use the
+  16th edition files if that is imperative for you.  The package
+  relies heavily, in all styles, on using \textsf{biber} as its
+  backend; other backends will not work properly.}
 
 \mylittlespace \textbf{I have tried to implement as much of the
   \emph{Manual's} specification as possible, though undoubtedly some
@@ -123,16 +151,19 @@
   more elegantly or accurately would be most welcome.}
 
 \mylittlespace\textbf{Important Note:} If you have used
-\textsf{biblatex-chicago} before, please make sure you have read the
+\textsf{biblatex-chicago} before, especially if you've been using
+anything earlier than version 2.0, please make sure you have read the
 RELEASE file that came with the package.  It details the changes
 you'll need to make to your .bib database in order for it to work
-properly with this release.  I do strongly recommend that you switch
-to the new edition.  The changes, as you can see from the RELEASE
-file, in the main involve \emph{additions} to the specification, with
-required alterations to your existing .bib databases actually being
-rather rare.  If, on the other hand, you are new to these styles or to
-\textsf{biblatex} itself, please do continue reading at least the
-following section.
+properly with this release.  If you have continued to use the
+16th-edition styles, I do strongly recommend that you switch to the
+new edition, as I am deprecating the previous edition styles, and will
+delete them in a future release.  Any required changes, as you can see
+from the RELEASE file, in the main involve \emph{additions} to the
+specification, with required alterations to your existing .bib
+databases actually being rather rare, which should help ease the
+transition.  If you are new to these styles or to \textsf{biblatex}
+itself, please do continue reading at least the following section.
 
 \section{Quickstart}
 \label{quickstart}
@@ -182,17 +213,17 @@
 
 \begin{itemize}{}{}
 \item The \textsf{biblatex} package, of course!  The current version
-  --- 3.14 at the time of writing --- has received extensive testing,
+  --- 3.16 at the time of writing --- has received extensive testing,
   and contains features and bug fixes upon which my code relies.
   Please don't use any earlier version.  \textsf{Biblatex} requires
   several packages, and it strongly recommends several more:
   \begin{itemize}{}{}
   \item \textsf{biber} --- the next-generation \textsc{Bib}\TeX\
-    replacement by Philip Kime and Fran\xE7ois Charette, available from
-    SourceForge (required).  You should use the latest version, 2.14,
-    to work with \textsf{biblatex} 3.14 and \textsf{biblatex-chicago};
-    please note that any other backend will not produce accurate
-    results.
+    replacement by Philip Kime and Fran\c{c}ois Charette, available
+    from SourceForge (required).  You should use the latest version,
+    2.16, to work with \textsf{biblatex} 3.16 and
+    \textsf{biblatex-chicago}; please note that any other backend will
+    not produce accurate results.
   \item e-\TeX\ (required)
   \item \textsf{etoolbox} --- available from CTAN (required)
   \item \textsf{keyval} --- a standard package (required)
@@ -201,18 +232,17 @@
   \item \textsf{babel} --- a standard package (\emph{strongly}
     recommended)
   \item \textsf{csquotes} --- available from CTAN (recommended).
-    Please upgrade to the latest version of \textsf{csquotes} (5.2j).
+    Please upgrade to the latest version of \textsf{csquotes} (5.2l).
   \end{itemize}
-\item With the changes both to \textsf{biblatex} and to
-  \textsf{biblatex-chicago} in this release, \textsf{biblatex-chicago}
-  itself now requires two packages, which are both loaded for you if
-  you load \textsf{biblatex-chicago.sty}, but which you'll have to
-  load manually if not.  They are:
+\item With recent changes both to \textsf{biblatex} and to
+  \textsf{biblatex-chicago}, \textsf{biblatex-chicago} itself now
+  requires two packages, which are both loaded for you if you load
+  \textsf{biblatex-chicago.sty}, but which you'll have to load
+  manually if not.  They are:
   \begin{itemize}{}{}
-  \item \mycolor{\textsf{nameref}} --- a standard package, available
+  \item \textsf{nameref} --- a standard package, available
     in CTAN.
-  \item \mycolor{\textsf{xstring}} --- also standard and available in
-    CTAN.
+  \item \textsf{xstring} --- also standard and available in CTAN.
   \end{itemize}
 \item The line:
   \begin{quote}
@@ -245,64 +275,62 @@
   who wish to set much of the low-level formatting of their documents
   themselves.  Please see sections~\ref{sec:loading} and
   \ref{sec:loading:auth} below for a fuller discussion of the issues
-  involved here, and please also remember to load
-  \mycolor{\textsf{xstring}} and \mycolor{\textsf{nameref}} manually
-  if you use this latter method.
-\item You can use
-  \verb+\usepackage[notes,short,backend=biber]{biblatex-chicago}+ to
-  get the short note format even in the first reference of a notes \&\
-  bibliography document, letting the bibliography provide the full
-  reference.
-\item If you are accustomed to using the \textsf{natbib} compatibility
-  option with \textsf{biblatex}, then you can continue to do so with
-  \textsf{biblatex-chicago}.  If you are using
-  \cmd{usepackage\hfill\{biblatex-chicago\}} to load the package, then
-  the option must be the plain \texttt{natbib} rather than
-  \texttt{natbib=true}.  If you use the latter, you'll get a
-  \textsf{keyval} error.  Please see sections~\ref{sec:useropts} and
-  \ref{sec:authuseropts}, below.
+  involved here, and please also remember to load \textsf{xstring} and
+  \textsf{nameref} manually if you use this latter method.
+\item If you set
+  \verb+\usepackage[notes,short,backend=biber]{biblatex-chicago}+
+  you'll get the short note format even in the first reference of a
+  notes \&\ bibliography document, letting the bibliography provide
+  the full reference.
+\item If you are accustomed to using the \textsf{natbib} or
+  \textsf{mcite} compatibility options with \textsf{biblatex}, then
+  you can continue to do so with \textsf{biblatex-chicago}.  If you
+  are using \cmd{usepac\-kage\{biblatex-chicago\}} to load the style,
+  then you can place (e.g.) \texttt{natbib} or \texttt{natbib=true}
+  among its options to pass it through to \textsf{biblatex}.  Please
+  see sections~\ref{sec:useropts} and \ref{sec:authuseropts}, below.
 \item By far the simplest setup is to use \textsf{babel}, and to have
   \texttt{american} as the main text language.  (\textsf{Polyglossia}
-  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 provides (at least partial) support
-  for Brazilian Portuguese, British, \mycolor{Dutch}, Finnish, French,
-  German, Icelandic, Norwegian, and Swedish.  Please see below
-  (section~\ref{sec:international}) for a fuller explanation of all
-  the options.
-\item {\small \textsf{chicago-authordate.cbx,
-      chicago-authordate-trad.cbx, chicago-dates-common.cbx},
-    \textsf{chi\-ca\-go-authordate.bbx},
-    \textsf{chicago-authordate-trad.bbx}, \textsf{chicago-notes.cbx},
-    \textsf{chicago-notes.bbx},\break \textsf{cms-american.lbx},
-    \textsf{cms-brazilian.lbx}, \textsf{cms-british.lbx},
-    \mycolor{\textsf{cms-dutch.lbx}}, \textsf{cms-finnish.lbx},
-    \textsf{cms-french.lbx}, \textsf{cms-german.lbx},
-    \textsf{cms-icelandic.lbx}, \textsf{cms-ngerman.lbx},
-    \textsf{cms-norsk.lbx}, \textsf{cms-nor\-wegian.lbx},
-    \textsf{cms-nynorsk.lbx}, \textsf{cms-swedish.lbx},
-    \textsf{bibla\-tex-chicago.sty}, and \textsf{cmsdocs.sty}}, all
-  from \textsf{biblatex-chicago}, installed either in a system-wide
-  \TeX\ directory, or in the working directory where you keep your
-  *.tex files.  The .zip file from CTAN contains subdirectories to
-  help keep the growing number of files organized, so the files listed
-  above can be found in the \texttt{latex/} subdirectory.  If you
-  install in a system-wide directory, I suggest a standard layout
-  using \texttt{<TEXMFLOCAL>\slash
-    tex/latex/bib\-latex-contrib/biblatex-chicago}, where\
+  should work, too, and has received somewhat more testing for this
+  release.)  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 provides (at least
+  partial) support for Brazilian Portuguese, British, Dutch, Finnish,
+  French, German, Icelandic, Norwegian, \mycolor{Romanian} and
+  Swedish.  Please see below (section~\ref{sec:international}) for a
+  fuller explanation of all the options.
+\item \textsf{chicago-authordate.cbx, chicago-authordate-trad.cbx,
+    chicago-dates-common.cbx},\break \textsf{chicago-authordate.bbx},
+  \textsf{chicago-authordate-trad.bbx}, \textsf{chicago-notes.cbx},
+  \textsf{chicago-notes.bbx}, \textsf{cms-american.lbx},
+  \textsf{cms-brazilian.lbx}, \textsf{cms-british.lbx},
+  \textsf{cms-dutch.lbx}, \textsf{cms-finnish.lbx},
+  \textsf{cms-french.lbx}, \textsf{cms-german.lbx},
+  \textsf{cms-icelandic.lbx}, \textsf{cms-ngerman.lbx},\break
+  \textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx},
+  \textsf{cms-nynorsk.lbx}, \mycolor{\textsf{cms-romanian.lbx}},
+  \textsf{cms-swe-\break dish.lbx}, \textsf{biblatex-chicago.sty}, and
+  \textsf{cmsdocs.sty}, all from \textsf{biblatex-chicago}, installed
+  either in a system-wide \TeX\ directory, or in the working directory
+  where you keep your *.tex files.  The .zip file from CTAN contains
+  subdirectories to help keep the growing number of files organized,
+  so the files listed above can be found in the \texttt{latex/}
+  subdirectory.  If you install in a system-wide directory, I suggest
+  a standard layout like \texttt{<TEXMFLOCAL>\slash
+    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 preferences,
-  \texttt{/usr/share/texmflocal}, \texttt{/usr/local/share/texmf}, or
-  \texttt{C:\textbackslash{}Local TeX Files\textbackslash}.  Then you
-  can copy the contents of the \texttt{latex/} directory there.  (If
-  you install into your working directory, then you'll need to copy
-  the files directly there, without subdirectories.)  Of course, if
-  you choose to place them anywhere in the \texttt{texmf} tree, you'll
-  need to update the file name database to make sure \TeX\ can find
-  them.
-\item \textsf{chicago-authordate16.cbx, chicago-authordate-trad16.cbx,
-    chicago-dates-com\-mon16.cbx}, \textsf{chicago-authordate16.bbx},
+  --- for example, and depending on your operating system and
+  preferences, \texttt{/usr/share/texmflocal},
+  \texttt{/usr/local/share/texmf}, or \texttt{C:\textbackslash{}Local
+    TeX Files\textbackslash}.  Then you can copy the contents of the
+  \texttt{latex/} directory there.  (If you install into your working
+  directory, then you'll need to copy the files directly there,
+  without subdirectories.)  Of course, if you choose to place them
+  anywhere in the \texttt{texmf} tree, you'll need to update the file
+  name database to make sure \TeX\ can find them.
+\item The files \textsf{chicago-authordate16.cbx,
+    chicago-authordate-trad16.cbx, chicago-dates-common16.cbx},
+  \textsf{chicago-authordate16.bbx},
   \textsf{chicago-authordate-trad16.bbx},
   \textsf{chicago-notes16.cbx}, and \textsf{chicago-notes16.bbx},
   which, as their names suggest, allow you to continue using the
@@ -309,11 +337,11 @@
   16th-edition specifications alongside the most recent
   \textsf{biblatex}, if your project requires this.  They can be found
   in the same directory as the 17th-edition equivalents.
-\item The new dependent \LaTeX\ package
-  \mycolor{\textsf{cmsendnotes.sty}}, found with the previous files.
-  It offers additional functionality for those wishing to use the new
-  \mycolor{\texttt{noteref}} option with endnotes instead of
-  footnotes.  See section~\ref{sec:noteref}, below, and also
+\item The dependent \LaTeX\ package \textsf{cmsendnotes.sty}, found
+  with the previous files.  It offers additional functionality for
+  those wishing to use the new \texttt{noteref} option with endnotes
+  instead of footnotes.  See section~\ref{sec:noteref}, below, and
+  also
   \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}.
 \item The very clear and detailed documentation of the
   \textsf{biblatex} system, available in that package as
@@ -331,10 +359,10 @@
   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.  The fourth gives a brief example of the usage
-  of the \mycolor{\texttt{noteref}} package option to the notes \&\
-  bibliography style.  All four are fully hyperlinked, the first three
-  in particular allowing you easily to jump from notes or citations to
-  an annotated bibliography or reference list, and thence to the .bib
+  of the \texttt{noteref} package option to the notes \&\ bibliography
+  style.  All four are fully hyperlinked, the first three in
+  particular allowing you easily to jump from notes or citations to an
+  annotated bibliography or reference list, and thence to the .bib
   entries themselves.  If you ensure that all four are in the same
   directory as the document you are reading (the \TeX\ Live default),
   marginal links there will take you to further discussions here.  The
@@ -358,8 +386,8 @@
   the second and third are the result of processing
   \textsf{dates-test.bib} with \textsf{cms-dates-sample.tex} or
   \textsf{cms-trad-sample.tex}, and the fourth processes
-  \textsf{legal-test.bib} using \textsf{cms-legal-sam\-ple.tex}.  All
-  of these files are in \texttt{doc/}, and the \textsf{sample} files,
+  \textsf{legal-test.bib} using \textsf{cms-legal-sample.tex}.  All of
+  these files are in \texttt{doc/}, and the \textsf{sample} files,
   aside from the last named, are mainly included for testing purposes.
 \item The file you are reading, \textsf{biblatex-chicago.pdf}, which
   aims to be as complete a description as possible of the rules for
@@ -377,8 +405,8 @@
   page~\pageref{deprec:obsol}.  You will find the nineteen previous
   files in the \texttt{doc/} subdirectory once you've extracted
   \textsf{biblatex-chicago.zip}.  If you wish to place them in a
-  system-wide directory, I would recommend:\,\,\,
-  \texttt{<TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago},\\
+  system-wide directory, you can try:
+  \texttt{<TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago},
   all the while remembering, of course, to update the file name
   database afterward.
 \item Access to a copy of \emph{The Chicago Manual of Style} itself,
@@ -390,7 +418,7 @@
 \subsection{License}
 \label{sec:lppl}
 
-Copyright \xA9 2008--2020 David Fussner.  This package is
+Copyright \copyright\ 2008--2021 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
 modified under the conditions of the \LaTeX\ Project Public License,
 either version 1.3 of this license or (at your option) any later
@@ -415,31 +443,32 @@
 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\xDFenhoven's \textsf{biblatex-dw} package.  I've adapted Audrey
+Wa{\ss}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}.  The dependent package \mycolor{\textsf{cmsendnotes.sty}}
-contains code by John Lavagnino and Ulrich Dirr.  I am very grateful
-to Wouter Lancee for the new Dutch localization, to Gustavo Barros for
-the Brazilian Portuguese localization, to Stefan Bj\xF6rk for the Swedish
-localization, to Antti-Juhani Kaijahano for the Finnish localization,
-to Baldur Kristinsson for providing the Icelandic localization, and to
-H\xE5kon Malmedal for the Norwegian localizations.  Kazuo Teramoto and
-Gildas Hamel both sent patches to improve the package, and Arne
-Skj\xE6rholt provided some code to get me started on the
-\cmd{gentextcite} commands. There may be other \LaTeX\ code I've
-appropriated and forgotten, in which case please remind me.  Finally,
-Charles Schaum and Joseph Reagle Jr.\ were both extremely generous
-with their help and advice during the development of this package, and
-have both continued indefatigably to test it and suggest needed
-improvements.  They were particularly instrumental in encouraging the
-greatest possible degree of compatibility with other \textsf{biblatex}
-styles.  Indeed, if the task of adapting .bib files for use with the
-Chicago style seems onerous now, you should have tried it before they
-got their hands on it.
+  site}.  The dependent package \textsf{cmsendnotes.sty} contains code
+by John Lavagnino and Ulrich Dirr.  I am very grateful to Patrick
+Danilevici for the new Romanian localization, to Wouter Lancee for the
+Dutch localization, to Gustavo Barros for the Brazilian Portuguese
+localization, to Stefan Bj\"{o}rk for the Swedish localization, to
+Antti-Juhani Kaijahano for the Finnish localization, to Baldur
+Kristinsson for providing the Icelandic localization, and to H{\aa}kon
+Malmedal for the Norwegian localizations.  Kazuo Teramoto and Gildas
+Hamel both sent patches to improve the package, and Arne Skj{\ae}rholt
+provided some code to get me started on the \cmd{gentextcite}
+commands. There may be other \LaTeX\ code I've appropriated and
+forgotten, in which case please remind me.  Finally, Charles Schaum
+and Joseph Reagle Jr.\ were both extremely generous with their help
+and advice during the development of this package, and have both
+continued indefatigably to test it and suggest needed improvements.
+They were particularly instrumental in encouraging the greatest
+possible degree of compatibility with other \textsf{biblatex} styles.
+Indeed, if the task of adapting .bib files for use with the Chicago
+style seems onerous now, you should have tried it before they got
+their hands on it.
 
 \section{Detailed Introduction}
 \label{sec:Intro}
@@ -559,24 +588,22 @@
 
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-notes}, minus the odd \textsf{biblatex}
-alias, is as follows: \textbf{article}, \mycolor{\textbf{artwork}},
-\mycolor{\textbf{audio}}, \mycolor{\textbf{book}},
-\textbf{bookinbook}, \textbf{booklet}, \textbf{collection},
-\textbf{customc}, \mycolor{\textbf{dataset}}, \textbf{image},
-\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
-\mycolor{\textbf{inreference}}, \textbf{jurisdiction}, \textbf{legal},
-\textbf{legislation}, \textbf{letter}, \textbf{manual}, \textbf{misc},
-\mycolor{\textbf{music}}, \mycolor{\textbf{mvbook}},
-\mycolor{\textbf{mvcollection}}, \mycolor{\textbf{mvproceedings}},
-\mycolor{\textbf{mvreference}}, \mycolor{\textbf{online}} (with its
-alias \textbf{www}), \textbf{patent}, \mycolor{\textbf{performance}},
-\textbf{periodical}, \textbf{proceedings}, \textbf{reference},
-\textbf{report} (with its alias \textbf{techreport}),
-\mycolor{\textbf{review}}, \mycolor{\textbf{standard}},
-\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical},
-\textbf{thesis} (with its aliases \textbf{mastersthesis} and
-\textbf{phdthesis}), \textbf{unpublished}, and
-\mycolor{\textbf{video}}.
+alias, is as follows: \textbf{article}, \textbf{artwork},
+\textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet},
+\textbf{collection}, \textbf{customc}, \textbf{dataset},
+\textbf{image}, \textbf{inbook}, \textbf{incollection},
+\mycolor{\textbf{inproceedings}}, \textbf{inreference},
+\textbf{jurisdiction}, \textbf{legal}, \textbf{legislation},
+\textbf{letter}, \textbf{manual}, \textbf{misc}, \textbf{music},
+\textbf{mvbook}, \textbf{mvcollection}, \textbf{mvproceedings},
+\textbf{mvreference}, \textbf{online} (with its alias \textbf{www}),
+\textbf{patent}, \textbf{performance}, \textbf{periodical},
+\mycolor{\textbf{proceedings}}, \textbf{reference}, \textbf{report}
+(with its alias \textbf{techreport}), \textbf{review},
+\textbf{standard}, \textbf{suppbook}, \textbf{suppcollection},
+\textbf{suppperiodical}, \textbf{thesis} (with its aliases
+\textbf{mastersthesis} and \textbf{phdthesis}), \textbf{unpublished},
+and \textbf{video}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -779,12 +806,12 @@
 goes in \textsf{journaltitle}, and the word \enquote{\texttt{blog}} in
 the \textsf{location} field (though you could just use special
 formatting in the \textsf{journaltitle} field itself, which may
-sometimes be necessary).  The 17th \colmarginpar{New!} edition
-specifies that \enquote{blogs that are part of a larger publication
-  should include the name of that publication.}  This usually involves
-a newspaper or magazine which also publishes various blogs on its
-website, and it means that such entries need a more general title than
-the \textsf{journaltitle}.  It's not standard \textsf{biblatex} or
+sometimes be necessary).  The 17th edition specifies that
+\enquote{blogs that are part of a larger publication should include
+  the name of that publication.}  This usually involves a newspaper or
+magazine which also publishes various blogs on its website, and it
+means that such entries need a more general title than the
+\textsf{journaltitle}.  It's not standard \textsf{biblatex} or
 anything, but you can now put such information in \textsf{maintitle}
 (with \textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed),
 but only in \textsf{article} and \textsf{review} entries with a
@@ -797,7 +824,7 @@
 comments make particular use of the \textsf{eventdate} and of the
 \textsf{nameaddon} fields; please see the documentation of
 \textbf{review}, below, and also of the \textsf{relatedtype}
-\mycolor{\texttt{commenton}} in section~\ref{sec:related}.
+\texttt{commenton} in section~\ref{sec:related}.
 
 \mylittlespace Ninth, the special \textsf{biblatex} field
 \textsf{shortjournal} allows you to present shortened
@@ -807,13 +834,13 @@
 list.  Please see the documentation of \textbf{shortjournal} in
 section~\ref{sec:entryfields} for all the details on how this works.
 
-\mylittlespace Finally, \colmarginpar{New!} the 17th edition (14.191)
-specifies that, for news sites carrying \enquote{stories as they
-  unfold, it may be appropriate to include a time stamp for an article
-  that includes one.}  You can provide this by using the standard
-\textsf{biblatex} time stamp format inside the \textsf{date} field,
-e.g., \texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers
-the standard time zone initialisms, a separate \textsf{timezone} field
+\mylittlespace Finally, the 17th edition (14.191) specifies that, for
+news sites carrying \enquote{stories as they unfold, it may be
+  appropriate to include a time stamp for an article that includes
+  one.}  You can provide this by using the standard \textsf{biblatex}
+time stamp format inside the \textsf{date} field, e.g.,
+\texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers the
+standard time zone initialisms, a separate \textsf{timezone} field
 would be required if you want to provide one.
 
 \mylittlespace If you're still with me, allow me to recommend that you
@@ -827,10 +854,10 @@
 cases are really rather rare, and that the vast majority of sources
 won't require any knowledge of these onerous details.
 
-\mybigspace Arne \colmarginpar{\textbf{artwork}} Kjell Vikhagen
+\mybigspace Arne \mymarginpar{\textbf{artwork}} Kjell Vikhagen
 pointed out to me that none of the standard entry types were
 straightforwardly adaptable when referring to visual artworks.  It's
-unclear that the \emph{Manual} (14.235) believes it necessary to
+unclear whether the \emph{Manual} (14.235) believes it necessary to
 include them in the bibliographical apparatus at all, but it's easy
 all the same to conceive of contexts in which a list of artworks
 studied might be desirable, and \textsf{biblatex} includes entry types
@@ -854,16 +881,15 @@
 use lowercase in the .bib file and let \textsf{biblatex} handle it for
 you.  (See \emph{Manual} 3.22, 8.198; leo:madonna, bedford:photo.)
 
-\mylittlespace The \colmarginpar{New!} 17th edition of the
-\emph{Manual} has included new information in some of its examples, so
-I have added 4 new fields to the drivers.  Alongside the usual
-\textsf{date} for the creation of a work, you may also want to include
-the printing date of a particular exemplar of a photograph or a print.
-The system I have designed uses the \emph{earlier} of the
-\textsf{date} and the \textsf{origdate} to be the date of creation,
-and the \emph{later} to be the printing date.  The style will
-automatically prefix the printing date with the localized
-\cmd{bibstring} \mycolor{\texttt{printed}}, so if that's the wrong
+\mylittlespace The 17th edition of the \emph{Manual} has included new
+information in some of its examples, so I have added 4 new fields to
+the drivers.  Alongside the usual \textsf{date} for the creation of a
+work, you may also want to include the printing date of a particular
+exemplar of a photograph or a print.  The system I have designed uses
+the \emph{earlier} of the \textsf{date} and the \textsf{origdate} to
+be the date of creation, and the \emph{later} to be the printing date.
+The style will automatically prefix the printing date with the
+localized \cmd{bibstring} \texttt{printed}, so if that's the wrong
 string entirely then you can define \textsf{userd} any way you like to
 change it.  If only \emph{one} of those two dates is available, it
 will always serve as a creation date.
@@ -886,7 +912,7 @@
 required for such a work, in this instance the other fields in a
 \textsf{misc} entry function pretty much as in \textsf{artwork}.
 
-\mybigspace Following \colmarginpar{\textbf{audio}} the request of
+\mybigspace Following \mymarginpar{\textbf{audio}} the request of
 Johan Nordstrom, I have included three entry types, all undefined by
 the standard styles, designed to allow users to present audiovisual
 sources in accordance with the Chicago specifications.  The
@@ -916,9 +942,9 @@
 concern, fills gaps in the others, and presents its sources in a more
 \enquote{book-like} manner.  Published musical scores need this type
 --- unpublished ones would use \textsf{misc} with an
-\textsf{entrysubtype} (shapey:partita) --- as do \mycolor{podcasts}
-and such favorite educational formats as the slideshow and the
-filmstrip (danforth:podcast, greek:film\-strip, schubert:muellerin,
+\textsf{entrysubtype} (shapey:partita) --- as do podcasts and such
+favorite educational formats as the slideshow and the filmstrip
+(danforth:podcast, greek:filmstrip, schubert:muellerin,
 verdi:corsaro).  The \emph{Manual} (14.264) sometimes uses a similar
 format for audio books (twain:audio), though, depending on the sorts
 of publication facts you wish to present, this sort of material may
@@ -960,12 +986,12 @@
 need in an \textsf{editor[abc]type} field, e.g.,
 \enquote{\texttt{libretto by}} (verdi:corsaro).
 
-\mylittlespace For \colmarginpar{New!} podcasts, newly covered by the
-17th edition (14.267), the \textsf{audio} type provides the nearest
-analogue I could find, and in general most of the data should fit
-comfortably into the fields already discussed above, the episode name
-in \textsf{title} and the name of the podcast in \textsf{booktitle},
-for starters.  Two details, however, need mentioning: first, the
+\mylittlespace For podcasts, newly covered by the 17th edition
+(14.267), the \textsf{audio} type provides the nearest analogue I
+could find, and in general most of the data should fit comfortably
+into the fields already discussed above, the episode name in
+\textsf{title} and the name of the podcast in \textsf{booktitle}, for
+starters.  Two details, however, need mentioning: first, the
 \textsf{note} field as the place to specify that it is a podcast, and
 the \textsf{eventdate} field for the date of publication of the
 specific episode (\textsf{title}) cited, which appears in close
@@ -974,7 +1000,7 @@
 entry is a podcast episode, and helps it construct the entry
 appropriately (danforth:podcast).
 
-\mybigspace This \colmarginpar{\textbf{book}} is the standard
+\mybigspace This \mymarginpar{\textbf{book}} is the standard
 \textsf{biblatex} and \textsc{Bib}\TeX\ entry type, and the package
 can automatically provide abbreviated references in notes and
 bibliography when you use a \textsf{crossref} or an \textsf{xref}
@@ -983,13 +1009,13 @@
 \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.  The
+harley\hc cartography, and harley:hoc for how this might look.  The
 \textsf{book} type is useful also to present multimedia app content,
 the added fields \textsf{version} and \textsf{type} providing
 information about the app's version and about the system on which it
 runs (14.268; angry:birds).
 
-\enlargethispage{\baselineskip}
+\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
 means of referring to parts of books that are considered, in other
@@ -1039,7 +1065,7 @@
 mechanisms, all primarily designed to include cross-references to
 other works.  Cf.\ 14.81--82).  The lecarre:cornwell entry, for
 example, would allow your readers to find the more-commonly-used
-pseudonym \enquote{John Le Carr\xE9} even if they were, for some reason,
+pseudonym \enquote{John Le Carr\'e} 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
@@ -1063,9 +1089,10 @@
 will connect the two parts of the cross-reference with the word
 \enquote{\emph{See}} --- or its equivalent in the document's language
 --- in italics.  If you wish to present it differently, you can put
-the connecting word(s) into the \textsf{nameaddon} field.
+the connecting word(s) into the \textsf{nameaddon} field, formatted as
+you wish.
 
-\mybigspace This \colmarginpar{\textbf{dataset}} entry type, new in
+\mybigspace This \mymarginpar{\textbf{dataset}} entry type, new in
 \textsf{biblatex} 3.13, allows you to cite scientific databases, for
 which the \emph{Manual} (14.257) presents some rather specific, if
 brief, instructions.  To construct your entry, you can put the name of
@@ -1091,7 +1118,7 @@
 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} (\xA7~2.1.1) intends the first for \enquote{a part
+\textsf{Biblatex.pdf} (\S~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
@@ -1132,12 +1159,17 @@
 command overrides the contents of a \textsf{pages} field in a .bib
 file entry.
 
-\mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works
-pretty much as in standard \textsf{biblatex}.  Indeed, the main
-differences between it and \textsf{incollection} are the lack of an
-\textsf{edition} field and the possibility that an
-\textsf{organization} may be cited alongside the \textsf{publisher},
-even though the \emph{Manual} doesn't specify its use (14.217).
+\mybigspace This \colmarginpar{\textbf{inproceedings}} entry type
+works pretty much as in standard \textsf{biblatex}, even more so now
+that, after a request from Patrick Danilevici, I have newly included
+the \mycolor{\textsf{eventdate}}, \mycolor{\textsf{eventtitle}},
+\mycolor{\textsf{eventtitleaddon}}, and \mycolor{\textsf{venue}}
+fields for specifying where and when the event occurred that produced
+the proceedings.  These four fields are the main difference between it
+and \textsf{incollection}, along with the lack of an \textsf{edition}
+field and the possibility that an \textsf{organization} may be cited
+alongside the \textsf{publisher}, even though the \emph{Manual}
+doesn't specify the use of any of these supplementary fields (14.217).
 Please note, also, that the \textsf{crossref} and \textsf{xref}
 mechanism for shortening citations of multiple pieces from the same
 \textsf{proceedings} is operative here, just as it is in
@@ -1146,7 +1178,7 @@
 \texttt{longcrossref} in section~\ref{sec:chicpreset} for more
 details.
 
-\mybigspace This \colmarginpar{\textbf{inreference}} entry type is
+\mybigspace This \mymarginpar{\textbf{inreference}} entry type is
 aliased to \textsf{incollection} in the standard styles, but the
 \emph{Manual} has particular requirements, so if you are citing
 \enquote{[w]ell-known reference books, such as major dictionaries and
@@ -1218,27 +1250,26 @@
 choice for unfamiliar or non-standard reference works.
 
 \mylittlespace Finally, all of these rules apply to online reference
-works, along with a few more.  The \colmarginpar{New!} 17th edition of
-the \emph{Manual} now allows, \enquote{subject to editorial
-  discretion,} the alternative treatment of an online reference work
-which \enquote{does not have (and never had) a printed counterpart}
-(14.206, 14.233).  In effect this means that it can be treated more
-like an \textsf{online} entry than a \textsf{book}, its \textsf{title}
-therefore in plain roman rather than in italics.  You can achieve this
-in \textsf{inreference} entries by providing an \textsf{entrysubtype}
-in the entry.  Online reference works need not only a \textsf{url} but
-also, always, a \textsf{urldate} (instead of a \textsf{date)}, as
-these sources are in constant flux.  When that flux is of a
-particularly high frequency, as with Wikipedia, then a time stamp may
-also be needed.  You can provide this in the \textsf{urldate} field
-itself, using the standard \textsf{biblatex} format, e.g.,
-\texttt{2008-07-01T10:18:00}.  It is
-\colmarginpar{\texttt{urlstamp=true}} possible to turn off the
-printing of the \textsf{urltime} with the new
-\mycolor{\texttt{urlstamp}} option, which is set to \texttt{true} by
-default, but which can be changed in your preamble for the whole
-document, for specific entry types, or in the \textsf{options} field
-of specific entries (wikiped:bibtex, grove:sibelius).
+works, along with a few more.  The 17th edition of the \emph{Manual}
+now allows, \enquote{subject to editorial discretion,} the alternative
+treatment of an online reference work which \enquote{does not have
+  (and never had) a printed counterpart} (14.206, 14.233).  In effect
+this means that it can be treated more like an \textsf{online} entry
+than a \textsf{book}, its \textsf{title} therefore in plain roman
+rather than in italics.  You can achieve this in \textsf{inreference}
+entries by providing an \textsf{entrysubtype} in the entry.  Online
+reference works need not only a \textsf{url} but also, always, a
+\textsf{urldate} (instead of a \textsf{date)}, as these sources are in
+constant flux.  When that flux is of a particularly high frequency, as
+with Wikipedia, then a time stamp may also be needed.  You can provide
+this in the \textsf{urldate} field itself, using the standard
+\textsf{biblatex} format, e.g., \texttt{2008-07-01T10:18:00}.  It is
+\mymarginpar{\texttt{urlstamp=true}} possible to turn off the printing
+of the \textsf{urltime} with the \texttt{urlstamp} option, which is
+set to \texttt{true} by default, but which can be changed in your
+preamble for the whole document, for specific entry types, or in the
+\textsf{options} field of specific entries (wikiped:bibtex,
+grove:sibelius).
 
 \mybigspace I
 \mymarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
@@ -1344,7 +1375,7 @@
 you would need to define both \textsf{author} and \textsf{publisher}
 using the name you here might have put in \textsf{organization}.  (See
 14.84; chicago:manual, dyna:browser, natrecoff:camera.  Cp.\ also the
-new \mycolor{\textbf{standard}} entry type.)
+\textbf{standard} entry type.)
 
 \mybigspace As \mymarginpar{\textbf{misc}} its name suggests, the
 \textsf{misc} entry type was designed as a hold-all for citations that
@@ -1410,7 +1441,9 @@
 using the \textsf{nameaddon} field, providing your own square brackets
 if you're indicating that the \textsf{author} is pseudonymous, or
 parentheses if it's another sort of information of interest to your
-readers.
+readers.  The package options \mycolor{\texttt{nameaddonformat}} and
+\mycolor{\texttt{nameaddonsep}} can help here, as well.  See
+sections~\ref{sec:useropts} and \ref{sec:chicpreset}, below.
 
 \mylittlespace Now for the subtleties.  First, the \emph{Manual}
 (14.224) allows in these entries, as it does in documentation
@@ -1431,17 +1464,16 @@
 the citation command.  (The standard \textsf{biblatex} command
 \cmd{printdate} will work if you prefer the standard date form.)
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace Second, some material (roosevelt:speech) includes a
 venue for the event recorded in the archive, so I have added the
-\mycolor{\textsf{venue}} field, which prints \emph{before} the date,
-with the \textsf{origlocation} appearing after it.  Somewhat
-confusingly, in published letters the \textsf{origlocation} itself
-prints before the date, rather than after, so if the inconsistency
-between published and unpublished letters bothers you then you could
-conceivably use \textsf{venue} instead of \textsf{origlocation} for
-that purpose here.
+\textsf{venue} field, which prints \emph{before} the date, with the
+\textsf{origlocation} appearing after it.  Somewhat confusingly, in
+published letters the \textsf{origlocation} itself prints before the
+date, rather than after, so if the inconsistency between published and
+unpublished letters bothers you then you could conceivably use
+\textsf{venue} instead of \textsf{origlocation} for that purpose here.
 
 \mylittlespace Finally, a few further notes.  First, please be aware
 that defining an \textsf{entrysubtype} activates the automatic
@@ -1471,7 +1503,7 @@
 regard.  (See 14.211, 14.219, 14.221-231, 14.256, 14.264; creel:house,
 dinkel:agassiz, roosevelt:speech, shapey:partita, spock:interview.)
 
-\mybigspace This \colmarginpar{\textbf{music}} is one of three
+\mybigspace This \mymarginpar{\textbf{music}} is one of three
 audiovisual entry types, and is intended primarily to aid in the
 presentation of musical recordings that do not have a video component,
 though it can also include audio books (auden:reading).  A DVD or VHS
@@ -1510,10 +1542,10 @@
   options can alter the presentation within an entry.  Because these
   are non-standard roles, you will need to identify them using the
   following:
-\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
-  roles, all associated with specific bibstrings (or their absence),
-  will be \texttt{conductor}, \texttt{director}, \texttt{producer},
-  and, oddly, \texttt{none}.  The last is particularly useful when
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will be
+  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
+  oddly, \texttt{none}.  The last is particularly useful when
   identifying the group performing a piece, as it usually doesn't need
   further specifying and this role prevents \textsf{biblatex} from
   falling back on the default \texttt{editor} bibstring.  The 17th
@@ -1525,25 +1557,24 @@
     by}) suits your citation.
 \item[note:] This field can also hold contributors, perhaps
   collaborators or featured artists (holiday:fool, rihanna:umbrella).
-\item[\mycolor{title, booktitle, maintitle:}] As with the other
-  audiovisual types, \textsf{music} serves as an analogue both to
-  books and to collections, so the title will either be, e.g., the
-  album title or a song title, in which latter case the album title
-  would go into \textsf{booktitle}.  If you wish to cite a song that,
-  as may happen, isn't part of any larger collection, your entry will
-  in such a case have only a \textsf{title}, which
-  \textsf{biblatex-chicago} would normally interpret as an album
-  title.  You \colmarginpar{New!} can now define an
+\item[title, booktitle, maintitle:] As with the other audiovisual
+  types, \textsf{music} serves as an analogue both to books and to
+  collections, so the title will either be, e.g., the album title or a
+  song title, in which latter case the album title would go into
+  \textsf{booktitle}.  If you wish to cite a song that, as may happen,
+  isn't part of any larger collection, your entry will in such a case
+  have only a \textsf{title}, which \textsf{biblatex-chicago} would
+  normally interpret as an album title.  You can now define an
   \textsf{entrysubtype} to let it know that the lone \textsf{title} is
   in fact a song (cf.\ naraya).  The \textsf{maintitle} might be
   necessary for something like a box set of \emph{Complete
     Symphonies}.
-\item[\mycolor{chapter:}] The 17th edition seems more keen on having
-  track numbers for individual pieces, whether on a traditional format
-  or on a streaming service.  The \colmarginpar{New!} \textsf{chapter}
-  field is the place for this information, and
-  \textsf{biblatex-chicago} will automatically prepend the localized
-  string \texttt{track} (cf.\ holiday:fool, rihanna:umbrella).
+\item[chapter:] The 17th edition seems more keen on having track
+  numbers for individual pieces, whether on a traditional format or on
+  a streaming service.  The \textsf{chapter} field is the place for
+  this information, and \textsf{biblatex-chicago} will automatically
+  prepend the localized string \texttt{track} (cf.\ holiday:fool,
+  rihanna:umbrella).
 \item[publisher, series, number:] These three closely-associated
   fields are intended for presenting the catalog information provided
   by the music publisher.  The 17th edition generally only requires
@@ -1590,14 +1621,13 @@
   \textsf{origdate}, barring that to a \textsf{urldate}, and absent
   those three to the \textsf{date}.  (See floyd:atom, holiday:fool,
   nytrumpet:art.)
-\item[type, \mycolor{howpublished}:] As in all the audiovisual entry
-  types, the \textsf{type} field holds the medium of the recording,
-  e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg
-  vorbis.  The \colmarginpar {New!} \mycolor{\textsf{howpublished}}
-  field, newly included for the 17th edition, can hold similar
-  information \enquote{for streaming audio formats and downloads}
-  (14.263). It can also, alternatively, hold the name of the streaming
-  service, e.g., Spotify (cf.\ rihanna:umbrella).
+\item[type, howpublished:] As in all the audiovisual entry types, the
+  \textsf{type} field holds the medium of the recording, e.g., vinyl,
+  33 rpm, 8-track tape, cassette, compact disc, mp3, ogg vorbis.  The
+  \textsf{howpublished} field, newly included for the 17th edition,
+  can hold similar information \enquote{for streaming audio formats
+    and downloads} (14.263). It can also, alternatively, hold the name
+  of the streaming service, e.g., Spotify (cf.\ rihanna:umbrella).
 \end{description}}
 
 The entries in \textsf{notes-test.bib} should at least give you a good
@@ -1612,7 +1642,7 @@
 bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
 rubinstein:chopin.)
 
-\mybigspace The \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
+\mybigspace The \mymarginpar{\textbf{mvbook}\\\textbf{mvcollection}%
   \\\textbf{mvproceedings}\\\textbf{mvreference}} 17th edition of the
 \emph{Manual} has deployed, in at least two contexts, a notable
 syntactic change in the presentation of works that form part of other,
@@ -1623,20 +1653,20 @@
 in TV episodes, for one example, the recommendation now is to present
 the name of the series (\textsf{booktitle}) \emph{before} the name of
 the episode (\textsf{title}).  The \textbf{video} type (14.265)
-provides this by using a new \textsf{entrysubtype},
-\mycolor{\texttt{tvepisode}}, which reverses the order for you in both
-long and short notes, and in the bibliography.  The other context in
-which this reversal occurs is multi-volume works (14.116--22).  Here,
-the preferred format, at least for notes, appears to be
-\textsf{maintitle} -- \textsf{[book]title} or, when all three titles
-are present, \textsf{title} -- \textsf{maintitle} --
-\textsf{booktitle}.  The \emph{Manual} doesn't carry this reordering
-through with absolute consistency, but I think it important at least
-to offer it as a possibility to users of \textsf{biblatex-chicago}.
-Reluctant as I am simply to change the data model and provide
-non-standard entry types, the least invasive method seemed, and seems,
-to me to be to modify the \textbf{mv*} entry types while maintaining
-backward compatibility with users' current deployments of these types.
+provides this by using an \textsf{entrysubtype}, \texttt{tvepisode},
+which reverses the order for you in both long and short notes, and in
+the bibliography.  The other context in which this reversal occurs is
+multi-volume works (14.116--22).  Here, the preferred format, at least
+for notes, appears to be \textsf{maintitle} -- \textsf{[book]title}
+or, when all three titles are present, \textsf{title} --
+\textsf{maintitle} -- \textsf{booktitle}.  The \emph{Manual} doesn't
+carry this reordering through with absolute consistency, but I think
+it important at least to offer it as a possibility to users of
+\textsf{biblatex-chicago}.  Reluctant as I am simply to change the
+data model and provide non-standard entry types, the least invasive
+method seemed, and seems, to me to be to modify the \textbf{mv*} entry
+types while maintaining backward compatibility with users' current
+deployments of these types.
 
 \mylittlespace So, while these types are no longer aliased to the
 entry type that results from removing the \enquote{mv} from their
@@ -1675,36 +1705,36 @@
 affected by this, and of course you must be using \textsf{Biber} for
 the settings to apply.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace Should you wish to employ the new,
 \textsf{maintitle}-first syntax, then you'll
-\colmarginpar{\texttt{maintitle}} need to use the new
-\mycolor{\texttt{maintitle}} \textsf{relatedtype}.  In its simplest
-usage, to document one volume of a multi-volume set, you would have,
-e.g., an \textsf{mvcollection} entry with \textsf{relatedtype}
-\texttt{maintitle}, and a \textsf{related} field pointing to a
-\textsf{collection} entry.  When you cite the \textsf{mvcollection}
-entry itself, you'll get a long note like \emph{MVCollTitle}, vol.\ 1,
-\emph{CollTitle}, and a short note like \emph{MVCollTitle}, vol.\ 1.,
-or, with a \textsf{postnote} field, \emph{MVCollTitle}, 1:12, as the
-specification requires.  If you wanted to cite one essay in the
-\textsf{collection}, then you would, additionally, need an
-\textsf{incollection} entry with the \texttt{maintitle}
-\textsf{relatedtype} and a \textsf{related} field pointing to the
-\textsf{mvcollection} entry already mentioned, so you're creating a
-chain of three different related entries but presenting them in one
-reference.  It's important to keep in mind here that, in effect,
-you're \emph{not} actually citing the \textsf{mvcollection} entry, but
-the one volume of it represented by the \textsf{collection} entry, or
-indeed an essay in that one volume.  Please consult the \emph{Manual}
-(14.116--22), and also see harley:ancient:cart, harley:cartography,
-and harley:hoc for the \enquote{old style} presentation with
-abbreviated cross references using the \textsf{crossref} field,
-harleymt:ancient:cart, harleymt:cartography and harleymt:hoc for the
-new presentation using the \texttt{maintitle} \textsf{relatedtype},
-and also plato:timaeus:gr for an example of a three-work
-\texttt{maintitle} chain starting with a \textsf{bookinbook} entry.
+\mymarginpar{\texttt{maintitle}} need to use the \texttt{maintitle}
+\textsf{relatedtype}.  In its simplest usage, to document one volume
+of a multi-volume set, you would have, e.g., an \textsf{mvcollection}
+entry with \textsf{relatedtype} \texttt{maintitle}, and a
+\textsf{related} field pointing to a \textsf{collection} entry.  When
+you cite the \textsf{mvcollection} entry itself, you'll get a long
+note like \emph{MVCollTitle}, vol.\ 1, \emph{CollTitle}, and a short
+note like \emph{MVCollTitle}, vol.\ 1., or, with a \textsf{postnote}
+field, \emph{MVCollTitle}, 1:12, as the specification requires.  If
+you wanted to cite one essay in the \textsf{collection}, then you
+would, additionally, need an \textsf{incollection} entry with the
+\texttt{maintitle} \textsf{relatedtype} and a \textsf{related} field
+pointing to the \textsf{mvcollection} entry already mentioned, so
+you're creating a chain of three different related entries but
+presenting them in one reference.  It's important to keep in mind here
+that, in effect, you're \emph{not} actually citing the
+\textsf{mvcollection} entry, but the one volume of it represented by
+the \textsf{collection} entry, or indeed an essay in that one volume.
+Please consult the \emph{Manual} (14.116--22), and also see
+harley:ancient:cart, harley:cartography, and harley:hoc for the
+\enquote{old style} presentation with abbreviated cross references
+using the \textsf{crossref} field, harleymt:ancient:cart,
+harleymt:cartography and harleymt:hoc for the new presentation using
+the \texttt{maintitle} \textsf{relatedtype}, and also plato:timaeus:gr
+for an example of a three-work \texttt{maintitle} chain starting with
+a \textsf{bookinbook} entry.
 
 \mylittlespace The documentation of the \texttt{maintitle}
 \textsf{relatedtype} in section~\ref{sec:related} contains all the
@@ -1758,7 +1788,7 @@
 please see all of the (multifarious) details in
 section~\ref{sec:related}, below.
 
-\paragraph*{\protect\colmarginpar{\textbf{online}}}
+\paragraph*{\protect\mymarginpar{\textbf{online}}}
 \label{sec:online}
 
 One of the features of the 17th edition of the \emph{Manual} is the
@@ -1774,10 +1804,10 @@
 increasingly detailed instructions in the \emph{Manual}, along with
 some further annotations here that might help to clarify it.
 
-\afterpage{\clearpage
+\afterpage{\clearpage\thispagestyle{longtable}
 
 \begin{table}[h!]
-  \caption[\hspace{-1em}\mycolor{Online Entry Types - Notes \&\ Bibliography}]%
+  \caption[\hspace{-1em}Online Entry Types - Notes \&\ Bibliography]%
   {Online materials and notes \&\ bibliography entry types}
   \label{tab:online:types}
   \centering\small\sffamily
@@ -1808,7 +1838,7 @@
     \hspace{.5em} Single post & @Article & & amlen:hoot &
     \\\addlinespace[.8mm]
     \hspace{.5em} Comment & @Review & & viv:amlen & You can also
-    use the new \mycolor{\texttt{commenton}} \textsf{relatedtype} for
+    use the \texttt{commenton} \textsf{relatedtype} for
     this. \\\addlinespace[.8mm]
     \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
     Social Media & @Online &&& This includes anything --- posts, photos,
@@ -1823,7 +1853,7 @@
     \hspace{.5em} Instagram&&& souza:obama &\\\addlinespace[.8mm]
     \hspace{.5em} Comments / \hspace*{.5em} replies & & 14.210
     & braun:reply &
-    The \mycolor{\texttt{commenton}} \textsf{relatedtype} is \emph{required}
+    The \texttt{commenton} \textsf{relatedtype} is \emph{required}
     for this, and for the next entry, too.\\\addlinespace[.8mm]
     && 14.209 & licis:diazcomment &\\\addlinespace[.8mm]
     \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
@@ -1847,7 +1877,7 @@
     Streaming Media&&&& \\\addlinespace[.8mm]
     \hspace*{.5em} TV / Film & @Video & 14.265 & mayberry:brady &
     The streaming service is supplied by the URL.  The
-    \mycolor{\texttt{tvepisode}} entrysubtype is new in the 17th
+    \texttt{tvepisode} entrysubtype is new in the 17th
     edition. \\\addlinespace[.8mm]
     \hspace*{.5em} Music & @Music & 14.263 & rihanna:umbrella &
     The streaming service is supplied by the howpublished field.
@@ -1866,7 +1896,7 @@
     type & 14.233 & wikiped:bibtex & As above, you can choose the
     @Online treatment of the title, but it's best achieved
     using an @InReference entry w/ entrysubtype. \\\addlinespace[.8mm]
-    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & \mycolor{@Dataset} &
+    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & @Dataset &
     14.257 & genbank:db & New in this release.\\\addlinespace[.8mm]
     \bottomrule
   \end{tabularx}
@@ -1899,14 +1929,15 @@
 simplify most of your choices.  If something remains unclear, please
 let me know and I'll see if I can improve it.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace A few more notes are in order. I designed the
-\colmarginpar{New!} new \textsf{relatedtype}
-\mycolor{\texttt{commenton}} to facilitate citation of online
-comments, though it works slightly differently in the two entry types
-in which it is available, \textsf{online} and \textsf{review}.  In
-both types it allows you to mimic thread structure by citing a chain
-of replies to comments on posts, etc., all in a single entry, while
-also simplifying your\ .bib entries.  This simplification works
+\textsf{relatedtype} \texttt{commenton} to facilitate citation of
+online comments, though it works slightly differently in the two entry
+types in which it is available, \textsf{online} and \textsf{review}.
+In both types it allows you to mimic thread structure by citing a
+chain of replies to comments on posts, etc., all in a single entry,
+while also simplifying your\ .bib entries.  This simplification works
 differently depending on whether the comment itself has no specific
 title, as always in \textsf{review} entries, or does have such a
 title, as especially in \textsf{online} social media entries.  In the
@@ -1957,7 +1988,7 @@
 \textsf{timezone}, \textsf{urldate}, and \textsf{userd} in
 section~\ref{sec:entryfields}, below.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on this subject (14.258), but very clear about which information
@@ -1982,17 +2013,16 @@
 you need to keep a word capitalized then you should wrap it in curly
 braces.  See petroff:impurity.
 
-\mybigspace The \colmarginpar{\textbf{performance}} 17th edition of
-the \emph{Manual} includes a new section (14.266) on citing live
+\mybigspace The \mymarginpar{\textbf{performance}} 17th edition of the
+\emph{Manual} includes a new section (14.266) on citing live
 performances, and even though such references can usually be limited
 to the main text it may sometimes be useful to include them in notes.
-Since \textsf{biblatex} provides the \mycolor{\textbf{performance}}
-type, albeit without using it in its standard styles, I though it
-might be useful to define it for \textsf{biblatex-chicago},
-particularly as the other option for such material is the
-\textsf{misc} entry without any \textsf{entrysubtype}, and that entry
-type is already somewhat overloaded, though you can still use it if
-you wish.
+Since \textsf{biblatex} provides the \textbf{performance} type, albeit
+without using it in its standard styles, I though it might be useful
+to define it for \textsf{biblatex-chicago}, particularly as the other
+option for such material is the \textsf{misc} entry without any
+\textsf{entrysubtype}, and that entry type is already somewhat
+overloaded, though you can still use it if you wish.
 
 \mylittlespace Such entries will generally have a \textsf{title}, a
 \textsf{venue}, a \textsf{location} for the venue, and a \textsf{date}
@@ -2000,8 +2030,8 @@
 and/or editorial roles depending on which sorts of contributor(s) you
 wish to emphasize in the citation.  The \textsf{editor[abc]} and
 \textsf{editor[abc]type} fields should be most helpful here.  I have
-included strings for \mycolor{\texttt{choreographer}} in all
-localization files, but for others you may need to provide them in the
+included strings for \texttt{choreographer} in all localization files,
+but for others you may need to provide them in the
 \textsf{editor[abc]type} fields as you wish them printed ---
 \textsf{biblatex-chicago} will automatically capitalize any that start
 with a lowercase letter.
@@ -2032,22 +2062,25 @@
 section~\ref{sec:entryfields} for all the details on how this works.
 Second, the \textsf{periodical} type is the place for citing whole
 blogs, rather than individual blog posts, which require either an
-\textsf{article} or a \textsf{review} entry.  In \colmarginpar{New!}
-such citations the 17th edition (14.208) recommends that you include
-the name of any larger (usually periodical) publication of which the
-blog is a part.  The \textsf{maintitle} field (with
-\textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed) is the
-place for it. Cf.\ amlen:wordplay.
+\textsf{article} or a \textsf{review} entry.  In such citations the
+17th edition (14.208) recommends that you include the name of any
+larger (usually periodical) publication of which the blog is a part.
+The \textsf{maintitle} field (with \textsf{mainsubtitle} and
+\textsf{maintitleaddon}, if needed) is the place for it. Cf.\
+amlen:wordplay.
 
-\mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
-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 \colmarginpar{\textbf{proceedings}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, now also including
+the \mycolor{\textsf{eventdate}}, \mycolor{\textsf{eventtitle}},
+\mycolor{\textsf{eventtitleaddon}}, and \mycolor{\textsf{venue}}
+fields for identifying the event that produced the
+\textsf{proceedings}.  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}
@@ -2085,7 +2118,7 @@
 report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
-\mybigspace As \colmarginpar{\textbf{review}} its name suggests, the
+\mybigspace As \mymarginpar{\textbf{review}} its name suggests, the
 \textsf{review} entry type was designed for reviews published in
 periodicals, and if you've already read the \textsf{article}
 instructions above --- if you haven't, I recommend doing so now ---
@@ -2153,52 +2186,54 @@
 and heads the entry, while in long notes the \textsf{title} comes
 first.  The sorting of such entries is an issue, solved if you use
 \textsf{Biber} as your backend, and otherwise requiring manual
-intervention with a \textsf{sortkey} or the like (14.204;
-gourmet:052006, nyt:trevorobit, unsigned:ranke, and see
-\cmd{DeclareSortingTemplate} in section~\ref{sec:formatopts}, below.).
-As in \textsf{misc} entries with an \textsf{entrysubtype}, words like
-\enquote{interview,} \enquote{review,} and \enquote{letter} only need
-capitalization after a full stop, i.e., ordinarily in a bibliography
-and not a note, so \textsf{biblatex-chicago-notes} automatically deals
-with this problem itself if you start the \textsf{title} field with a
-lowercase letter.  The file \textsf{notes-test.bib} and the
-documentation of \cmd{autocap} will provide guidance here.
+intervention with, e.g., a \textsf{sortkey} (14.204; gourmet:052006,
+nyt:trevorobit, unsigned:ranke, and see \cmd{DeclareSortingTemplate}
+in section~\ref{sec:formatopts}, below.).  As in \textsf{misc} entries
+with an \textsf{entrysubtype}, words like \enquote{interview,}
+\enquote{review,} and \enquote{letter} only need capitalization after
+a full stop, i.e., ordinarily in a bibliography and not a note, so
+\textsf{biblatex-chicago-notes} automatically deals with this problem
+itself if you start the \textsf{title} field with a lowercase letter.
+The file \textsf{notes-test.bib} and the documentation of
+\cmd{autocap} will provide guidance here.
 
-\mylittlespace One \colmarginpar{New!} detail of the \textsf{review}
-type is fairly new, and in particular has changed between the 16th and
-17th editions of the \emph{Manual}.  As I mentioned above, blogs are
-best treated as \textsf{articles} with \texttt{magazine}
-\textsf{entrysubtype}, whereas comments on those blogs --- or replies
-to those comments, etc.\ --- need the \textsf{review} type with the
-same \textsf{entrysubtype}.  (Neither need appear in the
-bibliography.)  What they also need is a date closely associated with
-the comment (14.208; ac:comment), so I have included the
-\textsf{eventdate} in \textsf{review} entries for just this purpose.
-It will be printed just after the \textsf{author} and before the
-\textsf{title}.  If you need a time stamp in addition, as may
-frequently be the case with multiple contributions by the same author
-to a single thread, then you should now use the standard
-\textsf{biblatex} time-stamp format (e.g.,
+\mylittlespace One detail of the \textsf{review} type is fairly new,
+and in particular has changed between the 16th and 17th editions of
+the \emph{Manual}.  As I mentioned above, blogs are best treated as
+\textsf{articles} with \texttt{magazine} \textsf{entrysubtype},
+whereas comments on those blogs --- or replies to those comments,
+etc.\ --- need the \textsf{review} type with the same
+\textsf{entrysubtype}.  (Neither need appear in the bibliography.)
+What they also need is a date closely associated with the comment
+(14.208; ac:comment), so I have included the \textsf{eventdate} in
+\textsf{review} entries for just this purpose.  It will be printed
+just after the \textsf{author} and before the \textsf{title}.  If you
+need a time stamp in addition, as may frequently be the case with
+multiple contributions by the same author to a single thread, then you
+should now use the standard \textsf{biblatex} time-stamp format (e.g.,
 \texttt{2008-07-01T10:18:00}) in the \textsf{eventdate} field itself,
 which \textsf{biblatex-chicago} will format and print appropriately.
 Please see the documentation concerning time stamps in
-section~\ref{sec:entryfields}, s.v.\ \mycolor{\textsf{date}}.  This
-change allows the \textsf{nameaddon} field to revert to its primary
-use, which is to provide extra information about the \textsf{author}.
-In blog comments, this could include the commenter's geographical
+section~\ref{sec:entryfields}, s.v.\ \textsf{date}.  This change
+allows the \textsf{nameaddon} field to revert to its primary use,
+which is to provide extra information about the \textsf{author}.  In
+blog comments, this could include the commenter's geographical
 location, which you need to enclose in parentheses, as I've removed
 the automatic square brackets from this field to allow it this more
 general usefulness.  You can, of course, still provide your own square
 brackets in \textsf{review} entries to indicate pseudonymous
 authorship, which is the standard function of \textsf{nameaddon} in
-most entry types.
+most entry types.  The package options
+\mycolor{\texttt{nameaddonformat}} and \mycolor{\texttt{nameaddonsep}}
+can help here, as well.  See sections~\ref{sec:useropts} and
+\ref{sec:chicpreset}, below.
 
-\mylittlespace In \colmarginpar{New!} this context I should mention a
-small change to the default behavior of \textsf{review} entries when
-they utilize a \textsf{crossref} or \textsf{xref} field, as is really
-only useful when the entry is a blog comment, as otherwise there won't
-generally be any fields worth inheriting from the reviewed entry.
-Assuming the default values of the \textsf{biblatex-chicago} option
+\mylittlespace In this context I should mention a small change to the
+default behavior of \textsf{review} entries when they utilize a
+\textsf{crossref} or \textsf{xref} field, as is really only useful
+when the entry is a blog comment, as otherwise there won't generally
+be any fields worth inheriting from the reviewed entry.  Assuming the
+default values of the \textsf{biblatex-chicago} option
 \texttt{longcrossref}, the driver now explicitly tests if the reviewed
 entry has already been cited, and accordingly shortens the reviewing
 citation, as the \emph{Manual} (14.208) suggests (viv:amlen).  (This
@@ -2206,32 +2241,32 @@
 use a \textsf{crossref} or \textsf{xref} field there, or change the
 state of the \texttt{longcrossref} option --- cf.\ the documentation
 starting on page~\pageref{sec:crossref}, below.)  You
-\colmarginpar{\texttt{blogurl}} can, if you wish, and while we're on
-this subject, set the new preamble option \mycolor{\texttt{blogurl}}
-to allow your child comments to inherit the URL from the parent blog.
+\mymarginpar{\texttt{blogurl}} can, if you wish, and while we're on
+this subject, set the preamble option \texttt{blogurl} to allow your
+child comments to inherit the URL from the parent blog.
 
-\mylittlespace Also \colmarginpar{New!} new in this release is the
-\textsf{relatedtype} \mycolor{\texttt{commenton}}, which allows you to
-simplify your\ .bib entries in much the same way as the
-\texttt{reviewof} \textsf{relatedtype} does, i.e., it constructs your
-\textsf{title} field for you (which the \textsf{crossref} mechanism
-doesn't do).  It further allows you to mimic thread structure by
-citing a chain of replies to comments on blogs, etc., all in a single
-entry, while also simplifying your\ .bib entries.  I've not tested how
-far down the rabbit hole you can go, but a series of entries linked
-one to the next by this \textsf{relatedtype} will all turn up if you
-cite the first in the chain, though of course you can use the
-technique merely as a convenient way to structure and simplify your\
-.bib file, without creating chains longer than 2 entries.  The default
-connecting string is the localized \texttt{commenton}, but you can use
+\mylittlespace Another recent addition is the \textsf{relatedtype}
+\texttt{commenton}, which allows you to simplify your\ .bib entries in
+much the same way as the \texttt{reviewof} \textsf{relatedtype} does,
+i.e., it constructs your \textsf{title} field for you (which the
+\textsf{crossref} mechanism doesn't do).  It further allows you to
+mimic thread structure by citing a chain of replies to comments on
+blogs, etc., all in a single entry, while also simplifying your\ .bib
+entries.  I've not tested how far down the rabbit hole you can go, but
+a series of entries linked one to the next by this
+\textsf{relatedtype} will all turn up if you cite the first in the
+chain, though of course you can use the technique merely as a
+convenient way to structure and simplify your\ .bib file, without
+creating chains longer than 2 entries.  The default connecting string
+is the localized \texttt{commenton}, but you can use
 \textsf{relatedstring} to change it to \enquote{\texttt{reply to}} or
 whatever else you need.  Please see the documentation of this
-\textsf{relatedtype} in section~\ref{sec:related}, and also
-ellis:blog, ac:comment, and the (fictional) ellis:reply.  Note also
-that this way of structuring your\ .bib file is by no means required
-in \textsf{review} entries, though if you want to cite replies and
-comments to social media threads, where you need the \textsf{online}
-entry type, you will need to use this \textsf{relatedtype}.
+\textsf{relatedtype} in section~\ref{sec:related}, and also ellis:blog
+and ac:comment.  Note also that this way of structuring your\ .bib
+file is by no means required in \textsf{review} entries, though if you
+want to cite replies and comments to social media threads, where you
+need the \textsf{online} entry type, you will need to use this
+\textsf{relatedtype}.
 
 \mylittlespace Two more notes.  For the reasons I explained in the
 \textsf{article} docs above, I have brought the \textsf{article} and
@@ -2254,13 +2289,13 @@
 \textbf{shortjournal} in section~\ref{sec:entryfields} for all the
 details on how this works.
 
-\mybigspace In \colmarginpar{\textbf{standard}} older releases it was
+\mybigspace In \mymarginpar{\textbf{standard}} older releases it was
 fairly straightforward to present published national or international
 standards using a \textsf{book} entry, but with some additional
 specifications now included in the 17th edition of the \emph{Manual}
 (14.259) I think it might be helpful to provide a separate entry type.
-The \mycolor{\textbf{standard}} type has long existed in
-\textsf{biblatex}, though none of its included styles use it.  In
+The \textbf{standard} type has long existed in \textsf{biblatex},
+though none of its included styles use it.  In
 \textsf{biblatex-chicago} constructing such an entry is mostly
 straightforward.  The organization responsible for the standard goes
 in \textsf{organization}, the title in \textsf{title}, and the
@@ -2372,7 +2407,7 @@
 fields further to specify unpublished conference papers and the like
 (14.216--18; nass:address).
 
-\mybigspace This \colmarginpar{\textbf{video}} is the last of the
+\mybigspace This \mymarginpar{\textbf{video}} is the last of the
 three audiovisual entry types, and as its name suggests it is intended
 for citing visual media, be it films of any sort or TV shows, whether
 broadcast, on the Net, on VHS, DVD, or Blu-ray, though it will serve
@@ -2402,9 +2437,9 @@
   usual \texttt{useauthor} and \texttt{useeditor} options can alter
   the presentation within an entry.  Because these are non-standard
   roles, you will need to identify them using the following:
-\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
-  roles, all associated with specific bibstrings (or their absence),
-  will likely be \texttt{director}, \texttt{producer}, and, oddly,
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will
+  likely be \texttt{director}, \texttt{producer}, and, oddly,
   \texttt{none}.  The last is particularly useful if you want to
   identify performers, as they usually don't need further specifying
   and this role prevents \textsf{biblatex} from falling back on the
@@ -2413,7 +2448,7 @@
   provided here, and will be printed as-is, contextually capitalized.
   (Cf.\ hitchcock:nbynw.)
 \item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As
-  with the other audiovisual types, \textsf{video} serves as an
+  with the other two audiovisual types, \textsf{video} serves as an
   analogue both to books and to collections, so the \textsf{title} may
   be of a whole film DVD or of a TV series, or it may identify one
   episode in a series or one scene in a film.  In the latter cases,
@@ -2422,12 +2457,12 @@
   and/or episode number of a TV series, while the \textsf{titleaddon}
   is for any information that needs to come between the \textsf{title}
   and the \textsf{booktitle} (american:crime, cleese:holygrail,
-  friends:\break leia, handel:messiah, hitchcock:nbynw,
+  friends\hc leia, handel:messiah, hitchcock:nbynw,
   mayberry:brady).  As in the \textsf{music} type, a
   \textsf{maintitle} may be necessary for a boxed set or something
   similar.
-\item[\mycolor{entrysubtype:}] If, for some reason, you want to cite
-  an individual episode or scene without reference to any larger unit,
+\item[entrysubtype:] If, for some reason, you want to cite an
+  individual episode or scene without reference to any larger unit,
   then your entry will contain only a \textsf{title}, which
   \textsf{biblatex-chicago} would normally interpret as the title of a
   complete film or TV series.  In such a case, you'll need to define
@@ -2436,22 +2471,22 @@
   the 17th edition (14.265) now recommends that, when presenting
   episodes from a TV series, the name of the series
   (\textsf{booktitle}) comes before the episode name (\textsf{title}).
-  The exact string \mycolor{\texttt{tvepisode}} in the
-  \textsf{entrysubtype} field achieves this reversal, which includes
-  using the \textsf{booktitle} as a \textsf{sorttitle} in the
-  bibliography and also as the \textsf{labeltitle} in short notes.
-\item[\mycolor{usera:}] When citing recordings of TV shows, the 17th
-  edition now wants you to include the TV network for the original
-  broadcast, and the \mycolor{\textsf{usera}} field is the place for
-  it.  \textsf{Biblatex-chicago} has long used this field for this
-  same purpose in \textsf{article, periodical}, and \textsf{review}
-  entries with a \texttt{magazine} \textsf{entrysubtype}, so its
-  inclusion here can at least hope to benefit from that prior
-  acquaintance.  It will appear after the broadcast date, i.e., the
-  \textsf{eventdate}, and will be separated from it by the
-  \cmd{bibstring} \enquote{\texttt{on.}}
+  The exact string \texttt{tvepisode} in the \textsf{entrysubtype}
+  field achieves this reversal, which includes using the
+  \textsf{booktitle} as a \textsf{sorttitle} in the bibliography and
+  also as the \textsf{labeltitle} in short notes.
+\item[usera:] When citing recordings of TV shows, the 17th edition now
+  wants you to include the TV network for the original broadcast, and
+  the \textsf{usera} field is the place for it.
+  \textsf{Biblatex-chicago} has long used this field for this same
+  purpose in \textsf{article, periodical}, and \textsf{review} entries
+  with a \texttt{magazine} \textsf{entrysubtype}, so its inclusion
+  here can at least hope to benefit from that prior acquaintance.  It
+  will appear after the broadcast date, i.e., the \textsf{eventdate},
+  and will be separated from it by the \cmd{bibstring}
+  \enquote{\texttt{on.}}
 \item[date, eventdate, origdate:] As with \textsf{music} entries, in
-  order to follow the specifications of the \emph{Manual}, I have had
+  order to follow the specifications of the \emph{Manual}, we need
   to provide three separate date fields for citing \textsf{video}
   sources, but their uses differ somewhat between the two types.  In
   both, the \textsf{date} will generally provide the publishing or
@@ -2517,6 +2552,8 @@
 then \textsf{biblatex-chicago-notes} will concatenate these fields in
 the formatted references.
 
+\enlargethispage{-\baselineskip}
+
 \mylittlespace As noted above, however, this field has a special
 meaning in the \textsf{suppbook} entry type, used to make an
 afterword, foreword, or introduction the main focus of a citation.  If
@@ -2526,25 +2563,43 @@
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual}
 14.105, 14.110; polakow:afterw.)
 
-\paragraph*{\protect\mymarginpar{\textbf{annotation}}}
+\paragraph*{\protect\colmarginpar{\textbf{annotation}}}
 \label{sec:annote}
 
 At the request of Emil Salim, \textsf{biblatex-chicago-notes} provides
 a package option (see \texttt{annotation} below, section
 \ref{sec:useropts}) to allow you to produce annotated bibliographies.
-The formatting of such a bibliography is currently fairly basic,
-though it conforms with the \emph{Manual's} minimal guidelines
-(14.64).  The default in \textsf{chicago-notes.cbx} is to define
-\verb+\DeclareFieldFormat{annotation}{\par\nobreak\vskip\bibitemsep #1}+;
-if ne\-cessary you can alter it by re-declaring the format in
-your preamble.  The page-breaking algorithms don't always give perfect
-results here, but the default formatting looks, to my eyes, fairly
-decent.  In addition to tweaking the field formatting you can also
-insert \cmd{par} (or even \verb+\vadjust{\eject}+) commands into
-the text of your annotations to improve the appearance.  Please
-consider the \texttt{annotation} option a work in progress, but it is
-usable now.  (N.B.: The old \textsc{Bib}\TeX\ field \textsf{annote}
-serves as an alias for this.)
+A recent feature request by Moritz Wemheuer referenced a
+\href{https://tex.stackexchange.com/questions/528374/moving-addendum-field-to-the-end-in-biblatex-chicago/540755#540755}{StackExchange}
+question which suggested that the possible uses for the
+\textsf{annotation} field could well be more extensive, appearing as
+it does at the very end of all entry types.  I have therefore modified
+the \texttt{annotation} option so that you can print the field in the
+bibliography (\texttt{=bib} or \texttt{=true}, the default), in long
+notes (\texttt{=notes}), in both (\texttt{=all}), or in neither
+(\texttt{=false}).  The two new options
+\mycolor{\texttt{bibannotesep}} and \mycolor{\texttt{citeannotesep}}
+allow you to choose the separator between the rest of the entry and
+the \textsf{annotation}, and to choose a different one in notes and
+bibliography.  The default formatting in the bibliography
+(\texttt{vpar}) is to print the \textsf{annotation} as a separate
+block using\ \verb+\par\nobreak\vskip\bibitemsep #1+, while in long
+notes the default (\texttt{period}) is to print it simply as an
+additional field, separated by a period.  The \emph{Manual's}
+guidelines (14.64) allow for both these possibilities, and I have
+provided a range of others, for which you should consult the full
+documentation in section~\ref{sec:chicpreset}.  (Note also that both
+options can be set globally or per-type in the preamble, or per-entry
+in the \textsf{options} field of individual entries.  For specialized
+needs, of course, you can re-declare the format
+[\verb+\DeclareFieldFormat{annotation}+] in your preamble, or redefine
+the \cmd{bibannotesep} and \cmd{citeannotesep} commands there.)  In
+section~\ref{sec:useropts} you will find instructions for employing
+the new \mycolor{\texttt{formatbib}} and \mycolor{\texttt{entrybreak}}
+options to give you fine-grained control over the formatting of the
+entire bibliography, particularly with regard to \TeX's page-breaking
+algorithms.  The aim is to remove, in most cases, any need for you to
+delve into the low-level commands involved in these algorithms.
 
 \mybigspace I \mymarginpar{\textbf{annotator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
@@ -2562,10 +2617,10 @@
 an \textsf{editor}, a \textsf{nameb}, a \textsf{translator}, or a
 \textsf{namec} (i.e., a compiler) and use that name (or those names)
 instead, followed by the appropriate identifying string (esp.\ 14.103,
-also 14.76, 14.121, 14.126, 14.180; boxer:china, brown:bre\-mer,
+also 14.76, 14.121, 14.126, 14.180; boxer:china, brown:bremer,
 harley:cartography, schellinger:novel, sechzer:women, silver:gawain,
-soltes:geor\-gia).  \textsf{Biblatex's} sorting algorithms will use
-the first of those names found, which should ensure correct
+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{DeclareSortingTemplate} in section~\ref{sec:formatopts}, below.)
 In short notes, where the \textsf{labelname} is used, the order
@@ -2576,8 +2631,8 @@
 \mylittlespace In the rare cases when this substitution mechanism
 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},
+field rather than individual fields, or you can use the standard
+\textsf{biblatex} options \texttt{useauthor=\hfill false},
 \texttt{usenamea=false}, \texttt{useeditor=false},
 \texttt{usenameb=false}, \texttt{usetranslator=false}, and
 \texttt{usenamec=false} in the \textsf{options} field (chaucer:alt).
@@ -2588,7 +2643,7 @@
 latter doesn't work as smoothly and completely as \textsf{biblatex's}
 own name toggles.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace This system of options, then, can turn off
 \textsf{biblatex-chicago-notes}'s mechanism for finding a name to
@@ -2636,7 +2691,7 @@
 by \textsf{biblatex} (lecarre:quest).  If you have given the author's
 real name in the \textsf{author} field, then the pseudonym goes in
 \textsf{nameaddon}, in the form \texttt{Firstname Lastname,\,pseud.}\
-(creasey:ashe:blast, creasey:morton:hide, creasey:york:death).  This
+(creasey\hc ashe:blast, creasey:morton:hide, creasey:york:death).  This
 latter method will allow you to keep references to one author's work
 under different pseudonyms grouped together in the bibliography, as
 recommended by the \emph{Manual}, though it is now recommended that,
@@ -2643,9 +2698,11 @@
 whichever system you employ, you include a cross-reference from one
 name to the other in the bibliography.  You can do this using a
 \textsf{customc} entry (ashe:creasey, morton:creasey, york:creasey).
-Please see also the entry on \textbf{nameaddon}, below, for
-circumstances where you may need to provide your own square brackets
-when presenting a pseudonym.
+Please see the entry on \textbf{nameaddon}, below, for circumstances
+where you may need to provide your own square brackets when presenting
+a pseudonym, and also the package options
+\mycolor{\texttt{nameaddonformat}} and \mycolor{\texttt{nameaddonsep}}
+in sections~\ref{sec:useropts} and \ref{sec:chicpreset}, below.
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
@@ -2668,6 +2725,18 @@
 thing in the short note form.  Cf.\ \textsf{author}.  (See 14.79--80;
 cook:sotweed, horsley:prosodies.)
 
+\mylittlespace The \emph{Manual} doesn't clarify how to treat multiple
+works by the same \textsf{author}, in one or more of which their name
+doesn't appear on the title page.  By default,
+\textsf{biblatex-chicago} will, after the first appearance in the
+bibliography, replace identical \textsf{authors} with the 3-em dash,
+regardless of any \textsf{authortype} field that may be present.  If
+you want to distinguish between works certainly written by and works
+merely ascribed to a given author, then you can use the
+\mycolor{\texttt{dashed}} option in the \textsf{options} field of
+individual entries, and possibly also a \textsf{sortname}, to get the
+results you want.
+
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
 \textsf{biblatex}, a \textsf{bookauthor} is the author of a
 \textsf{booktitle}, so that, for example, if one chapter in a book has
@@ -2731,7 +2800,7 @@
 customize the punctuation that appears before the
 \textsf{booktitleaddon} field.
 
-\mybigspace This \colmarginpar{\textbf{chapter}} field holds the
+\mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
 \textsf{incollection} entry where you wish to cite a specific chapter
 of a book (ashbrook:brain).  It now also holds the track number of
@@ -2743,7 +2812,7 @@
 do, even though the \emph{Manual} doesn't actually mention it.  It may
 be useful for some purposes.  Cf.\ \textsf{annotator}.
 
-\paragraph*{\protect\colmarginpar{\textbf{crossref}}}
+\paragraph*{\protect\mymarginpar{\textbf{crossref}}}
 \label{sec:crossref}
 
 This field is the standard \textsc{Bib}\TeX\ cross-referencing
@@ -2803,29 +2872,29 @@
 
 \mylittlespace First, I added five entry types --- \textbf{book},
 \textbf{bookinbook}, \textbf{collection}, \textbf{inbook},
-\textbf{proceedings}, and \mycolor{\textbf{review}} --- to the list of
-those which use shortened cross references, and I added two options
---- \texttt{longcrossref} and \texttt{booklongxref}, on which more
-below --- which you can use in the preamble or in the \textsf{options}
-field of an entry to enable or disable the automatic provision of
+\textbf{proceedings}, and \textbf{review} --- to the list of those
+which use shortened cross references, and I added two options ---
+\texttt{longcrossref} and \texttt{booklongxref}, on which more below
+--- which you can use in the preamble or in the \textsf{options} field
+of an entry to enable or disable the automatic provision of
 abbreviated references.  (The \textsf{crossref} or \textsf{xref} field
 are still necessary for this provision, but they are no longer
-sufficient on their own.)  The \textsf{inbook} and
-\mycolor{\textsf{review}} types work exactly like
-\textsf{incollection} or \textsf{inproceedings}; in previous releases,
-you could use \textsf{inbook} instead of \textsf{incollection} to
-avoid the automatic abbreviation, the two types being otherwise
-identical.  Now that you can use an option to turn off abbreviated
-references even in the presence of a \textsf{crossref} or
-\textsf{xref} field, I have thought it sensible to include this entry
-type alongside the others.  (Cf.\ ellet:galena, keating:dearborn,
-lippincott:chicago, and prairie:state to see this mechanism in action
-in both notes and bibliography.)  In the \mycolor{\textsf{review}}
-type the mechanism is aimed primarily at blog comments, assuming you
-don't want to use the more convenient \mycolor{\texttt{commenton}}
-\textsf{relatedtype}, which absolves you even of the need to provide a
-\textsf{title} field for such entries.  See the documentation of the
-\textsf{review} type above for the details.
+sufficient on their own.)  The \textsf{inbook} and \textsf{review}
+types work exactly like \textsf{incollection} or
+\textsf{inproceedings}; in previous releases, you could use
+\textsf{inbook} instead of \textsf{incollection} to avoid the
+automatic abbreviation, the two types being otherwise identical.  Now
+that you can use an option to turn off abbreviated references even in
+the presence of a \textsf{crossref} or \textsf{xref} field, I have
+thought it sensible to include this entry type alongside the others.
+(Cf.\ ellet:galena, keating:dearborn, lippincott:chicago, and
+prairie:state to see this mechanism in action in both notes and
+bibliography.)  In the \textsf{review} type the mechanism is aimed
+primarily at blog comments, assuming you don't want to use the more
+convenient \texttt{commenton} \textsf{relatedtype}, which absolves you
+even of the need to provide a \textsf{title} field for such entries.
+See the documentation of the \textsf{review} type above for the
+details.
 
 \mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook},
 \textbf{collection}, and \textbf{proceedings} entries fulfills a
@@ -2838,7 +2907,7 @@
 differently for these four entry types than for the other 4 (see
 below).  In \textsf{notes-test.bib} you can get a feel for how this
 works by looking at bernhard:boris, bernhard:ritter,
-bernhard:themacher, harley:ancient:cart, harley:carto\-graphy, and
+bernhard:themacher, harley:ancient:cart, harley\hc cartography, and
 harley:hoc.
 
 \mylittlespace Before discussing the new package options, I should say
@@ -2909,11 +2978,11 @@
 
 \mylittlespace Returning, \mymarginpar{\texttt{longcrossref}} then, to
 the package options which control whether and where the abbreviated
-references may appear, they function, by default, asymmetrically.  The
+references appear, they function, by default, asymmetrically.  The
 first, \texttt{longcrossref}, generally controls the settings for the
 entry types more-or-less authorized by the \emph{Manual}:
 \textsf{inbook}, \textsf{incollection}, \textsf{inproceedings},
-\textsf{letter}, and \mycolor{\textsf{review}}.
+\textsf{letter}, and \textsf{review}.
 
 \begin{description}
 \item[\qquad false:] This is the default.  If you use
@@ -2965,7 +3034,7 @@
 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
+\mymarginpar{\texttt{inheritshorthand}} 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
@@ -2975,20 +3044,19 @@
 \textsf{crossref} functionality in a single entry is now possible.  If
 you come across any problems or inaccuracies, please report them.)
 
-\mybigspace With\colmarginpar{\textbf{date}} this release I have
-implemented all of the applicable parts of \textsf{biblatex's}
-elegant, and long standing, support for the
-\mycolor{\textsc{iso}8601-2 Extended Format specification}, which
-means the package now provides greatly enhanced possibilities for
-presenting uncertain and unspecified dates and date ranges, along with
-date eras, seasons, and time stamps.  I have also implemented the
-\emph{Manual's} (9.64) guidelines for compressing year ranges, as well
-as providing a few more extras to help with some of the other tricky
-corners of the \emph{Manual's} instructions.  A combination of
-\textsf{biblatex} and \textsf{biblatex-chicago} package options allows
-you to define when, how, and where any of these extended
-specifications will appear in your documents.  I have attempted to
-provide as compliant a set of defaults as possible in
+\mybigspace I\mymarginpar{\textbf{date}} have now implemented all of
+the applicable parts of \textsf{biblatex's} elegant, and long
+standing, support for the \textsc{iso}8601-2 Extended Format
+specification, which means the package now provides greatly enhanced
+possibilities for presenting uncertain and unspecified dates and date
+ranges, along with date eras, seasons, and time stamps.  I have also
+implemented the \emph{Manual's} (9.64) guidelines for compressing year
+ranges, as well as providing a few more extras to help with some of
+the other tricky corners of the \emph{Manual's} instructions.  A
+combination of \textsf{biblatex} and \textsf{biblatex-chicago} package
+options allows you to define when, how, and where any of these
+extended specifications will appear in your documents.  I have
+attempted to provide as compliant a set of defaults as possible in
 \textsf{biblatex-chicago.sty}, but you can alter any of them according
 to your needs.  All are documented in section~\ref{sec:options},
 below, but table~\ref{ad:date:extras}, located in the author-date
@@ -2999,35 +3067,34 @@
 \textsf{date} field that may be helpful to users.  First, I highly
 recommend familiarizing yourself with the extended date
 specifications, as in many cases they will greatly simplify the
-creation of your .bib databases.  The new
-\mycolor{\texttt{compressyears}} option (\texttt{true} by default),
-for example, takes a year range in a date field and handles the
-somewhat tricky Chicago compression rules for you, while also giving
-you a simple means of turning it off that doesn't involve combing your
-.bib file for all the \textsf{year} fields that contain your
-hand-formatted ranges.  Clearly, situations may still arise when a
-specially-crafted \textsf{year} or \textsf{origyear} field may be
-necessary, but if you can use the enhanced specifications then I
-strongly advocate doing so.  Second, the fine-grained specification of
-a time stamp is really only necessary for news stories that are
-frequently updated \enquote{as they unfold} (14.191), for online
-sources that change rapidly enough for a time stamp to be necessary
-(14.207, 14.233; wikiped:bibtex), or for online posts, particularly
-comments, that may need a time stamp for disambiguation (14.208--10).
-If you wish to specify the time zone, the \emph{Manual} (10.41)
-prefers initialisms like \enquote{EST} or \enquote{PDT,} and these are
-most easily provided using the \textsf{timezone} field, where you can
-include your own parentheses if so desired (cp.\ 14.191).  For the
-\textsf{date} field itself, a time stamp will only appear in
-\textsf{article}, \textsf{review}, \textsf{suppperiodical}, and
-\textsf{online} entries, the first three only with a \texttt{magazine}
-\textsf{entrysubtype}.  All types can print such a stamp from the
-\textsf{urldate} (controllable using the
-new\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}}
-option), while only \textsf{review} and \textsf{suppperiodical}
-entries will print this data from an \textsf{eventdate}.  If you find
-a context in which a time stamp would be useful and which isn't
-included in this discussion, please let me know.
+creation of your .bib databases.  The new \texttt{compressyears}
+option (\texttt{true} by default), for example, takes a year range in
+a date field and handles the somewhat tricky Chicago compression rules
+for you, while also giving you a simple means of turning it off that
+doesn't involve combing your .bib file for all the \textsf{year}
+fields that contain your hand-formatted ranges.  Clearly, situations
+may still arise when a specially-crafted \textsf{year} or
+\textsf{origyear} field may be necessary, but if you can use the
+enhanced specifications then I strongly advocate doing so.  Second,
+the fine-grained specification of a time stamp is really only
+necessary for news stories that are frequently updated \enquote{as
+  they unfold} (14.191), for online sources that change rapidly enough
+for a time stamp to be necessary (14.207, 14.233; wikiped:bibtex), or
+for online posts, particularly comments, that may need a time stamp
+for disambiguation (14.208--10).  If you wish to specify the time
+zone, the \emph{Manual} (10.41) prefers initialisms like \enquote{EST}
+or \enquote{PDT,} and these are most easily provided using the
+\textsf{timezone} field, where you can include your own parentheses if
+so desired (cp.\ 14.191).  For the \textsf{date} field itself, a time
+stamp will only appear in \textsf{article}, \textsf{review},
+\textsf{suppperiodical}, and \textsf{online} entries, the first three
+only with a \texttt{magazine} \textsf{entrysubtype}.  All types can
+print such a stamp from the \textsf{urldate} (controllable using the
+new\mymarginpar{\texttt{urlstamp}} \texttt{urlstamp} option), while
+only \textsf{review} and \textsf{suppperiodical} entries will print
+this data from an \textsf{eventdate}.  If you find a context in which
+a time stamp would be useful and which isn't included in this
+discussion, please let me know.
 
 \mylittlespace Third, an incomplete time specification will be ignored
 by \textsf{biber}, so include the seconds in it, as in
@@ -3052,17 +3119,15 @@
 \textsf{date} or the \textsf{eventdate}, typically).  On all these
 questions generally please cf.\ also \textsf{origdate},
 \textsf{timezone}, and \textsf{year}, below; the \texttt{alldates},
-\texttt{alltimes}, \mycolor{\texttt{alwaysrange}},
-\mycolor{\texttt{centuryrange}}, \mycolor{\texttt{compressyears}},
-\texttt{datecirca}, \texttt{dateera}, \texttt{dateeraauto},
-\texttt{dateuncertain}, \mycolor{\texttt{decaderange}},
-\mycolor{\texttt{nodatebrackets}}, \mycolor{\texttt{nodates}},
-\mycolor{\texttt{noyearbrackets}}, \texttt{timezones},
-\mycolor{\texttt{urlstamp}}, and \texttt{urltime} options in
+\texttt{alltimes}, \texttt{alwaysrange}, \texttt{centuryrange},
+\texttt{compressyears}, \texttt{datecirca}, \texttt{dateera},
+\texttt{dateeraauto}, \texttt{dateuncertain}, \texttt{decaderange},
+\texttt{nodatebrackets}, \texttt{nodates}, \texttt{noyearbrackets},
+\texttt{timezones}, \texttt{urlstamp}, and \texttt{urltime} options in
 sections~\ref{sec:presetopts}, \ref{sec:chicpreset}, and
 \ref{sec:useropts}; and section~4.5.10 in \textsf{biblatex.pdf}
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace (Users of the Chicago author-date style who wish to
 minimize the labor needed to convert a .bib database for the notes \&\
@@ -3144,13 +3209,13 @@
 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}, and
-now also the \mycolor{\textsf{performance}} type, in all of which they
-can help to identify conductors, directors, producers, and performers.
-To specify the role, use the fields \textsf{editoratype},
+now also the \textsf{performance} type, in all of which they can help
+to identify conductors, directors, producers, and performers.  To
+specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
 bernstein:shostakovich, hamilton:miranda, handel:messiah.)
 
-\mybigspace Normally, \colmarginpar{\textbf{editortype}} with the
+\mybigspace Normally, \mymarginpar{\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
@@ -3174,18 +3239,17 @@
 field, and \textsf{biblatex} will print the correct string after the
 name in both the bibliography and in the long note form.
 
-\mylittlespace In \colmarginpar{New!} previous releases of
-\textsf{biblatex-chicago} you could only use defined \cmd{bibstrings}
-in this field, at least if you wanted anything printed.  N.~Andrew
-Walsh pointed out that the standard \textsf{biblatex} styles will just
-print the field as-is in this case, allowing them to handle a great
-many unforeseen editorial roles with comparative ease, so I've
-implemented this, too, making sure to capitalize the string if the
-context demands it.  The string you choose will differ depending on
-whether it will be printed after a name at the head of an entry or
-before a name later on in the entry, e.g., \enquote{cartographer} or
-\enquote{maps created by.}  A bit of trial and error should see you
-through.
+\mylittlespace In previous releases of \textsf{biblatex-chicago} you
+could only use defined \cmd{bibstrings} in this field, at least if you
+wanted anything printed.  N.~Andrew Walsh pointed out that the
+standard \textsf{biblatex} styles will just print the field as-is in
+this case, allowing them to handle a great many unforeseen editorial
+roles with comparative ease, so I've implemented this, too, making
+sure to capitalize the string if the context demands it.  The string
+you choose will differ depending on whether it will be printed after a
+name at the head of an entry or before a name later on in the entry,
+e.g., \enquote{cartographer} or \enquote{maps created by.}  A bit of
+trial and error should see you through.
 
 \mylittlespace There are a few more details of which you need to be
 aware.  Because \textsf{biblatex-chicago} has added the \textsf{namea}
@@ -3231,7 +3295,7 @@
 \textsf{suppperiodical}.
 
 \mybigspace These
-\colmarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
+\mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
 identify the exact role of the person named in the corresponding
 \textsf{editor[a-c]} field, just as \textsf{editortype} (q.v.) does
 for the \textsf{editor}.  Note that they are not part of the string
@@ -3238,11 +3302,11 @@
 concatenation mechanism.  I have implemented them just as the standard
 styles do, that is, if the field isn't a pre-defined \cmd{bibstring}
 it will be printed as-is, contextually capitalized.  They have found a
-use particularly in \textsf{music}, \mycolor{\textsf{performance}},
-and \textsf{video} entries.  Cf.\ bernstein:shostakovich,
+use particularly in \textsf{music}, \textsf{performance}, and
+\textsf{video} entries.  Cf.\ bernstein:shostakovich,
 hamilton:miranda, handel:messiah.
 
-\mybigspace Standard \colmarginpar{\textbf{eid}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
 identify a particular article.  Only applicable to the
 \textsf{article} entry type, and only to those without a
@@ -3252,11 +3316,11 @@
 \textsf{pages} field in long notes and bibliography, and appears after
 any specific page cited in the \textsf{postnote} field of a long note.
 
-\paragraph*{\protect\colmarginpar{\textbf{entrysubtype}}}
+\paragraph*{\protect\mymarginpar{\textbf{entrysubtype}}}
 \label{sec:entrysub}
 
 Standard and very powerful \textsf{biblatex} field, left undefined by
-the standard styles.  In \textsf{biblatex-chicago-notes} it has eight
+the standard styles.  In \textsf{bib\-latex-chicago-notes} it has eight
 very specific uses, the first three of which I have designed in order
 to maintain, as much as possible, backward compatibility with the
 standard styles.  First, in \textsf{article}, \textsf{periodical}, and
@@ -3306,10 +3370,10 @@
 \textsf{artwork} entry type in order to refer to a work from antiquity
 whose title you do not wish to be italicized.  Please see the
 documentation of \textbf{artwork} above for the details.  Fifth, you
-can define it in a \mycolor{\textbf{standard}} entry, q.v., to change
-the appearance of both long and short notes.  Sixth, you can define it
-in an \textbf{audio}, \textbf{music}, or \textbf{video} entry if such
-an entry refers to an individual unit that isn't part of any larger
+can define it in a \textbf{standard} entry, q.v., to change the
+appearance of both long and short notes.  Sixth, you can define it in
+an \textbf{audio}, \textbf{music}, or \textbf{video} entry if such an
+entry refers to an individual unit that isn't part of any larger
 collection, the entry therefore having only a \textsf{title} and not a
 \textsf{booktitle}, a \textsf{title} that \textsf{biblatex-chicago}
 would normally interpret as the title of a larger unit (and therefore
@@ -3318,9 +3382,9 @@
 edition (14.265) now recommends that, when presenting episodes from a
 TV series, the name of the series (\textsf{booktitle}) comes before
 the episode name (\textsf{title}).  The exact string
-\mycolor{\texttt{tvepisode}} in the \textsf{entrysubtype} field
-achieves this reversal, which includes using the \textsf{booktitle} as
-a \textsf{sorttitle} in the bibliography and also as the
+\texttt{tvepisode} in the \textsf{entrysubtype} field achieves this
+reversal, which includes using the \textsf{booktitle} as a
+\textsf{sorttitle} in the bibliography and also as the
 \textsf{labeltitle} in short notes.
 
 \mylittlespace Eighth, and finally, you can use any
@@ -3340,22 +3404,22 @@
 abbreviated references to online content than conventional URLs,
 though I can find no specific reference to them in the \emph{Manual}.
 
-\enlargethispage{-\baselineskip}
+% \enlargethispage{-\baselineskip}
 
 \mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
 \textsf{biblatex} field which has gradually accumulated functions in
 \textsf{biblatex-chicago}.  It can now play a role in
-\mycolor{\textsf{artwork}}, \mycolor{\textsf{audio}},
-\mycolor{\textsf{image}}, \textsf{music}, \textsf{review},
-\mycolor{\textsf{standard}}, \textsf{suppperiodical},
-\textsf{unpublished}, and \textsf{video} entries.  In \textsf{artwork}
-and \textsf{image} entries it identifies the publication date of, most
-frequently, a photograph, in association with the
-\textsf{howpublished} field which identifies the periodical or other
-medium in which it was published (mccurry:afghangirl).  In
+\textsf{artwork}, \textsf{audio}, \textsf{image},
+\mycolor{\textsf{inproceedings}}, \textsf{music},
+\mycolor{\textsf{proceedings}}, \textsf{review}, \textsf{standard},
+\textsf{suppperiodical}, \textsf{unpublished}, and \textsf{video}
+entries.  In \textsf{artwork} and \textsf{image} entries it identifies
+the publication date of, most frequently, a photograph, in association
+with the \textsf{howpublished} field which identifies the periodical
+or other medium in which it was published (mccurry:afghangirl).  In
 \textsf{standard} entries it will also usually be associated with a
 \textsf{howpublished} field, allowing you to specify a later renewal
-or reaffirmation of a standard (niso:bibref).  In \textsf{audio}
+or reaffirmation of a standard (niso\hc bibref).  In \textsf{audio}
 entries, it specifies the release date of a single episode of a
 podcast (danforth:podcast).  In \textsf{music} entries, it identifies
 the recording or performance date of a particular song (rather than of
@@ -3369,30 +3433,42 @@
 want to do for filmed musical performances (friends:leia,
 handel:messiah, holiday:fool).
 
-\mylittlespace In \textsf{unpublished} entries it identifies the date
-of an event at which an unpublished work was presented, though in
-truth the \textsf{date} will do as well here (nass:address).  The
-field's use in \textsf{review} entries, finally, includes a possible
-time stamp.  In this context, an \textsf{eventdate} helps to identify
-a particular comment on, or reply to another comment on, a blog post.
-Given that many such posts by a single \textsf{author} could appear on
-the same day, you can distinguish them by putting a time specification
-in the \textsf{eventdate} field itself (ac:comment).  Please see the
+\mylittlespace In \mycolor{\textsf{inproceedings}},
+\mycolor{\textsf{proceedings}}, and \textsf{unpublished} entries it
+identifies the date of an event at which a published or unpublished
+work was presented, though in truth the \textsf{date} will do as well
+in \textsf{unpublished} entries (nass:address).  The field's use in
+\textsf{review} entries, finally, includes a possible time stamp.  In
+this context, an \textsf{eventdate} helps to identify a particular
+comment on, or reply to another comment on, a blog post.  Given that
+many such posts by a single \textsf{author} could appear on the same
+day, you can distinguish them by putting a time specification in the
+\textsf{eventdate} field itself (ac:comment).  Please see the
 \textbf{review} type, above, for the details of how to cite these
-materials, possibly with the help of the new
-\mycolor{\texttt{commenton}} \textsf{relatedtype}.  See also the
-\textsf{date} field docs, in particular table~\ref{ad:date:extras}
-(located in the author-date section), for\colmarginpar{New!} details on
-how the \mycolor{\textsc{iso}8601-2 Extended Format specifications}
-offered by \textsf{biblatex}, including time stamps and much else
-besides, have been implemented in \textsf{biblatex-chicago}.
+materials, possibly with the help of the \texttt{commenton}
+\textsf{relatedtype}.  See also the \textsf{date} field docs, in
+particular table~\ref{ad:date:extras} (located in the author-date
+section), for details on how the \textsc{iso}8601-2 Extended Format
+specifications offered by \textsf{biblatex}, including time stamps and
+much else besides, have been implemented in \textsf{biblatex-chicago}.
 
-\mybigspace This \colmarginpar{\textbf{eventtimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{eventtimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{eventdate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
 around it at your discretion (cp.\ 10.41 and 14.191).
 
+\mybigspace A \colmarginpar{\textbf{eventtitle}} standard
+\textsf{biblatex} field for identifying the name of the event that
+produces either a published record (\mycolor{\textsf{inproceedings}}
+and \mycolor{\textsf{proceedings}} entries) or an unpublished one
+(\textsf{unpublished}).
+
+\mybigspace Standard \colmarginpar{\textbf{eventtitleaddon}}
+\textsf{biblatex} field for adding information about an
+\textsf{eventtitle}, and available in the same entry types as that
+field.
+
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
 function as it does in standard \textsf{biblatex}.  Like
@@ -3408,27 +3484,27 @@
 subject, but \textsf{biblatex-chicago-notes} prints it (them), in
 parentheses, just after the author(s).
 
-\mybigspace Standard \colmarginpar{\textbf{howpublished}}
+\mybigspace Standard \mymarginpar{\textbf{howpublished}}
 \textsf{biblatex} field which, like the \textsf{eventdate} field, is
 gradually accumulating functions in \textsf{biblatex-chicago}.  In the
 \textsf{booklet} type it retains something of its traditional usage,
 replacing the \textsf{publisher}, and has a similar (somewhat
 paradoxical) place in \textsf{unpublished} entries.  In the
-\textsf{misc} and \mycolor{\textsf{performance}} types it works almost
-as a second \textsf{note} field, bringing in extra information about a
-work in close association with the \textsf{type} and \textsf{version}
-fields, while in \mycolor{\textsf{dataset}} entries its information
-will be associated with both those fields and also with the
-\textsf{number} field.  17th-edition \textsf{music} entries require a
-field to provide the medium of downloaded music and/or the name of the
-streaming service, so \textsf{howpublished} works there as an online
-double of \textsf{type} and of \textsf{publisher}.  Finally, in
-\textsf{artwork}, \textsf{image}, and \mycolor{\textsf{standard}}
-entries it serves to qualify or modify an \textsf{eventdate}, almost
-as a \textsf{userd} field modifies a \textsf{date} or
-\textsf{urldate}.  Please see the docs of those entry types for more
-information, and also bedford:photo, clark:mesopot,
-mccurry:afghangirl, niso:bibref, rihanna:umbrella.
+\textsf{misc} and \textsf{performance} types it works almost as a
+second \textsf{note} field, bringing in extra information about a work
+in close association with the \textsf{type} and \textsf{version}
+fields, while in \textsf{dataset} entries its information will be
+associated with both those fields and also with the \textsf{number}
+field.  17th-edition \textsf{music} entries require a field to provide
+the medium of downloaded music and/or the name of the streaming
+service, so \textsf{howpublished} works there as an online double of
+\textsf{type} and of \textsf{publisher}.  Finally, in
+\textsf{artwork}, \textsf{image}, and \textsf{standard} entries it
+serves to qualify or modify an \textsf{eventdate}, almost as a
+\textsf{userd} field modifies a \textsf{date} or \textsf{urldate}.
+Please see the docs of those entry types for more information, and
+also bedford:photo, clark:mesopot, mccurry:afghangirl, niso:bibref,
+rihanna:umbrella.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -3436,7 +3512,7 @@
 while in a \textsf{report} entry it may identify any sort of
 institution issuing the report.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace As \mymarginpar{\textbf{introduction}} with the
 \textsf{afterword} and \textsf{foreword} fields above,
@@ -3598,26 +3674,26 @@
 \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a
 \textsf{maintitle} --- see next entry.
 
-\mybigspace The \colmarginpar{\textbf{maintitle}} main title for a
+\mybigspace The \mymarginpar{\textbf{maintitle}} main title for a
 multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
-(See donne:\hfill var, euripides:orestes, harley:cartography,
-lach:asia, pelikan:christian, and plato:repub\-lic:gr.)  When using a
+(See donne\hc var, euripides:orestes, harley:cartography, lach:asia,
+pelikan:christian, and plato\hc republic:gr.)  When using a
 \textsf{crossref} field and \textsf{Biber}, the \textsf{title} of
 \textbf{mv*} entry types always becomes a \textsf{maintitle} in the
-child entry.  See also the documentation of the new
-\mycolor{\texttt{maintitle}} \textsf{relatedtype} in the
-\textbf{mvbook} docs in section~\ref{sec:entrytypes}, above, and in
-section~\ref{sec:related}, below.
+child entry.  See also the documentation of the \texttt{maintitle}
+\textsf{relatedtype} in the \textbf{mvbook} docs in
+section~\ref{sec:entrytypes}, above, and in section~\ref{sec:related},
+below.
 
-\mylittlespace Because \colmarginpar{New!} the 17th edition of the
-\emph{Manual} recommends that you present not only the names of blogs
-but also the names of their parent (usually periodical) publications,
-I have added this field to \textsf{article}, \textsf{periodical}, and
-\textsf{review} entries for just this purpose.  See the documentation of
-those entry types in section~\ref{sec:entrytypes}, above, and also
+\mylittlespace Because the 17th edition of the \emph{Manual}
+recommends that you present not only the names of blogs but also the
+names of their parent (usually periodical) publications, I have added
+this field to \textsf{article}, \textsf{periodical}, and
+\textsf{review} entries for just this purpose.  See the documentation
+of those entry types in section~\ref{sec:entrytypes}, above, and also
 table~\ref{tab:online:types} (14.208; amlen:hoot).
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
 \textsf{maintitle}, for which see previous entry.  Such an annex would
@@ -3663,40 +3739,109 @@
 
 \mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
-\textsf{biblatex-chicago}, it allows you, in most entry types, to
-specify that an author's name is a pseudo\-nym, or to provide either
-the real name or the pseudonym itself, if the other is being provided
-in the \textsf{author} field.  The abbreviation
+\textsf{biblatex-chicago} its primary use, in most entry types, has
+always been to specify that an author's name is a pseudonym, or to
+provide either the real name or the pseudonym itself, if the other is
+being provided in the \textsf{author} field.  The abbreviation
 \enquote{\texttt{pseud}.}\ (always lowercase in English) is specified,
 either on its own or after the pseudonym (centinel:letters,
 creasey:ashe:blast, creasey:morton:hide, creasey:york:death, and
-lecarre:quest); \verb+\bibstring{pseudonym}+ does the work for you.
-See under \textbf{author} above for the full details.
+lecarre:quest); remember that \verb+\bibstring{pseudonym}+ does the
+work for you.  See under \textbf{author} above for the full details.
 
-\mylittlespace In \textsf{online, review,} and \textsf{suppperiodical}
-entries, as well as in \textsf{misc} entries with an
-\textsf{entrysubtype}, I have removed the automatic provision of
-square brackets from the field, allowing it to be used in at least two
-ways.  First, if you provide your own square brackets, then it can
-have its standard function, as above.  Second you can, within
-parentheses, provide a screen name for online social media, or merely
-additional specifics about an author in a piece from an unpublished
-archive.  (The 16th edition of the \emph{Manual} recommended
-specifying comments to blogs and other online content using a time
-stamp in parentheses after the \textsf{author}, but the 17th edition
-\colmarginpar{New!} handles time stamps both differently and more
-widely, so in this case you would now put time data into the
-\textsf{date} or \textsf{eventdate} field, particularly when the date
-itself is too coarse a specification to identify a comment
-unambiguously.  Cf.\ ac:comment, obrien:recycle.)
+\mylittlespace The field has slowly accumulated other functions, so
+when Philipp Immel made a feature request, and pointed to a discussion
+on Stack Exchange which suggested a few more, I thought I might
+generalize the field's functionality, providing three package options
+to allow users to mould it to their needs.  Before discussing these,
+allow me to emphasize that the package defaults remain exactly the
+same as before, so that, absent any of the new options, the style
+still provides square brackets around the \textsf{nameaddon} in most
+entry types, no brackets of any sort in \textsf{online, review,} and
+\textsf{suppperiodical} entries, as well as in \textsf{misc} entries
+with an \textsf{entrysubtype}, and rather specialized handling in
+\textsf{customc} entries (which ignore all but the first of the new
+options --- see below).  If you're happy with the status quo, then no
+changes to your documents or\ .bib databases are necessary.
 
-\mylittlespace In the \textsf{customc} entry type, finally, which is
-used to create alphabetized cross-references to other bibliography
-entries, the \textsf{nameaddon} field allows you to change the 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.
+\mylittlespace If you do need or want to put the field to a different
+use, the following options may help.  All of them are available
+globally, per type, and per entry.  The first
+\colmarginpar{\texttt{nameaddon}} new option is simply called
+\mycolor{\texttt{nameaddon}}, and determines where and when the field
+will be printed at all.  There are seven possible values:
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{all}:] This is the default; if an entry has a
+  \textsf{nameaddon}, it will appear in both long notes and in the
+  bibliography.
+\item[\qquad \texttt{none}:] The field will appear neither in the
+  bibliography nor in long notes.
+\item[\qquad \texttt{bib}:] The field will appear only in the
+  bibliography.
+\item[\qquad \texttt{cite}:] The field will appear only in long notes.
+\item[\qquad \texttt{first}:] (This key and the next two are only
+  available as global options.)  Philipp Immel requested this as a way
+  to provide an \textsf{author's} dates in the \textsf{nameaddon}
+  field and only have them printed the first time that author appears
+  in the bibliography.  A sequence of consecutive long notes citing
+  works by the same author will be treated the same way.  The code
+  tests for identical \textsf{nameaddon} fields in works by identical
+  \textsf{authors}, so other sorts of \textsf{nameaddon} will be
+  printed as usual.
+\item[\qquad \texttt{bibfirst}:] Like \texttt{first}, but will not
+  print the \textsf{nameaddon} field in long notes.
+\item[\qquad \texttt{citefirst}:] Like \texttt{first}, but will not
+  print the \textsf{nameaddon} field in the bibliography.
+\end{description}
 
+The \colmarginpar{\texttt{nameaddonsep}}
+\mycolor{\texttt{nameaddonsep}} option controls the punctuation that
+appears before the \textsf{nameaddon}. It takes the following six
+keys:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{space}] = \cmd{addspace}.  This is the default.
+\item[\qquad \texttt{none}] = no separator at all.  It presumes that
+  you will include one in the \textsf{nameaddon} field itself.
+\item[\qquad \texttt{colon}] = \verb+\addcolon\addspace+.
+\item[\qquad \texttt{comma}] = \verb+\addcomma\addspace+.
+\item[\qquad \texttt{period}] = \verb+\addperiod\addspace+.
+\item[\qquad \texttt{semicolon}] = \verb+\addsemicolon\addspace+.
+\end{description}
+
+The \colmarginpar{\texttt{nameaddon-\\format}}
+\mycolor{\texttt{nameaddonformat}} option allows you to change the
+format of the \textsf{nameaddon} field on the fly, so its value should
+be a field format that \textsf{biblatex} understands.  This includes
+standard formats like \texttt{parens,\,brackets} or \texttt{emph}, and
+also custom formats that you provide in your preamble using
+\cmd{DeclareFieldFormat}, in case the standard ones aren't adequate.
+If you don't define this option, then the usual defaults apply, as
+delineated above, and you can use your own parentheses in
+\textsf{online, review,} and \textsf{suppperiodical} entries, as well
+as in \textsf{misc} entries with an \textsf{entrysubtype}, to
+distinguish screen names or other authorial information from
+traditional pseudonyms (in brackets).
+
+\mylittlespace Finally, two more details.  If you are using the
+17th-edition styles for the first time, please note that the 16th
+edition of the \emph{Manual} recommended specifying comments to blogs
+and other online content using a time stamp in parentheses after the
+\textsf{author}, but the 17th edition handles time stamps both
+differently and more widely, so in this case you would now put time
+data into the \textsf{date} or \textsf{eventdate} field, particularly
+when the date itself is too coarse a specification to identify a
+comment unambiguously (cf.\ ac:comment, obrien:recycle).  In the
+\textsf{customc} entry type, finally, which is used to create
+alphabetized cross-references to other bibliography entries, the
+\textsf{nameaddon} field allows you to change the 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 you've provided in the \textsf{nameaddon} field
+itself.  The punctuation is fixed.
+
 \mybigspace You \mymarginpar{\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
@@ -3724,9 +3869,9 @@
 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-\break comp} in section~\ref{sec:formatcommands}.
+the macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans},
+\cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and
+\cmd{partedittransandcomp} in section~\ref{sec:formatcommands}.
 
 \mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (14.103)
 specifies that works without an author may be listed under an editor,
@@ -3792,7 +3937,7 @@
 lowercase, and \textsf{biblatex-chicago-notes} will automatically do
 the right thing.  Cf.\ \textsf{addendum}.
 
-\mybigspace This \colmarginpar{\textbf{number}} is a standard
+\mybigspace This \mymarginpar{\textbf{number}} is a standard
 \textsf{biblatex} field, steadily accumulating uses in
 \textsf{biblatex-chicago}.  It may contain the number of a
 \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry,
@@ -3800,8 +3945,8 @@
 volume/number of a book (or musical recording) in a \textsf{series},
 the (generally numerical) specifier of the \textsf{type} in a
 \textsf{report} entry, the archive location (or database accession
-number) of a \mycolor{\textsf{dataset}} entry, and the number of a
-national or international standard in a \mycolor{\textsf{standard}}
+number) of a \textsf{dataset} entry, and the number of a
+national or international standard in a \textsf{standard}
 entry.  Generally, in an \textsf{article}, \textsf{periodical}, or
 \textsf{review} entry, this will be a plain cardinal number, but in
 such entries \textsf{biblatex-chicago} now does the right thing if you
@@ -3841,7 +3986,7 @@
 \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}} \textsf{biblatex}
+\mybigspace This \mymarginpar{\textbf{origdate}} \textsf{biblatex}
 field allows you to provide more than one full date specification for
 those references which need it.  As with the analogous \textsf{date}
 field, you provide the date (or range of dates) in \textsc{iso}8601
@@ -3864,10 +4009,11 @@
 in \textsf{letter} entries the \textsf{date} applies to the
 publication of the whole collection.  If such a published collection
 were itself a reprint, improvisation in the \textsf{location} field
-might be able to rescue the situation.  (See jackson:paulina:letter,
-white:ross:memo, white:russ, and white:total for how \textsf{letter}
-entries usually work; creel:house shows the field in action in a
-\textsf{misc} entry, while spock:interview uses \textsf{date}.)
+might be able to rescue the situation.  (See jackson:paulina\hc
+letter, white:ross:memo, white:russ, and white:total for how
+\textsf{letter} entries usually work; creel:house shows the field in
+action in a \textsf{misc} entry, while spock:interview uses
+\textsf{date}.)
 
 \mylittlespace In \textsf{music} entries, you can use the
 \textsf{origdate} in two separate but related ways.  First, it can
@@ -3904,7 +4050,7 @@
 section~\ref{sec:related}, below.
 \vspace{18pt}
 
-\mybigspace This \colmarginpar{\textbf{origtimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{origtimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{origdate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
@@ -3976,7 +4122,7 @@
 case would be \textsf{number} [palmatary:pottery]).  Cf.\
 \textsf{volume}.
 
-\mybigspace Standard \colmarginpar{\textbf{publisher}}
+\mybigspace Standard \mymarginpar{\textbf{publisher}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
 keyword for connecting multiple publishers, so if a publisher's name
 contains \enquote{and,} then you should either use the ampersand (\&)
@@ -3984,7 +4130,7 @@
 14.133--41; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
 dunn:revolutions.)
 
-\enlargethispage{\baselineskip}
+\enlargethispage{.5\baselineskip}
 
 \mylittlespace There are, as one might expect, a few further
 subtleties involved here.  If you give two publishers in the field
@@ -4013,7 +4159,7 @@
 mentions {s.n.}\,(= \emph{sine nomine}) to specify the lack of a
 publisher (10.42).
 
-\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+\mybigspace In \mymarginpar{\textbf{pubstate}} response to new
 specifications in the 17th edition of the \emph{Manual} (esp.\
 14.137), I have tried to generalize the functioning of the
 \textsf{pubstate} field in all entry types.  The \texttt{reprint}
@@ -4029,11 +4175,10 @@
 else, which will be printed before, and in close association with,
 other information about the publisher of a work.  The four in the
 first category will always be localized, as will \texttt{reprint} and
-\mycolor{\texttt{selfpublished}} (and anything else that
-\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
-category.  All other strings will be printed as-is, capitalized if
-needed, just before the publisher (author:forthcoming,
-contrib:contrib, schweitzer:bach).
+\texttt{selfpublished} (and anything else that \textsf{biblatex} finds
+to be a \cmd{bibstring}) from the second category.  All other strings
+will be printed as-is, capitalized if needed, just before the
+publisher (author:forthcoming, contrib:contrib, schweitzer:bach).
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
@@ -4048,8 +4193,8 @@
 \textsf{periodical}, or \textsf{review} entry, almost always the name
 of a publication series in \textsf{book}-like entries, and providing
 similar identifying information associated with a \textsf{number} in
-\textsf{music} and \mycolor{\textsf{standard}} entries.  If you need
-to attach further information to the \textsf{series} name in a
+\textsf{music} and \textsf{standard} entries.  If you need to attach
+further information to the \textsf{series} name in a
 \textsf{book}-like entry, then the \textsf{number} field is again the
 place for it, whether it be a volume, a number, or even something like
 \enquote{2nd ser.} or \enquote{\cmd{bibstring\{oldseries\}}.}  Of
@@ -4076,7 +4221,7 @@
 \label{sec:shortauthor}
 
 This is a standard \textsf{biblatex} field, but
-\textsf{biblatex-chicago-notes} makes considerably grea\-ter use of it
+\textsf{biblatex-chicago-notes} makes considerably greater use of it
 than the standard styles.  For the purposes of the Chicago style, the
 field provides the name to be used in the short form of a footnote.
 In the vast majority of cases, you don't need to specify it, because
@@ -4130,33 +4275,39 @@
 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
-\verb+\printbiblist{shorthand}+, will produce a formatted list of
-abbreviations for reference purposes, a list which the \emph{Manual}
-suggests should be placed either in the front matter (when using
-footnotes) or before the endnotes, in case these are used.
+in standard \textsf{biblatex}, the \cmd{printshorthands} command, now
+an alias for \verb+\printbiblist{shorthand}+, will produce a formatted
+list of abbreviations for reference purposes, a list which the
+\emph{Manual} suggests should be placed either in the front matter
+(when using footnotes) or before the endnotes, in case these are used.
 
-\mylittlespace I have provided three options to alter these defaults.
-First, there is a new citation command, \cmd{shorthandcite}, which
-will print the \textsf{shorthand} even at the first citation.  I have
-only provided the most general form of this command, so you'll need to
-put it inside parentheses or in a \cmd{footnote} command yourself.
-Second, I have included two \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.)  Third, I have provided a package option,
-\texttt{shorthandfull}, which prints entries in the list of shorthands
-which contain full bibliographical information, effectively allowing
-you to eschew the bibliography in favor of a fortified shorthand list.
-(See 13.67, 14.59--60, and also \textsf{biblatex.pdf} for more
-information.)
+\mylittlespace I have provided five options to alter these defaults.
+First, there is a citation command, \cmd{shorthandcite}, which will
+print the \textsf{shorthand} even at the first citation.  I have only
+provided the most general form of this command, so you'll need to put
+it inside parentheses or in a \cmd{footnote} command yourself.
+Alternately, you can set the \texttt{shorthandfirst} option to
+\texttt{true}, either in the preamble or in individual entries, to get
+the same effect, somewhat more simply.  Third, I have included two
+\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.)  Fourth, I have
+provided a package option, \texttt{shorthandfull}, which prints
+entries in the list of shorthands which contain full bibliographical
+information, effectively allowing you to eschew the bibliography in
+favor of a fortified shorthand list.  (See 13.67, 14.59--60, and also
+\textsf{biblatex.pdf} for more information.)  Finally, the new
+\mycolor{\texttt{shorthandintro}} option (section~\ref{sec:useropts})
+allows you to control whether the first, long citation will introduce
+the \textsf{shorthand} at all, rather than just leaving it to the
+shorthand list (or perhaps \enquote{common knowledge}) to clarify the
+reference.
 
 \mylittlespace Alexandre Roberts suggested a further refinement to
 \textsf{shorthand} behavior, which allows for it to appear in the
@@ -4192,8 +4343,10 @@
 \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.}
-With this standard \textsf{biblatex} field, you can change that
-formatting and that phrase to suit your needs.  Please note, first,
+To modify this, you can either use the new
+\mycolor{\texttt{shorthandintro}} option (section~\ref{sec:useropts})
+or you can use this standard \textsf{biblatex} field to change the
+formatting and the phrase to suit your needs.  Please note, first,
 that you need to include the shorthand in this field as you intend it
 to appear and, second, that you still need the \textsf{shorthand}
 field present in order to ensure the appropriate presentation of that
@@ -4248,7 +4401,7 @@
 --- you can see its default definition at the top of
 \textsf{chicago-notes.bbx}.
 
-\mybigspace A \colmarginpar{\textbf{shortseries}} special
+\mybigspace A \mymarginpar{\textbf{shortseries}} special
 \textsf{biblatex} field, used both to provide an abbreviated form of a
 (book) \textsf{series} in notes and/or bibliography and to facilitate
 the creation of a list of such abbreviations rather in the manner of a
@@ -4262,30 +4415,29 @@
   standard, suppbook,} and \textsf{video}.  There are several steps to
 take in order to use the field.  First, you'll need to provide both
 \textsf{shortseries} and \textsf{series} fields in the entry, then
-you'll need to set the \mycolor{\texttt{seriesabbrev}} option either
-when loading \textsf{biblatex-chicago}, for the whole document or for
+you'll need to set the \texttt{seriesabbrev} option either when
+loading \textsf{biblatex-chicago}, for the whole document or for
 specific entry types, or in the \textsf{options} field of individual
 .bib entries.  By default, this option is not set, so your
-\mycolor{\textsf{shortseries}} fields will be silently ignored.  There
-are three other settings:\ \texttt{true} prints the shortened fields
-both in notes and bibliography, \texttt{notes} only in notes, and
-\texttt{bib} only in the bibliography.  Should you wish to present a
-list of these abbreviations with their expansions, then you need to
-use the \verb+\printbiblist{shortseries}+ command, perhaps with a
+\textsf{shortseries} fields will be silently ignored.  There are three
+other settings:\ \texttt{true} prints the shortened fields both in
+notes and bibliography, \texttt{notes} only in notes, and \texttt{bib}
+only in the bibliography.  Should you wish to present a list of these
+abbreviations with their expansions, then you need to use the
+\verb+\printbiblist{shortseries}+ command, perhaps with a
 \texttt{title} option to differentiate the list from any
 \textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
 provided two \texttt{bibenvironments} for printing this list in foot-
-or endnotes (\mycolor{\texttt{shsernotes}} and
-\mycolor{\texttt{shserendnotes}}, respectively), to be used with the
-\texttt{env} option to \cmd{printbiblist}.  Again as with
-\textsf{shorthands}, you'll probably want to use the option
-\texttt{heading=none} when using these environments, just to turn off
-the (oversized) default, and perhaps provide your own title within the
-\cmd{footnote} command.  Finally, if you don't like the default
-formatting of the abbreviations in the list (plain roman), you can
-roll your own using \verb+\DeclareFieldFormat{shortserieswidth}+ ---
-you can see its default definition at the top of
-\textsf{chicago-notes.bbx}.
+or endnotes (\texttt{shsernotes} and \texttt{shserendnotes},
+respectively), to be used with the \texttt{env} option to
+\cmd{printbiblist}.  Again as with \textsf{shorthands}, you'll
+probably want to use the option \texttt{heading=none} when using these
+environments, just to turn off the (oversized) default, and perhaps
+provide your own title within the \cmd{footnote} command.  Finally, if
+you don't like the default formatting of the abbreviations in the list
+(plain roman), you can roll your own using
+\verb+\DeclareFieldFormat{shortserieswidth}+ --- you can see its
+default definition at the top of \textsf{chicago-notes.bbx}.
 
 \mybigspace A \mymarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
@@ -4328,7 +4480,7 @@
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
 
-\mybigspace This \colmarginpar{\textbf{timezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{timezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{date}.  The \emph{Manual} prefers initialisms like
 \enquote{EST} for this purpose, and you can provide parentheses around
@@ -4361,9 +4513,9 @@
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
   \textsf{booklet}, \textsf{collection}, \textsf{image},
   \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
-  \mycolor{\textsf{performance}}, \textsf{periodical},
-  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
-  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+  \textsf{performance}, \textsf{periodical}, \textsf{proceedings},
+  \textsf{report}, \textsf{standard}, \textsf{suppbook}, and
+  \textsf{suppcollection} entry types.
 \item[\qquad Quotation Marks:] \textsf{title} of \textsf{article},
   \textsf{inbook}, \textsf{incollection}, \textsf{inproceedings},
   \textsf{online}, \textsf{periodical}, \textsf{thesis}, and
@@ -4408,12 +4560,12 @@
   \cmd{mkbibquote} command does this for you automatically, and also,
   I repeat, takes care of any following punctuation that needs to be
   brought within the closing quotation mark(s).  (See 14.94--95;
-  garrett, loften:hamlet, murphy:silent, white:cal\-limachus.)
+  garrett, loften:hamlet, murphy:silent, white:callimachus.)
 \item Inside a plain title (most likely in a \textsf{review} entry or
   a \textsf{titleaddon} field), you should present another title as it
   would appear on its own, once again formatting it yourself using
   \cmd{mkbibemph} or \cmd{mkbibquote}.  (barcott:review, gibbard,
-  osborne:poi\-son, ratliff:review, unsigned:ranke).
+  osborne\hc poison, ratliff:review, unsigned:ranke).
 \end{enumerate}
 
 The \emph{Manual} provides a few more rules, as well.  A word normally
@@ -4437,7 +4589,7 @@
 your .bib database.  See\,\textbf{\textbackslash autocap} in
 section~\ref{sec:formatcommands} below for more details.
 
-\enlargethispage{-\baselineskip}
+% \enlargethispage{-\baselineskip}
 
 \mybigspace Standard \mymarginpar{\textbf{titleaddon}}
 \textsf{biblatex} intends this field for use with additions to titles
@@ -4490,7 +4642,7 @@
 precedence over \textsf{translator}.
 
 \mylittlespace I have also provided a \textsf{namea} field, which
-holds the editor of a given \textsf{title} (euripides:ores\-tes).  If
+holds the editor of a given \textsf{title} (euripides\hc orestes).  If
 \textsf{namea} and \textsf{nameb} are the same,
 \textsf{biblatex-chicago} will concatenate them, just as
 \textsf{biblatex} already does for \textsf{editor},
@@ -4514,7 +4666,7 @@
 \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and
 \textsf{namec}.
 
-\mybigspace This \colmarginpar{\textbf{type}} is a standard
+\mybigspace This \mymarginpar{\textbf{type}} is a standard
 \textsf{biblatex} field, and in its normal usage serves to identify
 the type of a \textsf{manual}, \textsf{patent}, \textsf{report}, or
 \textsf{thesis} entry.  \textsf{Biblatex} 0.7 introduced the ability,
@@ -4534,9 +4686,9 @@
 \mylittlespace In the \textsf{suppbook} entry type, and in its alias
 \textsf{suppcollection}, you can use the \textsf{type} field to
 specify what sort of supplemental material you are citing, e.g.,
-\enquote{\texttt{preface to}} or \enquote{\texttt{post\-script to}.}
+\enquote{\texttt{preface to}} or \enquote{\texttt{postscript to}.}
 Cf.\ \textsf{suppbook} above for the details.  (See \emph{Manual}
-14.110; polakow:afterw, prose:intro).
+14.110; polakow:afterw, prose\hc intro).
 
 \mylittlespace You can use the \textsf{type} field in
 \textsf{artwork}, \textsf{audio}, \textsf{image}, \textsf{music}, and
@@ -4561,12 +4713,11 @@
 inherit \textsf{url} fields from their parents --- the information
 seems entry-specific enough to warrant a little bit of extra typing if
 you need to present the same locator in several entries.  You
-\colmarginpar{\texttt{blogurl}} can, however, set the new preamble
-option \mycolor{\texttt{blogurl}} to allow your child comments
-(\textsf{review}) to inherit the URL from the parent blog
-(\textsf{article}).
+\mymarginpar{\texttt{blogurl}} can, however, set the preamble option
+\texttt{blogurl} to allow your child comments (\textsf{review}) to
+inherit the URL from the parent blog (\textsf{article}).
 
-\mybigspace A standard \colmarginpar{\textbf{urldate}}
+\mybigspace A standard \mymarginpar{\textbf{urldate}}
 \textsf{biblatex} field, it identifies exactly when you accessed a
 given url, and is given in \textsc{iso}8601 format.  The \emph{Manual}
 prefers DOIs to URLs; in the latter case it allows the use of access
@@ -4576,42 +4727,41 @@
 documented below.  If an entry doesn't have a \textsf{userd}, then the
 \textsf{urldate} will be treated as an access date (14.8, 14.12--13,
 14.207; evanston:library, grove:sibelius, hlatky:hrt, osborne:poison,
-sirosh:visualcortex, wikiped:bibtex).  You can \colmarginpar{New!}
-also use the field to specify a time stamp, should the date alone not
-be specific enough.  The time stamp follows the date, separated by an
-uppercase \enquote{T}, like so: \texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.
-If you wish to specify the time zone, the \emph{Manual} (10.41)
-prefers initialisms like \enquote{EST} or \enquote{PDT,} and these are
-most easily provided using the \mycolor{\texttt{urltimezone}} field,
-where you can provide your own parentheses if so desired (cp.\
-14.191).  Following the examples in the \emph{Manual}, any
-\textsf{urldate} will by default be printed in 24-hour format, though
-other time stamps use 12-hour format.  The \textsf{biblatex} option
-\texttt{urltime}, discussed in section~\ref{sec:presetopts}, allows
-you to change this in your preamble.
+sirosh:visualcortex, wikiped:bibtex).  You can also use the field to
+specify a time stamp, should the date alone not be specific enough.
+The time stamp follows the date, separated by an uppercase
+\enquote{T}, like so: \texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.  If you
+wish to specify the time zone, the \emph{Manual} (10.41) prefers
+initialisms like \enquote{EST} or \enquote{PDT,} and these are most
+easily provided using the \texttt{urltimezone} field, where you can
+provide your own parentheses if so desired (cp.\ 14.191).  Following
+the examples in the \emph{Manual}, any \textsf{urldate} will by
+default be printed in 24-hour format, though other time stamps use
+12-hour format.  The \textsf{biblatex} option \texttt{urltime},
+discussed in section~\ref{sec:presetopts}, allows you to change this
+in your preamble.
 
 \mylittlespace A \textsf{urldate} time stamp (and
-\mycolor{\texttt{urltimezone}}) can appear in any entry whatsoever, if
-you judge the online source to be the sort that changes rapidly enough
-for a time stamp to be necessary (14.207, 14.233; wikiped:bibtex).
-You can stop it printing by setting the new
-\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}} option to
-\texttt{false} in your preamble for the whole document or for
-specified entry types, or in the \textsf{options} field of individual
-entries.  Please see the documentation of \textbf{date}, above, and
-also table~\ref{ad:date:extras}, below, for more details about time
-stamps and other parts of \textsf{biblatex's} enhanced date
-specifications.  Table~\ref{tab:online:types} contains a summary of
-the current state of \textsf{biblatex-chicago's} handling of online
-materials.
+\texttt{urltimezone}) can appear in any entry whatsoever, if you judge
+the online source to be the sort that changes rapidly enough for a
+time stamp to be necessary (14.207, 14.233; wikiped:bibtex).  You can
+stop it printing by setting the new \mymarginpar{\texttt{urlstamp}}
+\texttt{urlstamp} option to \texttt{false} in your preamble for the
+whole document or for specified entry types, or in the
+\textsf{options} field of individual entries.  Please see the
+documentation of \textbf{date}, above, and also
+table~\ref{ad:date:extras}, below, for more details about time stamps
+and other parts of \textsf{biblatex's} enhanced date specifications.
+Table~\ref{tab:online:types} contains a summary of the current state
+of \textsf{biblatex-chicago's} handling of online materials.
 
-\mybigspace This \colmarginpar{\textbf{urltimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{urltimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{urldate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
 around it at your discretion (cp.\ 10.41 and 14.191).
 
-\mybigspace A \colmarginpar{\textbf{usera}} supplemental
+\mybigspace A \mymarginpar{\textbf{usera}} supplemental
 \textsf{biblatex} field which in certain contexts in
 \textsf{biblatex-chicago} will identify the broadcast network when you
 cite a radio or television program.  In \textsf{article},
@@ -4643,6 +4793,8 @@
 (See 14.81--82; creasey:ashe:blast, creasey:morton:hide,
 creasey:york:death, lecarre:quest.)
 
+\enlargethispage{2\baselineskip}
+
 \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
@@ -4659,12 +4811,12 @@
 would have modified a \textsf{urldate}.
 
 \mylittlespace Because of the rather specialized needs of some
-audio-visual references, this basic sche\-ma changes for
-\textsf{music} and \textsf{video} entries.  In \textsf{music} entries
-where an \textsf{eventdate} is present, \textsf{userd} will modify
-that date instead of any \textsf{urldate} that may also be present,
-and it will modify an \textsf{origdate} if it is present and there is
-no \textsf{eventdate}.  It will modify a \textsf{date} only in the
+audio-visual references, this basic schema changes for \textsf{music}
+and \textsf{video} entries.  In \textsf{music} entries where an
+\textsf{eventdate} is present, \textsf{userd} will modify that date
+instead of any \textsf{urldate} that may also be present, and it will
+modify an \textsf{origdate} if it is present and there is no
+\textsf{eventdate}.  It will modify a \textsf{date} only in the
 absence of the other three.  In \textsf{video} entries it will modify
 an \textsf{eventdate} if it is present, and in its absence the
 \textsf{urldate}.  In the absence of those two, it can modify a
@@ -4696,27 +4848,25 @@
 
 \mybigspace Standard \colmarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
-\textsf{inproceedings} entries, but I haven't yet implemented it
-there, mainly because the \emph{Manual} has nothing to say about it.
-Perhaps the \textsf{organization} field could be used, for the moment,
-instead.  I have implemented the field in the \textbf{misc} entry
-type, both with and without an \textsf{entrysubtype}, in the new
-\mycolor{\textbf{performance}} type, and in the \textbf{unpublished}
-type.  In all uses it will normally present the actual venue of an
-event, as opposed, e.g., to the \textsf{origlocation}, which might
-present where a letter was written or where an earlier edition was
-printed.
+\textsf{inproceedings} entries, and after a request from Patrick
+Danilevici I have followed suit.  I have also implemented the field in
+the \textsf{misc} entry type, both with and without an
+\textsf{entrysubtype}, in the \textsf{performance} type, and in the
+\textsf{unpublished} type.  In all uses it will normally present the
+actual venue of an event, as opposed, e.g., to the
+\textsf{origlocation}, which might present where a letter was written
+or where an earlier edition was printed.
 
-\mybigspace Standard \colmarginpar{\textbf{version}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{version}} \textsf{biblatex}
 field, formerly only available in \textsf{artwork}, \textsf{image},
-\textsf{misc}, \textsf{music}, and \textsf{pa\-tent} entries in
-\textsf{biblatex-chicago-notes}, but now also in \textbf{book} and
-\mycolor{\textbf{performance}} entries.  In most entry types it prints
-a localized \enquote{\texttt{version}} string, but there may be
+\textsf{misc}, \textsf{music}, and \textsf{patent} entries in
+\textsf{biblatex-chicago-notes}, but now also in \textsf{book} and
+\textsf{performance} entries.  In most entry types it prints a
+localized \enquote{\texttt{version}} string, but there may be
 specialist needs in \textsf{artwork} and \textsf{image} entries, so
-there you'll need to specify the type of data inside the field
-itself.  In the \textsf{book} type it is particularly needed for
-presenting multimedia app content (14.268).
+there you'll need to specify the type of data inside the field itself.
+In the \textsf{book} type it is particularly needed for presenting
+multimedia app content (14.268).
 
 \mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex}
 field.  It holds the volume of a \textsf{journaltitle} in
@@ -4754,7 +4904,7 @@
 field.  It holds the total number of volumes of a multi-volume work
 (meredith:letters).  If both a \textsf{volume} and a \textsf{volumes}
 field are present, as may occur particularly in cross-referenced
-entries or in entries using the new \mycolor{\texttt{maintitle}}
+entries or in entries using the \texttt{maintitle}
 \textsf{relatedtype}, then \textsf{biblatex-chicago} will ordinarily
 suppress the \textsf{volumes} field in your references, except in some
 instances when a \textsf{maintitle} is present.  If the
@@ -4762,7 +4912,7 @@
 \texttt{hidevolumes}, \mymarginpar{\texttt{hidevolumes}} set to
 \texttt{true} by default, controls whether to print the
 \textsf{volumes} field after that title or not.  If it appears after
-the \textsf{maintitle}, as with the new \textsf{relatedtype} just
+the \textsf{maintitle}, as with the \textsf{relatedtype} just
 mentioned, the same option controls whether to print the
 \textsf{volumes} field in close association with the \textsf{volume}.
 Set the option to \texttt{false} either in the preamble or in the
@@ -4774,7 +4924,7 @@
 field provided by \textsf{biblatex}, which prevents inheritance of any
 data from the parent entry.  See \textbf{crossref}, above.
 
-\mybigspace Standard \colmarginpar{\textbf{year}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{year}} \textsf{biblatex}
 field.  It usually identifies the year of publication, though unlike
 the \textsf{date} field it allows non-numeric input, so you can put
 \enquote{n.d.}\ (or, to be language agnostic,
@@ -4789,7 +4939,7 @@
 \subsubsection{Fields for Related Entries}
 \label{sec:related}
 
-As \textsf{biblatex.pdf} puts it (\xA7~3.4), \enquote{Almost all
+As \textsf{biblatex.pdf} puts it (\S~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
@@ -4893,7 +5043,7 @@
 same information \emph{after} the entry, using data extracted from a
 separate entry.
 
-\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+\mybigspace In \mymarginpar{\textbf{pubstate}} response to new
 specifications in the 17th edition of the \emph{Manual} (esp.\
 14.137), I have tried to generalize the functioning of the
 \textsf{pubstate} field in all entry types.  The \texttt{reprint}
@@ -4909,16 +5059,15 @@
 \texttt{submitted}; and those, i.e., everything else, which will be
 printed before, and in close association with, other information about
 the publisher of a work.  The four in the first category will always
-be localized, as will \texttt{reprint} and
-\mycolor{\texttt{selfpublished}} (and anything else that
-\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
-category.  All other strings will be printed as-is, capitalized if
-needed, just before the publisher (author:forthcoming,
+be localized, as will \texttt{reprint} and \texttt{selfpublished} (and
+anything else that \textsf{biblatex} finds to be a \cmd{bibstring})
+from the second category.  All other strings will be printed as-is,
+capitalized if needed, just before the publisher (author:forthcoming,
 contrib:contrib, schweitzer:bach).  \textbf{NB:} The \textsf{pubstate}
 functionality currently has no equivalent using the \textsf{related}
 field.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{related}} field is required to
 use \textsf{biblatex's} \textsf{related} functionality, and it should
@@ -4944,8 +5093,8 @@
 relevant entry, to \texttt{notes}, \texttt{true}, or \texttt{false},
 respectively (coolidge:speech and weed:flatiron).  For the three
 \textsf{relatedtypes} that construct a single entry using data
-extracted from related entries --- \mycolor{\texttt{commenton}},
-\mycolor{\textsf{maintitle}}, and \texttt{reviewof} ---
+extracted from related entries --- \texttt{commenton},
+\texttt{maintitle}, and \texttt{reviewof} ---
 \textsf{biblatex-chicago} will automatically set it to \texttt{true}
 for you entry by entry, as this is required to get properly-formatted
 citations in notes and bibliography.  See below for the details.
@@ -4960,7 +5109,7 @@
 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} \xA7~3.4.
+however you wish.  See \textsf{biblatex.pdf} \S~3.4.
 
 \mybigspace The \mymarginpar{\textbf{relatedstring}} procedure for
 choosing a string to connect the main entry with its related entry/ies
@@ -4983,7 +5132,7 @@
 \textsf{biblatex} styles define six \textsf{relatedtypes}, and I have
 either simply adopted them wholesale or adapted them to the needs of
 the Chicago style, retaining the basic syntax as much as possible.  I
-have also added three to these six (see below).  First, the standard
+have also added four to these six (see below).  First, the standard
 types:
 
 \begin{description}
@@ -5028,15 +5177,15 @@
   \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].)
+  \textsf{babel} [which I've tested] or \textsf{polyglossia} [which
+  I've tested somewhat less].)
 \end{description}
 Now, the Chicago-specific types:
 \begin{description}
-\item[\qquad \mycolor{commenton:}] I designed this new
-  \textsf{relatedtype} to facilitate citation of online comments,
-  though it works slightly differently in the two entry types in which
-  it is available, \textsf{online} and \textsf{review} (with its clone
+\item[\qquad commenton:] I designed this \textsf{relatedtype} to
+  facilitate citation of online comments, though it works slightly
+  differently in the two entry types in which it is available,
+  \textsf{online} and \textsf{review} (with its clone
   \textsf{suppperiodical}) (14.208--10).  In both types it allows you
   to mimic thread structure by citing a chain of replies to comments
   on posts, etc., all in a single entry, while also simplifying your\
@@ -5111,27 +5260,26 @@
   \textsf{suppperiodical}, though you can of course override these
   defaults by setting the \texttt{shortextra} options yourself.  See
   their documentation in section~\ref{sec:useropts}, below.
-\item[\qquad \mycolor{maintitle:}] The 17th edition of the
-  \emph{Manual} has deployed, in at least two contexts, a notable
-  syntactic change in the presentation of works that form part of
-  other, larger works.  Generally, the order of presentation, in
-  \textsf{biblatex} terms, has always been \textsf{title} --
-  \textsf{booktitle} -- \textsf{maintitle}, in increasing order of
-  generality.  In the vast majority of cases this order still holds,
-  but in TV episodes, for one example, the recommendation now is to
-  present the name of the series (\textsf{booktitle}) \emph{before}
-  the name of the episode (\textsf{title}). (See the \textbf{video}
-  type in section~\ref{sec:entrytypes}, above).  The other context in
-  which this reversal occurs is multi-volume works (14.116--22).
-  Here, the preferred format, at least for notes, appears to be
+\item[\qquad maintitle:] The 17th edition of the \emph{Manual} has
+  deployed, in at least two contexts, a notable syntactic change in
+  the presentation of works that form part of other, larger works.
+  Generally, the order of presentation, in \textsf{biblatex} terms,
+  has always been \textsf{title} -- \textsf{booktitle} --
+  \textsf{maintitle}, in increasing order of generality.  In the vast
+  majority of cases this order still holds, but in TV episodes, for
+  one example, the recommendation now is to present the name of the
+  series (\textsf{booktitle}) \emph{before} the name of the episode
+  (\textsf{title}). (See the \textbf{video} type in
+  section~\ref{sec:entrytypes}, above).  The other context in which
+  this reversal occurs is multi-volume works (14.116--22).  Here, the
+  preferred format, at least for notes, appears to be
   \textsf{maintitle} -- \textsf{[book]title} or, when all three titles
   are present, \textsf{title} -- \textsf{maintitle} --
   \textsf{booktitle}.  The \emph{Manual} doesn't carry this reordering
   through with absolute consistency, but I think it important at least
   to offer it as a possibility to users of \textsf{biblatex-chicago},
-  hence the new \mycolor{\texttt{maintitle}} \textsf{relatedtype},
-  which is currently the only way to achieve this reversal in this
-  context.
+  hence the \texttt{maintitle} \textsf{relatedtype}, which is
+  currently the only way to achieve this reversal in this context.
 
   In its simplest usage, to document one volume of a multi-volume set,
   you would have, e.g., an \textsf{mvcollection} entry with
@@ -5250,14 +5398,14 @@
   place, you do need to cite (or \cmd{nocite}) the original
   \textsf{mv*} entry somewhere in your document.
 
-  As an example of how this might look, consider the
-  three entries from \textsf{notes-test.bib}: harleymt:hoc,
-  harleymt:ancient:cart, and harleymt:cartography.  The first, an
-  \textsf{mvcollection} entry, has a \textsf{related} field containing
-  both of the others (\textsf{collec\-tion} entries), and in
-  \textsf{cms-notes-sample.tex} you'll see citations of harleymt:hoc,
+  As an example of how this might look, consider the three entries
+  from \textsf{notes-test.bib}: harleymt:hoc, harleymt:ancient:cart,
+  and harleymt:cartography.  The first, an \textsf{mvcollection}
+  entry, has a \textsf{related} field containing both of the others
+  (\textsf{collection} entries), and in \textsf{cms-notes-sample.tex}
+  you'll see citations of harleymt:hoc,
   harleymt:hoc-harleymt:ancient:cart, and
-  harleymt:hoc-harleymt:cartography,\break which are themselves
+  harleymt:hoc-harleymt:cartography, which are themselves
   \textsf{mvcollection} entries.  The latter two don't exist in the\
   .bib file, only in the\ .bbl file, where you'd see that each has a
   \textsf{related} field pointing to the entrykey that forms the
@@ -5273,9 +5421,9 @@
   understandably, confused.  As a convenience feature for this
   situation, I have included a very slightly modified version of the
   \texttt{maintitle} \textsf{relatedtype}, called
-  \colmarginpar{\texttt{maintitlenc}} \mycolor{\texttt{maintitlenc}},
-  the \enquote{nc} standing for \cmd{nocite}.  As you might have
-  guessed, every clone produced by an \textsf{mv*} entry with multiple
+  \mymarginpar{\texttt{maintitlenc}} \texttt{maintitlenc}, the
+  \enquote{nc} standing for \cmd{nocite}.  As you might have guessed,
+  every clone produced by an \textsf{mv*} entry with multiple
   entrykeys in its \textsf{related} field and \texttt{maintitlenc} as
   its \textsf{relatedtype} will automatically be \cmd{nocite}'d, and
   will then be available for inclusion in another entry's
@@ -5340,15 +5488,14 @@
   includes this type, and user Bertold Schweitzer suggested it might
   be a useful addition to \textsf{biblatex-chicago}, so I've added it
   to the standard six detailed above.  It differs from all of them,
-  and resembles \mycolor{\texttt{commenton}} and
-  \mycolor{\texttt{maintitle}}, in that it prints the
-  \textsf{relatedstring} (by default \verb+\bibstring{reviewof}+) and
-  the data from the \textsf{related} entry in the middle of the parent
-  entry, rather than at the end.  It differs from
-  \mycolor{\texttt{commenton}} in that it's not possible to create a
-  chain of such entries to mimic online thread structures.  Finally,
-  it differs from all other \textsf{relatedtypes} in being available
-  only in \textsf{article} and \textsf{review} entries (along with the
+  and resembles \texttt{commenton} and \texttt{maintitle}, in that it
+  prints the \textsf{relatedstring} (\verb+\bibstring{reviewof}+ by
+  default) and the data from the \textsf{related} entry in the middle
+  of the parent entry, rather than at the end.  It differs from
+  \texttt{commenton} in that it's not possible to create a chain of
+  such entries to mimic online thread structures.  Finally, it differs
+  from all other \textsf{relatedtypes} in being available only in
+  \textsf{article} and \textsf{review} entries (along with the
   latter's clone, \textsf{suppperiodical}).
 
   In \textsf{article} entries it replaces the \textsf{titleaddon} with
@@ -5376,6 +5523,12 @@
   Please remember, too, that the standard way of presenting reviewed
   works is still available if the mechanism doesn't work for you in a
   particular context.
+\item[\qquad \mycolor{short:}] This \textsf{relatedtype} is like the
+  \texttt{default} type, only it prints \emph{short} references rather
+  than long ones. There is no default \textsf{relatedstring} for this
+  type, so if you leave that field blank then the short references
+  will simply appear at the end of the long note or bibliography
+  entry.
 \end{description}
 
 \mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
@@ -5525,7 +5678,7 @@
 \end{enumerate}
 
 In any other cases --- and there are only two examples of this in
-\textsf{notes-test.bib} (centinel:letters, powell:email) --- you'll
+\textsf{notes-test.bib} (centinel\hc letters, powell:email) --- you'll
 need to provide the \cmd{autocap} command yourself.  Indeed, if you
 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
@@ -5563,14 +5716,14 @@
 \textsf{title} only, enclosed within parentheses.  You can change the
 way the citation part is presented by using \cmd{renewcommand} in your
 preamble.  The default definitions are: \texttt{\{\textbackslash
-  addspace\textbackslash headlessparenshortcite\}} and
+  addspace\textbackslash headlessparenshortcite\}} \&
 \texttt{\{\textbackslash addspace\textbackslash
   headlessparenshortcites\}}.  If you wanted to return to the default
-behavior of previous releases of \textsf{biblatex-chicago}, for
-example, you could change the first to: \texttt{\{\textbackslash
-  newcunit\textbackslash bibstring\{in\}\textbackslash
-  addspace\break\textbackslash headlesscite\}}, and the second similarly,
-only using \cmd{headlesscites}.  (There is also, by the way, a
+behavior of previous releases of \textsf{biblatex-chicago} 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
 citations inside the parentheses.)
 
@@ -5727,7 +5880,7 @@
 whose name doesn't conveniently fit into the usual fields
 (\textsf{translator} and \textsf{nameb}).
 
-\mylittlespace Unlike \colmarginpar{\textbf{\textbackslash
+\mylittlespace Unlike \mymarginpar{\textbf{\textbackslash
     suppress-\\bibfield[]\{\}}} the other commands presented here,
 this should be used in your document preamble rather than in your
 bibliographical apparatus.  Also unlike them, it has two arguments,
@@ -5737,7 +5890,7 @@
 section~\ref{sec:chicpreset}), I might also provide a general-purpose
 macro to clear fields from selected entry types when the package
 options aren't quite right for a user's particular needs.  The
-\mycolor{\cmd{suppressbibfield}} command does this, so that
+\cmd{suppressbibfield} command does this, so that
 \verb+\suppressbibfield{note}+ clears the \textsf{note} field from
 \emph{all} entries, while \verb+\suppressbibfield[report]{note}+
 clears it only from \textsf{report} entries.  Both arguments take
@@ -5744,7 +5897,7 @@
 comma-separated lists, so to suppress \textsf{titleaddon} and
 \textsf{volumes} fields from \textsf{report} and \textsf{manual}
 entries, your preamble could contain
-\verb+\suppressbibfield[report,manual]{titleaddon,volumes}+.
+\verb+\suppressbib-field[report,manual]{titleaddon,volumes}+.
 
 \mylittlespace A few usage notes are in order.  First, you can use as
 many calls to the command in your preamble as you wish.  Second, the
@@ -5767,8 +5920,8 @@
 \textsf{year}.  Fifth, the code for the command resides in
 \textsf{biblatex-chicago.sty}, so if you load the styles without
 loading that package it won't be available to you.  Sixth and finally,
-the \mycolor{\cmd{suppressbibfield}} command is new and relatively
-untested, so please report any untoward behavior to me.
+the \cmd{suppressbibfield} command is new and relatively untested, so
+please report any untoward behavior to me.
 
 \subsubsection{Citation Commands}
 \label{sec:citecommands}
@@ -5806,7 +5959,7 @@
 the most common citation command you will use, and also works fine in
 its multicite form, \textbf{\textbackslash autocites}.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace While \mymarginpar{\textbf{\textbackslash cite*}} the
 \cmd{cite} command works just as you would expect it to, I have also
@@ -5829,6 +5982,37 @@
 command manually.  (Cf.\ also \textsf{entrysubtype} in
 section~\ref{sec:entryfields}, above.)
 
+\mybigspace Although \colmarginpar{\textbf{\textbackslash citeincite}}
+the officially-sanctioned, and safest, way to present cross-references
+to other works is by using the \textsf{related} mechanism, it would
+appear, judging from various bug reports I've received, that there are
+plenty of users who need to present such references in ways that
+aren't supported by the \textsf{related} code as it stands. This new
+citation command is designed to allow you to present short references
+to other works inside other references, and to avoid some, I hope
+most, of the bugs associated with using cite commands in the fields of
+other entries. If you want to present long citations, I'm assuming
+that you wouldn't want to do that in fields right in the middle of the
+parent entry, and that, therefore, the usual methods detailed in
+section~\ref{sec:related} (above) or the new
+\mycolor{\cmd{fullciteincite}} command (below) will serve your
+needs. Similarly, if you want to provide short citations at the end of
+your parent entry, the new \textsf{relatedtype}
+\mycolor{\texttt{short}} should work.
+
+\mylittlespace If, however, you must have a short reference in the
+midst of another field, then \mycolor{\cmd{citeincite}} can help. It
+is certified to work properly only in the \textsf{addendum,
+  annotation, annote, note, and titleaddon} fields, which I hope is a
+broad enough choice to cover most needs. The multicite command
+\mycolor{\cmd{citeincites}} is also available. In previous releases of
+\textsf{biblatex} there were differences in how the case-changing
+backends behaved with respect to citation commands inside entry
+fields, but in my testing the two backends appear currently to be
+equivalent on this score. Still, should you run into problems using
+\cmd{citeincite}, it might still be worth setting
+\texttt{casechanger=latex2e} in your preamble to see if that helps.
+
 \mybigspace This \mymarginpar{\textbf{\textbackslash citejournal}}
 command provides an alternative short form when citing journal
 \textsf{articles}, giving the \textsf{journaltitle} and
@@ -5873,8 +6057,22 @@
 the previous command it doesn't automatically place it in a footnote.
 It may be useful within long textual notes.
 
+\mybigspace Ordinarily, \colmarginpar{\textbf{\textbackslash
+    fullciteincite}} you can use one of the methods discussed in
+section~\ref{sec:related} to present, in notes or bibliography, full
+references to a work related in some way to the current entry. The new
+command \mycolor{\cmd{citeincite}} (above) allows you to present short
+citations to other works within selected fields of the parent entry,
+while attempting to minimize the problems caused by citations within
+other citations. The \mycolor{\cmd{fullciteincite}} command does the
+same for full citations, but really is designed to work only in
+\textsf{annotation} fields, the idea being that you might want to
+refer in an annotated bibliography to works that you haven't cited in
+the main body of your text. The multicite command
+\mycolor{\cmd{fullciteincites}} is also available.
+
 \mybigspace Arne \mymarginpar{\textbf{\textbackslash gentextcite}}
-Skj\xE6rholt requested, for the author-date styles, a variant of the
+Skj{\ae}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
@@ -5891,7 +6089,7 @@
 \textsf{postnote}, and with two a \textsf{prenote} and a
 \textsf{postnote}.  There is a \cmd{gentextcites} command as well, and
 for it you may need to specify
-\cmd{gentextcites[<ending>]()()[][]\\\{entry:key1\}\{entry:key2\}},
+\cmd{gentextcites[<ending>]()()[][]\hfill\{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\}}.
@@ -5910,7 +6108,7 @@
 
 \mybigspace Matthew \mymarginpar{\textbf{\textbackslash
     headlesscite}\\\textbf{\textbackslash
-    headlesscites}\\\mycolor{\textbf{\textbackslash Headlesscite}}}
+    headlesscites}\\\textbf{\textbackslash Headlesscite}}
 Lundin requested a more generalized \cmd{headlesscite} macro,
 suppressing the author's name in specific contexts while allowing
 users not to worry about whether a particular citation needs the long
@@ -5927,21 +6125,21 @@
 discussion of some of the needs this command might help address.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash
-    headless-\\fullcite}\\\mycolor{\textbf{\textbackslash
-      headless-\\fullcites}}} have provided these commands in case you
+    headless-\\fullcite}\\\textbf{\textbackslash
+    headless-\\fullcites}} have provided these commands in case you
 want to print a full citation without the author's name.  The
 \emph{Manual} (14.78, 14.104) suggests this for brevity's sake in
 cases where that name is already obvious enough from the title, and
 where repetition might seem awkward (creel:house, feydeau:farces,
 meredith:letters, and sewall:letter).  \textsf{Letter} entries and
-\mycolor{\textsf{standard}} entries (where the \textsf{author} is
-usually the publishing \textsf{organization}) --- and only these
-entries --- do this for you automatically, and of course the
-repetition is tolerated in bibliographies for the sake of
-alphabetization, but in notes for other entry types this command may
-help achieve greater elegance, even if it isn't strictly necessary.
-As I've provided only the most flexible form of the command, you'll
-have to wrap it in a \cmd{footnote} yourself.
+\textsf{standard} entries (where the \textsf{author} is usually the
+publishing \textsf{organization}) --- and only these entries --- do
+this for you automatically, and of course the repetition is tolerated
+in bibliographies for the sake of alphabetization, but in notes for
+other entry types this command may help achieve greater elegance, even
+if it isn't strictly necessary.  As I've provided only the most
+flexible form of the command, you'll have to wrap it in a
+\cmd{footnote} yourself.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash shortcite}} have
 provided this command in case, for any reason, you specifically
@@ -5950,12 +6148,11 @@
 of the command, so you'll have to wrap it in a \cmd{footnote}
 manually.
 
-\mybigspace The \colmarginpar{\textbf{\textbackslash shortcite*}}
+\mybigspace The \mymarginpar{\textbf{\textbackslash shortcite*}}
 starred version of the command turns off page and citation tracking
-for a short note, designed particularly to prevent a
-\mycolor{\texttt{noteref}} back reference from appearing, should you
-and the code have a disagreement over just when such back references
-might be necessary.
+for a short note, designed particularly to prevent a \texttt{noteref}
+back reference from appearing, should you and the code have a
+disagreement over just when such back references might be necessary.
 
 \mybigspace At \mymarginpar{\textbf{\textbackslash shorthandcite}}
 the request of Kenneth Pearce, I have included this command which
@@ -5964,29 +6161,28 @@
 command, so you'll need to place it inside parentheses or wrap it in a
 \cmd{footnote} manually.
 
-\mybigspace The \colmarginpar{\textbf{\textbackslash shorthandcite*}}
+\mybigspace The \mymarginpar{\textbf{\textbackslash shorthandcite*}}
 starred version of the command turns off page and citation tracking
 for a \textsf{shorthand} note, designed particularly to prevent a
-\mycolor{\texttt{noteref}} back reference from appearing, should you
-and the code have a disagreement over just when such back references
-might be necessary.
+\texttt{noteref} back reference from appearing, should you and the
+code have a disagreement over just when such back references might be
+necessary.
 
-\mybigspace This \colmarginpar{\textbf{\textbackslash
+\mybigspace This \mymarginpar{\textbf{\textbackslash
     shorthand-\\refcite}} command, like the next, forces the printing
 of a back reference when you are using the new package option
-\mycolor{\texttt{noteref}}, only it prints a \textsf{shorthand} note
-rather than a short note.  It's the opposite of
-\mycolor{\cmd{shorthandcite*}}.
+\texttt{noteref}, only it prints a \textsf{shorthand} note rather than
+a short note.  It's the opposite of \cmd{shorthandcite*}.
 
-\mybigspace The \colmarginpar{\textbf{\textbackslash shortrefcite}}
-new package option \mycolor{\texttt{noteref}} provides for the
-printing of back references from short notes to their corresponding
-long notes.  \textsf{Biblatex-chicago} provides several options to
-help you control when such back references should appear, but as there
-may well be occasions when you and the code disagree, this command
-forces the printing of a short note with a back reference.  It's the
-opposite, then, of \mycolor{\cmd{shortcite*}}, which prevents such a back
-reference from appearing.
+\mybigspace The \mymarginpar{\textbf{\textbackslash shortrefcite}} new
+package option \texttt{noteref} provides for the printing of back
+references from short notes to their corresponding long notes.
+\textsf{Biblatex-chicago} provides several options to help you control
+when such back references should appear, but as there may well be
+occasions when you and the code disagree, this command forces the
+printing of a short note with a back reference.  It's the opposite,
+then, of \cmd{shortcite*}, which prevents such a back reference from
+appearing.
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash surnamecite}}
 command is analogous to \cmd{headlesscite}, but whereas the latter
@@ -6044,8 +6240,8 @@
 thought I might gather them here also for your perusal.  These
 settings are, I believe, consistent with the specification, but you
 can alter them in the options to \textsf{biblatex-chicago} in your
-preamble or by loading the package via
-\verb+\usepackage[style=chicago-notes]{biblatex}+, which gives you the
+preamble or by loading the package via \verb+\usepackage+
+\verb+[style=chicago-notes]{biblatex}+, which gives you the
 \textsf{biblatex} defaults unless you redefine them yourself inside
 the square brackets.
 
@@ -6065,13 +6261,12 @@
 for the long format when presenting dates, slightly shortened when
 presenting date ranges.
 
-\mylittlespace In \colmarginpar{\texttt{alltimes=12h}} entries which
+\mylittlespace In \mymarginpar{\texttt{alltimes=12h}} entries which
 print time stamps, they will, when the stamp is part of a
 \textsf{date}, \textsf{eventdate}, or \textsf{origdate}, appear in
 12-hour format, i.e., \enquote{4:45 p.m.}  Stamps that are part of a
-\textsf{urldate} are, by default, controlled by the
-\mycolor{\texttt{urltime}} option, which is set to
-\mycolor{\texttt{24h}}.  See that option below, and
+\textsf{urldate} are, by default, controlled by the \texttt{urltime}
+option, which is set to \texttt{24h}.  See that option below, and
 table~\ref{ad:date:extras}.
 
 \mylittlespace The \mymarginpar{\texttt{dateabbrev=\\false}}
@@ -6078,19 +6273,19 @@
 \emph{Manual} prefers to use full month names in the notes \&\
 bibliography style.
 
-\mylittlespace This \colmarginpar{\texttt{datecirca=true}} option
-enables \textsf{biblatex's} enhanced \enquote{circa} date
-specification, which given a \textsf{date} like \verb+1989~+ will
-print [ca.\ 1989].  Cf.\ table~\ref{ad:date:extras}.
+\mybigspace This \mymarginpar{\texttt{datecirca=true}} option enables
+\textsf{biblatex's} enhanced \enquote{circa} date specification, which
+given a \textsf{date} like \verb+1989~+ will print [ca.\ 1989].  Cf.\
+table~\ref{ad:date:extras}.
 
-\mylittlespace This \colmarginpar{\texttt{dateuncertain=\\true}}
-option enables \textsf{biblatex's} enhanced \enquote{uncertain} date
+\mylittlespace This \mymarginpar{\texttt{dateuncertain=\\true}} option
+enables \textsf{biblatex's} enhanced \enquote{uncertain} date
 specification, which given a \textsf{date} like \verb+1989?+ will
 print [1989?].  A field like \verb+1989%+ is both \enquote{circa}
 \emph{and} \enquote{uncertain,} like so: [ca.\ 1989?].  Cf.\
 table~\ref{ad:date:extras}.
 
-\mylittlespace This \colmarginpar{\texttt{datezeros=false}} ensures
+\mylittlespace This \mymarginpar{\texttt{datezeros=false}} ensures
 that leading zeros don't appear in date specifications.
 
 \mybigspace This \mymarginpar{\texttt{ibidtracker=\\constrict}}
@@ -6101,7 +6296,7 @@
 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.  Please see section~\ref{sec:useropts} for
-options (\texttt{noibid} and \mycolor{\texttt{useibid}}) managing how
+options (\texttt{noibid} and \texttt{useibid}) managing how
 \textsf{biblatex-chicago} presents ibidem references, as the defaults
 have changed in the 17th edition (14.34).
 
@@ -6113,19 +6308,19 @@
 a different work by that author, two consecutive references to the
 same work by the same author generating, of course, \enquote{Ibid.}
 Indeed, if you are going to use the \texttt{idemtracker}, you should
-also set the package option \mycolor{\texttt{useibid}} to
-\texttt{true}, so that you don't get a mix of \enquote{Idem} and the
-new 17th-edition ibidem behavior which doesn't print \enquote{Ibid.}
-You can turn this all on when loading \textsf{biblatex-chicago} by
-setting \texttt{idemtracker=constrict,useibid=true}.  It works very
-much like the standard \textsf{biblatex} styles which include this
-option, so that you never get \enquote{Idem} in long notes, but only
-in short ones, and (ideally) never when the repeated name might be
-somewhat ambiguous.  Also, if you wish the localized string to be
-appropriately gendered, you need to employ the \textsf{biblatex} field
-\textsf{gender}, on which see \textsf{biblatex.pdf} \xA7~2.3.3.
+also set the package option \texttt{useibid} to \texttt{true}, so that
+you don't get a mix of \enquote{Idem} and the new 17th-edition ibidem
+behavior which doesn't print \enquote{Ibid.}  You can turn this all on
+when loading \textsf{biblatex-chicago} by setting
+\texttt{idemtracker=constrict,useibid=true}.  It works very much like
+the standard \textsf{biblatex} styles which include this option, so
+that you never get \enquote{Idem} in long notes, but only in short
+ones, and (ideally) never when the repeated name might be somewhat
+ambiguous.  Also, if you wish the localized string to be appropriately
+gendered, you need to employ the \textsf{biblatex} field
+\textsf{gender}, on which see \textsf{biblatex.pdf} \S~2.3.3.
 
-\mylittlespace This \colmarginpar{\texttt{labeltitle=\\true}} option
+\mylittlespace This \mymarginpar{\texttt{labeltitle=\\true}} option
 enables \textsf{biblatex-chicago-notes} to disambiguate shortened
 citations to different sources which might otherwise be confusingly
 identical.  Though I've set it in \textsf{biblatex-chicago.sty},
@@ -6163,12 +6358,12 @@
 only, not in long notes.  You can set it either in the preamble or in
 individual entries to enable the functionality in long notes only
 (\texttt{notes}), in both notes and bibliography (\texttt{true}), or
-in neither (\texttt{false}).  When you use the
-\mycolor{\texttt{commenton}}, \mycolor{\texttt{maintitle}}, or
-\texttt{reviewof} \textsf{relatedtypes}, \textsf{biblatex-chicago}
-automatically sets this option to \texttt{true} on an entry-by-entry
-basis, as these \textsf{relatedtypes} require this for proper
-functioning.  Cf.\ coolidge:speech, weed:flatiron.
+in neither (\texttt{false}).  When you use the \texttt{commenton},
+\texttt{maintitle}, or \texttt{reviewof} \textsf{relatedtypes},
+\textsf{biblatex-chicago} automatically sets this option to
+\texttt{true} on an entry-by-entry basis, as these
+\textsf{relatedtypes} require this for proper functioning.  Cf.\
+coolidge:speech, weed:flatiron.
 
 \mylittlespace This \mymarginpar{\texttt{sortcase=\\false}} turns off
 the sorting of uppercase and lowercase letters separately, a practice
@@ -6182,22 +6377,22 @@
 (\texttt{nty}).  Please see the discussion of
 \cmd{DeclareSortingTemplate} just below.
 
-\mylittlespace If \colmarginpar{\texttt{timezones=true}} you provide a
+\mylittlespace If \mymarginpar{\texttt{timezones=true}} you provide a
 timezone for a time stamp, usually using one of the \textsf{timezone}
 fields, this option ensures it will be printed.
 
-\mylittlespace In \colmarginpar{\texttt{urltime=24h}} entries with
+\mylittlespace In \mymarginpar{\texttt{urltime=24h}} entries with
 \textsf{urldate} fields containing time stamps, that stamp will by
 default appear in 24-hour format, i.e., \enquote{16:45.}  Cf.\
-\mycolor{\texttt{alltimes}}, above, \mycolor{\texttt{urlstamp}} in
+\texttt{alltimes}, above, \texttt{urlstamp} in
 section~\ref{sec:chicpreset} below, and table~\ref{ad:date:extras}.
 
 \mylittlespace In
-\colmarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
-\mycolor{\textsf{standard}} entries any editors' or compilers' names
-appear after the title, according to 14.259, so these
-entry-type-specific options encode this.  You can, of course, override
-these defaults in your preamble, should you deem it necessary.
+\mymarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
+\textsf{standard} entries any editors' or compilers' names appear
+after the title, according to 14.259, so these entry-type-specific
+options encode this.  You can, of course, override these defaults in
+your preamble, should you deem it necessary.
 
 \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}}
 enables automatic use of the \textsf{translator} at the head of
@@ -6204,7 +6399,7 @@
 entries in the absence of an \textsf{author} or an \textsf{editor}.
 In the bibliography, the entry will be alphabetized by the
 translator's surname.  You can disable this functionality on a
-per-entry basis by setting \texttt{use\-translator=false} in the
+per-entry basis by setting \texttt{usetranslator=false} in the
 \textsf{options} field.  Cf.\ silver:gawain.
 
 \subsubsection*{Other \textsf{biblatex} Formatting Options}
@@ -6234,23 +6429,24 @@
 three dashes separated by gaps.  He suggested an alternative, which
 I've adopted, with a minor tweak to make the dash thicker, though you
 can toy with all the parameters to find what looks right with your
-chosen font.  The default definition is:\\
-\verb+\renewcommand*{bibnamedash}{\rule[.4ex]{3em}{.6pt}}+.
+chosen font.  The default definition is:
 
+\mylittlespace\verb+\renewcommand*{bibnamedash}{\rule[.4ex]{3em}{.6pt}}+.
+
 \mylittlespace At \mymarginpar{\texttt{losnotes}
   \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have
-added two \texttt{bibenvironments} to \textsf{chicago-notes\break .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 you use a command like
-\verb+\printbiblist{shortjournal}+ to print a list of journal
-abbreviations, you can use the \texttt{sjnotes} and
+added two \texttt{bibenvironments} to \textsf{chicago-notes\break
+  .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 you use a
+command like \verb+\printbiblist{shortjournal}+ to print a list of
+journal abbreviations, you can use the \texttt{sjnotes} and
 \texttt{sjendnotes} \texttt{bibenvironments} in exactly the same way.
 Please see the documentation of \textsf{shorthand} and
 \textsf{shortjournal} in section~\ref{sec:entryfields} above for
@@ -6257,7 +6453,7 @@
 further options available to you for presenting and formatting these
 two types of \texttt{biblist}.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace Formerly
 \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} available only to
@@ -6290,12 +6486,12 @@
 \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} or a
-\mycolor{\textsf{standard}} entry headed by an \textsf{organization},
-or an \textsf{article} or \textsf{review} entry headed by a
-\textsf{journaltitle} won't need a \textsf{sortkey} set.  Further, the
-\texttt{use<name>=false} options will remove any name field from the
-sorting order, again reducing the need for user intervention.
+fields (\textsf{name[a-c]}), a \textsf{manual} or a \textsf{standard}
+entry headed by an \textsf{organization}, or an \textsf{article} or
+\textsf{review} entry headed by a \textsf{journaltitle} won't need a
+\textsf{sortkey} set.  Further, the \texttt{use<name>=false} options
+will remove any name field from the sorting order, again reducing the
+need for user intervention.
 
 \subsubsection{{Pre-Set \textsf{chicago} Options}}
 \label{sec:chicpreset}
@@ -6364,7 +6560,7 @@
 \textsf{url} field is always printed in \textsf{online} entries,
 regardless of the state of this option.
 
-\mylittlespace This \colmarginpar{\texttt{urlstamp=true}} option
+\mylittlespace This \mymarginpar{\texttt{urlstamp=true}} option
 controls whether any \textsf{urltime} fields, included as part of the
 \textsf{urldate}, will be printed in notes and bibliography.  It
 defaults to true, and can be set to false either in the preamble, for
@@ -6390,14 +6586,13 @@
 approximation.  Some per-type or per-entry work afterward may then
 polish up the details.  If you find that you need control over fields
 that aren't included among these options, I have provided the
-\mycolor{\cmd{suppressbibfield}} command for your preamble, as
-suggested by Jan David Hauck.  It is in fact a user interface to the
-source mapping feature of \textsf{biblatex}, and it is something of a
-nuclear option, preventing fields from even appearing in the .bbl file
-generated by \textsf{biber} from your .bib database.  See the
-\mycolor{\cmd{suppressbibfield}} command in
-section~\ref{sec:formatcommands} and the source mapping docs in
-\textsf{biblatex.pdf} \S~4.5.3.
+\cmd{suppressbibfield} command for your preamble, as suggested by Jan
+David Hauck.  It is in fact a user interface to the source mapping
+feature of \textsf{biblatex}, and it is something of a nuclear option,
+preventing fields from even appearing in the .bbl file generated by
+\textsf{biber} from your .bib database.  See the
+\cmd{suppressbibfield} command in section~\ref{sec:formatcommands} and
+the source mapping docs in \textsf{biblatex.pdf} \S~4.5.3.
 
 \mylittlespace At \mymarginpar{\texttt{addendum=\\true}} the request
 of Roger Hart, I have included this option, which controls the
@@ -6435,6 +6630,53 @@
 for specific fields, in the \textsf{options} field of individual
 entries.
 
+\mylittlespace These
+\colmarginpar{\texttt{bibannotesep\\=vpar\\citeannotesep\\=period}}
+options define the relation of the \textsf{annotation} field to the
+main entry, \mycolor{\texttt{bibannotesep}} doing so in the
+bibliography and \mycolor{\texttt{citeannotesep}} in long notes.  (The
+\texttt{annotation} option in section~\ref{sec:useropts} determines
+where, if anywhere, the field will appear.)  Both options have the
+same set of keys, though they have different default settings if you
+don't define them yourself.  The possible values are:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad none] = no punctuation at all.
+\item[\qquad space] = \cmd{addspace}
+\item[\qquad comma] = \verb+\addcomma\addspace+
+\item[\qquad period] = \verb+\addperiod\addspace+
+\item[\qquad colon] = \verb+\addcolon\addspace+
+\item[\qquad semicolon] = \verb+\addsemicolon\addspace+
+\item[\qquad par:] This starts a new paragraph on the next line.  Page
+  breaking is strongly inhibited before the \textsf{annotation}.
+\item[\qquad vpar:] This starts a new paragraph, and also inserts
+  some vertical space before it.  In long notes that vertical space is
+  minimal (1 pt), while in the bibliography it creates a blank line.
+  Page breaking is strongly inhibited before the \textsf{annotation}.
+\item[\qquad parbreak:] This is the same as \texttt{par}, but it allows
+  a page break to occur between the main entry and the start of the
+  \textsf{annotation}.
+\item[\qquad vparbreak:] This is the same as \texttt{vpar}, but it also
+  allows a page break between the main entry and the
+  \textsf{annotation}.
+\end{description}
+
+Please note that both of these options are available in the preamble
+both globally and per-type, and also in the \textsf{options} field of
+individual entries.  Each defines a command (\cmd{bibannotesep} and
+\cmd{citeannotesep}) which appears in the \textsf{annotation} field's
+formatting directive, so it's possible to redefine these commands in
+your preamble if you have needs that the available values don't
+address.  (You can also try sending an email to encourage me to add
+other keys.)  Please also keep in mind that
+\mycolor{\texttt{bibannotesep}} interacts with the
+\mycolor{\texttt{entrybreak}} and \mycolor{\textsf{formatbib}} options
+in section~\ref{sec:useropts}, below, to determine the general layout
+of the bibliography.  Depending on the settings of those options,
+changing the \mycolor{\texttt{bibannotesep}} from entry to entry may
+not work out well.
+
 \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
@@ -6450,6 +6692,7 @@
 depending on the value of the option:
 
 \begin{description}
+\setlength{\parskip}{-4pt}
 \item[\qquad true:] This is the default.  If you use \textsf{crossref}
   or \textsf{xref} fields in these entry types, by default you will
   \emph{not} get any abbreviated references, either in notes or
@@ -6469,7 +6712,7 @@
 \texttt{longcrossref}, below, and also the documentation of
 \textsf{crossref} in section~\ref{sec:entryfields}.
 
-\mylittlespace The \colmarginpar{\texttt{compressyears\\=true}}
+\mylittlespace The \mymarginpar{\texttt{compressyears\\=true}}
 \emph{Manual} has long recommended (9.64, 14.117, 14.144), as a
 space-saving measure, the compression of year ranges when presenting
 dates.  I have, finally, implemented this in the current release, and
@@ -6485,7 +6728,7 @@
 requested a way to control the punctuation printed before the
 \textsf{titleaddon}, \textsf{booktitleaddon}, and
 \textsf{maintitleaddon} fields.  By default, this is
-\verb+\addcomma\addspace+ (\textsf{ctitleaddon}) for all occurrences
+\verb+\addcomma\addspace+ (\textsf{cti\-tleaddon}) for all occurrences
 in notes and for nearly all \textsf{book-} and
 \textsf{maintitleaddons} in the bibliography, while
 \verb+\addperiod\addspace+ (\textsf{ptitleaddon}) is the default
@@ -6492,7 +6735,7 @@
 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
+(Cf.\ coolidge\hc speech and schubert:muellerin.)  The accepted option
 keys are:
 
 \begin{description}
@@ -6514,16 +6757,15 @@
 relevant option to \texttt{none} in your entry and then include the
 punctuation in the \textsf{titleaddon} field itself.
 
-\mylittlespace Constanza Cordoni \colmarginpar{\texttt{dashed=true}}
+\mylittlespace Constanza Cordoni \mymarginpar{\texttt{dashed=true}}
 has requested a way to turn off the 3-em dash for replacing repeated
 names in the bibliography, and the \emph{Manual} admits that some
 publishers prefer this, as the dash can carry with it certain
 inconveniences, especially for electronic formats (14.67).  Some of
 \textsf{biblatex's} standard styles have a \texttt{dashed} option, so
-for compatibility purposes I've provided the same.  By default, I have
-set it to print the name dash, but you can set
-\mycolor{\texttt{dashed=false}} in your preamble to repeat names
-instead throughout your document.
+for compatibility purposes I've provided the same.  By default I have
+set it to print the name dash, but you can set \texttt{dashed=false}
+globally, per type, or per entry to repeat names as and when required.
 
 \mylittlespace If \mymarginpar{\texttt{hidevolumes=\\true}} both a
 \textsf{volume} and a \textsf{volumes} field are present, as may occur
@@ -6544,9 +6786,9 @@
 series.  It controls the settings for the entry types more-or-less
 authorized by the \emph{Manual}, i.e., \textsf{inbook},
 \textsf{incollection}, \textsf{inproceedings}, \textsf{letter}, and
-\mycolor{\textsf{review}}.  The mechanism itself is enabled by
-multiple \textsf{crossref} or \textsf{xref} references to the same
-parent, whether that be, e.g., a \textsf{collection}, an
+\textsf{review}.  The mechanism itself is enabled by multiple
+\textsf{crossref} or \textsf{xref} references to the same parent,
+whether that be, e.g., a \textsf{collection}, an
 \textsf{mvcollection}, a \textsf{proceedings}, or an
 \textsf{mvproceedings} entry.  Given these multiple cross references,
 the presentation in the reference apparatus will be governed by the
@@ -6553,6 +6795,7 @@
 following options:
 
 \begin{description}
+\setlength{\parskip}{-4pt}
 \item[\qquad false:] This is the default.  If you use
   \textsf{crossref} or \textsf{xref} fields in the four mentioned
   entry types, you'll get the abbreviated references in both notes and
@@ -6577,13 +6820,33 @@
 above, and also the documentation of \textsf{crossref} in
 section~\ref{sec:entryfields}.
 
-\mylittlespace This \colmarginpar{\texttt{nodates=true}} option means
+\mylittlespace This \colmarginpar{\texttt{nameaddonsep\\=space}}
+option sets the punctuation which appears
+before the \textsf{nameaddon} field in all entry types except
+\textsf{customc}.  You can set it globally, per type or per entry,
+using one of the six following keys:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{space}] = \cmd{addspace}.  This is the default.
+\item[\qquad \texttt{none}] = no separator at all.  It presumes that
+  you will include one in the \textsf{nameaddon} field itself.
+\item[\qquad \texttt{colon}] = \verb+\addcolon\addspace+.
+\item[\qquad \texttt{comma}] = \verb+\addcomma\addspace+.
+\item[\qquad \texttt{period}] = \verb+\addperiod\addspace+.
+\item[\qquad \texttt{semicolon}] = \verb+\addsemicolon\addspace+.
+\end{description}
+
+Cf.\ \mycolor{\texttt{nameaddon}} and
+\mycolor{\texttt{nameaddonformat}} in section~\ref{sec:useropts}.
+
+\mylittlespace This \mymarginpar{\texttt{nodates=true}} option means
 that \textsf{biblatex-chicago} automatically provides
 \verb+\bibstring{nodate}+ in any \enquote{circa} or
 \enquote{uncertain} date specification where the user has also turned
 off the printing of brackets around the date using the
-\mycolor{\texttt{nodatebrackets}} or \mycolor{\texttt{noyearbrackets}}
-options (section~\ref{sec:useropts}; 14.145).  If you set
+\texttt{nodatebrackets} or \texttt{noyearbrackets} options
+(section~\ref{sec:useropts}; 14.145).  If you set
 \texttt{nodates=false} either in your preamble (for global coverage or
 for specific entry types) or in individual entries then the package
 will simply print the unbracketed date specification in this context.
@@ -6614,7 +6877,7 @@
 \end{description}
 
 You can, in emergencies, directly
-\verb+\renewcommand{\shorthandpunct}+ in the pream\-ble, but it might
+\verb+\renewcommand{\shorthandpunct}+ in the preamble, but it might
 be easier to use the \texttt{none} option to \texttt{shorthandpunct}
 and hand-craft solutions inside the \textsf{shorthandintro} fields of
 individual entries.
@@ -6623,37 +6886,52 @@
 \label{sec:useropts}
 
 These are parts of the specification that not everyone will wish to
-enable.  All except the fifth and eighth can be used even if you load
-the package in the old way via a call to \textsf{biblatex}, but most
-users can just place the appropriate string(s) in the options to the
-\cmd{usepackage} \texttt{\{biblatex-chicago\}} call in your preamble.
+enable.  All except the fifth, sixth, and eleventh can be used even if
+you load the package in the old way via a call to \textsf{biblatex},
+but most users can just place the appropriate string(s) in the options
+to the \cmd{usepackage} \texttt{\{biblatex-chicago\}} call in your
+preamble.
 
 \mylittlespace \textsf{Biblatex-chicago}
-\colmarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
+\mymarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
 enhanced date specifications, one part of which is the presentation of
 decades and centuries not as year ranges but as localized strings like
-\enquote{19th c.} or \enquote{1970s.}  The
-\mycolor{\texttt{alwaysrange}} option set to \texttt{true}, either in
-your preamble or in individual entries, simply tells the package to
-present the year range instead.  This allows you to use the efficient
-enhanced notations in the \textsf{date} field (\verb+{18XX}+ or
-\verb+{197X}+) without the localized strings appearing, should you
-require it.  The two options \mycolor{\texttt{centuryrange}} and
-\mycolor{\texttt{decaderange}} limit the same effect to centuries and
-decades, respectively.  Please see table~\ref{ad:date:extras}.
+\enquote{19th c.} or \enquote{1970s.}  The \texttt{alwaysrange} option
+set to \texttt{true}, either in your preamble or in individual
+entries, simply tells the package to present the year range instead.
+This allows you to use the efficient enhanced notations in the
+\textsf{date} field (\verb+{18XX}+ or \verb+{197X}+) without the
+localized strings appearing, should you require it.  The two options
+\texttt{centuryrange} and \texttt{decaderange} limit the same effect
+to centuries and decades, respectively.  Please see
+table~\ref{ad:date:extras}.
 
-\mylittlespace At \mymarginpar{\texttt{annotation}} the request of
+\mylittlespace At \colmarginpar{\texttt{annotation}} the request of
 Emil Salim, I included in \textsf{biblatex-chicago} the ability to
-produce annotated bibliographies.  If you turn this option on then the
-contents of your \textsf{annotation} (or \textsf{annote}) field will
-be printed after the bibliographical reference.  (You can also use
-external files to store annotations -- please see
-\textsf{biblatex.pdf} \xA7~3.13.8 for details on how to do this.)  This
-functionality is currently in a beta state, so before you use it
-please have a look at the documentation for the \textsf{annotation}
-field, on page~\pageref{sec:annote} above.
+produce annotated bibliographies.  More recently, Moritz Wemheuer
+brought to my attention a
+\href{https://tex.stackexchange.com/questions/528374/moving-addendum-field-to-the-end-in-biblatex-chicago/540755#540755}{StackExchange}
+question which suggested that the field might be useful in several
+other contexts as well, so I've modified the \texttt{annotation}
+option to allow the field to appear in the bibliography (\texttt{=bib}
+or \texttt{=true}, the default, if no string is given), in long notes
+(\texttt{=notes}), in both (\texttt{=all}), or in neither
+(\texttt{=false}).  You can now set the option in the preamble both
+globally and per-type, and in the \textsf{options} field of individual
+entries.  There are two new options (\mycolor{\texttt{bibannotesep}}
+and \mycolor{\texttt{citeannotesep}}) to allow you to choose the
+separator between the \textsf{annotation} and the rest of the entry,
+and also two new options (\mycolor{\texttt{formatbib}} and
+\mycolor{\texttt{entrybreak}}) to give you fine-grained control over
+the presentation of the bibliography as a whole, including an
+annotated one.  Please have a look at the documentation for the latter
+two options just below, for the former two options in
+section~\ref{sec:chicpreset}, and for the \textsf{annotation} field on
+page~\pageref{sec:annote}.  Please also see \textsf{biblatex.pdf}
+\S~3.13.8 for details on how to use external files to store
+annotations.
 
-\mylittlespace As \colmarginpar{\texttt{blogurl}} a convenience
+\mylittlespace As \mymarginpar{\texttt{blogurl}} a convenience
 feature, this option, available only in the preamble, allows
 \textsf{review} entries to inherit a \textsf{url} from
 \textsf{article} entries.  The main use, as the name suggests, is when
@@ -6661,11 +6939,23 @@
 have for a blog post.  You'll need an extra \LaTeX - \textsf{Biber} -
 \LaTeX\ run to make sure any changes to this option take effect.
 
-\mylittlespace This \colmarginpar{\texttt{centuryrange}} option works
-just like \mycolor{\texttt{alwaysrange}}, above, but only affects
-century presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+\mylittlespace Like \colmarginpar{\texttt{casechanger}} \texttt{mcite}
+and \texttt{natbib}, this is a standard \textsf{biblatex} option which
+\textsf{biblatex-chicago} simply passes through to that package.  In
+\textsf{biblatex} it defaults to \texttt{auto}, but there were, and
+possibly still are, cases when the old \texttt{latex2e} case-changing
+code can work around some bugs when using, for example, citation
+commands inside fields that have a case-changing element as an
+automatic part of their formatting (\textsf{note},
+\textsf{titleaddon}, \textsf{type}).  Cf.\ the
+\mycolor{\cmd{citeincite}} command in section~\ref{sec:citecommands},
+and section~3.1.1 of \textsf{biblatex.pdf}.
 
-\mylittlespace The \colmarginpar{\texttt{cmsbreakurl}} \emph{Manual}
+\mylittlespace This \mymarginpar{\texttt{centuryrange}} option works
+just like \texttt{alwaysrange}, above, but only affects century
+presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace The \mymarginpar{\texttt{cmsbreakurl}} \emph{Manual}
 gives fairly specific instructions about breaking URLs across lines
 (14.18), so I have attempted to implement them by tweaking
 \textsf{biblatex's} default settings, which are found in
@@ -6674,8 +6964,8 @@
 instructions, nor do the changes I have made work well in all
 circumstances, being particularly unsightly if you happen to be using
 the \textsf{ragged2e} package.  For these reasons, I have made my
-changes dependent on a package option, \mycolor{\texttt{cmsbreakurl}},
-which you can set in your preamble.  I have placed all of this code in
+changes dependent on a package option, \texttt{cmsbreakurl}, which you
+can set in your preamble.  I have placed all of this code in
 \textsf{biblatex-chicago.sty}, so if you load the package with a call
 to \textsf{biblatex} instead, then URL line breaking will revert to
 the \textsf{biblatex} defaults.  See
@@ -6694,10 +6984,18 @@
 with a call to \textsf{biblatex} instead then you'll get the default
 \textsf{biblatex} compression style.
 
-\mylittlespace This \colmarginpar{\texttt{decaderange}} option works
-just like \mycolor{\texttt{alwaysrange}}, above, but only affects
-decade presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
+\mylittlespace This \colmarginpar{\texttt{datamodel}} is the standard
+\textsf{biblatex} option for loading the named data model file
+(excluding its\ .dbx extension).  After a request by Philipp Immel,
+you can now set this option when you load the Chicago styles with
+\verb+\usepackage{biblatex-chicago}+, and it will be passed through
+properly to \textsf{biblatex} itself.  Cf.\ \textsf{biblatex.pdf}
+\S~4.5.4.
 
+\mylittlespace This \mymarginpar{\texttt{decaderange}} option works
+just like \texttt{alwaysrange}, above, but only affects decade
+presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
+
 \mylittlespace The \mymarginpar{\texttt{delayvolume}} presentation of
 \textsf{volume} information in the notes \&\ bibliography style is
 complicated (\emph{Manual}, 14.116--22).  Depending on entry type and
@@ -6717,6 +7015,19 @@
 without this option, be printed \emph{after} a \textsf{booktitle} or
 \textsf{maintitle}.  Cf.\ also \cmd{postvolpunct}, below.
 
+\mylittlespace This \colmarginpar{\texttt{entrybreak}} option only
+makes sense when used in conjunction with the \texttt{annotenp} switch
+to the \mycolor{\texttt{formatbib}} option (below).  The latter allows
+\LaTeX\ to break a page inside an \textsf{annotation} field printed
+without starting a new paragraph, and it does so by allowing such a
+break in the entry only after a set number of lines, by default set to
+3.  The idea is that most bibliography entries will fit within 3
+lines, so the break would generally be somewhere inside the
+\textsf{annotation}.  If your document needs a value different from 3,
+provide the integer using the \mycolor{\texttt{entrybreak}} option in
+your preamble.  Some experimentation may be needed to find the optimum
+number for a given document.
+
 \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the
 \emph{Manual} (14.24) recommends specific formatting for footnote (and
 endnote) marks, i.e., superscript in the text and in-line in foot- or
@@ -6733,12 +7044,74 @@
 amount of other formatting, as well.  See section~\ref{sec:loading},
 below.
 
+\mylittlespace The \colmarginpar{\texttt{formatbib}} \emph{Manual} in
+fact says very little about formatting issues in bibliographies, e.g.,
+whether to break entries across pages and whether to allow widows and
+orphans (single lines at the start or end of a page).  A quick and
+non-scientific survey of publications issued by the University of
+Chicago Press suggests that actual practices are extremely varied, so
+I've tried to provide a number of choices for users of
+\textsf{biblatex-chicago}, most of them available as keys to the new
+\mycolor{\texttt{formatbib}} preamble option, but a few of them also
+involving settings of the \mycolor{\texttt{bibannotesep}} and the
+\mycolor{\texttt{entrybreak}} options.  The keys of
+\mycolor{\texttt{formatbib}} are as follows:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad max:] This is the \textsf{biblatex} default, so if you
+  don't set \mycolor{\texttt{formatbib}} at all it's what you get.  It
+  provides maximal intervention, disallowing entries broken across
+  pages, including even when an entry includes a lengthy annotation.
+\item[\qquad min:] This allows page breaks just about anywhere,
+  including inside entries, and it also allows widows and orphans, so
+  it will usually provide the most efficient use of available space on
+  the pages of your bibliography.
+\item[\qquad minwo:] This is like \texttt{min}, but discourages
+  widows and orphans.
+\item[\qquad annote:] This option treats annotations separately from
+  bibliography entries, allowing them to be broken across pages while
+  the entry itself won't be.  It is intended for use with, and will
+  only properly work with, \mycolor{\texttt{bibannotesep}} set to one
+  of the modes that start a new paragraph for the annotation, to wit,
+  \texttt{par}, \texttt{vpar} (the default), \texttt{parbreak}, or
+  \texttt{vparbreak}.  See below for the meaning of the
+  \enquote{\texttt{break}} options here.
+\item[\qquad annotenp:] This option attempts to treat annotations
+  separately from bibliography entries in those settings of
+  \mycolor{\texttt{bibannotesep}} which don't involve starting a new
+  paragraph.  It works by setting the number of lines in an entry
+  after which page breaking is allowed.  By default entries will only
+  break after 3 lines, the idea being that most bibliography entries
+  fit into three lines, so at that point you're likely to be inside
+  the annotation, but you can set the \mycolor{\texttt{entrybreak}}
+  option to any integer that works for your reference apparatus.
+\end{description}
+
+Please note that there is one possible break point that isn't directly
+addressed by these options, that is, the one between the main entry
+and the annotation when that annotation starts a new paragraph.  If
+you set \mycolor{\texttt{bibannotesep}} to \texttt{par} or
+\texttt{vpar}, then \LaTeX\ will try very hard not to break between
+entry and annotation, ensuring that the annotation at least starts on
+the same page as its entry.  If you use \texttt{parbreak} or
+\texttt{vparbreak}, \LaTeX\ is positively encouraged to break a page
+there, as is usual between paragraphs.
+
+\mylittlespace You can of course ignore the
+\mycolor{\texttt{formatbib}} option and provide your own settings.
+\textsf{Biblatex} uses the \cmd{bibsetup} command which you can renew
+in your preamble.  You can find a nice commentary on the default
+values set by the package in the file \textsf{biblatex.def}, which
+you'll find in the main \textsf{biblatex} directory of your \TeX\
+distribution.
+
 \mylittlespace This \mymarginpar{\texttt{genallnames}} option affects
 the choice of which names to present in the genitive case when using
 the \cmd{gentextcites} command.  Please see the documentation of that
 command in section~\ref{sec:citecommands}, above.
 
-\mylittlespace Setting \mymarginpar{\texttt{inheritshort\-hand}} this
+\mylittlespace Setting \mymarginpar{\texttt{inheritshorthand}} 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
@@ -6782,22 +7155,65 @@
 names, and in this position it always takes a comma, the presence of
 which is unaffected by this option.
 
-\mylittlespace This \mymarginpar{\texttt{natbib}} may look like the
-standard \textsf{biblatex} option, but to keep the coding of
-\textsf{biblatex-chicago.sty} simpler for the moment I have
-reimplemented it there, from whence it is merely passed on to
-\textsf{biblatex}.  If you load the Chicago style with
-\verb+\usepackage{biblatex-chicago}+, then the option should simply
-read \texttt{natbib}, rather than \texttt{natbib=true}.  The shorter
-form also works if you load the style using
-\cmd{usepackage[style=chicago-notes]\\\{biblatex\}}, so I hope this
-requirement isn't too onerous.
+\mylittlespace This \colmarginpar{\texttt{nameaddon}} option
+determines where and when the \textsf{nameaddon }field will be
+printed.  There are seven possible values, the first four of which are
+available globally, per type, and per entry, with the last three only
+applicable globally:
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{all}:] This is the default; if an entry has a
+  \textsf{nameaddon}, it will appear in both long notes and in the
+  bibliography.
+\item[\qquad \texttt{none}:] The field will appear neither in the
+  bibliography nor in long notes.
+\item[\qquad \texttt{bib}:] The field will appear only in the
+  bibliography.
+\item[\qquad \texttt{cite}:] The field will appear only in long notes.
+\item[\qquad \texttt{first}:] Philipp Immel requested this as a way to
+  provide an \textsf{author's} dates in the \textsf{nameaddon} field
+  and only have them printed the first time that author appears in the
+  bibliography.  A sequence of consecutive long notes citing works by
+  the same author will be treated the same way.  The code tests for
+  identical \textsf{nameaddon} fields in works by identical
+  \textsf{authors}, so other sorts of \textsf{nameaddon} will be
+  printed as usual.
+\item[\qquad \texttt{bibfirst}:] Like \texttt{first}, but will not
+  print the \textsf{nameaddon} field in long notes.
+\item[\qquad \texttt{citefirst}:] Like \texttt{first}, but will not
+  print the \textsf{nameaddon} field in the bibliography.
+\end{description}
 
-\mylittlespace When \colmarginpar{\texttt{nodatebrackets}\\
+Cf.\ \mycolor{\texttt{nameaddonformat}} just below, and
+\mycolor{\texttt{nameaddonsep}} in section~\ref{sec:chicpreset}.
+
+\mylittlespace This \colmarginpar{\texttt{nameaddon-\\format}} option,
+available globally, per type, and per entry, allows you to change the
+format of the \textsf{nameaddon} field on the fly, so its value should
+be a field format that \textsf{biblatex} understands.  This includes
+standard formats like \texttt{parens,\,brackets} or \texttt{emph}, and
+also custom formats that you provide in your preamble using
+\cmd{DeclareFieldFormat}, in case the standard ones aren't adequate.
+If you don't define this option, then the usual defaults apply, that
+is, no formatting in \textsf{online, review,} and
+\textsf{suppperiodical} entries, as well as in \textsf{misc} entries
+with an \textsf{entrysubtype}, while square brackets surround the
+field in all other entry types with the exception of \textsf{customc},
+which has its own rules and ignores this option. Cf.\
+\mycolor{\texttt{nameaddonsep}} in section~\ref{sec:chicpreset}.
+
+\mylittlespace These \mymarginpar{\texttt{natbib}\\\texttt{mcite}} are
+the standard \textsf{biblatex} options, which formerly required
+slightly special handling when you loaded the Chicago style with
+\verb+\usepackage{biblatex-chicago}+.  Both the forms \texttt{natbib}
+and \texttt{natbib=true} (\texttt{mcite} \&\ \texttt{mcite=true})
+should now work.
+
+\mylittlespace When \mymarginpar{\texttt{nodatebrackets}\\
   \texttt{noyearbrackets}} you use \textsf{biblatex's} enhanced date
-specifications to present an uncertain date (\verb+{1956?}+), a
-\enquote{circa} date (\verb+{1956~}+), or one that is both at the same
-time (\verb+{1956%}+), the date that by default will appear in your
+specifications to present a \enquote{circa} date (\verb+{1956~}+), an
+uncertain date (\verb+{1956?}+), or one that is both at the same time
+(\verb+{1956%}+), the date that by default will appear in your
 documents will have square brackets around it.  This accords with the
 \emph{Manual's} instructions concerning such dates (14.145), but that
 section also includes an alternative form, where the guessed at date
@@ -6805,19 +7221,19 @@
 \enquote{\texttt{n.d., ca.\ 1750.}}  These two package options, which
 may appear in the preamble either for the whole document or for
 specific entry types, or in individual entries, allow you to control
-when these brackets will appear, while the \mycolor{\texttt{nodates}}
-option, set to \texttt{true} by default, decides whether to print
+when these brackets will appear, while the \texttt{nodates} option,
+set to \texttt{true} by default, decides whether to print
 \verb+\bibstring{nodate}+ before the date.  In truth, users of the
 notes \&\ bibliography style will probably only ever need
-\mycolor{\texttt{nodatebrackets}}, which controls most of the dates
-that will appear in your documents, with the exception of dates in
-some \textsf{article}, \textsf{review}, and \textsf{periodical}
-entries without an \textsf{entrysubtype}, which are governed by
-\mycolor{\texttt{noyearbrackets}}.  (The distribution is different in
-the author-date styles, so it's impossible to do without both
-options.)  Cf.\ table~\ref{ad:date:extras}.
+\texttt{nodatebrackets}, which controls most of the dates that will
+appear in your documents, with the exception of dates in some
+\textsf{article}, \textsf{review}, and \textsf{periodical} entries
+without an \textsf{entrysubtype}, which are governed by
+\texttt{noyearbrackets}.  (The distribution is different in the
+author-date styles, so it's impossible to do without both options.)
+Cf.\ table~\ref{ad:date:extras}.
 
-\mylittlespace At \colmarginpar{\texttt{noibid}} the request of an
+\mylittlespace At \mymarginpar{\texttt{noibid}} the request of an
 early tester, I have included this option to allow you globally to
 turn off the \emph{ibidem} mechanism that
 \textsf{biblatex-chicago-notes} uses by default.  Some publishers, it
@@ -6825,10 +7241,10 @@
 instead of the \emph{ibidem} mechanism you'll get the short note form.
 Please note that the 17th edition no longer recommends the use of
 \enquote{\emph{ibid.}}\ at all (14.34), so depending on the state of
-the \mycolor{\texttt{useibid}} option, below, what you'll be turning
-off may well no longer be the appearance of \emph{ibid.}\ itself.  For
-more fine-grained control of individual citations you'll probably want
-to use specialized citation commands, instead.  See section
+the \texttt{useibid} option, below, what you'll be turning off may
+well no longer be the appearance of \emph{ibid.}\ itself.  For more
+fine-grained control of individual citations you'll probably want to
+use specialized citation commands, instead.  See section
 \ref{sec:citecommands}.
 
 \mylittlespace As \mymarginpar{\texttt{omitxrefdate}} part of the
@@ -6870,9 +7286,9 @@
 Note also that the option only affects the \textsf{postnote} field of
 citation commands, not the \textsf{pages} field in your .bib file.
 
-\mylittlespace This \colmarginpar{\texttt{seriesabbrev}} option
-controls the printing of the \mycolor{\textsf{shortseries}} field in
-place of the \textsf{series} field in book-like entries in notes and
+\mylittlespace This \mymarginpar{\texttt{seriesabbrev}} option
+controls the printing of the \textsf{shortseries} field in place of
+the \textsf{series} field in book-like entries in notes and
 bibliography.  It is \texttt{false} by default, so as shipped
 \textsf{biblatex-chicago-notes} will silently ignore such fields, but
 you can set it, either in the preamble for the whole document or for
@@ -6880,8 +7296,7 @@
 values: \texttt{true} prints the abbreviated form in notes and
 bibliography, \texttt{notes} in notes only, and \texttt{bib} in the
 bibliography only.  For more details, see the documentation of
-\mycolor{\textsf{shortseries}} in section~\ref{sec:entryfields},
-above.
+\textsf{shortseries} in section~\ref{sec:entryfields}, above.
 
 \mylittlespace This \mymarginpar{\texttt{short}} option means that
 your text will only use the short note form, even in the first
@@ -6900,11 +7315,11 @@
 works that, though perfectly distinguishable in their long form, end
 up looking identical in short notes; multiple performances of the same
 work by the same artist, for example, might end up producing such a
-situation.  (In \textsf{online} and \textsf{review} entries using the
-\mycolor{\texttt{commenton}} \textsf{relatedtype} this situation is so
-endemic that I've set a default method of disambiguating short notes
-there, though you can still override it with the following options.
-See section~\ref{sec:related}, above.)  While the use of a
+situation.  (In \textsf{online} and \textsf{review} entries using
+\texttt{commenton} \textsf{relatedtype} this situation is so endemic
+that I've set a default method of disambiguating short notes there,
+though you can still override it with the following options.  See
+section~\ref{sec:related}, above.)  While the use of a
 \textsf{shorthand} field could provide some sort of remedy, he
 requested a way to disambiguate short notes by adding a
 user-configurable field to the note, thereby keeping it both short and
@@ -6948,7 +7363,7 @@
 section~\ref{sec:entryfields} above for information on further options
 available to you for presenting and formatting the list of shorthands.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace Chris Sparks \mymarginpar{\texttt{shorthandibid}}
 pointed out that \textsf{biblatex-chicago-notes} would never use
@@ -6965,6 +7380,43 @@
 of \emph{ibid.}\ instead of the shorthand in such circumstances,
 though the default behavior remains the same as it always has.
 
+\mylittlespace Fr.\ Norbert \colmarginpar{\texttt{shorthand-\\intro}}
+Keliher requested a way to turn off the printing, in the first
+citation of a work, of the introduction of a \textsf{shorthand} that
+will appear in subsequent citations.  (A possible use case is when
+that \textsf{shorthand} is so well known that it needs no
+introduction.)  By default, \textsf{biblatex-chicago} prints a notice
+--- (hereafter cited as) --- when no \textsf{shorthandintro} field is
+present, the latter field allowing you to modify the notice but not
+eliminate it.  The new \mycolor{\texttt{shorthandintro}} option is
+available globally, per-type, and per-entry, and has three possible
+values:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad none:] This setting turns off the notice entirely.  The
+  \textsf{shorthand} field will simply appear in subsequent citations
+  with no introduction.
+\item[\qquad short:] This setting provides the \textsf{shorthand}
+  alone in parentheses at the end of the first citation.  You can get
+  a similar effect by providing a \textsf{shorthandintro} field which
+  only contains the \textsf{shorthand} wrapped in parentheses.
+\item[\qquad full:] This is in effect the default setting, but you
+  would only need to use it in a document where one of the other two
+  settings was in force either globally or per-type.  In
+  \textsf{chicago-notes.cbx} I have set this value for the
+  \textsf{jurisdiction}, \textsf{legal}, and \textsf{legislation}
+  entry types to fulfil the \emph{Bluebook's} specification even when
+  a user changes it for other sorts of entry.  This requires you to
+  alter it specifically for these types should you wish to depart from
+  the \emph{Bluebook} guidelines. Cf.\ section~\ref{sec:legal}, below.
+\end{description}
+
+N.B.\ The list of shorthands will always still be available to you as
+an explanatory tool in the absence of any introductions to individual
+shorthands.  Please see the documentation of the \textsf{shorthand}
+and \textsf{shorthandintro} fields in section~\ref{sec:entryfields}.
+
 \mylittlespace This \mymarginpar{\texttt{strict}} still-experimental
 option attempts to follow the \emph{Manual}'s recommendations (14.41)
 for formatting footnotes on the page, using no rule between them and
@@ -6973,7 +7425,7 @@
 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 \mymarginpar{\texttt{urlnotes}} Bj\xF6rk, for
+\mylittlespace Stefan \mymarginpar{\texttt{urlnotes}} Bj\"{o}rk, for
 specialized reasons, requested a way to turn off the printing of
 \textsf{url}, \textsf{doi}, and \textsf{eprint} information in notes
 but not in the bibliography.  As it's possible this might be of more
@@ -6981,7 +7433,7 @@
 \texttt{false} either in the preamble or in individual entries, but
 please note that it does not apply to \textsf{online} entries.
 
-\mylittlespace In \colmarginpar{\texttt{useibid}} a change to previous
+\mylittlespace In \mymarginpar{\texttt{useibid}} a change to previous
 recommendations, the 17th edition of the \emph{Manual}
 \enquote{discourages the use of \emph{ibid.,}}\ preferring instead a
 shortened reference with only the author's name (14.34).
@@ -6988,10 +7440,10 @@
 \textsf{Biblatex-chicago} now implements these recommendations by
 default, including the repetition of page references even when they're
 exactly the same as the previous note.  If you prefer to continue
-using \emph{ibid.}, then set \mycolor{\texttt{useibid=true}} in your
-document preamble and you'll get the traditional behavior.
+using \emph{ibid.}, then set \texttt{useibid=true} in your document
+preamble and you'll get the traditional behavior.
 
-\mylittlespace Stefan \mymarginpar{\texttt{xrefurl}} Bj\xF6rk pointed
+\mylittlespace Stefan \mymarginpar{\texttt{xrefurl}} Bj\"{o}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
@@ -7002,7 +7454,7 @@
 individual entries will allow the \textsf{url}, \textsf{doi}, or
 \textsf{eprint} field to appear even in these abbreviated references.
 
-\subsubsection{Back References: The \mycolor{\texttt{noteref}} Option}
+\subsubsection{Back References: The \texttt{noteref} Option}
 \label{sec:noteref}
 
 \textsf{Biblatex} has always provided the \texttt{backref} option,
@@ -7009,21 +7461,21 @@
 which prints, in the bibliography, those pages on which individual
 works have been cited.  The \emph{Manual} (14.31) recommends another,
 related system, which involves, at the end of short notes,
-cross-referen\-ces to the note where the reader can find the full,
-long citation of the same source, \enquote{especially in the absence
-  of a full bibliography.}  The general idea is that, where a short
-note is \enquote{far} from the long citation, a back reference to that
-long note may prove \enquote{helpful.}  The recommended format is
-something like this: \texttt{(see chap.\ 1, n.\ 4)}.  The previous
-release of \textsf{biblatex-chicago} provided something similar only
-for certain subsets of material from the \emph{Bluebook} guidelines
-for legal citations.  That provision is very basic and has a different
+cross-references to the note where the reader can find the full, long
+citation of the same source, \enquote{especially in the absence of a
+  full bibliography.}  The general idea is that, where a short note is
+\enquote{far} from the long citation, a back reference to that long
+note may prove \enquote{helpful.}  The recommended format is something
+like this: \texttt{(see chap.\ 1, n.\ 4)}.  The previous release of
+\textsf{biblatex-chicago} provided something similar only for certain
+subsets of material from the \emph{Bluebook} guidelines for legal
+citations.  That provision is very basic and has a different
 rationale, so it remains both unaltered and entirely separate.  With
 this release, in the notes \&\ bibliography style only, I have
 provided Chicago-style back references for all other entry types,
-enabled through the new \mycolor{\texttt{noteref}} preamble option.
-(Cf.\ \href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}}
-for a brief introduction.)
+enabled through the \texttt{noteref} preamble option.  (Cf.\
+\href{file:cms-noteref-demo.pdf}{\textsf{cms-noteref-demo.pdf}} for a
+brief introduction.)
 
 \mylittlespace Before embarking on a description of this new option,
 and its many sub-options, I would like to point out that
@@ -7032,18 +7484,18 @@
 \textsf{biblatex-chicago hyperref} interface, so electronic documents
 can, at your discretion, contain clickable links from short notes to
 long notes or, in a document with all short notes, from such notes to
-bibliography entries.  (The \mycolor{\textsf{noteref}} mechanism
-cooperates well with \textsf{hyperref}, and therefore can add another
-layer of links to those already available.)  \textsf{Biblatex} also
-offers the \texttt{refsection} and \texttt{citereset} preamble
-options, which allow you to choose how its citation trackers behave.
-Using these you can, for example, always have a long note appear for a
-given source at its first appearance in a chapter or a section,
-something which the \emph{Manual} recommends in any case, and which
-may mean that your short notes are never too \enquote{far} from a
-longer citation.  (See \textsf{biblatex.pdf, \S~3.1.2.1}.)
+bibliography entries.  (The \textsf{noteref} mechanism cooperates well
+with \textsf{hyperref}, and therefore can add another layer of links
+to those already available.)  \textsf{Biblatex} also offers the
+\texttt{refsection} and \texttt{citereset} preamble options, which
+allow you to choose how its citation trackers behave.  Using these you
+can, for example, always have a long note appear for a given source at
+its first appearance in a chapter or a section, something which the
+\emph{Manual} recommends in any case, and which may mean that your
+short notes are never too \enquote{far} from a longer citation.  (See
+\textsf{biblatex.pdf, \S~3.1.2.1}.)
 
-\mylittlespace All \colmarginpar{\texttt{noteref}} the same, sometimes
+\mylittlespace All \mymarginpar{\texttt{noteref}} the same, sometimes
 chapters or sections can get rather long, or a too-frequent
 reappearance of the long form may not be optimal for your work, so in
 such situations the \texttt{noteref} option may well prove useful.
@@ -7058,7 +7510,7 @@
 printed, then the value of the \texttt{noteref} option determines what
 it will look like.  Its six possible values are:
 
-{\renewcommand{\descriptionlabel}[1]{\qquad\mycolor{\texttt{#1}}}
+{\renewcommand{\descriptionlabel}[1]{\qquad\texttt{#1}}
 \begin{description}
 \item[none:] This is the default, and will always produce a back
   reference like this: (see n.~1).  It may well be useful when you are
@@ -7082,10 +7534,10 @@
   \texttt{parts, chapters, sections, or subsections} will the actual
   division type appear in the \texttt{noteref}.  If you want the
   longer form in \emph{all} of your \texttt{noterefs}, you can set
-  \colmarginpar{\texttt{fullnoterefs}} the \textsf{biblatex-chicago}
-  option \mycolor{\texttt{fullnoterefs}} to \texttt{true} when loading
-  the package.  In endnotes, depending on which options you've chosen
-  for presenting them, you may well never get the short version of the
+  \mymarginpar{\texttt{fullnoterefs}} the \textsf{biblatex-chicago}
+  option \texttt{fullnoterefs} to \texttt{true} when loading the
+  package.  In endnotes, depending on which options you've chosen for
+  presenting them, you may well never get the short version of the
   back reference.  Please see the details starting on
   page~\pageref{sec:endnoterefs}, below.
 \item[section:] This key is particularly intended for documents, like
@@ -7140,20 +7592,20 @@
 possibilities offered by CTAN, so please do let me know if something
 breaks for you.
 
-\mylittlespace I \colmarginpar{\texttt{noterefinterval}} mentioned
+\mylittlespace I \mymarginpar{\texttt{noterefinterval}} mentioned
 above that the gap between appearances of a \texttt{noteref} for a
 given source was configurable.  What I had in mind was this option,
 along with four new citation commands which I discuss below.  The
-\mycolor{\texttt{noterefinterval}} preamble option allows you to
-define the number of references that must have intervened since the
-last \texttt{noteref} before another to the same source will appear.
-If you judge that your readers don't need a pointer on every new page
-but only after a certain number of other citations have passed, you
-can set this to a number higher than zero (the default).  You can't,
+\texttt{noterefinterval} preamble option allows you to define the
+number of references that must have intervened since the last
+\texttt{noteref} before another to the same source will appear.  If
+you judge that your readers don't need a pointer on every new page but
+only after a certain number of other citations have passed, you can
+set this to a number higher than zero (the default).  You can't,
 currently, use this mechanism to make new pointers appear on the same
-page as previous ones, but you can spread them out if they appear
-too frequently for your tastes.  Also, the counter that this option
-uses is \texttt{instcount}, which will be incremented not only by new
+page as previous ones, but you can spread them out if they appear too
+frequently for your tastes.  Also, the counter that this option uses
+is \texttt{instcount}, which will be incremented not only by new
 references but also, e.g., by uses of the \textsf{related}
 functionality to extract data from other entries.  A value of
 \texttt{15} may not delay a reappearance for exactly that many notes,
@@ -7160,7 +7612,7 @@
 so you will need to experiment a little to find a value that suits
 your document.
 
-\mylittlespace If \colmarginpar{\cmd{shortrefcite}\\
+\mylittlespace If \mymarginpar{\cmd{shortrefcite}\\
   \cmd{shorthand-}\\\texttt{refcite}\\ \cmd{shortcite*}\\
   \cmd{shorthandcite*}} you require more fine-grained control over the
 spacing between \texttt{noterefs}, or indeed if you want them to
@@ -7190,7 +7642,7 @@
 citations occur in contexts that will produce them, or you can use a
 combination of the next three options to hide them.
 
-\mylittlespace This \colmarginpar{\texttt{noterefintro}} option is
+\mylittlespace This \mymarginpar{\texttt{noterefintro}} option is
 special in that it handles only zeros that occur in the \emph{first}
 position in a sectioning identifier, e.g., \S~0.x.x or chap.~0.  It's
 possible that this zero represents some sort of introductory material
@@ -7206,7 +7658,7 @@
 about capitalization because the word always appears after the
 \verb+\bibstring{see}+.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace Now, it's perfectly possible for an introduction to
 have numbered sections of its own, so a citation there may produce a
@@ -7220,9 +7672,9 @@
 will either print the zero after the \texttt{noterefintro} string, or
 you can use the \texttt{pagezeros} option, to which I turn.
 
-\mylittlespace This \colmarginpar{\texttt{pagezeros}} boolean option
-deals with the problem of zero sections by changing such
-back references, and only such back references, to behave as though
+\mylittlespace This \mymarginpar{\texttt{pagezeros}} boolean option
+deals with the problem of zero sections by changing such back
+references, and only such back references, to behave as though
 \texttt{noteref=page}.  In the absence of a \textsf{noterefintro}
 \emph{all} such zero citations will be so treated, but if both options
 are set then zero sections with the zero in the first position of the
@@ -7246,7 +7698,7 @@
 need to decide whether you and your readers might still find it
 acceptable.
 
-\mylittlespace This \colmarginpar{\texttt{hidezeros}} boolean option
+\mylittlespace This \mymarginpar{\texttt{hidezeros}} boolean option
 attempts, with varying degrees of success, to disguise the zeros in
 section identifiers without mixing different sorts of back reference
 in one document.  Unlike \texttt{pagezeros}, it will never modify
@@ -7268,7 +7720,7 @@
   1.0 ---> (see \S~1.1 [pref.], n.~1)
 \end{verse}
 
-The \colmarginpar{\cmd{cmspref}} brackets and placement of the
+The \mymarginpar{\cmd{cmspref}} brackets and placement of the
 identifying string are hard coded, but you can change the string
 itself with a line something like this in your preamble:\\
 \verb+\renewrobustcmd{\cmspref}{\emph{pref.\@}}+ <--- \textbf{NB} the
@@ -7289,7 +7741,7 @@
 if they wish to provide Chicago-style back references.  I document
 these forthwith.
 
-\subsubsection*{Endnotes and \mycolor{\texttt{noteref}}}
+\subsubsection*{Endnotes and \texttt{noteref}}
 \label{sec:endnoterefs}
 
 The traditional way to provide endnotes instead of footnotes in a
@@ -7303,17 +7755,17 @@
 functionality, I think, and is also more future proof, relying as it
 does on the work of the \LaTeX 3 project.  The downside is that my
 \TeX nical abilities fell short of being able to make it work with the
-\mycolor{\texttt{noteref}} option, so I have instead created a new
-package \colmarginpar{\small\texttt{\textbf{cmsendnotes.sty}}} which
-combines functionality from \textsf{endnotes}, from Ulrich Dirr's
+\texttt{noteref} option, so I have instead created a new package
+\mymarginpar{\small\texttt{\textbf{cmsendnotes.sty}}} which combines
+functionality from \textsf{endnotes}, from Ulrich Dirr's
 \textsf{hyperendnotes}, and from \textsf{biblatex-chicago}.  If you
 need some functionality that \textsf{endnotes} doesn't provide, then
-you can load \mycolor{\textsf{cmsendnotes}} instead.  (I haven't
-tested any of this with the \textsf{memoir} class, which has its own
-endnote mechanism, so please let me know if it doesn't work and I'll
-try to have a look.)  The documentation that follows should clarify
-when you might want to load the new package, and also the options
-available to get \textsf{cmsendnotes} to do what you want.
+you can load \textsf{cmsendnotes} instead.  (I haven't tested any of
+this with the \textsf{memoir} class, which has its own endnote
+mechanism, so please let me know if it doesn't work and I'll try to
+have a look.)  The documentation that follows should clarify when you
+might want to load the new package, and also the options available to
+get \textsf{cmsendnotes} to do what you want.
 
 \mylittlespace Before we begin, I should just point out that, as usual
 with \textsf{biblatex}, you can mix foot- and endnotes in the same
@@ -7375,21 +7827,21 @@
 are package options to \textsf{cmsendnotes} and two of which are
 commands that you can redefine to your liking.
 
-\mylittlespace Two \colmarginpar{\texttt{hyper}} package options
+\mylittlespace Two \mymarginpar{\texttt{hyper}} package options
 control the \textsf{hyperref} behavior of endnote numbers.  They are
 both set to \texttt{true} by default, if the \textsf{hyperref} package
 is loaded.  If you set the first, \texttt{hyper}, to \textsf{false}
 when loading \textsf{cmsendnotes}, there will be no hyperlinking of
-endnote numbers at all.  If you \colmarginpar{\texttt{enotelinks}} set
+endnote numbers at all.  If you \mymarginpar{\texttt{enotelinks}} set
 the second, \texttt{enotelinks}, which I've borrowed from
 \textsf{hyperendnotes.sty}, to \texttt{false}, then only endnote
 numbers in the main text will function as links, the numbers in the
 endnote sections themselves ceasing to act as such.
 
-\mylittlespace This \colmarginpar{\texttt{noheader}} package option,
-if set to \texttt{true}, stops the printing of the usual section
-header before the endnotes themselves, in case this might help to
-solve some formatting problems in your documents.
+\mylittlespace This \mymarginpar{\texttt{noheader}} package option, if
+set to \texttt{true}, stops the printing of the usual section header
+before the endnotes themselves, in case this might help to solve some
+formatting problems in your documents.
 
 \mylittlespace This \mymarginpar{\cmd{enoteheading}} is the standard
 \textsf{endnotes} package command for defining exactly what is printed
@@ -7397,11 +7849,11 @@
 explain later), but you can redefine it in your preamble if you wish,
 and that will be respected by \textsf{cmsendnotes}.
 
-\mylittlespace This \colmarginpar{\texttt{blocknotes}} package option,
+\mylittlespace This \mymarginpar{\texttt{blocknotes}} package option,
 if set to \texttt{true}, presents the text of each endnote as a
 flush-left block, i.e., without the first line being indented.
 
-\mylittlespace This \colmarginpar{\cmd{enoteskip}} command, which was
+\mylittlespace This \mymarginpar{\cmd{enoteskip}} command, which was
 inspired by a similar provision in \textsf{hyperendnotes.sty}, sets
 the vertical space between individual endnotes.  By default it doesn't
 change basic interline space, but you can define it in your preamble
@@ -7408,18 +7860,16 @@
 to something like \cmd{smallskip} or \cmd{medskip} in case you want a
 bit more light inside your endnote sections.
 
-\mylittlespace So far, then, I have discussed contexts where
+\mylittlespace So far, then, I have discussed contexts where using
 \textsf{cmsendnotes.sty} only brings cosmetic changes to functionality
 which basically already works using \textsf{endnotes.sty}.  Indeed, if
 you are using either of these packages in the ways already outlined,
-then the setting of the main \mycolor{\texttt{noteref}} option defines
-how your back references will look, and
-\colmarginpar{\texttt{fullnoterefs}} the
-\mycolor{\texttt{fullnoterefs}} option will still govern the
-\mycolor{\texttt{chapter}}, \mycolor{\texttt{section}},
-\mycolor{\texttt{subsection}}, and \mycolor{\texttt{part}} values of
-the \texttt{noteref} option, just as in the general discussion above.
-In the methods discussed below, additional steps are required for
+then the setting of the main \texttt{noteref} option defines how your
+back references will look, and \mymarginpar{\texttt{fullnoterefs}} the
+\texttt{fullnoterefs} option will still govern the \texttt{chapter},
+\texttt{section}, \texttt{subsection}, and \texttt{part} values of the
+\texttt{noteref} option, just as in the general discussion above.  In
+the methods discussed below, additional steps are required for
 defining how your back references will look, and the
 \texttt{fullnoterefs} option is irrelevant, as the back references
 will always appear in their fullest form.
@@ -7457,25 +7907,25 @@
 provisions, then move on to the two handcrafted options, leaving you
 to judge which seems best suited to your needs.
 
-\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
-\mylittlespace For \colmarginpar{\texttt{\textbf{split}}} the
-automatic subdivision of an endnotes section I have borrowed a
-concept, if not its implementation, from \textsf{enotez}, and provided
-the \textsf{cmsendnotes} option \mycolor{\texttt{split}}, which has 4
-possible values: \texttt{part}, \texttt{chapter}, \texttt{section} and
+\mylittlespace For \mymarginpar{\texttt{\textbf{split}}} the automatic
+subdivision of an endnotes section I have borrowed a concept, if not
+its implementation, from \textsf{enotez}, and provided the
+\textsf{cmsendnotes} option \texttt{split}, which has 4 possible
+values: \texttt{part}, \texttt{chapter}, \texttt{section} and
 \texttt{subsection}.  (If you don't provide a key, it defaults to
 \texttt{chapter}.)  With this option set, you need to use a new
 command for printing the endnotes, the ungainly
-\colmarginpar{\cmd{\textbf{theendnotes\-bypart}}} but I hope memorable
-\mycolor{\cmd{theendnotesbypart}}.  When you do this,
-\textsf{cmsendnotes} does something in the background that's worth
-understanding.  Ordinarily, in the standard \textsf{endnotes} package,
-any call to \cmd{theendnotes} produces an\ .ent file containing all of
-the endnote data in the document up to that point, and proceeds to
-print it.  Another call to \cmd{theendnotes} gathers the endnote data
-occurring between it and the first call, overwriting the\ .ent file,
-and again printing it, and so on.  Whenever you use any version of
+\mymarginpar{\cmd{\textbf{theendnotes\-bypart}}} but I hope memorable
+\cmd{theendnotesbypart}.  When you do this, \textsf{cmsendnotes} does
+something in the background that's worth understanding.  Ordinarily,
+in the standard \textsf{endnotes} package, any call to
+\cmd{theendnotes} produces an\ .ent file containing all of the endnote
+data in the document up to that point, and proceeds to print it.
+Another call to \cmd{theendnotes} gathers the endnote data occurring
+between it and the first call, overwriting the\ .ent file, and again
+printing it, and so on.  Whenever you use any version of
 \cmd{theendnotesbypart}, \textsf{cmsendnotes} will write one\ .ent
 file per section named by the \texttt{split} option, assuming that
 said section actually contains any endnotes.  The plain
@@ -7560,13 +8010,13 @@
 additional caveats.
 
 \mylittlespace First, I probably shouldn't have bothered trying to
-implement the combination of \texttt{note\-refintro} and
+implement the combination of \texttt{noterefintro} and
 \texttt{hidezeros}, as any sections of a zero chapter in your document
 will appear by default with zeros intact in the text itself, unless
-measures are taken.  I did \colmarginpar{\cmd{cmsintrosec\-tion}} do
-this thing, however, and part of the implementation is a command
-\mycolor{\cmd{cmsintrosection}}, which provides the identifying string
-for subsections of the introduction.  It is set by default to \S, and
+measures are taken.  I did \mymarginpar{\cmd{cmsintrosection}} do this
+thing, however, and part of the implementation is a command
+\cmd{cmsintrosection}, which provides the identifying string for
+subsections of the introduction.  It is set by default to \S, and
 though you can redefine it in your preamble, please remember that it
 will appear as such in both \cmd{subsection*} names and
 \texttt{noterefs}.
@@ -7574,8 +8024,8 @@
 \mylittlespace Indeed, it is the need to cater for two quite distinct
 contexts that makes the automatic provision of \textsf{noteref} back
 references in a divided endnotes section surprisingly tricky.  You
-need \colmarginpar{\cmd{introduction\-name}\\\cmd{forewordname}\\
-  \cmd{sectionname}\\ \cmd{subsection\-name}} one mechanism to take
+need \mymarginpar{\cmd{introduction\-name}\\\cmd{forewordname}\\
+  \cmd{sectionname}\\ \cmd{subsectionname}} one mechanism to take
 \texttt{chapter} and turn it into Chapter, and quite another to turn
 it into chap., bearing in mind that \cmd{bibstrings} don't work
 outside of the reference apparatus, and therefore not in
@@ -7601,7 +8051,7 @@
 contexts or you can define a \cmd{[value]name} command and a new
 \cmd{bibstring} for the value in your language, both in your preamble.
 
-\mylittlespace The \colmarginpar{\texttt{subheadername}} same caveat
+\mylittlespace The \mymarginpar{\texttt{subheadername}} same caveat
 applies if you want to supply your own name for the \cmd{subsection*}
 commands that divide up the general endnotes \cmd{section*}.  Let's
 say for some reason you want subsections called \textbf{Further
@@ -7621,28 +8071,26 @@
 I discuss below, though for anything more complicated you'll probably
 need those options.
 
-\mylittlespace Before \colmarginpar{\texttt{headername}} I move on to
+\mylittlespace Before \mymarginpar{\texttt{headername}} I move on to
 the handcrafted methods, I should point out two more
-\textsf{cmsendnotes} options.  The first,
-\mycolor{\texttt{headername}}, sets the name of the main
-\cmd{section*} command at the start of the endnotes section.  It
-defaults to the usual \textsf{endnotes} package command
-\cmd{notesname}, which gives \textbf{Notes} in English.  I have kept
-this separate from the standard \cmd{enoteheading} because it needs
-slightly different treatment in a divided endnotes section.  If the
-definitions I have provided of \cmd{notesname} in the\ .lbx files that
-come with \textsf{biblatex-chicago} aren't to your liking, you can
-provide a string here instead, which is simpler to do because it
-shouldn't be turning up in any \texttt{noterefs}.  If you'd like to
+\textsf{cmsendnotes} options.  The first, \texttt{headername}, sets
+the name of the main \cmd{section*} command at the start of the
+endnotes section.  It defaults to the usual \textsf{endnotes} package
+command \cmd{notesname}, which gives \textbf{Notes} in English.  I
+have kept this separate from the standard \cmd{enoteheading} because
+it needs slightly different treatment in a divided endnotes section.
+If the definitions I have provided of \cmd{notesname} in the\ .lbx
+files that come with \textsf{biblatex-chicago} aren't to your liking,
+you can provide a string here instead, which is simpler to do because
+it shouldn't be turning up in any \texttt{noterefs}.  If you'd like to
 redefine any of the \cmd{*name} commands, the best place to do so is
 very near to where you actually print the endnotes, where it can
 override the definitions in the\ .lbx files (or in \textsf{babel's}
-files).  Remember, too, that you can use the
-\mycolor{\texttt{noheader}} option to turn off the printing of this
-header if you just want to provide your own sectioning command
-instead.
+files).  Remember, too, that you can use the \texttt{noheader} option
+to turn off the printing of this header if you just want to provide
+your own sectioning command instead.
 
-\mylittlespace This \colmarginpar{\texttt{runningname}}
+\mylittlespace This \mymarginpar{\texttt{runningname}}
 \textsf{cmsendnotes} option controls the text that appears in running
 headers in the endnotes section of your document, should you be
 providing them.  I have followed the style of the \textsf{endnotes}
@@ -7649,20 +8097,20 @@
 package, so that the default reads something like: \emph{NOTES TO
   CHAPTER 1}.  The section name and number are controlled by the other
 options already discussed, but the \enquote{Notes to} part is
-controlled by \mycolor{\texttt{runningname}}, so if your document
-isn't in English, and/or you're unhappy with the default string, you
-can change it when loading \textsf{cmsendnotes}.
+controlled by \texttt{runningname}, so if your document isn't in
+English, and/or you're unhappy with the default string, you can change
+it when loading \textsf{cmsendnotes}.
 
-\mylittlespace Should \colmarginpar{\texttt{\textbf{endnotesplit}}}
-the options above not fulfil your needs, you can control more or less
-all parts of the subdivision of your endnotes section, of the running
+\mylittlespace Should \mymarginpar{\texttt{\textbf{endnotesplit}}} the
+options above not fulfil your needs, you can control more or less all
+parts of the subdivision of your endnotes section, of the running
 headers there, and of back references from short notes to full ones,
 by providing your own sectioning commands in your document.  If you
 wish to use \texttt{noteref} back references in this context, you
 \mymarginpar{\textbf{NB}} must first set the \textsf{biblatex-chicago}
-option \mycolor{\texttt{endnotesplit}} to \texttt{true}, no matter
-which of the two possible implementation methods you choose.  With the
-standard \textsf{endnotes} package you would then use the command
+option \texttt{endnotesplit} to \texttt{true}, no matter which of the
+two possible implementation methods you choose.  With the standard
+\textsf{endnotes} package you would then use the command
 \cmd{addtoendnotes}, while with \textsf{cmsendnotes} it involves
 variants of the endnote-printing command \cmd{theendnotesbypart}.
 (Please note, first, that \cmd{addtoendnotes} still works with
@@ -7674,25 +8122,25 @@
 \mylittlespace First, \mymarginpar{Handcrafting
   w/\\\texttt{cmsendnotes}} I introduce the methods provided by
 \textsf{cmsendnotes}.  The command \cmd{theendnotesbypart} has three
-variants.  The first, \mycolor{\cmd{theendnotesbypart*}}, simply
-suppresses the printing of the \texttt{headername}, so it works more
-or less like setting \texttt{noheader} in the options to
-\textsf{cmsendnotes}.  The other two involve an optional argument,
-\colmarginpar{\cmd{theendnotes\-bypart[]}} in square brackets,
+variants.  The first, \cmd{theendnotesbypart*}, simply suppresses the
+printing of the \texttt{headername}, so it works more or less like
+setting \texttt{noheader} in the options to \textsf{cmsendnotes}.  The
+other two involve an optional argument,
+\mymarginpar{\cmd{theendnotes\-bypart[]}} in square brackets,
 containing an individual section number, which prints the endnotes
 from that section.  This command never prints the general endnote
 section header (as controlled by the \texttt{headername} option), but
 it will print the individual
-\colmarginpar{\cmd{theendnotes\-bypart*[]}} section's subheader, as
+\mymarginpar{\cmd{theendnotes\-bypart*[]}} section's subheader, as
 controlled by the \texttt{subheadername} option.  To turn that
 printing off you can either use the starred version of the command,
-i.e., \mycolor{\cmd{theendnotesbypart*[]}}, or you can set the
-\textsf{cmsendnotes} option \colmarginpar{\texttt{nosubheader}}
-\mycolor{\texttt{nosubheader}} to \texttt{true}.  A sequence of
-commands, each with one section of the document inside square
-brackets, will give you a complete endnotes section wherever you
-decide to place it, while the starred forms or \texttt{nosubheader}
-option allow you to create your own subheaders before each subsection.
+i.e., \cmd{theendnotesbypart*[]}, or you can set the
+\textsf{cmsendnotes} option \mymarginpar{\texttt{nosubheader}}
+\texttt{nosubheader} to \texttt{true}.  A sequence of commands, each
+with one section of the document inside square brackets, will give you
+a complete endnotes section wherever you decide to place it, while the
+starred forms or \texttt{nosubheader} option allow you to create your
+own subheaders before each subsection.
 
 \mylittlespace First, \mymarginpar{\textbf{NB}} please note that what
 you need to place inside the square brackets is the \emph{number that
@@ -7787,16 +8235,16 @@
 \mylittlespace To \mymarginpar{Handcrafting w/ \textsf{endnotes}} use
 the \textsf{endnotes} package with its main command \cmd{theendnotes}
 to produce a subdivided endnotes section, you must first remember to
-set the \textsf{biblatex-chicago} option
-\mycolor{\texttt{endnotesplit}} to \texttt{true}, that is, assuming
-you want to provide \texttt{noteref} back references.  For splitting
-the endnotes, you \mymarginpar{\cmd{addtoendnotes}} need the
-\cmd{addtoendnotes} command, which you have to place in your document
-yourself.  Ordinarily, you'll need one such command for each relevant
-division of your text, placed just after the sectioning command
-itself, so that any endnotes that occur in the section will appear
-grouped underneath the heading you provide.  At the next section,
-another such command starts a new subsection of endnotes.
+set the \textsf{biblatex-chicago} option \texttt{endnotesplit} to
+\texttt{true}, that is, assuming you want to provide \texttt{noteref}
+back references.  For splitting the endnotes, you
+\mymarginpar{\cmd{addtoendnotes}} need the \cmd{addtoendnotes}
+command, which you have to place in your document yourself.
+Ordinarily, you'll need one such command for each relevant division of
+your text, placed just after the sectioning command itself, so that
+any endnotes that occur in the section will appear grouped underneath
+the heading you provide.  At the next section, another such command
+starts a new subsection of endnotes.
 
 \mylittlespace To provide the same endnotes section divided by chapter
 that we've already discussed above, your commands will look something
@@ -7905,7 +8353,7 @@
 the Chicago-specific bibstrings I've defined unless you provide, in
 your preamble, a \cmd{DeclareLanguageMapping} command adapted for your
 setup, on which see section~\ref{sec:international} below and also
-\xA7\xA7~4.9.1 and 4.11.8 in \textsf{biblatex.pdf}.
+\S\S~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, short,} and
@@ -7944,8 +8392,8 @@
 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}
-\xA73.1.2.2, for controlling the printing of some of these fields, and I
-have implemented the ones that are relevant to
+\S~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
@@ -8006,10 +8454,10 @@
 according to the guidelines in chapter 15.  The second author-date
 style, \textsf{biblatex-chicago-authordate-trad}, implements the same
 specification but with a markedly different style of title
-presentation, including sentence-style capitalization and an absence
-of quotation marks around the (plain-text) titles of \textsf{article}
-or \textsf{incollection} entries, \emph{inter alia}.  The
-\textsf{trad} style is so named because older versions of the
+presentation, including sentence-style capitalization and the absence
+of any quotation marks around the (plain-text) titles of
+\textsf{article} or \textsf{incollection} entries, \emph{inter alia}.
+The \textsf{trad} style is so named because older versions of the
 \emph{Manual}, up to and including the 15th edition, recommended this
 plainer style for author-date titles, and the 17th edition itself
 suggests the possibility, when needed, of retaining such title
@@ -8047,24 +8495,23 @@
 \label{sec:types:authdate}
 
 The complete list of entry types currently available in
-\textsf{authordate} and \textsf{authordate-trad},
-minus the odd \textsf{biblatex} alias, is as follows:
-\textbf{article}, \mycolor{\textbf{artwork}}, \textbf{audio},
-\textbf{book}, \textbf{bookinbook}, \textbf{booklet},
-\textbf{collection}, \textbf{customc}, \mycolor{\textbf{dataset}},
-\textbf{image}, \textbf{inbook}, \textbf{incollection},
-\textbf{inproceedings}, \textbf{inreference}, \textbf{jurisdiction},
-\textbf{legal}, \textbf{legislation}, \textbf{letter},
-\textbf{manual}, \textbf{misc}, \textbf{music}, \textbf{mvbook},
-\textbf{mvcollection}, \textbf{mvproceedings}, \textbf{mvreference},
-\textbf{online} (with its alias \textbf{www}), \textbf{patent},
-\mycolor{\textbf{performance}}, \textbf{periodical},
-\textbf{proceedings}, \textbf{reference}, \textbf{report} (with its
-alias \textbf{techreport}), \textbf{review},
-\mycolor{\textbf{standard}}, \textbf{suppbook},
-\textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis}
-(with its aliases \textbf{mastersthesis} and \textbf{phdthesis}),
-\textbf{unpublished}, and \textbf{video}.
+\textsf{authordate} and \textsf{authordate-trad}, minus the odd
+\textsf{biblatex} alias, is as follows: \textbf{article},
+\textbf{artwork}, \textbf{audio}, \textbf{book}, \textbf{bookinbook},
+\textbf{booklet}, \textbf{collection}, \textbf{customc},
+\textbf{dataset}, \textbf{image}, \textbf{inbook},
+\textbf{incollection}, \mycolor{\textbf{inproceedings}},
+\textbf{inreference}, \textbf{jurisdiction}, \textbf{legal},
+\textbf{legislation}, \textbf{letter}, \textbf{manual}, \textbf{misc},
+\textbf{music}, \textbf{mvbook}, \textbf{mvcollection},
+\textbf{mvproceedings}, \textbf{mvreference}, \textbf{online} (with
+its alias \textbf{www}), \textbf{patent}, \textbf{performance},
+\textbf{periodical}, \mycolor{\textbf{proceedings}},
+\textbf{reference}, \textbf{report} (with its alias
+\textbf{techreport}), \textbf{review}, \textbf{standard},
+\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical},
+\textbf{thesis} (with its aliases \textbf{mastersthesis} and
+\textbf{phdthesis}), \textbf{unpublished}, and \textbf{video}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -8108,12 +8555,11 @@
 \emph{Manual} 14.168--87, 15.9, 15.46--49; batson, beattie:crime,
 chu:panda, connell:chronic, conway:evolution, friedman:learning,
 garaud:gatine, garrett, hlatky:hrt, kern, lewis, loften:hamlet,
-loomis:structure, rozner:liberation, schneider:mittelpleistozaene,
+loomis:structure, rozner:liberation, schneider\hc mittelpleistozaene,
 terborgh:preservation, wall:radio, warr:ellison,
-white:callima\-chus. For \textsf{entrysubtype} \texttt{maga\-zine},
-cf.\ 14.171, 14.188--200, 15.49; assocpress:gun,
-lakeforester:pushcarts, morgenson:market, reaves:rosen,
-stenger:privacy.)
+white:callimachus. For \textsf{entrysubtype} \texttt{magazine}, cf.\
+14.171, 14.188--200, 15.49; assocpress:gun, lakeforester:pushcarts,
+morgenson:market, reaves:rosen, stenger:privacy.)
 
 \mylittlespace The \emph{Manual} suggests that, no matter which
 citation style you are using, it is \enquote{usually sufficient to
@@ -8295,16 +8741,16 @@
 \textsf{journaltitle}, and the word \enquote{\texttt{blog}} in the
 \textsf{location} field (though you could just use special formatting
 in the \textsf{journaltitle} field itself, which may sometimes be
-necessary).  The 17th \colmarginpar{New!} edition specifies that
-\enquote{blogs that are part of a larger publication should include
-  the name of that publication.}  This usually involves a newspaper or
-magazine which also publishes various blogs on its website, and it
-means that such entries need a more general title than the
-\textsf{journaltitle}.  It's not standard \textsf{biblatex} or
-anything, but you can now put such information in \textsf{maintitle}
-(with \textsf{mainsubtitle} and \textsf{maintitleaddon}, if needed),
-but only in \textsf{article} and \textsf{review} entries with a
-\texttt{magazine} \textsf{entrysubtype} (amlen:hoot).
+necessary).  The 17th edition specifies that \enquote{blogs that are
+  part of a larger publication should include the name of that
+  publication.}  This usually involves a newspaper or magazine which
+also publishes various blogs on its website, and it means that such
+entries need a more general title than the \textsf{journaltitle}.
+It's not standard \textsf{biblatex} or anything, but you can now put
+such information in \textsf{maintitle} (with \textsf{mainsubtitle} and
+\textsf{maintitleaddon}, if needed), but only in \textsf{article} and
+\textsf{review} entries with a \texttt{magazine} \textsf{entrysubtype}
+(amlen:hoot).
 
 \mylittlespace The \emph{Manual} (15.51) is even more emphatic about
 whole blogs (rather than individual posts) and comments on blogs not
@@ -8320,8 +8766,8 @@
 \textsf{nameaddon} fields, and also of specialized \textbf{customc}
 entries for adding comments to in-text citations.  Please see the
 documentation of \textbf{customc}, \textbf{periodical}, and
-\textbf{review}, the \textsf{relatedtype} \mycolor{\texttt{commenton}}
-in section~\ref{sec:authrelated}, and the general discussion of online
+\textbf{review}, the \textsf{relatedtype} \texttt{commenton} in
+section~\ref{sec:authrelated}, and the general discussion of online
 sources in the \textbf{online} documentation.
 
 \mylittlespace Ninth, the special \textsf{biblatex} field
@@ -8333,13 +8779,13 @@
 section~\ref{sec:fields:authdate} for all the details on how this
 works.
 
-\mylittlespace Finally, \colmarginpar{New!} the 17th edition (14.191)
-specifies that, for news sites carrying \enquote{stories as they
-  unfold, it may be appropriate to include a time stamp for an article
-  that includes one.}  You can provide this by using the standard
-\textsf{biblatex} time stamp format inside the \textsf{date} field,
-e.g., \texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers
-the standard time zone initialisms, a separate \textsf{timezone} field
+\mylittlespace Finally, the 17th edition (14.191) specifies that, for
+news sites carrying \enquote{stories as they unfold, it may be
+  appropriate to include a time stamp for an article that includes
+  one.}  You can provide this by using the standard \textsf{biblatex}
+time stamp format inside the \textsf{date} field, e.g.,
+\texttt{2008-07-01T10:18:00}.  Since the \emph{Manual} prefers the
+standard time zone initialisms, a separate \textsf{timezone} field
 would be required if you want to provide one.
 
 \mylittlespace If you're still with me, allow me to recommend that you
@@ -8350,17 +8796,18 @@
 able to simplify these procedures somewhat, but with any luck the vast
 majority of sources won't require knowledge of these onerous details.
 
-\mybigspace Arne \colmarginpar{\textbf{artwork}} Kjell Vikhagen pointed
-out to me that none of the standard entry types were straightforwardly
-adaptable when referring to visual artworks.  It's unclear that the
-\emph{Manual} (14.235) believes it necessary to include them in the
-reference apparatus at all, but it's easy to conceive of contexts in
-which a list of artworks studied might be desirable, and
-\textsf{biblatex} includes entry types for just this purpose, though
-the standard styles leave them undefined.  \textsf{Biblatex-chicago}
-defines both \textsf{artwork} and \textsf{image}, which are in fact
-now clones of each other, so you can use either of them indifferently,
-the distinction existing only for historical reasons.
+\mybigspace Arne \mymarginpar{\textbf{artwork}} Kjell Vikhagen
+pointed out to me that none of the standard entry types were
+straightforwardly adaptable when referring to visual artworks.  It's
+unclear whether the \emph{Manual} (14.235) believes it necessary to
+include them in the reference apparatus at all, but it's easy to
+conceive of contexts in which a list of artworks studied might be
+desirable, and \textsf{biblatex} includes entry types for just this
+purpose, though the standard styles leave them undefined.
+\textsf{Biblatex-chicago} defines both \textsf{artwork} and
+\textsf{image}, which are in fact now clones of each other, so you can
+use either of them indifferently, the distinction existing only for
+historical reasons.
 
 \mylittlespace As one might expect, the artist goes in \textsf{author}
 and the name of the work in \textsf{title}.  The \textsf{type} field
@@ -8375,16 +8822,15 @@
 use lowercase in the .bib file and let \textsf{biblatex} handle it for
 you.  (See \emph{Manual} 3.22, 8.198; leo:madonna, bedford:photo.)
 
-\mylittlespace The \colmarginpar{New!} 17th edition of the
-\emph{Manual} has included new information in some of its examples, so
-I have added 4 new fields to the driver.  Alongside the usual
-\textsf{date} for the creation of a work, you may also want to include
-the printing date of a particular exemplar of a photograph or a print.
-The system I have designed uses the \emph{earlier} of the
-\textsf{date} and the \textsf{origdate} to be the date of creation,
-and the \emph{later} to be the printing date.  The style will
-automatically prefix the printing date with the localized
-\cmd{bibstring} \mycolor{\texttt{printed}}, so if that's the wrong
+\mylittlespace The 17th edition of the \emph{Manual} has included new
+information in some of its examples, so I have added 4 new fields to
+the driver.  Alongside the usual \textsf{date} for the creation of a
+work, you may also want to include the printing date of a particular
+exemplar of a photograph or a print.  The system I have designed uses
+the \emph{earlier} of the \textsf{date} and the \textsf{origdate} to
+be the date of creation, and the \emph{later} to be the printing date.
+The style will automatically prefix the printing date with the
+localized \cmd{bibstring} \texttt{printed}, so if that's the wrong
 string entirely then you can define \textsf{userd} any way you like to
 change it.  If only \emph{one} of those two dates is available, it
 will always serve as a creation date.  Any date specification provided
@@ -8423,7 +8869,7 @@
 required for such a work, in this instance the other fields in a
 \textsf{misc} entry function pretty much as in \textsf{artwork}.
 
-\mybigspace Following \colmarginpar{\textbf{audio}} the request of
+\mybigspace Following \mymarginpar{\textbf{audio}} the request of
 Johan Nordstrom, I have included three entry types, all undefined by
 the standard styles, designed to allow users to present audiovisual
 sources in accordance with the Chicago specifications.  The
@@ -8469,9 +8915,9 @@
 concern, fills gaps in the others, and presents its sources in a more
 \enquote{book-like} manner.  Published musical scores need this type
 --- unpublished ones would use \textsf{misc} with an
-\textsf{entrysubtype} (shapey:partita) --- as do \mycolor{podcasts}
-and such favorite educational formats as the slideshow and the
-filmstrip (danforth:podcast, greek:film\-strip, schubert:muellerin,
+\textsf{entrysubtype} (shapey:partita) --- as do podcasts and such
+favorite educational formats as the slideshow and the filmstrip
+(danforth:podcast, greek:filmstrip, schubert:muellerin,
 verdi:corsaro).  The \emph{Manual} (14.264) sometimes uses a similar
 format for audio books (twain:audio), though, depending on the sorts
 of publication facts you wish to present, this sort of material may
@@ -8513,12 +8959,12 @@
 need in an \textsf{editor[abc]type} field, e.g.,
 \enquote{\texttt{libretto by}} (verdi:corsaro).
 
-\mylittlespace For \colmarginpar{New!} podcasts, newly covered by the
-17th edition (14.267), the \textsf{audio} type provides the nearest
-analogue I could find, and in general most of the data should fit
-comfortably into the fields already discussed above, the episode name
-in \textsf{title} and the name of the podcast in \textsf{booktitle},
-for starters.  Two details, however, need mentioning: first, the
+\mylittlespace For podcasts, newly covered by the 17th edition
+(14.267), the \textsf{audio} type provides the nearest analogue I
+could find, and in general most of the data should fit comfortably
+into the fields already discussed above, the episode name in
+\textsf{title} and the name of the podcast in \textsf{booktitle}, for
+starters.  Two details, however, need mentioning: first, the
 \textsf{note} field as the place to specify that it is a podcast, and
 the \textsf{eventdate} field for the date of publication of the
 specific episode (\textsf{title}) cited, which appears in close
@@ -8527,9 +8973,9 @@
 entry is a podcast episode, and helps it construct the entry
 appropriately (danforth:podcast).
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
-\mybigspace This \colmarginpar{\textbf{book}} is the standard
+\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 the reference list
 when you use a \textsf{crossref} or an \textsf{xref} field.  The
@@ -8582,13 +9028,13 @@
 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.
+harley:ancient:cart, harley:cartography, and harley\hc hoc for how
+this might look.
 
-\mybigspace This \colmarginpar{\textbf{customc}} entry type allows you
+\mybigspace This \mymarginpar{\textbf{customc}} entry type allows you
 to include alphabetized cross-references to other, separate entries in
 the bibliography, particularly to other names or pseudonyms, as
-recommen\-ded by the \emph{Manual}.  (This is different from the usual
+recommended by the \emph{Manual}.  (This is different from the usual
 \textsf{crossref}, \textsf{xref}, \textsf{userf}, and \textsf{related}
 mechanisms, all primarily designed to include cross-references to
 other works.  Cf.\ 14.81--82, 15.35).  I should add immediately that,
@@ -8598,7 +9044,7 @@
   published by the same author but under different pseudonyms.}  The
 following entries in \textsf{dates-test.bib} show one way of
 addressing this: creasey:ashe:blast, creasey:york:death,
-creasey:morton:hide, ashe:creasey, york:creasey and morton:creasey.
+creasey:morton:hide, ashe:creasey, york\hc creasey and morton:creasey.
 In these latter cases, you would need merely to place the pseudonym in
 the \textsf{author} field, and the author's real name, under which his
 or her works are presented in the bibliography, in the \textsf{title}
@@ -8613,16 +9059,17 @@
 will connect the two parts of the cross-reference with the word
 \enquote{\emph{See}} --- or its equivalent in the document's language
 --- in italics.  If you wish to present it differently, you can put
-the connecting word(s) into the \textsf{nameaddon} field.
+the connecting word(s) into the \textsf{nameaddon} field, formatted as
+you wish.
 
 \mylittlespace Finally, you may need to use this entry type if you
 wish to include a comment inside the parentheses of a citation, as
 specified by the \emph{Manual} (15.24).  If you have a
 \textsf{postnote}, then you can manually provide the punctuation and
-comment there, e.g., \cmd{autocite[4; the unrevised
+comment there, e.g., \cmd{autocite[4;~the unrevised
   trans.]\{stendhal:parma\}}.  Without a \textsf{postnote}, you have
 two solutions.  You can enable the \texttt{postnotepunct} option,
-which allows you simply to type \cmd{autocite[; the unrevised
+which allows you simply to type \cmd{autocite[;~the unrevised
   trans.]\{stendhal:parma\}}, or you can use a separate
 \textsf{customc} entry containing just the text of the comment in the
 \textsf{title} field, \textsf{entrysubtype} \texttt{classical}, and
@@ -8631,24 +9078,23 @@
 \cmd{autocites\{chicago:manual\}\{chicago:comment\}}.  Cf.\
 \texttt{postnotepunct} in section~\ref{sec:authuseropts}, below.
 
-\mylittlespace For \colmarginpar{New!} its 17th edition, the
-\emph{Manual} has provided a more detailed treatment of online
-comments, whether on blogs, mailing lists, or social media posts
-(15.50--52).  Such comments \enquote{are cited only in the text, in
-  reference to the related post,} an arrangement most easily created
-using \textsf{customc} entries referencing the main post.  The new
-\mycolor{\texttt{commenton}} \texttt{relatedtype} in \textsf{online}
-and \textsf{review} entries attempts to automate this for you,
-creating a separate \textsf{customc} entry to be used in an
-\cmd{autocites} command together with the comment's own entry.  Please
-see the details of this in the \textbf{online} and \textbf{review}
-entry types, below, and in the \mycolor{\texttt{commenton}} docs in
-section~\ref{sec:authrelated}.  Cf.\ also ac:comment, diaz:surprise,
-ellis:blog, licis:diazcomment, and the associated
-automatically-created entries ellis:blog-customc and
+\mylittlespace For its 17th edition, the \emph{Manual} has provided a
+more detailed treatment of online comments, whether on blogs, mailing
+lists, or social media posts (15.50--52).  Such comments \enquote{are
+  cited only in the text, in reference to the related post,} an
+arrangement most easily created using \textsf{customc} entries
+referencing the main post.  The new \texttt{commenton}
+\texttt{relatedtype} in \textsf{online} and \textsf{review} entries
+attempts to automate this for you, creating a separate
+\textsf{customc} entry to be used in an \cmd{autocites} command
+together with the comment's own entry.  Please see the details of this
+in the \textbf{online} and \textbf{review} entry types, below, and in
+the \texttt{commenton} docs in section~\ref{sec:authrelated}.  Cf.\
+also ac:comment, diaz:surprise, ellis:blog, licis:diazcomment, and the
+associated automatically-created entries ellis:blog-customc and
 diaz:surprise-customc.
 
-\mybigspace This \colmarginpar{\textbf{dataset}} entry type, new in
+\mybigspace This \mymarginpar{\textbf{dataset}} entry type, new in
 \textsf{biblatex} 3.13, allows you to cite scientific databases, for
 which the \emph{Manual} (14.257) presents some rather specific, if
 brief, instructions.  To construct your entry, you can put the name of
@@ -8667,18 +9113,18 @@
 genbank:db, nasa:db.)  Given that usually the only relevant date in
 such entries is the access date, which means that they would usually
 have \enquote{n.d.}\ at the head of reference-list entries and in
-citations, I have thought it sensible to treat
-\mycolor{\textsf{dataset}} entries by default as author-title instead
-of author-date in citations, and to stop the printing of
-\enquote{n.d.}\ in reference lists just as in \textsf{misc} entries.
-You can shorten the component parts of the author-title citation using
-the usual \textsf{shortauthor}, \textsf{shorthand}, and/or
-\textsf{shorttitle} fields, and you can also restore author-date
-formatting to these entries by setting the
-\mycolor{\texttt{authortitle}} option to \texttt{false} either in
-individual entries or in the preamble for all examples of the entry
-type.
+citations, I have thought it sensible to treat \textsf{dataset}
+entries by default as author-title instead of author-date in
+citations, and to stop the printing of \enquote{n.d.}\ in reference
+lists just as in \textsf{misc} entries.  You can shorten the component
+parts of the author-title citation using the usual
+\textsf{shortauthor}, \textsf{shorthand}, and/or \textsf{shorttitle}
+fields, and you can also restore author-date formatting to these
+entries by setting the \texttt{authortitle} option to \texttt{false}
+either in individual entries or in the preamble for all examples of
+the entry type.
 
+\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{image}} entry type is now a
 clone of the \textsf{artwork} type, which see.  I retain it here for
@@ -8688,7 +9134,7 @@
 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} (\xA7~2.1.1) intends the first for \enquote{a part
+\textsf{Biblatex.pdf} (\S~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
@@ -8711,15 +9157,13 @@
 are referring has had a separate publishing history as a book in its
 own right, then you may wish to use the \textsf{bookinbook} type,
 instead, on which see above.  (See \emph{Manual} 14.106--9, 15.42;
-\textsf{inbook}:\,ashbrook:brain, phibbs:diary, will:cohere;
-\textsf{incollection}:\,centi\-nel:letters, contrib:contrib,
+\textsf{inbook}: ashbrook:brain, phibbs:diary, will:cohere;
+\textsf{incollection}: centinel:letters, contrib:contrib,
 sirosh:visualcortex; ellet:galena, keating:dearborn, and
 lippincott:chicago [and the \textsf{collection} entry prairie:state]
 demonstrate the use of the \textsf{crossref} field with its attendant
 abbreviations in the list of references.)
 
-\enlargethispage{\baselineskip}
-
 \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when
 referring to a chapter, one use either a chapter number or the
 inclusive page numbers, not both.  In-text citations, of course,
@@ -8726,12 +9170,17 @@
 require any \textsf{postnote} field to specify if it is a whole
 chapter to which you are referring.
 
-\mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works
-pretty much as in standard \textsf{biblatex}.  Indeed, the main
-differences between it and \textsf{incollection} are the lack of an
-\textsf{edition} field and the possibility that an
-\textsf{organization} may be cited alongside the \textsf{publisher},
-even though the \emph{Manual} doesn't specify its use (14.217).
+\mybigspace This \colmarginpar{\textbf{inproceedings}} entry type
+works pretty much as in standard \textsf{biblatex}, even more so now
+that, after a request from Patrick Danilevici, I have newly included
+the \mycolor{\textsf{eventdate}}, \mycolor{\textsf{eventtitle}},
+\mycolor{\textsf{eventtitleaddon}}, and \mycolor{\textsf{venue}}
+fields for specifying where and when the event occurred that produced
+the proceedings.  These four fields are the main difference between it
+and \textsf{incollection}, along with the lack of an \textsf{edition}
+field and the possibility that an \textsf{organization} may be cited
+alongside the \textsf{publisher}, even though the \emph{Manual}
+doesn't specify the use of any of these supplementary fields (14.217).
 Please note, also, that the \textsf{crossref} and \textsf{xref}
 mechanism for shortening citations of multiple pieces from the same
 \textsf{proceedings} is operative here, just as it is in
@@ -8740,7 +9189,7 @@
 \texttt{longcrossref} in section~\ref{sec:authpreset}, below, for more
 details.
 
-\paragraph*{\protect\colmarginpar{\textbf{inreference}}}
+\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 prompted a thoroughgoing
@@ -8804,32 +9253,31 @@
 after the alphabetized entry's title (grove:sibelius).
 
 \mylittlespace Finally, all of these rules apply to online reference
-works, along with a few more.  The \colmarginpar{New!} 17th edition of
-the \emph{Manual} now allows, \enquote{subject to editorial
-  discretion,} the alternative treatment of an online reference work
-which \enquote{does not have (and never had) a printed counterpart}
-(14.206, 14.233).  In effect this means that it can be treated more
-like an \textsf{online} entry than a \textsf{book}, its \textsf{title}
-therefore in plain roman rather than in italics.  You can achieve this
-in \textsf{inreference} entries by providing an \textsf{entrysubtype}
-in the entry.  Online reference works need not only a \textsf{url} but
-also, always, a \textsf{urldate} (instead of a \textsf{date)}, as
-these sources are in constant flux.  When that flux is of a
-particularly high frequency, as with Wikipedia, then a time stamp may
-also be needed.  You can provide this in the \textsf{urldate} field
-itself, using the standard \textsf{biblatex} format, e.g.,
-\texttt{2008-07-01T10:18:00}.  It is
-\colmarginpar{\texttt{urlstamp=true}} possible to turn off the
-printing of the \textsf{urltime} with the new
-\mycolor{\texttt{urlstamp}} option, which is set to \texttt{true} by
-default, but which can be changed in your preamble for the whole
-document, for specific entry types, or in the \textsf{options} field
-of specific entries (wikiped:bibtex, grove:sibelius).  In keeping with
-the rules of the 17th edition, changed since the 16th, any
-\textsf{inreference} entry with no date, or with only an access date,
-as opposed to a revision date or another, more traditional publishing
-date, will use the \texttt{nodate} abbreviation at the head of the
-entry and in citations (15.44, 15.50).
+works, along with a few more.  The 17th edition of the \emph{Manual}
+now allows, \enquote{subject to editorial discretion,} the alternative
+treatment of an online reference work which \enquote{does not have
+  (and never had) a printed counterpart} (14.206, 14.233).  In effect
+this means that it can be treated more like an \textsf{online} entry
+than a \textsf{book}, its \textsf{title} therefore in plain roman
+rather than in italics.  You can achieve this in \textsf{inreference}
+entries by providing an \textsf{entrysubtype} in the entry.  Online
+reference works need not only a \textsf{url} but also, always, a
+\textsf{urldate} (instead of a \textsf{date)}, as these sources are in
+constant flux.  When that flux is of a particularly high frequency, as
+with Wikipedia, then a time stamp may also be needed.  You can provide
+this in the \textsf{urldate} field itself, using the standard
+\textsf{biblatex} format, e.g., \texttt{2008-07-01T10:18:00}.  It is
+\mymarginpar{\texttt{urlstamp=true}} possible to turn off the
+printing of the \textsf{urltime} with the new \texttt{urlstamp}
+option, which is set to \texttt{true} by default, but which can be
+changed in your preamble for the whole document, for specific entry
+types, or in the \textsf{options} field of specific entries
+(wikiped:bibtex, grove:sibelius).  In keeping with the rules of the
+17th edition, changed since the 16th, any \textsf{inreference} entry
+with no date, or with only an access date, as opposed to a revision
+date or another, more traditional publishing date, will use the
+\texttt{nodate} abbreviation at the head of the entry and in citations
+(15.44, 15.50).
 
 \mybigspace I
 \mymarginpar{\textbf{jurisdiction}\\\textbf{legal}\\\textbf{legislation}}
@@ -8884,8 +9332,7 @@
 then you would need to define both \textsf{author} and
 \textsf{publisher} using the name you here might have put in
 \textsf{organization}.  (See 14.84; chicago:manual, dyna:browser,
-natrecoff:camera.  Cp.\ also the new \mycolor{\textbf{standard}} entry
-type.)
+natrecoff:camera.  Cp.\ also the new \textbf{standard} entry type.)
 
 \paragraph*{\protect\mymarginpar{\textbf{misc}}}
 \label{sec:ad:misc}
@@ -8973,7 +9420,7 @@
 \textsf{origdate} fields.)
 
 \mylittlespace As in \textsf{letter} entries, the titles of
-unpublished letters are of the form \texttt{Author to Recipi\-ent},
+unpublished letters are of the form \texttt{Author to Recipient},
 further information can be given in the \textsf{titleaddon} field,
 while the \textsf{origlocation} field can hold the place where the
 letter was written.  Interviews or similar pieces will have a
@@ -8986,9 +9433,9 @@
 
 \mylittlespace There are a few more subtleties involved here.  Some
 material (roosevelt:speech) includes a venue for the event recorded in
-the archive, so I have added the \mycolor{\textsf{venue}} field, which
-prints \emph{before} the date, with the \textsf{origlocation}
-appearing after it.  Somewhat confusingly, in published letters the
+the archive, so I have added the \textsf{venue} field, which prints
+\emph{before} the date, with the \textsf{origlocation} appearing after
+it.  Somewhat confusingly, in published letters the
 \textsf{origlocation} itself prints before the date, rather than
 after, so if the inconsistency between published and unpublished
 letters bothers you then you could conceivably use \textsf{venue}
@@ -9006,7 +9453,7 @@
 is the former which you should pursue.  I hope that
 \textsf{biblatex-chicago} proves helpful in this regard.
 
-\mybigspace This \colmarginpar{\textbf{music}} is one of three
+\mybigspace This \mymarginpar{\textbf{music}} is one of three
 audiovisual entry types, and is intended primarily to aid in the
 presentation of musical recordings that do not have a video component,
 though it can also include audio books (auden:reading).  A DVD or VHS
@@ -9044,10 +9491,10 @@
   options can alter the presentation within an entry.  Because these
   are non-standard roles, you will need to identify them using the
   following:
-\item[\mycolor{editortype, editoratype, editorbtype:}] The most common
-  roles, all associated with specific bibstrings (or their absence),
-  will be \texttt{conductor}, \texttt{director}, \texttt{producer},
-  and, oddly, \texttt{none}.  The last is particularly useful when
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will be
+  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
+  oddly, \texttt{none}.  The last is particularly useful when
   identifying the group performing a piece, as it usually doesn't need
   further specifying and this role prevents \textsf{biblatex} from
   falling back on the default \texttt{editor} bibstring.  The 17th
@@ -9059,25 +9506,24 @@
     by}) suits your citation.
 \item[note:] This field can also hold contributors, perhaps
   collaborators or featured artists (holiday:fool, rihanna:umbrella).
-\item[\mycolor{title, booktitle, maintitle:}] As with the other
-  audiovisual types, \textsf{music} serves as an analogue both to
-  books and to collections, so the title will either be, e.g., the
-  album title or a song title, in which latter case the album title
-  would go into \textsf{booktitle}.  If you wish to cite a song that,
-  as may happen, isn't part of any larger collection, your entry will
-  in such a case have only a \textsf{title}, which
-  \textsf{biblatex-chicago} would normally interpret as an album
-  title.  You \colmarginpar{New!} can now define an
+\item[title, booktitle, maintitle:] As with the other audiovisual
+  types, \textsf{music} serves as an analogue both to books and to
+  collections, so the title will either be, e.g., the album title or a
+  song title, in which latter case the album title would go into
+  \textsf{booktitle}.  If you wish to cite a song that, as may happen,
+  isn't part of any larger collection, your entry will in such a case
+  have only a \textsf{title}, which \textsf{biblatex-chicago} would
+  normally interpret as an album title.  You can now define an
   \textsf{entrysubtype} to let it know that the lone \textsf{title} is
   in fact a song (cf.\ naraya).  The \textsf{maintitle} might be
   necessary for something like a box set of \emph{Complete
     Symphonies}.
-\item[\mycolor{chapter:}] The 17th edition seems more keen on having
-  track numbers for individual pieces, whether on a traditional format
-  or on a streaming service.  The \colmarginpar{New!} \textsf{chapter}
-  field is the place for this information, and
-  \textsf{biblatex-chicago} will automatically prepend the localized
-  string \texttt{track} (cf.\ holiday:fool, rihanna:umbrella).
+\item[chapter:] The 17th edition seems more keen on having track
+  numbers for individual pieces, whether on a traditional format or on
+  a streaming service.  The \textsf{chapter} field is the place for
+  this information, and \textsf{biblatex-chicago} will automatically
+  prepend the localized string \texttt{track} (cf.\ holiday:fool,
+  rihanna:umbrella).
 \item[publisher, series, number:] These three closely-associated
   fields are intended for presenting the catalog information provided
   by the music publisher.  The 17th edition generally only requires
@@ -9131,14 +9577,14 @@
   to the \textsf{origdate}, barring that to a \textsf{urldate}, and
   absent those three to a \textsf{date}.  (See floyd:atom,
   holiday:fool, nytrumpet:art.)
-\item[type, \mycolor{howpublished}:] As in all the audiovisual entry
-  types, the \textsf{type} field holds the medium of the recording,
-  e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg
-  vorbis.  The \colmarginpar {New!} \mycolor{\textsf{howpublished}}
-  field, newly included for the 17th edition, can hold similar
-  information \enquote{for streaming audio formats and downloads}
-  (14.263, 15.57). It can also, alternatively, hold the name of the
-  streaming service, e.g., Spotify (cf.\ rihanna:umbrella).
+\item[type, howpublished:] As in all the audiovisual entry types, the
+  \textsf{type} field holds the medium of the recording, e.g., vinyl,
+  33 rpm, 8-track tape, cassette, compact disc, mp3, ogg vorbis.  The
+  \textsf{howpublished} field, newly included for the 17th edition,
+  can hold similar information \enquote{for streaming audio formats
+    and downloads} (14.263, 15.57). It can also, alternatively, hold
+  the name of the streaming service, e.g., Spotify (cf.\
+  rihanna:umbrella).
 \end{description}}
 
 The entries in \textsf{notes-test.bib} should at least give you a good
@@ -9201,7 +9647,7 @@
 will use the \texttt{multivolume relatedtype} instead, which will very
 likely not be what you want.
 
-\mybigspace One \colmarginpar{\textbf{online}} of the features of the
+\mybigspace One \mymarginpar{\textbf{online}} of the features of the
 17th edition of the \emph{Manual} is the considerably extended, but
 still scattered, treatment of online materials (8.189--92, 14.6--18,
 14.159--63, 14.175--76, 14.187, 14.189, 14.205--10, 14.233, 15.4,
@@ -9215,10 +9661,10 @@
 increasingly detailed instructions in the \emph{Manual}, along with
 some further annotations here that might help to clarify it.
 
-\afterpage{\clearpage
+\afterpage{\clearpage\thispagestyle{longtable}
 
 \begin{table}[h!]
-  \caption[\hspace{-1em}\mycolor{Online Entry Types - Author-Date}]%
+  \caption[\hspace{-1em}Online Entry Types - Author-Date]%
   {Online materials and author-date entry types}
   \label{tab:online:adtypes}
   \centering\small\sffamily
@@ -9249,7 +9695,7 @@
     the next usually not in the ref.\ list.
     \\\addlinespace[.6mm]
     \hspace{.5em} Comment & @Review & & viv:amlen & The
-    \mycolor{\texttt{commenton}} \textsf{relatedtype} helps manage these,
+    \texttt{commenton} \textsf{relatedtype} helps manage these,
     in or out of the reference list. \\\addlinespace[.6mm]
     \cmidrule(r{2em}){1-1}\addlinespace[.6mm]
     Social Media & @Online & 15.52 && This includes anything ---
@@ -9265,7 +9711,7 @@
     \hspace{.5em} Comments / \hspace*{.5em} replies & & 14.210
     & braun:reply &This and the next are usually not included in the
     reference list. The
-    \mycolor{\texttt{commenton}} \textsf{relatedtype} helps manage them,
+    \texttt{commenton} \textsf{relatedtype} helps manage them,
     in or out of that list.
     \\
     && 14.209 & licis:diazcomment &\\\addlinespace[.6mm]
@@ -9290,7 +9736,7 @@
     Streaming Media&&&& \\\addlinespace[.6mm]
     \hspace*{.5em} TV / Film & @Video & 14.265 & mayberry:brady &
     The streaming service is supplied by the URL.  The
-    \mycolor{\texttt{tvepisode}} entrysubtype is new in the 17th
+    \texttt{tvepisode} entrysubtype is new in the 17th
     edition. \\\addlinespace[.6mm]
     \hspace*{.5em} Music & @Music & 14.263 & rihanna:umbrella &
     The streaming service is supplied by the howpublished field.
@@ -9312,7 +9758,7 @@
     type & 14.233 & wikiped:bibtex & As above, you can choose the
     @Online treatment of the title, but it's best achieved
     using an @InReference entry w/ entrysubtype. \\\addlinespace[.6mm]
-    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & \mycolor{@Dataset} &
+    \hspace*{.5em} Scientific data- \hspace*{.5em} bases & @Dataset &
     14.257 & genbank:db & Treated as author-title by
     default.\\\addlinespace[.6 mm]
     \bottomrule
@@ -9346,40 +9792,38 @@
 simplify most of your choices.  If something remains unclear, please
 let me know and I'll see if I can improve it.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
-\mylittlespace A few more notes are in order. I designed the
-\colmarginpar{New!} new \textsf{relatedtype}
-\mycolor{\texttt{commenton}} to facilitate citation of online
-comments, and it is available in two entry types, \textsf{online} and
-\textsf{review}.  In both types the \emph{Manual} (15.51--52)
-recommends that such material appear \emph{only} in the text and not
-in the reference list, but I have attempted to simplify the
-presentation of such material wherever you want it to appear.
+\mylittlespace A few more notes are in order. I designed the new
+\textsf{relatedtype} \texttt{commenton} to facilitate citation of
+online comments, and it is available in two entry types,
+\textsf{online} and \textsf{review}.  In both types the \emph{Manual}
+(15.51--52) recommends that such material appear \emph{only} in the
+text and not in the reference list, but I have attempted to simplify
+the presentation of such material wherever you want it to appear.
 Following the specifications, then, the default when you use
-\mycolor{\texttt{commenton}} is for
-\textsf{biblatex-chicago-authordate} to modify how your .bib entry
-appears in the .bbl file by setting both \texttt{skipbib} and
-\texttt{cmsdate=full} in the \textsf{options} field, so that nothing
-appears in the reference list and citations present the full date and
-possibly also a time stamp (see below).  Further, the style sets the
-\mycolor{\textsf{verbc}} field so that these entries don't interfere
-with the provision of extra date letters --- the full date and time
-should be enough to individuate separate comments.  Finally, the style
-creates a new \textsf{customc} entry in your .bbl file which you can
-cite after your initial \mycolor{\texttt{commenton}} entry using
-\cmd{autocites} and which will, as a comment to your initial entry,
-say whether it's a comment or a reply or what have you, and then
-giving the short citation of that upon which it is a comment.
+\texttt{commenton} is for \textsf{biblatex-chicago-authordate} to
+modify how your .bib entry appears in the .bbl file by setting both
+\texttt{skipbib} and \texttt{cmsdate=full} in the \textsf{options}
+field, so that nothing appears in the reference list and citations
+present the full date and possibly also a time stamp (see below).
+Further, the style sets the \textsf{verbc} field so that these entries
+don't interfere with the provision of extra date letters --- the full
+date and time should be enough to individuate separate comments.
+Finally, the style creates a new \textsf{customc} entry in your .bbl
+file which you can cite after your initial \texttt{commenton} entry
+using \cmd{autocites} and which will, as a comment to your initial
+entry, say whether it's a comment or a reply or what have you, and
+then giving the short citation of that upon which it is a comment.
 
 \mylittlespace As an example, take the Facebook post diaz:surprise,
 which does appear in the reference list.  The entry licis:diazcomment
 presents a comment on this post using the \textsf{relatedtype}
-\mycolor{\texttt{commenton}}, so \textsf{biblatex-chicago-authordate}
-creates a new entry, diaz:surprise-customc, which won't appear in your
-.bib file (which is never altered) but in the .bbl file that
-\textsf{biber} produces to supply \textsf{biblatex} with the data for
-its citations.  A command like
+\texttt{commenton}, so \textsf{biblatex-chicago-authordate} creates a
+new entry, diaz:surprise-customc, which won't appear in your .bib file
+(which is never altered) but in the .bbl file that \textsf{biber}
+produces to supply \textsf{biblatex} with the data for its citations.
+A command like
 \verb+\autocites{licis:diazcomment}{diaz:surprise-customc}+ will
 produce a citation like (Licis, February 24, 2016; comment on D\'iaz
 2016).  You can alter the string connecting the two citations (by
@@ -9391,7 +9835,7 @@
 fields required.)
 
 \mylittlespace Those who want \textsf{online} comments to appear in
-the reference list can still use the \mycolor{\texttt{commenton}}
+the reference list can still use the \texttt{commenton}
 \textsf{relatedtype}, and the same citation of the commented piece
 will appear there, connected by the same string that the
 \textsf{customc} entry provides.  Here, though, you can also provide a
@@ -9405,8 +9849,8 @@
 \textsf{biblatex-chicago} will assume you want to hand-craft that
 entry without its intervention, though it will still provide the
 virtual \textsf{customc} entry in your .bbl file, as that may still
-prove convenient.  Note also that any \mycolor{\textsf{verbc}} field
-you provide will never be altered by the package.
+prove convenient.  Note also that any \textsf{verbc} field you provide
+will never be altered by the package.
 
 \mylittlespace In general, constructing an \textsf{online}\ .bib file
 entry is much the same as in \textsf{biblatex}.  The \textsf{title}
@@ -9430,11 +9874,10 @@
 separate \textsf{timezone} or \textsf{urltimezone} field is the best
 way, as it allows you to provide the initialisms that the
 \emph{Manual} prefers (10.41, 14.191).  On all of this please see
-\textsf{date}, \mycolor{\textsf{timezone}}, \textsf{urldate},
-\textsf{userd}, and \mycolor{\textsf{verbc}} in
-section~\ref{sec:fields:authdate}, below.  Cf.\ also the documentation
-of the \mycolor{\texttt{commenton}} \textsf{relatedtype} in
-section~\ref{sec:authrelated}.
+\textsf{date}, \textsf{timezone}, \textsf{urldate}, \textsf{userd},
+and \textsf{verbc} in section~\ref{sec:fields:authdate}, below.  Cf.\
+also the documentation of the \texttt{commenton} \textsf{relatedtype}
+in section~\ref{sec:authrelated}.
 
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on the subject of patents (15.55), but very clear about which
@@ -9460,13 +9903,13 @@
 specifications.  If you need to keep a word capitalized then you
 should wrap it in curly braces.  See petroff:impurity.
 
-\mybigspace The \colmarginpar{\textbf{performance}} 17th edition of
+\mybigspace The \mymarginpar{\textbf{performance}} 17th edition of
 the \emph{Manual} includes a new section (14.266) on citing live
 performances, and even though such references can usually be limited
 to the main text (cf.\ 15.57) it may sometimes be useful to include
 them in a reference list.  Since \textsf{biblatex} provides the
-\mycolor{\textbf{performance}} type, albeit without using it in its
-standard styles, I though it might be useful to define it for
+\textbf{performance} type, albeit without using it in its standard
+styles, I though it might be useful to define it for
 \textsf{biblatex-chicago}, particularly as the other option for such
 material is the \textsf{misc} entry without any \textsf{entrysubtype},
 and that entry type is already somewhat overloaded, though you can
@@ -9478,8 +9921,8 @@
 and/or editorial roles depending on which sorts of contributor(s) you
 wish to emphasize in the citation.  The \textsf{editor[abc]} and
 \textsf{editor[abc]type} fields should be most helpful here.  I have
-included strings for \mycolor{\texttt{choreographer}} in all
-localization files, but for others you may need to provide them in the
+included strings for \texttt{choreographer} in all localization files,
+but for others you may need to provide them in the
 \textsf{editor[abc]type} fields as you wish them printed ---
 \textsf{biblatex-chicago} will automatically capitalize any that start
 with a lowercase letter.  For the author-date styles it will probably
@@ -9517,28 +9960,30 @@
 works.  Second, although the 17th edition recommends that references
 to whole blogs, as opposed to individual blog posts, need appear only
 in the text (15.51), using the \textsf{periodical} type for such
-material can help with this, in or out of the reference list.  The
-\colmarginpar{New!} new \mycolor{\texttt{authortitle}} entry option
-will ensure the presence of the name of the blog (as opposed to the
-non-existent date) in citations, and you could also use a
-\cmd{citeurl} command to give the URL in the text (or a note).
-Alternately, you could let the entry appear in the reference list and
-cite it in the usual way.  In that list the \emph{Manual} (14.208)
-recommends that you include the name of any larger (usually
-periodical) publication of which the blog is a part.  The
-\textsf{maintitle} field (with \textsf{mainsubtitle} and
+material can help with this, in or out of the reference list.  The new
+\texttt{authortitle} entry option will ensure the presence of the name
+of the blog (as opposed to the non-existent date) in citations, and
+you could also use a \cmd{citeurl} command to give the URL in the text
+(or a note).  Alternately, you could let the entry appear in the
+reference list and cite it in the usual way.  In that list the
+\emph{Manual} (14.208) recommends that you include the name of any
+larger (usually periodical) publication of which the blog is a part.
+The \textsf{maintitle} field (with \textsf{mainsubtitle} and
 \textsf{maintitleaddon}, if needed) is the place for it. Cf.\
 amlen:wordplay.
 
-\mybigspace This \mymarginpar{\textbf{proceedings}} is the standard
-\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
-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 \colmarginpar{\textbf{proceedings}} is the standard
+\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, now also including
+the \mycolor{\textsf{eventdate}}, \mycolor{\textsf{eventtitle}},
+\mycolor{\textsf{eventtitleaddon}}, and \mycolor{\textsf{venue}}
+fields for identifying the event that produced the
+\textsf{proceedings}.  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}
@@ -9573,7 +10018,7 @@
 the report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
-\mybigspace As \colmarginpar{\textbf{review}} its name suggests, the
+\mybigspace As \mymarginpar{\textbf{review}} its name suggests, the
 \textsf{review} entry type was designed for reviews published in
 periodicals, and if you've already read the \textsf{article}
 instructions above --- if you haven't, I recommend doing so now ---
@@ -9631,7 +10076,7 @@
 you'll also need \texttt{useauthor=false} in the \textsf{options}
 field.  Other surplus fields will be ignored.  (See osborne:poison.)
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace \textsf{Biblatex-chicago} also, at the behest of
 Bertold Schweitzer, supports the \textsf{relatedtype}
@@ -9669,42 +10114,41 @@
 \cmd{autocap} do its work, though this isn't strictly necessary with
 \textsf{biblatex-chicago-authordate}.
 
-\mylittlespace A \colmarginpar{New!} few details of the
-\textsf{review} type are fairly new, and in particular have changed
-between the 16th and 17th editions of the \emph{Manual}.  As I
-mentioned above, blogs are best treated as \textsf{articles} with
-\texttt{magazine} \textsf{entrysubtype}, whereas comments on those
-blogs --- or replies to those comments, etc.\ --- need the
-\textsf{review} type with the same \textsf{entrysubtype}.  The 17th
-edition recommends that blog comments appear only in the text, and not
-in the reference list (15.51), so just as with comments in social
-media threads, for which see the \textbf{online} type above, I have
-provided the \mycolor{\texttt{commenton}} \texttt{relatedtype} to
-simplify the presentation of such material wherever you want it to
-appear.  Following the specifications, then, the default when you use
-\mycolor{\texttt{commenton}} is for
+\mylittlespace A few details of the \textsf{review} type are fairly
+new, and in particular have changed between the 16th and 17th editions
+of the \emph{Manual}.  As I mentioned above, blogs are best treated as
+\textsf{articles} with \texttt{magazine} \textsf{entrysubtype},
+whereas comments on those blogs --- or replies to those comments,
+etc.\ --- need the \textsf{review} type with the same
+\textsf{entrysubtype}.  The 17th edition recommends that blog comments
+appear only in the text, and not in the reference list (15.51), so
+just as with comments in social media threads, for which see the
+\textbf{online} type above, I have provided the \texttt{commenton}
+\texttt{relatedtype} to simplify the presentation of such material
+wherever you want it to appear.  Following the specifications, then,
+the default when you use \texttt{commenton} is for
 \textsf{biblatex-chicago-authordate} to modify how your .bib entry
 appears in the .bbl file by setting both \texttt{skipbib} and
 \texttt{cmsdate=full} in the \textsf{options} field, so that nothing
 appears in the reference list and citations present the full date and
 possibly also a time stamp (see below).  Further, the style sets the
-\mycolor{\textsf{verbc}} field so that these entries don't interfere
-with the provision of extra date letters --- the full date and time
-should be enough to individuate separate comments.  Finally, the style
-creates a new \textsf{customc} entry in your .bbl file which you can
-cite after your initial \mycolor{\texttt{commenton}} entry using
-\cmd{autocites} and which will, as a comment to your initial entry,
-say whether it's a comment or a reply or what have you, and then
-giving the short citation of that upon which it is a comment.
+\textsf{verbc} field so that these entries don't interfere with the
+provision of extra date letters --- the full date and time should be
+enough to individuate separate comments.  Finally, the style creates a
+new \textsf{customc} entry in your .bbl file which you can cite after
+your initial \texttt{commenton} entry using \cmd{autocites} and which
+will, as a comment to your initial entry, say whether it's a comment
+or a reply or what have you, and then giving the short citation of
+that upon which it is a comment.
 
 \mylittlespace As an example, take the blog ellis:blog, which does
 appear in the reference list.  The entry ac:comment presents a comment
-on this post using the \textsf{relatedtype}
-\mycolor{\texttt{commenton}}, so \textsf{biblatex-chicago-authordate}
-creates a new entry, ellis:blog-customc, which won't appear in your
-.bib file (which is never altered) but in the .bbl file that
-\textsf{biber} produces to supply \textsf{biblatex} with the data for
-its citations.  A command in your document like
+on this post using the \textsf{relatedtype} \texttt{commenton}, so
+\textsf{biblatex-chicago-authordate} creates a new entry,
+ellis:blog-customc, which won't appear in your .bib file (which is
+never altered) but in the .bbl file that \textsf{biber} produces to
+supply \textsf{biblatex} with the data for its citations.  A command
+in your document like
 \verb+\autocites{ac:comment}{ellis:blog-customc}+ will produce a
 citation like (AC, July 1, 2008, 10:18 a.m.; comment on Ellis 2008).
 You can alter the string connecting the two citations (by default
@@ -9715,7 +10159,7 @@
 \textsf{eventdate} are pretty much the only fields required.)
 
 \mylittlespace Those who want \textsf{online} comments to appear in
-the reference list can still use the \mycolor{\texttt{commenton}}
+the reference list can still use the \texttt{commenton}
 \textsf{relatedtype}, and the same citation of the commented piece
 will appear there, connected by the same string that the
 \textsf{customc} entry provides.  Here, though, you can also provide a
@@ -9727,18 +10171,17 @@
 options in your entry then \textsf{biblatex-chicago} will assume you
 want to hand-craft that entry without its intervention, though it will
 still provide the virtual \textsf{customc} entry in your .bbl file, as
-that may still prove convenient.  Note also that any
-\mycolor{\textsf{verbc}} field you provide will never be altered by
-the package.  (Please see the documentation of this
-\textsf{relatedtype} in section~\ref{sec:authrelated}, that of
-\mycolor{\textsf{verbc}} in section~\ref{sec:fields:authdate}, and
-also the information about online materials in
-table~\ref{tab:online:adtypes}.)
+that may still prove convenient.  Note also that any \textsf{verbc}
+field you provide will never be altered by the package.  (Please see
+the documentation of this \textsf{relatedtype} in
+section~\ref{sec:authrelated}, that of \textsf{verbc} in
+section~\ref{sec:fields:authdate}, and also the information about
+online materials in table~\ref{tab:online:adtypes}.)
 
 \mylittlespace The new edition of the \emph{Manual} retains the
 requirement for a date closely associated with the comment (14.208,
 15.51), so in such entries you now have a choice.  If you are using
-the \mycolor{\texttt{commenton}} \textsf{relatedtype}, you can use the
+the \texttt{commenton} \textsf{relatedtype}, you can use the
 \textsf{date} or \textsf{eventdate} indifferently, as even when you
 print the entry in the reference list the reference to the main blog
 provides its own date.  If, in 16th-edition style, you print a fuller
@@ -9758,11 +10201,15 @@
 from this field to allow it this more general usefulness.  You can, of
 course, still provide your own square brackets in \textsf{review}
 entries to indicate pseudonymous authorship, which is the standard
-function of \textsf{nameaddon} in most entry types.  Please see the
-documentation of \textsf{date}, \textsf{eventdate}, and
-\textsf{timezone} in section~\ref{sec:fields:authdate},
-\cmd{DeclareLabeldate} in section~\ref{sec:authformopts}, and
-\texttt{avdate} in section~\ref{sec:authpreset}.
+function of \textsf{nameaddon} in most entry types.  The package
+options \mycolor{\texttt{nameaddonformat}} and
+\mycolor{\texttt{nameaddonsep}} can help here, as well.  See
+sections~\ref{sec:authuseropts} and \ref{sec:authpreset}, below.
+Please also see the documentation of \textsf{date},
+\textsf{eventdate}, and \textsf{timezone} in
+section~\ref{sec:fields:authdate}, \cmd{DeclareLabeldate} in
+section~\ref{sec:authformopts}, and \texttt{avdate} in
+section~\ref{sec:authpreset}.
 
 \mylittlespace For the reasons I explained in the \textsf{article}
 docs above, I have brought the \textsf{article} and \textsf{review}
@@ -9784,12 +10231,12 @@
 \textbf{shortjournal} in section~\ref{sec:fields:authdate} for all the
 details on how this works.
 
-\mybigspace In \colmarginpar{\textbf{standard}} older releases it was
+\mybigspace In \mymarginpar{\textbf{standard}} older releases it was
 fairly straightforward to present published national or international
 standards using a \textsf{book} entry, but with some additional
 specifications now included in the 17th edition of the \emph{Manual}
 (14.259, 15.37) I think it might be helpful to provide a separate
-entry type.  The \mycolor{\textbf{standard}} type has long existed in
+entry type.  The \textbf{standard} type has long existed in
 \textsf{biblatex}, though none of its included styles use it.  In
 \textsf{biblatex-chicago} constructing such an entry is mostly
 straightforward.  The organization responsible for the standard goes
@@ -9799,8 +10246,8 @@
 date, though for some standards there may also be a later
 reaffirmation date (or similar), for which you can use the
 \textsf{eventdate}.  To choose which year appears in citations, the
-\mycolor{\textbf{standard}} type follows, by default, the same
-ordering as \textsf{review} and \textsf{music} entries, so that the
+\textbf{standard} type follows, by default, the same ordering as
+\textsf{review} and \textsf{music} entries, so that the
 \textsf{eventdate} will, if present, provide the year.  (Cf.\
 \texttt{avdate} in section~\ref{sec:authpreset}, below.)
 
@@ -9871,6 +10318,8 @@
 \textsf{introduction} field.  (See \emph{Manual} 14.110;
 friedman:intro, polakow:afterw, prose:intro).
 
+\enlargethispage{\baselineskip}
+
 \mybigspace This \mymarginpar{\textbf{suppcollection}} fulfills a
 function analogous to \textsf{suppbook}.  Indeed, I believe the
 \textbf{suppbook} type can serve to present supplemental material in
@@ -9902,7 +10351,7 @@
 fields further to specify unpublished conference papers and the like
 (14.216--18; nass:address).
 
-\mybigspace This \colmarginpar{\textbf{video}} is the last of the
+\mybigspace This \mymarginpar{\textbf{video}} is the last of the
 three audiovisual entry types, and as its name suggests it is intended
 for citing visual media, be it films of any sort or TV shows,
 broadcast, on the Net, on VHS, DVD, or Blu-ray, though it will serve
@@ -9943,7 +10392,7 @@
   provided here, and will be printed as-is, contextually capitalized.
   (Cf.\ hitchcock:nbynw.)
 \item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As
-  with the other audiovisual types, \textsf{video} serves as an
+  with the other two audiovisual types, \textsf{video} serves as an
   analogue both to books and to collections, so the \textsf{title} may
   be of a whole film DVD or of a TV series, or it may identify one
   episode in a series or one scene in a film.  In the latter cases,
@@ -9952,11 +10401,11 @@
   and/or episode number of a TV series, while the \textsf{titleaddon}
   is for any information that needs to come between the \textsf{title}
   and the \textsf{booktitle} (american:crime, cleese:holygrail,
-  friends:\break leia, handel:messiah, hitchcock:nbynw,
-  mayberry:brady).  As in the \textsf{music} type, \textsf{maintitle}
-  may be necessary for a boxed set or something similar.
-\item[\mycolor{entrysubtype:}] If, for some reason, you want to cite
-  an individual episode or scene without reference to any larger unit,
+  friends:leia, handel:messiah, hitchcock:nbynw, mayberry:brady).  As
+  in the \textsf{music} type, \textsf{maintitle} may be necessary for
+  a boxed set or something similar.
+\item[entrysubtype:] If, for some reason, you want to cite an
+  individual episode or scene without reference to any larger unit,
   then your entry will contain only a \textsf{title}, which
   \textsf{biblatex-chicago} would normally interpret as the title of a
   complete film or TV series.  In such a case, you'll need to define
@@ -9965,10 +10414,10 @@
   the 17th edition (14.265) now recommends that, when presenting
   episodes from a TV series, the name of the series
   (\textsf{booktitle}) comes before the episode name (\textsf{title}).
-  The exact string \mycolor{\texttt{tvepisode}} in the
-  \textsf{entrysubtype} field achieves this reversal, which includes
-  using the \textsf{booktitle} as a \textsf{sorttitle} in the
-  reference list and also as the \textsf{labeltitle} in short notes.
+  The exact string \texttt{tvepisode} in the \textsf{entrysubtype}
+  field achieves this reversal, which includes using the
+  \textsf{booktitle} as a \textsf{sorttitle} in the reference list and
+  also as the \textsf{labeltitle} in short notes.
 \item[date, eventdate, origdate, pubstate:] The 17th edition of the
   \emph{Manual} continues to encourage writers to find some way of
   dating audiovisual materials, while if there is more than one date
@@ -10055,23 +10504,42 @@
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual}
 14.105, 14.110; polakow:afterw.)
 
-\mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
+\mybigspace At \colmarginpar{\textbf{annotation}} the request of Emil
 Salim, \textsf{biblatex-chicago} provides a package option (see
 \texttt{annotation} below, section~\ref{sec:authuseropts}) to allow
-you to produce annotated lists of references.  The formatting of such
-a list is currently fairly basic, though it conforms with the
-\emph{Manual's} minimal guidelines (14.64).  The default in
-\textsf{chicago-dates-common.cbx} is to define
-\verb+\DeclareFieldFormat{annotation}+ using
-\verb+\par\nobreak\vskip\bibitemsep #1+, though you can alter it by
-re-declaring the format in your preamble.  The page-breaking
-algorithms don't always give perfect results here, but the default
-formatting looks, to my eyes, fairly decent.  In addition to tweaking
-the field formatting you can also insert \cmd{par} (or even
-\verb+\vadjust{\eject}+) commands into the text of your annotations to
-improve the appearance.  Please consider the \texttt{annotation}
-option a work in progress, but it is usable now.  (N.B.: The old
-\textsc{Bib}\TeX\ field \textsf{annote} serves as an alias for this.)
+you to produce annotated reference lists.  A recent feature request by
+Moritz Wemheuer referenced a
+\href{https://tex.stackexchange.com/questions/528374/moving-addendum-field-to-the-end-in-biblatex-chicago/540755#540755}{StackExchange}
+question which suggested that the possible uses for the
+\textsf{annotation} field could well be more extensive, appearing as
+it does at the very end of all entry types.  I have therefore modified
+the \texttt{annotation} option so that you can print the field in the
+reference list (\texttt{=bib} or \texttt{=true}, the default), in long
+(probably legal) notes (\texttt{=notes}), in both (\texttt{=all}), or
+in neither (\texttt{=false}).  The two new options
+\mycolor{\texttt{bibannotesep}} and \mycolor{\texttt{citeannotesep}}
+allow you to choose the separator between the rest of the entry and
+the \textsf{annotation}, and to choose a different one in reference
+list and notes.  The default formatting in the reference list
+(\texttt{vpar}) is to print the \textsf{annotation} as a separate
+block using\ \verb+\par\nobreak\vskip\bibitemsep #1+, while in long
+notes the default (\texttt{period}) is to print it simply as an
+additional field, separated by a period.  The \emph{Manual's}
+guidelines (14.64) allow for both these possibilities, and I have
+provided a range of others, for which you should consult the full
+documentation in section~\ref{sec:authpreset}.  (Note also that both
+options can be set globally or per-type in the preamble, or per-entry
+in the \textsf{options} field of individual entries.  For specialized
+needs, of course, you can re-declare the format
+[\verb+\DeclareFieldFormat{annotation}+] in your preamble, or redefine
+the \cmd{bibannotesep} and \cmd{citeannotesep} commands there.)  In
+section~\ref{sec:authuseropts} you will find instructions for
+employing the new \mycolor{\texttt{formatbib}} and
+\mycolor{\texttt{entrybreak}} options to give you fine-grained control
+over the formatting of the entire reference list, particularly with
+regard to \TeX's page-breaking algorithms.  The aim is to remove, in
+most cases, any need for you to delve into the low-level commands
+involved in these algorithms.
 
 \mybigspace I \mymarginpar{\textbf{annotator}} have implemented this
 \textsf{biblatex} field pretty much as that package's standard styles
@@ -10086,17 +10554,16 @@
 \texttt{\{\{Associated Press\}\}}\,) to prevent \textsf{biber} from
 treating one part of the name as a surname (14.84, 14.200, 15.37;
 assocpress:gun, chicago:manual).  If there is no \textsf{author}, then
-\textsf{biblatex-chicago} will look, in sequence, for a
-\textsf{namea}, an \textsf{editor}, a \textsf{nameb}, a
-\textsf{translator}, or a \textsf{namec} (i.e., a compiler) and use
-that name (or those names) instead, followed by the appropriate
-identifying string (esp.\ 15.36, also 14.76, 14.103, 14.121, 14.126,
-14.180; boxer:china, brown:bremer, harley:cartography,
-schellin\-ger:novel, sechzer:women, silver:gawain, soltes:georgia).
-\textsf{Biber} and \textsf{biblatex} take care of alphabetizing
-entries no matter which name appears at their head.  In citations,
-where the \textsf{labelname} is used, the order searched is somewhat
-augmented: \textsf{shortauthor}, \textsf{author},
+\textsf{biblatex-chicago} will look, in order, 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.36,
+also 14.76, 14.103, 14.121, 14.126, 14.180; boxer:china, brown:bremer,
+harley:cartography, schellinger:novel, sechzer:women, silver:gawain,
+soltes:georgia).  \textsf{Biber} and \textsf{biblatex} take care of
+alphabetizing entries no matter which name appears at their head.  In
+citations, 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}.
 
@@ -10170,11 +10637,13 @@
 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).  Please
-see also the entry on \textbf{nameaddon}, below, for circumstances
-where you may need to provide your own square brackets when presenting
-a pseudonym.
+see the entry on \textbf{nameaddon}, below, for circumstances where
+you may need to provide your own square brackets when presenting a
+pseudonym, and also the package options
+\mycolor{\texttt{nameaddonformat}} and \mycolor{\texttt{nameaddonsep}}
+in sections~\ref{sec:authuseropts} and \ref{sec:authpreset}, below.
 
-\enlargethispage{\baselineskip}
+\enlargethispage{2\baselineskip}
 
 \mylittlespace As its name suggests, the author-date style very much
 wants to have a name of some sort present both for the entries in the
@@ -10227,6 +10696,19 @@
 in citations.  (See the \textsf{author} docs just above.  Also
 \emph{Manual} 15.34; cook:sotweed, horsley:prosodies.)
 
+\mylittlespace The \emph{Manual} doesn't clarify how to treat multiple
+works by the same \textsf{author}, in one or more of which their name
+doesn't appear on the title page.  By default,
+\textsf{biblatex-chicago} will, after the first appearance in the
+reference list, replace identical \textsf{authors} with the 3-em dash,
+regardless of any \textsf{authortype} field that may be present.  If
+you want to distinguish between works certainly written by and works
+merely ascribed to a given author, then you can use the
+\texttt{dashed} option in the \textsf{options} field of individual
+entries, and possibly also a \textsf{sortname}, to get the results you
+want.
+
+
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
 \textsf{biblatex}, a \textsf{bookauthor} is the author of a
 \textsf{booktitle}, so that, for example, if one chapter in a book has
@@ -10292,7 +10774,7 @@
 customize the punctuation that appears before the
 \textsf{booktitleaddon} field.
 
-\mybigspace This \colmarginpar{\textbf{chapter}} field holds the
+\mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
 \textsf{incollection} entry where you wish to cite a specific chapter
 of a book (ashbrook:brain).  It now also holds the track number of
@@ -10377,7 +10859,7 @@
 these four entry types than for the other 4 (see below).  In
 \textsf{dates-test.bib} you can get a feel for how this works by
 looking at bernhard:boris, bernhard:ritter, bernhard:themacher,
-harley:ancient:cart, harley:cartogra\-phy, and harley:hoc.
+harley:ancient:cart, harley:cartography, and harley:hoc.
 
 \mylittlespace A published collection of letters requires a somewhat
 different treatment (15.40).  In the author-date style, the
@@ -10461,7 +10943,7 @@
 information might otherwise never appear.  See \texttt{xrefurl} in
 section~\ref{sec:authuseropts}.
 
-\paragraph*{\protect\colmarginpar{\textbf{date}}}
+\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
@@ -10469,11 +10951,11 @@
 \textsf{biblatex-chicago-authordate} will, in most entry types, supply
 a missing \cmd{bibstring\{nodate\}} if there is no date otherwise
 provided (15.44), or if there is only a \textsf{urldate}, and that
-date is an access\colmarginpar{New!} date, i.e., there's no
-\textsf{userd} field (15.50).  Citations will look like (Author,
-n.d.), and entries in the list of references will begin: Author,
-Firstname.\ n.d.  This seems simple enough, but there are a surprising
-number of complications which require attention.
+date is an access date, i.e., there's no \textsf{userd} field (15.50).
+Citations will look like (Author, n.d.), and entries in the list of
+references will begin: Author, Firstname.\ n.d.  This seems simple
+enough, but there are a surprising number of complications which
+require attention.
 
 \mylittlespace To start, in each entry, \textsf{Biber} attempts to
 find something which it can designate a \textsf{labeldate}, which
@@ -10489,15 +10971,14 @@
 instances, \textsf{Biber} will search each entry in the declared
 order, and the first match will provide the \textsf{labeldate}.  Only
 when it finds no match at all will it fall back on
-\verb+\bibstring{nodate}+.  (In the \textsf{misc} and
-\mycolor{\textsf{dataset}} types this automatic provision is turned
-off, as such material may not be expected in many standard cases to
-have a usable date provided.)  You can prevent the appearance of
-\verb+\bibstring{nodate}+ throughout your document in all entry types
-with the option \texttt{nodates=false} when loading
-\textsf{biblatex-chicago} in your preamble, or you can set it in the
-options field of individual entries.  (See
-section~\ref{sec:authpreset}, below.)
+\verb+\bibstring{nodate}+.  (In the \textsf{misc} and \textsf{dataset}
+types this automatic provision is turned off, as such material may not
+be expected in many standard cases to have a usable date provided.)
+You can prevent the appearance of \verb+\bibstring{nodate}+ throughout
+your document in all entry types with the option
+\texttt{nodates=false} when loading \textsf{biblatex-chicago} in your
+preamble, or you can set it in the options field of individual
+entries.  (See section~\ref{sec:authpreset}, below.)
 
 \mylittlespace The thing to keep in mind is that \emph{only} for a
 \textsf{labelyear} will \textsf{biblatex} provide what it calls the
@@ -10514,7 +10995,7 @@
 it requires a series of options for date presentation, and multiple
 iterations of the \cmd{DeclareLabeldate} command.  There are
 \emph{two} standard search orders set up by default: in
-\textsf{music}, \textsf{review}, \mycolor{\textsf{standard}},
+\textsf{music}, \textsf{review}, \textsf{standard},
 \textsf{suppperiodical}, and \textsf{video} entries, the default order
 is \textsf{eventdate, origdate, date, urldate}, while in all other
 entry types the default is \textsf{date, eventdate, origdate,
@@ -10524,11 +11005,11 @@
 options can help.
 
 \mylittlespace In the case of \textsf{music}, \textsf{review},
-\mycolor{\textsf{standard}}, \textsf{suppperiodical}, and
-\textsf{video} entries, the \texttt{avdate} (i.e., audio-visual date)
-option, set to \texttt{true} by default, can be set to \texttt{false}
-in your preamble to return these entry types to the general defaults.
-Please see the documentation of the entry types in
+\textsf{standard}, \textsf{suppperiodical}, and \textsf{video}
+entries, the \texttt{avdate} (i.e., audio-visual date) option, set to
+\texttt{true} by default, can be set to \texttt{false} in your
+preamble to return these entry types to the general defaults.  Please
+see the documentation of the entry types in
 section~\ref{sec:types:authdate} above for the details of how multiple
 dates will be treated in such entries, and also see \texttt{avdate} in
 section~\ref{sec:authpreset}, below.  If you don't alter the
@@ -10586,7 +11067,7 @@
 of references?  By the \textsf{labelyear}, in this case the
 \textsf{year} field, which appears first in the default definition
 (\textsf{date, eventdate, origdate, urldate}) of
-\cmd{DeclareLabel\-date}, and which in this case will be wrong, because
+\cmd{DeclareLabeldate}, and which in this case will be wrong, because
 the entries should always be ordered by the \emph{first} date to
 appear there, in this case the contents of \textsf{origdate}.  In this
 example, the solution can be as simple as a \textsf{sortyear} field
@@ -10693,14 +11174,14 @@
 \mylittlespace Obviously, any entry with only a \textsf{date} should
 behave as usual.  Also, since \textsf{patent} entries have fairly
 specialized needs, I have exempted them from this change to
-\cmd{DeclareLa\-beldate}.  Third, the per-entry \texttt{cmsdate}
-options will still affect which dates are printed in citations and at
-the head of reference list entries, but they cannot change the search
-order for the \textsf{labeldate}.  This will be fixed by the preamble
-option.  Fourth, if you have been used to switching the \textsf{date}
-and the \textsf{origdate} to get the correct results, then you should
-be aware that this mechanism may actually still be useful when using
-the \texttt{on} switch to \texttt{cmsdate} in the preamble, but it
+\cmd{DeclareLabeldate}.  Third, the per-entry \texttt{cmsdate} options
+will still affect which dates are printed in citations and at the head
+of reference list entries, but they cannot change the search order for
+the \textsf{labeldate}.  This will be fixed by the preamble option.
+Fourth, if you have been used to switching the \textsf{date} and the
+\textsf{origdate} to get the correct results, then you should be aware
+that this mechanism may actually still be useful when using the
+\texttt{on} switch to \texttt{cmsdate} in the preamble, but it
 produces incorrect results when the \texttt{cmsdate} option is
 \texttt{both} in the preamble and the individual entry.  The preamble
 option is designed to make the need for this switching as rare as
@@ -10721,7 +11202,7 @@
 behavior is turned off, so that single-date entries will still work
 properly without manual intervention.
 
-\mylittlespace Up\colmarginpar{\textsc{iso}8601-2\\Extended\\Format}
+\mylittlespace Up\mymarginpar{\textsc{iso}8601-2\\Extended\\Format}
 to this point, the discussion of the \textsf{date} field has in fact
 presented no substantive alterations to the way it behaved in previous
 releases of \textsf{biblatex-chicago.}  With this release, however, I
@@ -10748,7 +11229,7 @@
 \begin{table}[h!]
 \hspace*{-2.5em}
 \begin{threeparttable}
-  \caption[\hspace{-1em}\mycolor{Enhanced Date Specifications}]
+  \caption[\hspace{-1em}Enhanced Date Specifications]
   {Enhanced Date Specifications in biblatex-chicago}
 \begin{tabularx}{140mm}{@{}>{\ttfamily}llX@{}}
 \toprule
@@ -10775,7 +11256,7 @@
 -0876/-0866 & 877--867 BC & \\
 0876 & AD 876\tnote{d} & \texttt{dateeraauto=1000} also in preamble\\
 -0876/0866 & 877 BC--AD 866 & \\
-0866/0876 & AD 866--76 & Cf.\ \mycolor{\texttt{compressyears}}, below\\
+0866/0876 & AD 866--76 & Cf.\ \texttt{compressyears}, below\\
 0343-02-03 & February 3, AD 343 & \\\addlinespace[.8mm]
 \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
 -0876 & 877 BCE & \texttt{dateera=secular}, \texttt{dateeraauto=1000}\\
@@ -10782,19 +11263,19 @@
 -0876/-0866 & 877--867 BCE & \\
 0876 & 876 CE &  \\
 -0876/0866 & 877 BCE--866 CE & \\
-0866/0876 & 866--76 CE & Cf.\ \mycolor{\texttt{compressyears}}, below\\
+0866/0876 & 866--76 CE & Cf.\ \texttt{compressyears}, below\\
 0343-02-03 & February 3, 343 CE & \\\addlinespace[.8mm]
 \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
 195X & 1950s\tnote{e,f} & Chicago option
-\mycolor{\texttt{decaderange=true}} gets you 1950--59 \\
+\texttt{decaderange=true} gets you 1950--59 \\
 19XX & 20th c.\tnote{f} & Chicago option
-\mycolor{\texttt{centuryrange=true}} gets you 1900--1999;
-\mycolor{\texttt{alwaysrange=true}} does the same for this and the
+\texttt{centuryrange=true} gets you 1900--1999;
+\texttt{alwaysrange=true} does the same for this and the
 previous entry \\\addlinespace[.8mm]
 \cmidrule(r{2em}){1-1}\addlinespace[.8mm]
 2004-22 & Summer 2004 &  \\
 1908/1912 & 1908--12\tnote{g} & Chicago option
-\mycolor{\texttt{compressyears=true}} set by default \\
+\texttt{compressyears=true} set by default \\
 \bottomrule
 \end{tabularx}
   \def\TPTnoteSettings{%
@@ -10804,20 +11285,19 @@
     \footnotesize
     \rightskip\tabcolsep \leftskip\tabcolsep}%
 \begin{tablenotes}
-\item[a] In other languages both the strings and their
-    placement with respect to the year can and will differ.
-\item[b] The two Chicago options \mycolor{\texttt{nodatebrackets}}
-    and \mycolor{\texttt{noyearbrackets}} can remove the brackets
-    around the year in this context, though please note that they work
-    quite differently in the notes \&\ bibliography and author-date
-    styles. Please see their documentation in
-    sections~\ref{sec:useropts} and \ref{sec:authuseropts},
-    respectively.
-\item[c] Any time stamp that is part of a \textsf{urldate} will
+\item[a] In other languages both the strings and their placement with
+  respect to the year can and will differ.
+  \item[b] The two Chicago options \texttt{nodatebrackets} and
+    \texttt{noyearbrackets} can remove the brackets around the year in
+    this context, though please note that they work quite differently
+    in the notes \&\ bibliography and author-date styles. Please see
+    their documentation in sections~\ref{sec:useropts} and
+    \ref{sec:authuseropts}, respectively.
+  \item[c] Any time stamp that is part of a \textsf{urldate} will
     appear in any entry type, though you can prevent this by setting
-    \mycolor{\texttt{urlstamp=false}}. Time stamps in \textsf{date}
-    and \textsf{origdate} fields will appear only in \textsf{article}
-    and \textsf{periodical} entries with a \texttt{magazine}
+    \texttt{urlstamp=false}. Time stamps in \textsf{date} and
+    \textsf{origdate} fields will appear only in \textsf{article} and
+    \textsf{periodical} entries with a \texttt{magazine}
     \textsf{entrysubtype}, as well as in all \textsf{online},
     \textsf{review}, and \textsf{suppperiodical} entries. Such data in
     \textsf{eventdate} fields will appear only in \textsf{review} and
@@ -10855,17 +11335,16 @@
 entry.  A \textsf{year} field like \verb+{[1957?]}+ in the .bib
 database produces a field in the .bbl that neither sorts nor can be
 numerically tested.  The same holds for a compressed year range, as in
-tillich:system.  With \mycolor{\texttt{compressyears}} set to
-\texttt{true} by default, a \textsf{date} field like
-\verb+{1951/1963}+ lets the package decide what compression is
-correct, and provides \textsf{year} and \textsf{endyear} fields that
-sort and compare numerically for both \textsf{switchdates} and
-\textsf{extradate} tests.  Clearly, situations may still arise when a
-specially-crafted \textsf{year} or \textsf{origyear} field may be
-necessary, but if you can use the enhanced specifications then I
-strongly advocate doing so.
+tillich:system.  With \texttt{compressyears} set to \texttt{true} by
+default, a \textsf{date} field like \verb+{1951/1963}+ lets the
+package decide what compression is correct, and provides \textsf{year}
+and \textsf{endyear} fields that sort and compare numerically for both
+\textsf{switchdates} and \textsf{extradate} tests.  Clearly,
+situations may still arise when a specially-crafted \textsf{year} or
+\textsf{origyear} field may be necessary, but if you can use the
+enhanced specifications then I strongly advocate doing so.
 
-\mylittlespace One\colmarginpar{\textsf{verbc}} possible drawback is
+\mylittlespace One\mymarginpar{\textsf{verbc}} possible drawback is
 that using these facilities makes a great many more dates available to
 the \textsf{extradate} mechanism which, it turns out, is something of
 a mixed blessing.  The \emph{Manual} isn't entirely forthcoming about
@@ -10874,10 +11353,10 @@
 \textsf{Biblatex-chicago} will print the \textsf{extradate} in such
 situations, so that you could have \texttt{[1957?]a} followed by
 \texttt{[ca.~1957]b}, which may not be exactly right, nor exactly what
-you want.  Here, the new \mycolor{\textsf{verbc}} field can help ---
-giving the two entries different values of this field will prevent the
+you want.  Here, the new \textsf{verbc} field can help --- giving the
+two entries different values of this field will prevent the
 \textsf{extradate} from appearing.  Please see the documentation of
-the \mycolor{\textsf{verbc}} field below for all the details.
+the \textsf{verbc} field below for all the details.
 
 \mylittlespace Second, for most entry types, only a year is really
 necessary, and in most situations only the year --- or year range ---
@@ -10896,8 +11375,8 @@
 comments, that may need a time stamp for disambiguation.  If you wish
 to specify the time zone, the \emph{Manual} (10.41) prefers
 initialisms like \enquote{EST} or \enquote{PDT,} and these are most
-easily provided using the \mycolor{\texttt{timezone}} field, where you
-can include your own parentheses if so desired (cp.\ 14.191).  If you
+easily provided using the \texttt{timezone} field, where you can
+include your own parentheses if so desired (cp.\ 14.191).  If you
 follow the recommendations of the \emph{Manual} and present newspaper
 and magazine articles \enquote{entirely within the text} (15.49), then
 the citations need to contain the complete \textsf{date} (and possible
@@ -10907,17 +11386,17 @@
 or a \textsf{review} entry, alongside a possible
 \texttt{useauthor=false}, should allow you to achieve this.  For
 online comments in \textsf{online} or \textsf{review} entries this
-presentation is the default when you use the new
-\mycolor{\texttt{commenton}} \textsf{relatedtype}.  (See the
-documentation of those two types in section~\ref{sec:types:authdate},
-as well as \textsf{relatedtype} in section~\ref{sec:authrelated}.)
-While we're on this subject, the \emph{Manual} is flexible (in both
-specifications) on abbreviating the names of months (14.171).  By
-default, \textsf{biblatex-chicago-authordate} uses the full names,
-which you can change by setting the option \texttt{dateabbrev=true} in
-the preamble.  (Cf.\ ac:comment, assocpress:gun, barcott:review,
-batson, creel:house, friends:leia, holiday:fool, nass:address,
-petroff:impurity, powell:e\-mail.)
+presentation is the default when you use the new \texttt{commenton}
+\textsf{relatedtype}.  (See the documentation of those two types in
+section~\ref{sec:types:authdate}, as well as \textsf{relatedtype} in
+section~\ref{sec:authrelated}.)  While we're on this subject, the
+\emph{Manual} is flexible (in both specifications) on abbreviating the
+names of months (14.171).  By default,
+\textsf{biblatex-chicago-authordate} uses the full names, which you
+can change by setting the option \texttt{dateabbrev=true} in the
+preamble.  (Cf.\ ac:comment, assocpress:gun, barcott:review, batson,
+creel:house, friends:leia, holiday:fool, nass:address,
+petroff:impurity, powell:email.)
 
 \mylittlespace Third, in the \textsf{misc} entry type the
 \textsf{date} field can help to distinguish between two classes of
@@ -10938,25 +11417,23 @@
 should be moved into the corresponding date field (either the
 \textsf{date} or the \textsf{eventdate}, typically).
 
-\mylittlespace I recommend that you have a look through
+\mylittlespace I recommend that you have a look at
 \textsf{dates-test.bib} to see how all these complications will affect
 the construction of your .bib database, especially at the following
 entries: aristotle:metaphy:gr, creel:house, emerson:nature,
 james:ambassadors, maitland:canon, maitland:equity, schweitzer:bach,
 spock:interview, white:ross:memo, and white:russ.  Cf.\ also
-\textsf{origdate}, \textsf{timezone}, \mycolor{\textsf{verbc}}, and
+\textsf{origdate}, \textsf{timezone}, \textsf{verbc}, and
 \textsf{year}, below; the \texttt{alldates}, \texttt{alltimes},
-\mycolor{\texttt{alwaysrange}}, \mycolor{\texttt{centuryrange}},
-\texttt{cmsdate}, \mycolor{\texttt{compressyears}},
-\texttt{datecirca}, \texttt{dateera}, \texttt{dateera\-auto},
-\texttt{dateuncertain}, \mycolor{\texttt{decaderange}},
-\mycolor{\texttt{nodatebrackets}}, \texttt{nodates},
-\mycolor{\texttt{noyearbrackets}},\break \texttt{switchdates},
-\texttt{timezones}, \mycolor{\texttt{urlstamp}}, and \texttt{urltime}
-options in sections~\ref{sec:preset:authdate}, \ref{sec:authuseropts},
-and \ref{sec:authentryopts}; and section~4.5.10 in
-\textsf{biblatex.pdf}, and section \ref{sec:authformopts}, below, for
-the \cmd{DeclareLabeldate} command.
+\texttt{alwaysrange}, \texttt{centuryrange}, \texttt{cmsdate},
+\texttt{compressyears}, \texttt{datecirca}, \texttt{dateera},
+\texttt{dateeraauto}, \texttt{dateuncertain}, \texttt{decaderange},
+\texttt{nodatebrackets}, \texttt{nodates}, \texttt{noyearbrackets},
+\texttt{switchdates}, \texttt{timezones}, \texttt{urlstamp}, and
+\texttt{urltime} options in sections~\ref{sec:preset:authdate},
+\ref{sec:authuseropts}, and \ref{sec:authentryopts}; and
+section~4.5.10 in \textsf{biblatex.pdf}, and section
+\ref{sec:authformopts}, below, for the \cmd{DeclareLabeldate} command.
 
 \mybigspace This \mymarginpar{\textbf{day}} field, as of
 \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it
@@ -11028,13 +11505,13 @@
 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},
-and now also the \mycolor{\textsf{performance}} type, in all of which
-they help to identify conductors, directors, producers, and
-performers.  To specify the role, use the fields \textsf{editoratype},
+and now also the \textsf{performance} type, in all of which they help
+to identify conductors, directors, producers, and performers.  To
+specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
 bernstein:shostakovich, hamilton:miranda, handel:messiah.)
 
-\mybigspace Normally, \colmarginpar{\textbf{editortype}} with the
+\mybigspace Normally, \mymarginpar{\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
@@ -11060,18 +11537,17 @@
 field, and \textsf{biblatex} will print the correct string after the
 name in the list of references.
 
-\mylittlespace In \colmarginpar{New!} previous releases of
-\textsf{biblatex-chicago} you could only use defined \cmd{bibstrings}
-in this field, at least if you wanted anything printed.  N.~Andrew
-Walsh pointed out that the standard \textsf{biblatex} styles will just
-print the field as-is in this case, allowing them to handle a great
-many unforeseen editorial roles with comparative ease, so I've
-implemented this, too, making sure to capitalize the string if the
-context demands it.  The string you choose will differ depending on
-whether it will be printed after a name at the head of an entry or
-before a name later on in the entry, e.g., \enquote{cartographer} or
-\enquote{maps created by.}  A bit of trial and error should see you
-through.
+\mylittlespace In previous releases of \textsf{biblatex-chicago} you
+could only use defined \cmd{bibstrings} in this field, at least if you
+wanted anything printed.  N.~Andrew Walsh pointed out that the
+standard \textsf{biblatex} styles will just print the field as-is in
+this case, allowing them to handle a great many unforeseen editorial
+roles with comparative ease, so I've implemented this, too, making
+sure to capitalize the string if the context demands it.  The string
+you choose will differ depending on whether it will be printed after a
+name at the head of an entry or before a name later on in the entry,
+e.g., \enquote{cartographer} or \enquote{maps created by.}  A bit of
+trial and error should see you through.
 
 \mylittlespace There are a few details of which you need to be aware.
 Because \textsf{biblatex-chicago} has added the \textsf{namea} field,
@@ -11094,7 +11570,7 @@
 (\textsf{namea} or \textsf{editor}) appears at the head of the
 reference-list entry.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string
 concatenation mechanism, for reasons he outlines in his RELEASE file,
@@ -11123,7 +11599,7 @@
 \textsf{suppperiodical}.
 
 \mybigspace These
-\colmarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
+\mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
 identify the exact role of the person named in the corresponding
 \textsf{editor[a-c]} field, just as \textsf{editortype} (q.v.) does
 for the \textsf{editor}.  Note that they are not part of the string
@@ -11130,11 +11606,11 @@
 concatenation mechanism.  I have implemented them just as the standard
 styles do, that is, if the field isn't a pre-defined \cmd{bibstring}
 it will be printed as-is, contextually capitalized.  They have found a
-use particularly in \textsf{music}, \mycolor{\textsf{performance}},
-and \textsf{video} entries.  Cf.\ bernstein:shostakovich,
+use particularly in \textsf{music}, \textsf{performance}, and
+\textsf{video} entries.  Cf.\ bernstein:shostakovich,
 hamilton:miranda, and handel:messiah.
 
-\mybigspace Standard \colmarginpar{\textbf{eid}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
 identify a particular article.  Only applicable to the
 \textsf{article} entry type, and only to those without a
@@ -11146,7 +11622,7 @@
 \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
+the standard styles.  In \textsf{bibla\-tex-chicago-authordate} it has
 seven very specific uses, the first three of which I have designed in
 order to maintain, as much as possible, backward compatibility with
 the standard styles.  First, in \textsf{article} and
@@ -11210,10 +11686,9 @@
 transformation, the 17th edition (14.265) now recommends that, when
 presenting episodes from a TV series, the name of the series
 (\textsf{booktitle}) comes before the episode name (\textsf{title}).
-The exact string \mycolor{\texttt{tvepisode}} in the
-\textsf{entrysubtype} field achieves this reversal, which includes
-using the \textsf{booktitle} as a \textsf{sorttitle} in the list of
-references.
+The exact string \texttt{tvepisode} in the \textsf{entrysubtype} field
+achieves this reversal, which includes using the \textsf{booktitle} as
+a \textsf{sorttitle} in the list of references.
 
 \mylittlespace Seventh, and finally, you can use any
 \textsf{entrysubtype} whatever in \textsf{inreference} entries in
@@ -11235,17 +11710,17 @@
 \mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
 \textsf{biblatex} field which has gradually accumulated functions in
 \textsf{biblatex-chicago}.  It can now play a role in
-\mycolor{\textsf{artwork}}, \mycolor{\textsf{audio}},
-\mycolor{\textsf{image}}, \textsf{music}, \textsf{review},
-\mycolor{\textsf{standard}}, \textsf{suppperiodical},
-\textsf{unpublished}, and \textsf{video} entries.  In \textsf{artwork}
-and \textsf{image} entries it identifies the publication date of, most
-frequently, a photograph, in association with the
-\textsf{howpublished} field which identifies the periodical or other
-medium in which it was published (mccurry:afghangirl).  In
+\textsf{artwork}, \textsf{audio}, \textsf{image},
+\mycolor{\textsf{inproceedings}}, \textsf{music},
+\mycolor{\textsf{proceedings}}, \textsf{review}, \textsf{standard},
+\textsf{suppperiodical}, \textsf{unpublished}, and \textsf{video}
+entries.  In \textsf{artwork} and \textsf{image} entries it identifies
+the publication date of, most frequently, a photograph, in association
+with the \textsf{howpublished} field which identifies the periodical
+or other medium in which it was published (mccurry:afghangirl).  In
 \textsf{standard} entries it will also usually be associated with a
 \textsf{howpublished} field, allowing you to specify a later renewal
-or reaffirmation of a standard (niso:bibref).  In \textsf{audio}
+or reaffirmation of a standard (niso\hc bibref).  In \textsf{audio}
 entries, it specifies the release date of a single episode of a
 podcast (danforth:podcast).  In \textsf{music} entries, it identifies
 the recording or performance date of a particular song (rather than of
@@ -11259,30 +11734,31 @@
 want to do for filmed musical performances (friends:leia,
 handel:messiah, holiday:fool).
 
-\mylittlespace In \textsf{unpublished} entries it identifies the date
-of an event at which an unpublished work was presented, though in
-truth the \textsf{date} will do as well here (nass:address).  The
-field's use in \textsf{review} and \textsf{suppperiodical} entries,
-finally, includes a possible time stamp.  In this context, an
-\textsf{eventdate} helps to identify a particular comment on, or reply
-to another comment on, a blog post.  Given that many such posts by a
-single \textsf{author} could appear on the same day, you can
-distinguish them by putting a time specification in the
-\textsf{eventdate} field itself (ac:comment).  Please see the
-\textbf{review} type, above, for the details of how to cite these
-materials, possibly with the help of the new
-\mycolor{\texttt{commenton}} \textsf{relatedtype}.  See also the
+\mylittlespace In \mycolor{\textsf{inproceedings}},
+\mycolor{\textsf{proceedings}}, and \textsf{unpublished} entries it
+identifies the date of an event at which a published or unpublished
+work was presented, though in truth the \textsf{date} will do as well
+in \textsf{unpublished} entries (nass:address).  The field's use in
+\textsf{review} and \textsf{suppperiodical} entries, finally, includes
+a possible time stamp.  In this context, an \textsf{eventdate} helps
+to identify a particular comment on, or reply to another comment on, a
+blog post.  Given that many such posts by a single \textsf{author}
+could appear on the same day, you can distinguish them by putting a
+time specification in the \textsf{eventdate} field itself
+(ac:comment).  Please see the \textbf{review} type, above, for the
+details of how to cite these materials, possibly with the help of the
+new \texttt{commenton} \textsf{relatedtype}.  See also the
 \textsf{date} field docs above, in particular
-table~\ref{ad:date:extras}, for\colmarginpar{New!} details on how the
-\mycolor{\textsc{iso}8601-2 Extended Format specifications} offered by
-\textsf{biblatex}, including time stamps and much else besides, have
-been implemented in \textsf{biblatex-chicago}.
+table~\ref{ad:date:extras}, for details on how the \textsc{iso}8601-2
+Extended Format specifications offered by \textsf{biblatex}, including
+time stamps and much else besides, have been implemented in
+\textsf{biblatex-chicago}.
 
 \mylittlespace In the default configuration of \cmd{DeclareLabeldate},
 dates for citations and for the head of reference list entries are
 searched for in the order \textsf{date, eventdate, origdate, urldate}.
 This suits the Chicago author-date styles very well, except for
-\textsf{music}, \textsf{review}, \mycolor{\textsf{standard}},
+\textsf{music}, \textsf{review}, \textsf{standard},
 \textsf{suppperiodical}, and \textsf{video} entries.  In
 \textsf{music} and \textsf{video} entries the general rule is to
 emphasize the earliest date, whether that be, for example, the
@@ -11293,12 +11769,23 @@
   origdate, date, urldate}.  (See the \texttt{avdate} option in
 section~\ref{sec:authpreset}, below.)
 
-\mybigspace This \colmarginpar{\textbf{eventtimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{eventtimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{eventdate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
 around it at your discretion (cp.\ 10.41 and 14.191).
 
+\mybigspace A \colmarginpar{\textbf{eventtitle}} standard
+\textsf{biblatex} field for identifying the name of the event that
+produces either a published record (\mycolor{\textsf{inproceedings}}
+and \mycolor{\textsf{proceedings}} entries) or an unpublished one
+(\textsf{unpublished}).
+
+\mybigspace Standard \colmarginpar{\textbf{eventtitleaddon}}
+\textsf{biblatex} field for adding information about an
+\textsf{eventtitle}, and available in the same entry types as that
+field.
+
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
 function as it does in standard \textsf{biblatex}.  Like
@@ -11314,27 +11801,26 @@
 subject, but \textsf{biblatex-chicago} prints it (them), in
 parentheses, just after the author(s).
 
-\mybigspace Standard \colmarginpar{\textbf{howpublished}}
+\mybigspace Standard \mymarginpar{\textbf{howpublished}}
 \textsf{biblatex} field which, like the \textsf{eventdate} field, is
 gradually accumulating functions in \textsf{biblatex-chicago}.  In the
 \textsf{booklet} type it retains something of its traditional usage,
 replacing the \textsf{publisher}, and has a similar (somewhat
 paradoxical) place in \textsf{unpublished} entries.  In the
-\textsf{misc} and \mycolor{\textsf{performance}} types it works almost
-as a second \textsf{note} field, bringing in extra information about a
-work in close association with the \textsf{type} and \textsf{version}
-fields, while the \mycolor{\textsf{dataset}} entry type associates it
-both with those two fields and with the \textsf{number} field.
-17th-edition \textsf{music} entries require a field to provide the
-medium of downloaded music and/or the name of the streaming service,
-so \textsf{howpublished} works there as an online double of
-\textsf{type} and of \textsf{publisher}.  Finally, in
-\textsf{artwork}, \textsf{image}, and \mycolor{\textsf{standard}}
-entries it serves to qualify or modify an \textsf{eventdate}, almost
-as a \textsf{userd} field modifies a \textsf{date} or
-\textsf{urldate}.  Please see the docs of those entry types for more
-information, and also bedford:photo, clark:mesopot,
-mccurry:afghangirl, niso:bibref, rihanna:umbrella.
+\textsf{misc} and \textsf{performance} types it works almost as a
+second \textsf{note} field, bringing in extra information about a work
+in close association with the \textsf{type} and \textsf{version}
+fields, while the \textsf{dataset} entry type associates it both with
+those two fields and with the \textsf{number} field.  17th-edition
+\textsf{music} entries require a field to provide the medium of
+downloaded music and/or the name of the streaming service, so
+\textsf{howpublished} works there as an online double of \textsf{type}
+and of \textsf{publisher}.  Finally, in \textsf{artwork},
+\textsf{image}, and \textsf{standard} entries it serves to qualify or
+modify an \textsf{eventdate}, almost as a \textsf{userd} field
+modifies a \textsf{date} or \textsf{urldate}.  Please see the docs of
+those entry types for more information, and also bedford:photo,
+clark:mesopot, mccurry:afghangirl, niso:bibref, rihanna:umbrella.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -11354,6 +11840,8 @@
 field, for providing the International Standard Book Number of a
 publication.  Not typically required by the \emph{Manual}.
 
+\enlargethispage{-2\baselineskip}
+
 \mybigspace Standard \mymarginpar{\textbf{isrn}} \textsf{biblatex}
 field, for providing the International Standard Technical Report
 Number of a report.  Only relevant to the \textsf{report} entry type,
@@ -11368,7 +11856,7 @@
 field, designed for \textsf{article} or \textsf{periodical} entries
 identified by something like \enquote{Spring} or \enquote{Summer}
 rather than by the usual \textsf{month} or \textsf{number} fields
-(brown:bre\-mer).  \textsf{Biblatex's} enhanced date handling allows
+(brown\hc bremer).  \textsf{Biblatex's} enhanced date handling allows
 you to specify a season in the \textsf{date} field, with the
 \enquote{months} 21--24 used for Spring, Summer, Autumn, and Winter,
 respectively.  Cf.\ table~\ref{ad:date:extras}, above.
@@ -11490,7 +11978,7 @@
 \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a
 \textsf{maintitle} --- see next entry.
 
-\mybigspace The \colmarginpar{\textbf{maintitle}} main title for a
+\mybigspace The \mymarginpar{\textbf{maintitle}} main title for a
 multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
 It no longer takes sentence-style capitalization in
 \textsf{authordate}, though it does in \textsf{authordate-trad}.  In
@@ -11497,13 +11985,13 @@
 cross references produced using the \textsf{crossref} field, the
 \textsf{title} of \textbf{mv*} entry types always becomes a
 \textsf{maintitle} in the child entry.  (See donne:var,
-euripides:orestes, harley:carto\-graphy, lach:asia,
+euripides:orestes, harley\hc cartography, lach:asia,
 pelikan:christian, and plato:republic:gr.)
 
-\mylittlespace Because \colmarginpar{New!} the 17th edition of the
-\emph{Manual} recommends that you present not only the names of blogs
-but also the names of their parent (usually periodical) publications,
-I have added this field to \textsf{article}, \textsf{periodical}, and
+\mylittlespace Because the 17th edition of the \emph{Manual}
+recommends that you present not only the names of blogs but also the
+names of their parent (usually periodical) publications, I have added
+this field to \textsf{article}, \textsf{periodical}, and
 \textsf{review} entries for just this purpose.  See the documentation
 of those entry types in section~\ref{sec:types:authdate}, above, and
 also table~\ref{tab:online:adtypes} (15.51; amlen:hoot).
@@ -11552,49 +12040,111 @@
 
 \mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided
 by \textsf{biblatex}, though not used by the standard styles.  In
-\textsf{biblatex-chicago}, it allows you to specify that an author's
-name is a pseudonym, or to provide either the real name or the
-pseudonym itself, if the other is being provided in the
-\textsf{author} field.  The abbreviation
+\textsf{biblatex-chicago} its primary use, in most entry types, has
+always been to specify that an author's name is a pseudonym, or to
+provide either the real name or the pseudonym itself, if the other is
+being provided in the \textsf{author} field.  The abbreviation
 \enquote{\texttt{pseud.}\hspace{-2pt}}\ (always lowercase in English)
 is specified, either on its own or after the pseudonym
 (centinel:letters, creasey:ashe:blast, creasey:morton:hide,
-creasey:york:death, and lecarre:quest); \verb+\bibstring{pseudonym}+
-does the work for you.  See under \textbf{author} above for the full
-details.
+creasey:york:death, and lecarre:quest); remember that
+\verb+\bibstring{pseudonym}+ does the work for you.  See under
+\textbf{author} above for the full details.
 
-\mylittlespace In \textsf{online, review,} and \textsf{suppperiodical}
-entries, as well as in \textsf{misc} entries with an
-\textsf{entrysubtype}, I have removed the automatic provision of
-square brackets from the field, allowing it to be used in at least two
-ways.  First, if you provide your own square brackets, then it can
-have its standard function, as above.  Second you can, within
-parentheses, provide a screen name for online social media, or merely
-additional specifics about an author in a piece from an unpublished
-archive.  (The 16th edition of the \emph{Manual} recommended
-specifying comments to blogs and other online content using a time
-stamp in parentheses after the \textsf{author}, but the 17th edition
-\colmarginpar{New!} handles time stamps differently.  In this case the
-\emph{Manual} (15.52) now specifies that comments should appear
-\enquote{only in the text, in reference to the related post,} so I've
-provided some new functionality to enable this.  Please see the
-\textbf{online} and \textbf{review} types, above, especially
-table~\ref{tab:online:adtypes}, for the details of how to cite these
-materials, possibly with the help of the new
-\mycolor{\texttt{commenton}} \textsf{relatedtype} and a separate
+\mylittlespace The field has slowly accumulated other functions, so
+when Philipp Immel made a feature request, and pointed to a discussion
+on Stack Exchange which suggested a few more, I thought I might
+generalize the field's functionality, providing three package options
+to allow users to mould it to their needs.  Before discussing these,
+allow me to emphasize that the package defaults remain exactly the
+same as before, so that, absent any of the new options, the style
+still provides square brackets around the \textsf{nameaddon} in most
+entry types, no brackets of any sort in \textsf{online, review,} and
+\textsf{suppperiodical} entries, as well as in \textsf{misc} entries
+with an \textsf{entrysubtype}, and rather specialized handling in
+\textsf{customc} entries (which ignore all but the first of the new
+options --- see below).  If you're happy with the status quo, then no
+changes to your documents or\ .bib databases are necessary.
+
+\mylittlespace If you do need or want to put the field to a different
+use, the following options may help.  All of them are available
+globally, per type, and per entry.  The first
+\colmarginpar{\texttt{nameaddon}} new option is simply called
+\mycolor{\texttt{nameaddon}}, and determines where and when the field
+will be printed at all.  There are three possible values:
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{all}:] This is the default; if an entry has a
+  \textsf{nameaddon}, it will appear in the reference list.
+\item[\qquad \texttt{none}:] The field will not appear in the
+  reference list.
+\item[\qquad \texttt{first}:] Philipp Immel requested this as a way to
+  provide an \textsf{author's} dates in the \textsf{nameaddon} field
+  and only have them printed the first time that author appears in the
+  reference list.  The code tests for identical \textsf{nameaddon}
+  fields in works by identical \textsf{authors}, so other sorts of
+  \textsf{nameaddon} will be printed as usual.
+\end{description}
+
+The \colmarginpar{\texttt{nameaddonsep}}
+\mycolor{\texttt{nameaddonsep}} option controls the punctuation that
+appears before the \textsf{nameaddon}. It takes the following six
+keys:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{space}] = \cmd{addspace}.  This is the default.
+\item[\qquad \texttt{none}] = no separator at all.  It presumes that
+  you will include one in the \textsf{nameaddon} field itself.
+\item[\qquad \texttt{colon}] = \verb+\addcolon\addspace+.
+\item[\qquad \texttt{comma}] = \verb+\addcomma\addspace+.
+\item[\qquad \texttt{period}] = \verb+\addperiod\addspace+.
+\item[\qquad \texttt{semicolon}] = \verb+\addsemicolon\addspace+.
+\end{description}
+
+The \colmarginpar{\texttt{nameaddon-\\format}}
+\mycolor{\texttt{nameaddonformat}} option allows you to change the
+format of the \textsf{nameaddon} field on the fly, so its value should
+be a field format that \textsf{biblatex} understands.  This includes
+standard formats like \texttt{parens,\,brackets} or \texttt{emph}, and
+also custom formats that you provide in your preamble using
+\cmd{DeclareFieldFormat}, in case the standard ones aren't adequate.
+If you don't define this option, then the usual defaults apply, as
+delineated above, and you can use your own parentheses in
+\textsf{online, review,} and \textsf{suppperiodical} entries, as well
+as in \textsf{misc} entries with an \textsf{entrysubtype}, to
+distinguish screen names or other authorial information from
+traditional pseudonyms (in brackets).
+
+\mylittlespace There are two more details.  If you are using the
+17th-edition styles for the first time, please note that the 16th
+edition of the \emph{Manual} recommended specifying comments to blogs
+and other online content using a time stamp in parentheses after the
+\textsf{author}, but the 17th edition handles time stamps both
+differently and more widely, so in this case you would now put time
+data into the \textsf{date} or \textsf{eventdate} field, particularly
+when the date itself is too coarse a specification to identify a
+comment unambiguously.  Also, the \emph{Manual} (15.52) now specifies
+that comments should appear \enquote{only in the text, in reference to
+  the related post,} so I've provided some new functionality to enable
+this.  Please see the \textbf{online} and \textbf{review} types,
+above, especially table~\ref{tab:online:adtypes}, for the details of
+how to cite these materials, possibly with the help of the new
+\texttt{commenton} \textsf{relatedtype} and a separate
 \textbf{customc} entry.  See also the \textsf{date} field docs above,
 in particular table~\ref{ad:date:extras}, for details on how the
-\mycolor{\textsc{iso}8601-2 Extended Format specifications} offered by
+\textsc{iso}8601-2 Extended Format specifications offered by
 \textsf{biblatex}, including time stamps and much else besides, have
-been implemented in \textsf{biblatex-chicago}.  Cf.\ ellis:blog,
-obrien:recycle.)
+been implemented in \textsf{biblatex-chicago}.  (Cf.\ ellis:blog,
+obrien:recycle).
 
 \mylittlespace In the \textsf{customc} entry type, finally, which is
-used to create alphabetized cross-references to other entries in the
-reference list, the \textsf{nameaddon} field allows you to change the
-default string linking the two parts of the cross-reference.  The code
+used to create alphabetized cross-references to other bibliography
+entries, the \textsf{nameaddon} field allows you to change the 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.
+Otherwise, it prints the string as you've provided in the
+\textsf{nameaddon} field itself.  The punctuation is fixed.
 
 \mybigspace You \mymarginpar{\textbf{nameatype}} can use this field
 to change the role of a \textsf{namea} just as you can use
@@ -11685,11 +12235,12 @@
 usage in action.)  It also has a specialized use in the periodical
 types (\textsf{article}, \textsf{periodical}, and \textsf{review}),
 where it holds supplemental information about a \textsf{journaltitle},
-such as \enquote{special issue} (conley:fifthgrade, good:wholeissue).
-In all uses, 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.  Cf.\ \textsf{addendum}.
+such as \enquote{special issue} (conley\hc fifthgrade,
+good:wholeissue).  In all uses, 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.  Cf.\
+\textsf{addendum}.
 
 \mybigspace This \mymarginpar{\textbf{number}} is a standard
 \textsf{biblatex} field, steadily accumulating uses in
@@ -11700,21 +12251,21 @@
 the (generally numerical) specifier of the \textsf{type} in a
 \textsf{report} entry, the archive location (or database accession
 number) of a \textsf{dataset} entry, and the number of a national or
-international standard in a \mycolor{\textsf{standard}} entry.
-Generally, in an \textsf{article}, \textsf{periodical}, or
-\textsf{review} entry, this will be a plain cardinal number, but in
-such entries \textsf{biblatex-chicago} does the right thing if you
-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
-example, while the \textsf{series} field in such an entry will contain
-the name of the series, rather than a number.  This field is also the
-place for the patent number in a \textsf{patent} entry.  Cf.\
-\textsf{issue} and \textsf{series}.  (See 14.123--25 and boxer:china,
-palmatary:pottery, wauchope:ceramics; 14.171 and beattie:crime,
-conley:fifthgrade, friedman:learning, garrett, gibbard, hlatky:hrt,
-mcmillen:antebellum, rozner:liberation, warr:ellison; 14.257 and
-genbank:db; 14.259 and niso:bibref; 14.263 and holiday:fool.)
+international standard in a \textsf{standard} entry.  Generally, in an
+\textsf{article}, \textsf{periodical}, or \textsf{review} entry, this
+will be a plain cardinal number, but in such entries
+\textsf{biblatex-chicago} does the right thing if you 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 example, while the
+\textsf{series} field in such an entry will contain the name of the
+series, rather than a number.  This field is also the place for the
+patent number in a \textsf{patent} entry.  Cf.\ \textsf{issue} and
+\textsf{series}.  (See 14.123--25 and boxer:china, palmatary:pottery,
+wauchope:ceramics; 14.171 and beattie:crime, conley:fifthgrade,
+friedman:learning, garrett, gibbard, hlatky:hrt, mcmillen:antebellum,
+rozner:liberation, warr:ellison; 14.257 and genbank:db; 14.259 and
+niso:bibref; 14.263 and holiday:fool.)
 
 \mylittlespace \textbf{NB}: This may be an opportune place to point
 out that the \emph{Manual} (14.147) prefers arabic to roman numerals
@@ -11740,9 +12291,9 @@
 \textsf{inproceedings} entry, and I have retained this as a
 possibility, though the \emph{Manual} is silent on the matter.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
-\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 it.  (You can also
 provide a time stamp in the field, after an uppercase
@@ -11772,7 +12323,7 @@
 instead.)
 
 \mylittlespace Because of the importance of date specifications in the
-author-date styles, \textsf{biblatex-chicago-authordate} and
+author-date styles, \textsf{biblatex-chica\-go-authordate} and
 \textsf{authordate-trad} provide options and automated behaviors that
 allow you to emphasize the \textsf{origdate} in citations and at the
 head of entries in the list of references.  In entries which have
@@ -11806,8 +12357,8 @@
 If you set the \texttt{cmsdate} preamble options I've just mentioned,
 this changes to \textsf{origdate, date, eventdate, urldate}.  These
 generally cover the needs of the Chicago author-date styles well,
-except for \textsf{music}, \mycolor{\textsf{standard}}, and
-\textsf{video} entries, and, exceptionally, some \textsf{review} and
+except for \textsf{music}, \textsf{standard}, and \textsf{video}
+entries, and, exceptionally, some \textsf{review} and
 \textsf{suppperiodical} entries.  Here the general rule is to
 emphasize the earliest date.  For these five entry types, then,
 \cmd{DeclareLabeldate} uses the order \textsf{eventdate, origdate,
@@ -11858,7 +12409,7 @@
 section~\ref{sec:authrelated}, below.
 \vspace{18pt}
 
-\mybigspace This \colmarginpar{\textbf{origtimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{origtimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{origdate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
@@ -11929,7 +12480,7 @@
 \textsf{number} [palmatary:pottery]).  Cf.\ \textsf{volume};
 iso:electrodoc.
 
-\mybigspace Standard \colmarginpar{\textbf{publisher}}
+\mybigspace Standard \mymarginpar{\textbf{publisher}}
 \textsf{biblatex} field.  Remember that \enquote{\texttt{and}} is a
 keyword for connecting multiple publishers, so if a publisher's name
 contains \enquote{and,} then you should either use the ampersand (\&)
@@ -11964,7 +12515,7 @@
 mentions {s.n.}\,(= \emph{sine nomine}) to specify the lack of a
 publisher (10.42).
 
-\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+\mybigspace In \mymarginpar{\textbf{pubstate}} response to new
 specifications in the 17th edition of the \emph{Manual} (esp.\
 14.137), I have tried to generalize the functioning of the
 \textsf{pubstate} field in all entry types.  Because the author-date
@@ -11985,17 +12536,16 @@
 \texttt{forthcoming}, \texttt{inpreparation}, \texttt{inpress}, and
 \texttt{submitted}; and those, i.e., everything else, which will be
 printed before, and in close association with, other information about
-the publisher of a work.  (This \colmarginpar{\textbf{NB}} is a change
+the publisher of a work.  (This \mymarginpar{\textbf{NB}} is a change
 from previous behavior, where non-\texttt{reprint} strings were
 printed \emph{after} the publication information, as in the standard
 styles.  You can still use the \textsf{addendum} field to present
 information here, of course.)  The four strings that replace the
 \textsf{year} will always be localized, as will \texttt{reprint} and
-\mycolor{\texttt{selfpublished}} (and anything else that
-\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
-category.  All other strings will be printed as-is, capitalized if
-needed, just before the publisher (author:forthcoming,
-contrib:contrib, schweitzer:bach).
+\texttt{selfpublished} (and anything else that \textsf{biblatex} finds
+to be a \cmd{bibstring}) from the second category.  All other strings
+will be printed as-is, capitalized if needed, just before the
+publisher (author:forthcoming, contrib:contrib, schweitzer:bach).
 
 \mylittlespace There is one further subtlety of which you ought to be
 aware.  In \textsf{music} and \textsf{video} entries, the
@@ -12015,7 +12565,7 @@
 \mybigspace See \mymarginpar{\textbf{reprinttitle}}
 section~\ref{sec:authrelated}, below.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
@@ -12022,8 +12572,8 @@
 \textsf{periodical}, or \textsf{review} entry, almost always the name
 of a publication series in \textsf{book}-like entries, and providing
 similar identifying information associated with a \textsf{number} in
-\textsf{music} and \mycolor{\textsf{standard}} entries.  If you need
-to attach further information to the \textsf{series} name in a
+\textsf{music} and \textsf{standard} entries.  If you need to attach
+further information to the \textsf{series} name in a
 \textsf{book}-like entry, then the \textsf{number} field is the place
 for it, whether it be a volume, a number, or even something like
 \enquote{2nd ser.} or \enquote{\cmd{bibstring\{oldseries\}}.}  Of
@@ -12121,7 +12671,7 @@
 conventions of your field or, alternately, provide a list of journal
 abbreviations using \cmd{printbiblist\{shortjournal\}}.
 
-\enlargethispage{-\baselineskip}
+% \enlargethispage{-\baselineskip}
 
 \mylittlespace For long institutional names the \emph{Manual's}
 recommendation (15.37) involves using an abbreviation which will
@@ -12227,7 +12777,7 @@
 can see its default definition at the top of
 \textsf{chicago-authordate.bbx}.
 
-\mybigspace A \colmarginpar{\textbf{shortseries}} special
+\mybigspace A \mymarginpar{\textbf{shortseries}} special
 \textsf{biblatex} field, used both to provide an abbreviated form of a
 (book) \textsf{series} in a reference list and to facilitate the
 creation of a list of such abbreviations rather in the manner of a
@@ -12241,20 +12791,19 @@
   standard, suppbook,} and \textsf{video}.  There are several steps to
 take in order to use the field.  First, you'll need to provide both
 \textsf{shortseries} and \textsf{series} fields in the entry, then
-you'll need to set the \mycolor{\texttt{seriesabbrev}} option either
-when loading \textsf{biblatex-chicago}, for the whole document or for
+you'll need to set the \texttt{seriesabbrev} option either when
+loading \textsf{biblatex-chicago}, for the whole document or for
 specific entry types, or in the \textsf{options} field of individual
 .bib entries.  By default, this option is not set, so your
-\mycolor{\textsf{shortseries}} fields will be silently ignored.
-Setting it to \texttt{true} prints the shortened fields in the
-reference list.  Should you wish to present a list of these
-abbreviations with their expansions, then you need to use the
-\verb+\printbiblist{shortseries}+ command, perhaps with a
-\texttt{title} option to differentiate the list from any
-\textsf{shorthand} list.  As with \textsf{shorthand} lists, I have
-provided two \texttt{bibenvironments} for printing this list in foot-
-or endnotes (\mycolor{\texttt{shsernotes}} and
-\mycolor{\texttt{shserendnotes}}, respectively), to be used with the
+\textsf{shortseries} fields will be silently ignored.  Setting it to
+\texttt{true} prints the shortened fields in the reference list.
+Should you wish to present a list of these abbreviations with their
+expansions, then you need to use the \verb+\printbiblist{shortseries}+
+command, perhaps with a \texttt{title} option to differentiate the
+list from any \textsf{shorthand} list.  As with \textsf{shorthand}
+lists, I have provided two \texttt{bibenvironments} for printing this
+list in foot- or endnotes (\texttt{shsernotes} and
+\texttt{shserendnotes}, respectively), to be used with the
 \texttt{env} option to \cmd{printbiblist}.  Again as with
 \textsf{shorthands}, you'll probably want to use the option
 \texttt{heading=none} when using these environments, just to turn off
@@ -12274,14 +12823,14 @@
 only very rarely (unlike in the notes \&\ bibliography style), and is
 most likely to turn up in \textsf{inreference} or \textsf{reference}
 entries (where the \textsf{title} takes the place of the
-\textsf{author}), in \mycolor{\textsf{dataset}} entries, or in any
-sort of entry with a \texttt{classical} \textsf{entrysubtype} or with
-\mycolor{\texttt{authortitle}} set in its \textsf{options} field.
-These latter three contexts make citations use \textsf{author} and
-\textsf{title} instead of \textsf{author} and \textsf{year}, and if an
-abbreviated version of that title would save space in your running
-text this is the field where you can provide it.  (Cf.\
-ency:britannica, grove:sibelius, aristotle:metaphy:gr.)
+\textsf{author}), in \textsf{dataset} entries, or in any sort of entry
+with a \texttt{classical} \textsf{entrysubtype} or with
+\texttt{authortitle} set in its \textsf{options} field.  These latter
+three contexts make citations use \textsf{author} and \textsf{title}
+instead of \textsf{author} and \textsf{year}, and if an abbreviated
+version of that title would save space in your running text this is
+the field where you can provide it.  (Cf.\ ency:britannica,
+grove:sibelius, aristotle:metaphy:gr.)
 
 \mybigspace Standard \mymarginpar{\textbf{sortkey} \\\textbf{sortname}
   \\\textbf{sorttitle} \\\textbf{sortyear}} \textsf{biblatex} fields,
@@ -12305,7 +12854,7 @@
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
 
-\mybigspace This \colmarginpar{\textbf{timezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{timezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{date}.  The \emph{Manual} prefers initialisms like
 \enquote{EST} for this purpose, and you can provide parentheses around
@@ -12361,9 +12910,9 @@
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
   \textsf{booklet}, \textsf{collection}, \textsf{image},
   \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
-  \mycolor{\textsf{performance}}, \textsf{periodical},
-  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
-  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+  \textsf{performance}, \textsf{periodical}, \textsf{proceedings},
+  \textsf{report}, \textsf{standard}, \textsf{suppbook}, and
+  \textsf{suppcollection} entry types.
 \item[\qquad Quotation Marks:] \textsf{title} of \textsf{article},
   \textsf{inbook} \textsf{incollection}, \textsf{inproceedings},
   \textsf{online}, \textsf{periodical}, \textsf{thesis}, and
@@ -12406,12 +12955,12 @@
   \cmd{mkbibquote} command does this for you automatically, and also,
   I repeat, takes care of any following punctuation that needs to be
   brought within the closing quotation mark(s).  (See 14.94--95;
-  garrett, loften:hamlet, murphy:silent, white:cal\-limachus.)
+  garrett, loften:hamlet, murphy:silent, white:callimachus.)
 \item Inside a plain title (most likely in a \textsf{review} entry or
   a \textsf{titleaddon} field), you should present another title as it
   would appear on its own, once again formatting it yourself using
   \cmd{mkbibemph} or \cmd{mkbibquote}.  (barcott:review, gibbard,
-  osborne:poi\-son, ratliff:review, unsigned:ranke).
+  osborne\hc poison, ratliff:review, unsigned:ranke).
 \end{enumerate}
 
 The \emph{Manual} provides a few more rules, as well.  A word normally
@@ -12452,6 +13001,8 @@
 \textsf{biblatex-chicago-authordate-trad} might need your help in
 order to comply with them.
 
+\enlargethispage{2\baselineskip}
+
 \mylittlespace With regard to sentence-style capitalization, the rules
 of the Chicago \textsf{authordate-trad} style are fairly simple:
 
@@ -12468,10 +13019,9 @@
   sentence style.
 \item[\qquad Contextual Capitalization of First Word:]
   \textsf{titleaddon}, \textsf{booktitleaddon},
-  \textsf{maintitle\-addon} in all entry types, also the
-  \textsf{title} of \textsf{review} entries, of
-  \textsf{suppperiodical} entries, and of \textsf{misc} entries with
-  an \textsf{entrysubtype}.
+  \textsf{maintitleaddon} in all entry types, also the \textsf{title}
+  of \textsf{review} entries, of \textsf{suppperiodical} entries, and
+  of \textsf{misc} entries with an \textsf{entrysubtype}.
 \item[\qquad Plain:] \textsf{title} in \textsf{letter} entries.
 \end{description}
 
@@ -12478,26 +13028,24 @@
 What this means in practice is that to get a title like \emph{The
   Chicago manual of style}, your .bib entry needs to have a field that
 looks something like this:
-\begin{quote}
-  \texttt{title = \{The \{Chicago\} Manual of Style\}}
-\end{quote}
 
-This is completely straightforward, but remember that if an
-\textsf{article} has a title like: Review of \emph{The Chicago manual
-  of style}, then the curly braces enclosing material to be formatted
-in italics will cause the capitalization algorithm to stop and leave
-all of that material as it is, so your .bib entry would need to have a
-field something like this:
+\mylittlespace\hspace*{1em}\texttt{title = \{The \{Chicago\} Manual
+  of Style\}}
 
-\begin{quote}
-  \texttt{title = \{}\cmd{bibstring\{reviewof\}} \cmd{mkbibemph\{The
-    Chicago manual of style\}\}}
-\end{quote}
+\mylittlespace This is completely straightforward, but remember that
+if an \textsf{article} has a title like: Review of \emph{The Chicago
+  manual of style}, then the curly braces enclosing material to be
+formatted in italics will cause the capitalization algorithm to stop
+and leave all of that material as it is, so your .bib entry would need
+to have a field something like this:
 
-(As an aside, the use of the \texttt{reviewof} bibstring isn't
-strictly necessary here, but it helps with portability across
-languages and across the two Chicago styles.  If you've noticed a lot
-of lowercase letters starting fields in \textsf{dates-test.bib},
+\mylittlespace\hspace*{1em}\texttt{title = \{}\cmd{bibstring\{reviewof\}}
+\cmd{mkbibemph\{The Chicago manual of style\}\}}
+
+\mylittlespace (As an aside, the use of the \texttt{reviewof}
+bibstring isn't strictly necessary here, but it helps with portability
+across languages and across the two Chicago styles.  If you've noticed
+a lot of lowercase letters starting fields in \textsf{dates-test.bib},
 they're present because in the notes \&\ bibliography style
 capitalization is complicated by notes using commas where the
 bibliography uses periods, and words like \enquote{review} start in
@@ -12513,10 +13061,10 @@
   \textsf{journaltitle} in all entry types; \textsf{title} of
   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
   \textsf{booklet}, \textsf{collection}, \textsf{manual},
-  \textsf{misc} (w/o \textsf{entrysubtype}),
-  \mycolor{\textsf{performance}}, \textsf{periodical},
-  \textsf{proceedings}, \textsf{report}, \mycolor{\textsf{standard}},
-  \textsf{suppbook}, and \textsf{suppcollection} types.
+  \textsf{misc} (w/o \textsf{entrysubtype}), \textsf{performance},
+  \textsf{periodical}, \textsf{proceedings}, \textsf{report},
+  \textsf{standard}, \textsf{suppbook}, and \textsf{suppcollection}
+  types.
 \item[\qquad Main Text Font (Roman):] \textsf{title} of
   \textsf{article}, \textsf{image}, \textsf{inbook},
   \textsf{incollection}, \textsf{inproceedings}, \textsf{letter},
@@ -12555,8 +13103,8 @@
   as they would if they were on their own.  In such cases you'll need
   to do the formatting yourself, using \cmd{mkbibemph} or
   \cmd{mkbibquote}.  (See barcott:review, garrett, gibbard,
-  loften:hamlet, loomis:structure, murphy:silent, osborne:poison,
-  ratliff:review, unsigned:ranke, white:callimachus.)
+  loften:hamlet, loomis\hc structure, murphy:silent, osborne:poison,
+  ratliff:review, unsigned:ranke, white\hc callimachus.)
 \end{enumerate}
 
 The \emph{Manual} provides a few more rules, as well.  A word normally
@@ -12633,7 +13181,7 @@
 \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:ores\-tes).  If
+holds the editor of a given \textsf{title} (euripides\hc orestes).  If
 \textsf{namea} and \textsf{nameb} are the same,
 \textsf{biblatex-chicago} will concatenate them, just as
 \textsf{biblatex} already does for \textsf{editor},
@@ -12660,7 +13208,7 @@
 \textsf{options} field.  Cf.\ \textsf{author}, \textsf{editor},
 \textsf{namea}, \textsf{nameb}, and \textsf{namec}.
 
-\mybigspace This \colmarginpar{\textbf{type}} is a standard
+\mybigspace This \mymarginpar{\textbf{type}} is a standard
 \textsf{biblatex} field, and in its normal usage serves to identify
 the type of a \textsf{manual}, \textsf{patent}, \textsf{report}, or
 \textsf{thesis} entry.  \textsf{Biblatex} implements the possibility,
@@ -12709,7 +13257,7 @@
 seems entry-specific enough to warrant a little bit of extra typing if
 you need to present the same locator in several entries.
 
-\mybigspace Standard \colmarginpar{\textbf{urldate}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{urldate}} \textsf{biblatex}
 field, it identifies exactly when you accessed a given url.  The
 \emph{Manual} prefers DOIs to URLs; in the latter case it allows the
 use of access dates, particularly in contexts that require it, but
@@ -12722,51 +13270,52 @@
 the default setting of \cmd{DeclareLabeldate}, any entry without a
 \textsf{date}, \textsf{eventdate}, or \textsf{origdate} will use the
 \textsf{urldate} to find a year for citations and the list of
-references (grove:sibelius, wikiped:bibtex), but \colmarginpar{New!}
-\emph{only} if the \textsf{urldate} isn't an access date, that is,
-only if a \textsf{userd} field is present.  If the only date available
-is an online access date, then the entry is considered to have no
-date, and \enquote{n.d.} will appear instead, though of course the
-access date will still be printed later in the reference list entry.
-(If you were to put the string \texttt{accessed} into the
-\textsf{userd} field, you could work around this prohibition.)
+references (grove:sibelius, wikiped:bibtex), but \emph{only} if the
+\textsf{urldate} isn't an access date, that is, only if a
+\textsf{userd} field is present.  If the only date available is an
+online access date, then the entry is considered to have no date, and
+\enquote{n.d.} will appear instead, though of course the access date
+will still be printed later in the reference list entry.  (If you were
+to put the string \texttt{accessed} into the \textsf{userd} field, you
+could work around this prohibition.)
 
-\mylittlespace You can \colmarginpar{New!} also use the
-\textsf{urldate} field to specify a time stamp, should the date alone
-not be specific enough.  The time stamp follows the date, separated by
-an uppercase \enquote{T}, like so:
-\texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.  If you wish to specify the
+\mylittlespace You can also use the \textsf{urldate} field to specify
+a time stamp, should the date alone not be specific enough.  The time
+stamp follows the date, separated by an uppercase \enquote{T}, like
+so: \texttt{yyyy-mm-dd\textbf{T}hh:mm:ss}.  If you wish to specify the
 time zone, the \emph{Manual} (10.41) prefers initialisms like
 \enquote{EST} or \enquote{PDT,} and these are most easily provided
-using the \mycolor{\texttt{urltimezone}} field, where you can provide
-your own parentheses if so desired (cp.\ 14.191).  Following the
-examples in the \emph{Manual}, any \textsf{urldate} will by default be
-printed in 24-hour format, though other time stamps use 12-hour
-format.  The \textsf{biblatex} option \texttt{urltime}, discussed in
+using the \texttt{urltimezone} field, where you can provide your own
+parentheses if so desired (cp.\ 14.191).  Following the examples in
+the \emph{Manual}, any \textsf{urldate} will by default be printed in
+24-hour format, though other time stamps use 12-hour format.  The
+\textsf{biblatex} option \texttt{urltime}, discussed in
 section~\ref{sec:preset:authdate}, allows you to change this in your
 preamble.
 
 \mylittlespace A \textsf{urldate} time stamp (and
-\mycolor{\texttt{urltimezone}}) can appear in any entry whatsoever, if
-you judge the online source to be the sort that changes rapidly enough
-for a time stamp to be necessary (14.207, 14.233; wikiped:bibtex).
-You can stop it printing by setting the new
-\colmarginpar{\texttt{urlstamp}} \mycolor{\texttt{urlstamp}} option to
-\texttt{false} in your preamble for the whole document or for
-specified entry types, or in the \textsf{options} field of individual
-entries.  Please see the documentation of \textbf{date} and also
-table~\ref{ad:date:extras}, above, for more details about time stamps
-and other parts of \textsf{biblatex's} enhanced date specifications.
+\texttt{urltimezone}) can appear in any entry whatsoever, if you judge
+the online source to be the sort that changes rapidly enough for a
+time stamp to be necessary (14.207, 14.233; wikiped:bibtex).  You can
+stop it printing by setting the new \mymarginpar{\texttt{urlstamp}}
+\texttt{urlstamp} option to \texttt{false} in your preamble for the
+whole document or for specified entry types, or in the
+\textsf{options} field of individual entries.  Please see the
+documentation of \textbf{date} and also table~\ref{ad:date:extras},
+above, for more details about time stamps and other parts of
+\textsf{biblatex's} enhanced date specifications.
 Table~\ref{tab:online:adtypes} contains a summary of the current state
 of \textsf{biblatex-chicago's} handling of online materials.
 
-\mybigspace This \colmarginpar{\textbf{urltimezone}} field can, if
+\mybigspace This \mymarginpar{\textbf{urltimezone}} field can, if
 necessary, specify the time zone associated with a time stamp given as
 part of an \textsf{urldate}.  The \emph{Manual} prefers initialisms
 like \enquote{EST} for this purpose, and you can provide parentheses
 around it at your discretion (cp.\ 10.41 and 14.191).
 
-\mybigspace A \colmarginpar{\textbf{usera}} supplemental
+\enlargethispage{\baselineskip}
+
+\mybigspace A \mymarginpar{\textbf{usera}} supplemental
 \textsf{biblatex} field which in certain contexts in
 \textsf{biblatex-chicago} will identify the broadcast network when you
 cite a radio or television program.  In \textsf{article},
@@ -12815,17 +13364,17 @@
 field to qualify a \textsf{date} in the same way it would have
 modified a \textsf{urldate}.  If an entry contains \emph{only} a
 \textsf{urldate} and no other sort of date, and has no \textsf{userd}
-field, that entry will now \colmarginpar{New!} be treated as though it
-had no date, and \enquote{n.d.} will appear in citations and at the
-head of entries in the reference list (15.50).
+field, that entry will now be treated as though it had no date, and
+\enquote{n.d.} will appear in citations and at the head of entries in
+the reference list (15.50).
 
 \mylittlespace Because of the rather specialized needs of some
-audio-visual references, this basic sche\-ma changes for
-\textsf{music} and \textsf{video} entries.  In \textsf{music} entries
-where an \textsf{eventdate} is present, \textsf{userd} will modify
-that date instead of any \textsf{urldate} that may also be present,
-and it will modify an \textsf{origdate} if it is present and there is
-no \textsf{eventdate}.  It will modify a \textsf{date} only in the
+audio-visual references, this basic schema changes for \textsf{music}
+and \textsf{video} entries.  In \textsf{music} entries where an
+\textsf{eventdate} is present, \textsf{userd} will modify that date
+instead of any \textsf{urldate} that may also be present, and it will
+modify an \textsf{origdate} if it is present and there is no
+\textsf{eventdate}.  It will modify a \textsf{date} only in the
 absence of the other three.  In \textsf{video} entries it will modify
 an \textsf{eventdate} if it is present, and in its absence the
 \textsf{urldate}.  Given the absence of those two, it can modify a
@@ -12858,18 +13407,16 @@
 
 \mybigspace Standard \colmarginpar{\textbf{venue}} \textsf{biblatex}
 offers this field for use in \textsf{proceedings} and
-\textsf{inproceedings} entries, but I haven't yet implemented it
-there, mainly because the \emph{Manual} has nothing to say about it.
-Perhaps the \textsf{organization} field could be used, for the moment,
-instead.  I have implemented the field in the \textbf{misc} entry
-type, both with and without an \textsf{entrysubtype}, in the new
-\mycolor{\textbf{performance}} type, and in the \textbf{unpublished}
-type.  In all uses it will normally present the actual venue of an
-event, as opposed, e.g., to the \textsf{origlocation}, which might
-present where a letter was written or where an earlier edition was
-printed.
+\textsf{inproceedings} entries, and after a request from Patrick
+Danilevici I have followed suit.  I have also implemented the field in
+the \textsf{misc} entry type, both with and without an
+\textsf{entrysubtype}, in the \textsf{performance} type, and in the
+\textsf{unpublished} type.  In all uses it will normally present the
+actual venue of an event, as opposed, e.g., to the
+\textsf{origlocation}, which might present where a letter was written
+or where an earlier edition was printed.
 
-\mybigspace Author-date \colmarginpar{\textbf{verbc}} styles in
+\mybigspace Author-date \mymarginpar{\textbf{verbc}} styles in
 \textsf{biblatex} use the \textsf{extradate} field, automatically
 provided by \textsf{biber}, to distinguish citations of different
 works by the same \textsf{author} that were published in the same
@@ -12889,8 +13436,8 @@
 by that \textsf{author} appears in the list, or perhaps a series of
 letters with some missing from the sequence.
 
-\mylittlespace The \mycolor{\textbf{verbc}} field allows you manually
-to intervene to control these side effects.  (It's a standard
+\mylittlespace The \textsf{verbc} field allows you manually to
+intervene to control these side effects.  (It's a standard
 \textsf{biblatex} field, but isn't used in the standard styles.)
 Putting anything in the field prevents that entry from interfering in
 the \textsf{extradate} provision of entries that don't contain such a
@@ -12898,24 +13445,24 @@
 identical \textsf{verbc} field to prevent them from interfering both
 with entries not having any \textsf{verbc} field \emph{and} with
 entries having a different value for that field.  By default, the
-\mycolor{\texttt{commenton}} \textsf{relatedtype} for \textbf{online}
-and \textbf{review} entries adds a \textsf{verbc} field to its entry,
-but you can in all cases control this and provide your own in any
+\texttt{commenton} \textsf{relatedtype} for \textsf{online} and
+\textsf{review} entries adds a \textsf{verbc} field to its entry, but
+you can in all cases control this and provide your own in any
 circumstances and in any entry type you wish.  Please see the
 documentation of those two entry types in
 section~\ref{sec:types:authdate}, and of the \textsf{commenton}
 \textsf{relatedtype} in section~\ref{sec:authrelated}.
 
-\mybigspace Standard \colmarginpar{\textbf{version}} \textsf{biblatex}
+\mybigspace Standard \mymarginpar{\textbf{version}} \textsf{biblatex}
 field, formerly only available in \textsf{artwork}, \textsf{image},
-\textsf{misc}, \textsf{music}, and \textsf{pa\-tent} entries in
-\textsf{biblatex-chicago-authordate}, but now also in \textbf{book} and
-\mycolor{\textbf{performance}} entries.  In most entry types it prints
-a localized \enquote{\texttt{version}} string, but there may be
+\textsf{misc}, \textsf{music}, and \textsf{patent} entries in
+\textsf{biblatex-chicago-authordate}, but now also in \textsf{book}
+and \textsf{performance} entries.  In most entry types it prints a
+localized \enquote{\texttt{version}} string, but there may be
 specialist needs in \textsf{artwork} and \textsf{image} entries, so
-there you'll need to specify the type of data inside the field
-itself.  In the \textsf{book} type it is particularly needed for
-presenting multimedia app content (15.57, 14.268).
+there you'll need to specify the type of data inside the field itself.
+In the \textsf{book} type it is particularly needed for presenting
+multimedia app content (15.57, 14.268).
 
 \mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex}
 field.  It holds the volume of a \textsf{journaltitle} in
@@ -12971,7 +13518,7 @@
 field provided by \textsf{biblatex}, which prevents inheritance of any
 data from the parent entry.  See \textbf{crossref}, above.
 
-\mybigspace Standard \colmarginpar{\textbf{year}} \textsf{biblatex}
+\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
 \textsf{date} field \textsf{year} allows non-numeric input, so you can
@@ -12986,7 +13533,7 @@
 \subsubsection{Fields for Related Entries}
 \label{sec:authrelated}
 
-As \textsf{biblatex.pdf} puts it (\xA7~3.4), \enquote{Almost all
+As \textsf{biblatex.pdf} puts it (\S~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
@@ -13083,13 +13630,13 @@
 \textsf{origlocation} in addition to the \textsf{origdate}, and all
 will be presented in the reference list.  (Cf.\ \textsf{origdate}
 [section~\ref{sec:fields:authdate}], \textsf{origlocation}, and
-\textsf{pubstate}; schweitzer:\break bach.)  \textbf{NB:} It is impossible to
+\textsf{pubstate}; schweitzer:bach.)  \textbf{NB:} It is impossible to
 present this same information, as here, \emph{inside} a single entry
 using a \texttt{related} field, though the \textsf{relatedtype}
 \texttt{origpubin} presents much the same information \emph{after} the
 entry, using data extracted from a separate entry.
 
-\mybigspace In \colmarginpar{\textbf{pubstate}} response to new
+\mybigspace In \mymarginpar{\textbf{pubstate}} response to new
 specifications in the 17th edition of the \emph{Manual} (esp.\
 14.137), I have tried to generalize the functioning of the
 \textsf{pubstate} field in all entry types.  Because the author-date
@@ -13110,17 +13657,16 @@
 \texttt{forthcoming}, \texttt{inpreparation}, \texttt{inpress}, and
 \texttt{submitted}; and those, i.e., everything else, which will be
 printed before, and in close association with, other information about
-the publisher of a work.  (This \colmarginpar{\textbf{NB}} is a change
+the publisher of a work.  (This \mymarginpar{\textbf{NB}} is a change
 from previous behavior, where non-\texttt{reprint} strings were
 printed \emph{after} the publication information, as in the standard
 styles.  You can still use the \textsf{addendum} field to present
 information here, of course.)  The four strings that replace the
 \textsf{year} will always be localized, as will \texttt{reprint} and
-\mycolor{\texttt{selfpublished}} (and anything else that
-\textsf{biblatex} finds to be a \cmd{bibstring}) from the second
-category.  All other strings will be printed as-is, capitalized if
-needed, just before the publisher (author:forthcoming,
-contrib:contrib, schweitzer:bach).
+\texttt{selfpublished} (and anything else that \textsf{biblatex} finds
+to be a \cmd{bibstring}) from the second category.  All other strings
+will be printed as-is, capitalized if needed, just before the
+publisher (author:forthcoming, contrib:contrib, schweitzer:bach).
 
 \mylittlespace There is one further subtlety of which you ought to be
 aware.  In \textsf{music} and \textsf{video} entries, the
@@ -13159,9 +13705,9 @@
 \textsf{options} or \textsf{relatedoptions} field of the relevant
 entry, to \texttt{false}.  For the two \textsf{relatedtypes} that
 construct a single entry using data extracted from related entries ---
-\mycolor{\texttt{commenton}} and \texttt{reviewof} --- you'll need to
-make sure this is \texttt{true} to get properly-formatted citations in
-the reference list.  See below for the details.
+\texttt{commenton} and \texttt{reviewof} --- you'll need to make sure
+this is \texttt{true} to get properly-formatted citations in the
+reference list.  See below for the details.
 
 \mybigspace This \mymarginpar{\textbf{relatedoptions}} field will, I
 should expect, only be needed very rarely.  If you want to set
@@ -13174,7 +13720,7 @@
 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} \xA7~3.4.
+\textsf{biblatex.pdf} \S~3.4.
 
 \mybigspace The \mymarginpar{\textbf{relatedstring}} procedure for
 choosing a string to connect the main entry with its related entry/ies
@@ -13200,7 +13746,7 @@
 \textsf{biblatex} styles define six \textsf{relatedtypes}, and I have
 either simply adopted them wholesale or adapted them to the needs of
 the Chicago style, retaining the basic syntax as much as possible.  I
-have also added two to these six (see below):
+have also added three to these six (see below):
 
 \begin{description}
 \item[\qquad bytranslator:] This prints a full reference to a
@@ -13209,7 +13755,7 @@
     \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.99; furet:passing:fr).  The old \textsf{userf}
+  + translation (14.99; furet\hc passing:fr).  The old \textsf{userf}
   mechanism provides the other, as does the \texttt{origpubas}
   \textsf{relatedtype} (see below).
 \item[\qquad default:] This is the macro used when no
@@ -13242,46 +13788,47 @@
   \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].)
+  \textsf{babel} [which I've tested] or \textsf{polyglossia} [which
+  I've tested somewhat less].)
 \end{description}
 Now, the Chicago-specific types:
 \begin{description}
-\item[\qquad \mycolor{commenton:}] I designed the new
-  \textsf{relatedtype} \mycolor{\texttt{commenton}} to facilitate
-  citation of online comments, and it is available in two entry types,
-  \textsf{online} and \textsf{review} (with its clone
-  \textsf{suppperiodical}).  In both types the \emph{Manual}
-  (15.51--52) recommends that such material appear \emph{only} in the
-  text and not in the reference list, but I have attempted to simplify
-  the presentation of such material wherever you want it to appear.
-  Following the specifications, then, the default when you use
-  \mycolor{\texttt{commenton}} is for
+\item[\qquad commenton:] I designed the new \textsf{relatedtype}
+  \texttt{commenton} to facilitate citation of online comments, and it
+  is available in two entry types, \textsf{online} and \textsf{review}
+  (with its clone \textsf{suppperiodical}).  In both types the
+  \emph{Manual} (15.51--52) recommends that such material appear
+  \emph{only} in the text and not in the reference list, but I have
+  attempted to simplify the presentation of such material wherever you
+  want it to appear.  Following the specifications, then, the default
+  when you use \texttt{commenton} is for
   \textsf{biblatex-chicago-authordate} to modify how your .bib entry
   appears in the .bbl file by setting both \texttt{skipbib} and
   \texttt{cmsdate=full} in the \textsf{options} field, so that nothing
   appears in the reference list and citations present the full date
   and possibly also a time stamp (see below).  Further, the style sets
-  the \mycolor{\textsf{verbc}} field so that these entries don't
-  interfere with the provision of extra date letters --- the full date
-  and time should be enough to individuate separate comments.
-  Finally, the style creates a new \textsf{customc} entry in your .bbl
-  file which you can cite after your initial
-  \mycolor{\texttt{commenton}} entry using \cmd{autocites} and which
-  will, as a comment to your initial entry, say whether it's a comment
-  or a reply or what have you, and then giving the short citation of
-  that upon which it is a comment.  (Just to be clear: your .bib file
-  will itself never be altered, only the .bbl file, which is produced
-  by \textsf{biber} and which provides the data from which
-  \textsf{biblatex} actually typesets citations.)
+  the \textsf{verbc} field so that these entries don't interfere with
+  the provision of extra date letters --- the full date and time
+  should be enough to individuate separate comments.  Finally, the
+  style creates a new \textsf{customc} entry in your .bbl file which
+  you can cite after your initial \texttt{commenton} entry using
+  \cmd{autocites} and which will, as a comment to your initial entry,
+  say whether it's a comment or a reply or what have you, and then
+  giving the short citation of that upon which it is a comment.  (Just
+  to be clear: your .bib file will itself never be altered, only the
+  .bbl file, which is produced by \textsf{biber} and which provides
+  the data from which \textsf{biblatex} actually typesets citations.)
+  Because of how this works, you can currently only use \emph{one}
+  entry key in the \textsf{related} field for this
+  \textsf{relatedtype}, though I may lift this restriction in the
+  future.
 
   As an example, take the Facebook post diaz:surprise, which does
   appear in the reference list.  The entry licis:diazcomment presents
   a comment on this post using the \textsf{relatedtype}
-  \mycolor{\texttt{commenton}}, so
-  \textsf{biblatex-chicago-authordate} creates a new entry,
-  diaz:surprise-customc.  When you cite the comment in your document a
-  command like
+  \texttt{commenton}, so \textsf{biblatex-chicago-authordate} creates
+  a new entry, diaz:surprise-customc.  When you cite the comment in
+  your document a command like
   \verb+\autocites{licis:diazcomment}{diaz:surprise-customc}+ will
   produce a citation like (Licis, February 24, 2016; comment on D\'iaz
   2016).  You can alter the string connecting the two citations (by
@@ -13293,24 +13840,24 @@
   fields required.)
 
   Those who want \textsf{online} comments to appear in the reference
-  list can still use the \mycolor{\texttt{commenton}}
-  \textsf{relatedtype}, and the same citation of the commented piece
-  will appear there, connected by the same string that the
-  \textsf{customc} entry provides.  Here, though, you can also provide
-  a separate \textsf{title} for the comment, and/or a separate
-  \textsf{url} for it, should they exist, which will be printed
-  before/after the citation of the commented piece, respectively.  (In
-  \textsf{review} entries, which use the same \textsf{relatedtype},
-  only the generic title is available, as is always the case with such
-  entries.)  If you manually set either (or both) of the
-  \texttt{cmsdate} or the \texttt{skipbib} options in your entry then
+  list can still use the \texttt{commenton} \textsf{relatedtype}, and
+  the same citation of the commented piece will appear there,
+  connected by the same string that the \textsf{customc} entry
+  provides.  Here, though, you can also provide a separate
+  \textsf{title} for the comment, and/or a separate \textsf{url} for
+  it, should they exist, which will be printed before/after the
+  citation of the commented piece, respectively.  (In \textsf{review}
+  entries, which use the same \textsf{relatedtype}, only the generic
+  title is available, as is always the case with such entries.)  If
+  you manually set either (or both) of the \texttt{cmsdate} or the
+  \texttt{skipbib} options in your entry then
   \textsf{biblatex-chicago} will assume you want to hand-craft that
   entry without its intervention, so it won't alter the
-  \textsf{options} field or indeed provide any
-  \mycolor{\textsf{verbc}} field, though it will still provide the
-  virtual \textsf{customc} entry in your .bbl file, as that may still
-  prove convenient.  Note also that any \mycolor{\textsf{verbc}} field
-  you provide will never be altered by the package.
+  \textsf{options} field or indeed provide any \textsf{verbc} field,
+  though it will still provide the virtual \textsf{customc} entry in
+  your .bbl file, as that may still prove convenient.  Note also that
+  any \textsf{verbc} field you provide will never be altered by the
+  package.
 \item[\qquad reviewof:] Philip Kime's \textsf{biblatex-apa} package
   includes this type, and user Bertold Schweitzer suggested it might
   be a useful addition to \textsf{biblatex-chicago}, so I've added it
@@ -13322,6 +13869,8 @@
   and \textsf{review} entries (along with the latter's clone,
   \textsf{suppperiodical}).
 
+  \enlargethispage{\baselineskip}
+
   In \textsf{article} entries it replaces the \textsf{titleaddon} with
   the \textsf{relatedstring} followed by the \textsf{title} of the
   child entry, and in \textsf{review} entries it replaces the
@@ -13343,6 +13892,15 @@
   if the mechanism doesn't work for you in a particular context,
   remember that the standard way of presenting reviewed works is still
   available.
+\item[\qquad \mycolor{short:}] This \textsf{relatedtype} is like the
+  \texttt{default} type, only it prints author-date citations rather
+  than full reference-list entries. There is no default
+  \textsf{relatedstring} for this type, so if you leave that field
+  blank then the short references will simply appear at the end of the
+  parent entry in the reference list.  Any entries you reference in
+  this way will by default appear separately in the reference list,
+  even if you haven't cited them anywhere else in your document.
+  Otherwise the short reference won't actually be decipherable.
 \end{description}
 
 \mybigspace \textbf{NB:} \mymarginpar{\textbf{reprinttitle}}
@@ -13521,7 +14079,7 @@
 style-specific, one.  If the \textsf{biblatex} authors generalize it
 still further in a future release, I shall do the same, if possible.
 
-\mybigspace I \colmarginpar{\textbf{\textbackslash letterdatelong}}
+\mybigspace I \mymarginpar{\textbf{\textbackslash letterdatelong}}
 have provided this macro mainly for use in the optional postnote field
 of the various citation commands.  When citing a letter (published or
 unpublished, \textsf{letter} or \textsf{misc}), it may be useful to
@@ -13668,7 +14226,7 @@
 \&\ bibliography style, and I include it in the author-date styles for
 compatibility.
 
-\mylittlespace Unlike \colmarginpar{\textbf{\textbackslash
+\mylittlespace Unlike \mymarginpar{\textbf{\textbackslash
     suppress-\\bibfield[]\{\}}} the other commands presented here,
 this should be used in your document preamble rather than in your
 bibliographical apparatus.  Also unlike them, it has two arguments,
@@ -13678,7 +14236,7 @@
 section~\ref{sec:authpreset}), I might also provide a general-purpose
 macro to clear fields from selected entry types when the package
 options aren't quite right for a user's particular needs.  The
-\mycolor{\cmd{suppressbibfield}} command does this, so that
+\cmd{suppressbibfield} command does this, so that
 \verb+\suppressbibfield{note}+ clears the \textsf{note} field from
 \emph{all} entries, while \verb+\suppressbibfield[report]{note}+
 clears it only from \textsf{report} entries.  Both arguments take
@@ -13685,7 +14243,7 @@
 comma-separated lists, so to suppress \textsf{titleaddon} and
 \textsf{volumes} fields from \textsf{report} and \textsf{manual}
 entries, your preamble could contain
-\verb+\suppressbibfield[report,manual]{titleaddon,volumes}+.
+\verb+\suppressbib-field[report,manual]{titleaddon,volumes}+.
 
 \mylittlespace A few usage notes are in order.  First, you can use as
 many calls to the command in your preamble as you wish.  Second, the
@@ -13708,19 +14266,19 @@
 suppresses the \textsf{year}.  Fifth, the code for the command resides
 in \textsf{biblatex-chicago.sty}, so if you load the styles without
 loading that package it won't be available to you.  Sixth and finally,
-the \mycolor{\cmd{suppressbibfield}} command is new and relatively
-untested, so please report any untoward behavior to me.
+the \cmd{suppressbibfield} command is new and relatively untested, so
+please report any untoward behavior to me.
 
 \subsubsection{Citation Commands}
 \label{sec:cite:authordate}
 
 The \textsf{biblatex} package is particularly rich in citation
-commands, most of which, in \textsf{bibla\-tex-chicago-authordate} and
+commands, most of which, in \textsf{biblatex-chicago-authordate} and
 \textsf{authordate-trad}, function as they do in the standard
 author-date styles.  If you are getting unexpected behavior when using
 them please have a look in your .log file.  A command like
-\cmd{supercite}, listed in \xA7~3.6.2 of the \textsf{biblatex} manual but
-not defined by \textsf{biblatex-chicago-authordate} or by core
+\cmd{supercite}, listed in \S~3.6.2 of the \textsf{biblatex} manual
+but not defined by \textsf{biblatex-chicago-authordate} or by core
 \textsf{biblatex}, defaults to \cmd{cite}, and leaves a warning in the
 .log.  The following commands may require some minimal explanation,
 but if there are standard commands that don't work for you, or new
@@ -13727,7 +14285,7 @@
 commands that would be useful, please let me know, and it should be
 possible to fix or add them.
 
-\mybigspace These \colmarginpar{\textbf{\textbackslash atcite
+\mybigspace These \mymarginpar{\textbf{\textbackslash atcite
     \\\textbackslash atpcite}} two new citation commands allow you
 quickly and easily to provide an author-title citation of any entry,
 instead of an author-date citation.  The \texttt{classical}
@@ -13735,7 +14293,7 @@
 in the citation, so I've provided other means to achieve the same end.
 The first of these new citation commands presents the plain citation,
 the second includes it in parentheses for inclusion in running text.
-The new \mycolor{\texttt{authortitle}} type and entry option
+The new \texttt{authortitle} type and entry option
 (section~\ref{sec:authuseropts}) has the same effect when using the
 standard citation commands, but it's possible that using these new
 commands instead may give added flexibility.
@@ -13747,8 +14305,62 @@
 the most common citation command you will use, and also works fine in
 its multicite form, \textbf{\textbackslash autocites}.
 
+\mybigspace Although \colmarginpar{\textbf{\textbackslash citeincite}}
+the officially-sanctioned, and safest, way to present cross-references
+to other works is by using the \textsf{related} mechanism, it would
+appear, judging from various bug reports I've received, that there are
+plenty of users who need to present such references in ways that
+aren't supported by the \textsf{related} code as it stands. This new
+citation command is designed to allow you to present short references
+to other works inside other references, and to avoid some, I hope
+most, of the bugs associated with using cite commands in the fields of
+other entries. If you want to present long citations, I'm assuming
+that you wouldn't want to do that in fields right in the middle of the
+parent entry, and that, therefore, the usual methods detailed in
+section~\ref{sec:authrelated} (above) or the new
+\mycolor{\cmd{fullciteincite}} command (below) will serve your
+needs. Similarly, if you want to provide short citations at the end of
+your parent entry, the new \textsf{relatedtype}
+\mycolor{\texttt{short}} should work.
+
+\mylittlespace If, however, you must have a short reference in the
+midst of another field, then \mycolor{\cmd{citeincite}} can help. It
+is certified to work properly only in the \textsf{addendum,
+  annotation, annote, note, and titleaddon} fields, and in the
+author-date styles also in the \textsf{title} fields of
+\textsf{customc} entries, which allows you (via a multicite command)
+to include such citations as comments to other in-text citations. The
+multicite command \mycolor{\cmd{citeincites}} is also available in the
+same contexts. In previous releases of \textsf{biblatex} there were
+differences in how the case-changing backends behaved with respect to
+citation commands inside entry fields, but in my testing the two
+backends appear currently to be equivalent on this score. Still,
+should you run into problems using \cmd{citeincite}, it might still be
+worth setting \texttt{casechanger=latex2e} in your preamble to see if
+that helps.
+
+\mybigspace Ordinarily, \colmarginpar{\textbf{\textbackslash
+    fullciteincite}} you can use one of the methods discussed in
+section~\ref{sec:authrelated} to present, in a reference list, a full
+citation of a work related in some way to the current entry. The new
+command \mycolor{\cmd{citeincite}} (above) allows you to present short
+citations to other works within selected fields of the parent entry,
+or indeed as part of comments inside other in-text citations, while
+attempting to minimize the problems caused by citations within other
+citations. The \mycolor{\cmd{fullciteincite}} command works similarly
+for full citations, but really is designed for use only in
+\textsf{annotation} fields, the idea being that you might want to
+refer in an annotated reference list to works that you haven't cited
+in the main body of your text. The multicite command
+\mycolor{\cmd{fullciteincites}} is also available. It may be worth
+noting here that, because the full reference list drivers don't
+contain code for printing \textsf{postnote} fields, any postnotes that
+you provide will be silently ignored. Inconsistently enough,
+\textsf{prenote}, \textsf{multiprenote}, and \textsf{multipostnote}
+fields will appear.
+
 \mybigspace Arne \mymarginpar{\textbf{\textbackslash gentextcite}}
-Skj\xE6rholt requested, for the author-date styles, a variant of the
+Skj{\ae}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.25).  The \cmd{gentextcite} command, in effect,
@@ -13768,7 +14380,7 @@
 \textsf{postnote}.  There is a \cmd{gentextcites} command as well,
 though currently you can only specify one genitival ending for all
 keys, like so:\
-\cmd{gentextcites[<ending>]()()[][]\{entry:key1\}\{en\-try:key2\}},
+\cmd{gentextcites[<ending>]()()[][]\{entry:key1\}\{entry:key2\}},
 though if you don't have a \textsf{pre-} or \textsf{postnote} to the
 first citation you can make do with
 \cmd{gentextcites[<ending>]()\{entry:key1\}\{entry:key2\}}.
@@ -13813,10 +14425,10 @@
 thought I might gather them here also for your perusal.  These
 settings are, I believe, consistent with the specification, but you
 can alter them in the options to \textsf{biblatex-chicago} in your
-preamble or by loading the package using
-\cmd{usepackage[style=chicago-authordate]\{biblatex\}}, which gives
-you the \textsf{biblatex} defaults unless you redefine them yourself
-inside the square brackets.
+preamble or by loading the package using \verb+\usepackage+
+\verb+[style=chicago-authordate]{biblatex}+, which gives you the
+\textsf{biblatex} defaults unless you redefine them yourself inside
+the square brackets.
 
 \mylittlespace \textsf{Biblatex-chicago-authordate}
 \mymarginpar{\texttt{autocite=\\inline}} and \textsf{authordate-trad}
@@ -13828,27 +14440,26 @@
 \mybigspace The \mymarginpar{\texttt{alldates=comp}} specification
 calls for the long format when presenting dates, slightly shortened
 when presenting date ranges.  The new style option
-\mycolor{\texttt{compressyears}}, enabled by default, means that year
-ranges are now compressed automatically according to the
-\emph{Manual's} instructions (9.64; section~\ref{sec:authpreset}).
+\texttt{compressyears}, enabled by default, means that year ranges are
+now compressed automatically according to the \emph{Manual's}
+instructions (9.64; section~\ref{sec:authpreset}).
 
-\mylittlespace In \colmarginpar{\texttt{alltimes=12h}} entries which
+\mylittlespace In \mymarginpar{\texttt{alltimes=12h}} entries which
 print time stamps, they will, when the stamp is part of a
 \textsf{date}, \textsf{eventdate}, or \textsf{origdate}, appear in
 12-hour format, i.e., \enquote{4:45 p.m.}  Stamps that are part of a
-\textsf{urldate} are, by default, controlled by the
-\mycolor{\texttt{urltime}} option, which is set to
-\mycolor{\texttt{24h}}.  See that option below, and
+\textsf{urldate} are, by default, controlled by the \texttt{urltime}
+option, which is set to \texttt{24h}.  See that option below, and
 table~\ref{ad:date:extras}.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
-\mylittlespace This \colmarginpar{\texttt{datecirca=true}} option
+\mylittlespace This \mymarginpar{\texttt{datecirca=true}} option
 enables \textsf{biblatex's} enhanced \enquote{circa} date
 specification, which given a \textsf{date} like \verb+1989~+ will
 print [ca.\ 1989].  Cf.\ table~\ref{ad:date:extras}.
 
-\mylittlespace This \colmarginpar{\texttt{dateuncertain=\\true}}
+\mylittlespace This \mymarginpar{\texttt{dateuncertain=\\true}}
 option enables \textsf{biblatex's} enhanced \enquote{uncertain} date
 specification, which given a \textsf{date} like \verb+1989?+ will
 print [1989?].  A field like \verb+1989%+ is both \enquote{circa}
@@ -13855,7 +14466,7 @@
 \emph{and} \enquote{uncertain,} like so: [ca.\ 1989?].  Cf.\
 table~\ref{ad:date:extras}.
 
-\mylittlespace This \colmarginpar{\texttt{datezeros=false}} ensures
+\mylittlespace This \mymarginpar{\texttt{datezeros=false}} ensures
 that leading zeros don't appear in date specifications.
 
 \mylittlespace This \mymarginpar{\texttt{ibidtracker=\\constrict}}
@@ -13869,7 +14480,7 @@
 the package only offers automatic resetting on part, chapter, section,
 and subsection boundaries, while \textsf{biblatex-chicago}
 automatically resets the tracker at page breaks.  (Cf.\
-\textsf{biblatex.pdf} \xA73.1.2.1.)  Whenever there might be any
+\textsf{biblatex.pdf} \S~3.1.2.1.)  Whenever there might be any
 ambiguity, \textsf{biblatex} should default to printing a more
 informative reference.
 
@@ -13903,6 +14514,8 @@
 minor problem with punctuation in titles, ensuring that the colon
 between a title and a subtitle appears in the correct, matching font.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace This \mymarginpar{\texttt{related=true}} is the
 standard \textsf{biblatex} bibliography option, and it enables the use
 of \textsf{related} functionality in the list of references.  I have
@@ -13922,7 +14535,7 @@
 Chicago author-date specification.  Please see the documentation of
 \cmd{DeclareSortingTemplate} in section~\ref{sec:authformopts}, below.
 
-\mylittlespace If \colmarginpar{\texttt{timezones=true}} you provide a
+\mylittlespace If \mymarginpar{\texttt{timezones=true}} you provide a
 timezone for a time stamp, usually using one of the \textsf{timezone}
 fields, this option ensures it will be printed.
 
@@ -13943,18 +14556,18 @@
 initials aren't enough (15.22).  The option is \textsf{Biber}-only,
 like the previous one.
 
-\mylittlespace In \colmarginpar{\texttt{urltime=24h}} entries with
+\mylittlespace In \mymarginpar{\texttt{urltime=24h}} entries with
 \textsf{urldate} fields containing time stamps, that stamp will by
 default appear in 24-hour format, i.e., \enquote{16:45.}  Cf.\
-\mycolor{\texttt{alltimes}}, above, \mycolor{\texttt{urlstamp}} in
+\texttt{alltimes}, above, \texttt{urlstamp} in
 section~\ref{sec:authpreset} below, and table~\ref{ad:date:extras}.
 
 \mylittlespace In
-\colmarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
-\mycolor{\textsf{standard}} entries any editors' or compilers' names
-appear after the title, according to 14.259, so these
-entry-type-specific options encode this.  You can, of course, override
-these defaults in your preamble, should you deem it necessary.
+\mymarginpar{\texttt{[standard]\\useeditor=false\\usenamec=false}}
+\textsf{standard} entries any editors' or compilers' names appear
+after the title, according to 14.259, so these entry-type-specific
+options encode this.  You can, of course, override these defaults in
+your preamble, should you deem it necessary.
 
 \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}}
 enables automatic use of the \textsf{translator} at the head of
@@ -14020,7 +14633,7 @@
 \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} \xA7\xA74.5.6 and 4.5.10.
+preamble --- see \textsf{biblatex.pdf} \S\S~4.5.6 and 4.5.10.
 
 \mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}}
 option allows you to add name fields for consideration when
@@ -14030,7 +14643,7 @@
 rather than requiring a \textsf{shortauthor} field as previous
 releases of \textsf{biblatex-chicago} did.  The default definition
 currently is
-\texttt{\{shortauthor,author,\\shorteditor,namea,editor,nameb,%
+\texttt{\{shortauthor,author,shorteditor,namea,editor,nameb,%
   translator,namec\}}.
 
 \mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labeldate}}
@@ -14073,18 +14686,17 @@
 
 \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} or a
-\mycolor{\textsf{standard}} entry headed by an \textsf{organization},
-or an \textsf{article} or \textsf{review} entry with an
-\textsf{entrysubtype} and headed by a \textsf{journaltitle} will no
-longer need a \textsf{sortkey} set.  Further, the \textsf{biblatex}
-\texttt{use<name>=false} options will remove any name field from the
-sorting order, again reducing the need for user intervention.  The
-main disadvantage should only occur very rarely.  In
-\textsf{author}-less \textsf{article} and \textsf{review} entries
-without an \textsf{entrysubtype}, the \textsf{title} will appear
-instead of the \textsf{journaltitle}, and since the latter appears
-before the former in the sorting scheme, you'll need a
+(\textsf{name[a-c]}), a \textsf{manual} or a \textsf{standard} entry
+headed by an \textsf{organization}, or an \textsf{article} or
+\textsf{review} entry with an \textsf{entrysubtype} and headed by a
+\textsf{journaltitle} will no longer need a \textsf{sortkey} set.
+Further, the \textsf{biblatex} \texttt{use<name>=false} options will
+remove any name field from the sorting order, again reducing the need
+for user intervention.  The main disadvantage should only occur very
+rarely.  In \textsf{author}-less \textsf{article} and \textsf{review}
+entries without an \textsf{entrysubtype}, the \textsf{title} will
+appear instead of the \textsf{journaltitle}, and since the latter
+appears before the former in the sorting scheme, you'll need a
 \textsf{sortkey} for proper alphabetization.
 
 \subsubsection{{Pre-set \textsf{chicago} Options}}
@@ -14154,7 +14766,7 @@
 field is always printed in \textsf{online} entries, regardless of the
 state of this option.
 
-\mylittlespace This \colmarginpar{\texttt{urlstamp=true}} option
+\mylittlespace This \mymarginpar{\texttt{urlstamp=true}} option
 controls whether any \textsf{urltime} fields, included as part of the
 \textsf{urldate}, will be printed in citations and reference list.  It
 defaults to true, and can be set to false either in the preamble, for
@@ -14180,12 +14792,12 @@
 least to a first approximation.  Some per-type or per-entry work
 afterward may then polish up the details.  If you find that you need
 control over fields that aren't included among these options, I have
-provided the \mycolor{\cmd{suppressbibfield}} command for your
-preamble, as suggested by Jan David Hauck.  It is in fact a user
-interface to the source mapping feature of \textsf{biblatex}, and it
-is something of a nuclear option, preventing fields from even
-appearing in the .bbl file generated by \textsf{biber} from your .bib
-database.  See the \mycolor{\cmd{suppressbibfield}} command in
+provided the \cmd{suppressbibfield} command for your preamble, as
+suggested by Jan David Hauck.  It is in fact a user interface to the
+source mapping feature of \textsf{biblatex}, and it is something of a
+nuclear option, preventing fields from even appearing in the .bbl file
+generated by \textsf{biber} from your .bib database.  See the
+\cmd{suppressbibfield} command in
 section~\ref{sec:formatting:authdate} and the source mapping docs in
 \textsf{biblatex.pdf} \S~4.5.3.
 
@@ -14201,23 +14813,69 @@
 default ordering in \textsf{music} and \textsf{video} entries to the
 following: \textsf{eventyear, origyear, year, urlyear}.
 \textsf{Review} entries presenting on-line comments have similar
-needs, as do \mycolor{\textsf{standard}} entries, so the same
-reordering applies to those entry types, too.  If you simply want to
-apply the defaults to these four entry types, you can use
-\texttt{avdate=false} in the options when loading
-\textsf{biblatex-chicago}.  If, however, you want to tailor the
-algorithm to your own needs, then you can use \cmd{DeclareLabeldate}
-commands in your preamble.  Please be aware, however, that some parts
-of the style hard-code the search syntax, and although they take
-account of the \texttt{avdate} setting, if you use your own
-definitions of \cmd{DeclareLabeldate} the results may, in some corner
-cases, surprise.  Please see \textsf{music}, \textsf{review},
-\mycolor{\textsf{standard}}, and \textsf{video} in
+needs, as do \textsf{standard} entries, so the same reordering applies
+to those entry types, too.  If you simply want to apply the defaults
+to these four entry types, you can use \texttt{avdate=false} in the
+options when loading \textsf{biblatex-chicago}.  If, however, you want
+to tailor the algorithm to your own needs, then you can use
+\cmd{DeclareLabeldate} commands in your preamble.  Please be aware,
+however, that some parts of the style hard-code the search syntax, and
+although they take account of the \texttt{avdate} setting, if you use
+your own definitions of \cmd{DeclareLabeldate} the results may, in
+some corner cases, surprise.  Please see \textsf{music},
+\textsf{review}, \textsf{standard}, and \textsf{video} in
 section~\ref{sec:types:authdate}; \textsf{date}, \textsf{eventdate},
 \textsf{origdate}, and \textsf{urldate} in
 section~\ref{sec:fields:authdate}; and \cmd{DeclareLabeldate} in
 section~\ref{sec:authformopts}.
 
+\mylittlespace These
+\colmarginpar{\texttt{bibannotesep\\=vpar\\citeannotesep\\=period}}
+options define the relation of the \textsf{annotation} field to the
+main entry, \mycolor{\texttt{bibannotesep}} doing so in the reference
+list and \mycolor{\texttt{citeannotesep}} in long (legal) notes.  (The
+\texttt{annotation} option in section~\ref{sec:authuseropts}
+determines where, if anywhere, the field will appear.)  Both options
+have the same set of keys, though they have different default settings
+if you don't define them yourself.  The possible values are:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad none] = no punctuation at all.
+\item[\qquad space] = \cmd{addspace}
+\item[\qquad comma] = \verb+\addcomma\addspace+
+\item[\qquad period] = \verb+\addperiod\addspace+
+\item[\qquad colon] = \verb+\addcolon\addspace+
+\item[\qquad semicolon] = \verb+\addsemicolon\addspace+
+\item[\qquad par:] This starts a new paragraph on the next line.  Page
+  breaking is strongly inhibited before the \textsf{annotation}.
+\item[\qquad vpar:] This starts a new paragraph, and also inserts some
+  vertical space before it.  In long notes that vertical space is
+  minimal (1 pt), while in the reference list it creates a blank line.
+  Page breaking is strongly inhibited before the \textsf{annotation}.
+\item[\qquad parbreak:] This is the same as \texttt{par}, but it allows
+  a page break to occur between the main entry and the start of the
+  \textsf{annotation}.
+\item[\qquad vparbreak:] This is the same as \texttt{vpar}, but it also
+  allows a page break between the main entry and the
+  \textsf{annotation}.
+\end{description}
+
+Please note that both of these options are available in the preamble
+both globally and per-type, and also in the \textsf{options} field of
+individual entries.  Each defines a command (\cmd{bibannotesep} and
+\cmd{citeannotesep}) which appears in the \textsf{annotation} field's
+formatting directive, so it's possible to redefine these commands in
+your preamble if you have needs that the available values don't
+address.  (You can also try sending an email to encourage me to add
+other keys.)  Please also keep in mind that
+\mycolor{\texttt{bibannotesep}} interacts with the
+\mycolor{\texttt{entrybreak}} and \mycolor{\textsf{formatbib}} options
+in section~\ref{sec:authuseropts}, below, to determine the general
+layout of the reference list.  Depending on the settings of those
+options, changing the \mycolor{\texttt{bibannotesep}} from entry to
+entry may not work out well.
+
 \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
@@ -14256,7 +14914,7 @@
 recommend the use of shorthands as abbreviations for long authors'
 names, particularly institutional names, which means the shorthand
 will replace only the name part in citations rather than the whole
-citation (15.37; bsi:abbreviation, iso:electrodoc).  Recent editions
+citation (15.37; bsi\hc abbreviation, iso:electrodoc).  Recent editions
 suggest placing the abbreviation at the head of the entry, followed by
 its expansion inside parentheses, an arrangement automatically
 provided by \textsf{biblatex-chicago-authordate} when you use the
@@ -14269,7 +14927,7 @@
 s.v. \enquote{\textbf{shorthand}} above, and also
 \href{file:cms-dates-intro.pdf}{\textsf{cms-dates-intro.pdf}}.
 
-\mylittlespace The \colmarginpar{\texttt{compressyears\\=true}}
+\mylittlespace The \mymarginpar{\texttt{compressyears\\=true}}
 \emph{Manual} has long recommended (9.64, 15.41), as a space-saving
 measure, the compression of year ranges when presenting dates.  I
 have, finally, implemented this in the current release, and have made
@@ -14285,7 +14943,7 @@
 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{addspace}} (\textsf{ctitleaddon}) for nearly all
+\cmd{addcomma\cmd{addspace}} (\textsf{cti\-tleaddon}) for nearly all
 \textsf{book-} and \textsf{maintitleaddons} in the list of references,
 while \cmd{addperiod\cmd{addspace}} (\textsf{ptitleaddon}) is the
 default before most \textsf{titleaddons} there.  If the punctuation
@@ -14312,16 +14970,15 @@
 relevant option to \texttt{none} in your entry and then include the
 punctuation in the \textsf{titleaddon} field itself.
 
-\mylittlespace Constanza Cordoni \colmarginpar{\texttt{dashed=true}}
+\mylittlespace Constanza Cordoni \mymarginpar{\texttt{dashed=true}}
 has requested a way to turn off the 3-em dash for replacing repeated
 names in the reference list, and the \emph{Manual} admits that some
 publishers prefer this, as the dash can carry with it certain
 inconveniences, especially for electronic formats (15.17).  Some of
 \textsf{biblatex's} standard styles have a \texttt{dashed} option, so
-for compatibility purposes I've provided the same.  By default, I have
-set it to print the name dash, but you can set
-\mycolor{\texttt{dashed=false}} in your preamble to repeat names
-instead throughout your document.
+for compatibility purposes I've provided the same.  By default I have
+set it to print the name dash, but you can set \texttt{dashed=false}
+globally, per type, or per entry to repeat names as and when required.
 
 \mylittlespace If \mymarginpar{\texttt{hidevolumes=\\true}} both a
 \textsf{volume} and a \textsf{volumes} field are present, as may occur
@@ -14386,53 +15043,87 @@
 above, and also the documentation of \textsf{crossref} in
 section~\ref{sec:fields:authdate}.
 
+\mylittlespace This \colmarginpar{\texttt{nameaddonsep\\=space}}
+option sets the punctuation which appears before the
+\textsf{nameaddon} field in all entry types except \textsf{customc}.
+You can set it globally, per type, or per entry, using one of the six
+following keys:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{space}] = \cmd{addspace}.  This is the default.
+\item[\qquad \texttt{none}] = no separator at all.  It presumes that
+  you will include one in the \textsf{nameaddon} field itself.
+\item[\qquad \texttt{colon}] = \verb+\addcolon\addspace+.
+\item[\qquad \texttt{comma}] = \verb+\addcomma\addspace+.
+\item[\qquad \texttt{period}] = \verb+\addperiod\addspace+.
+\item[\qquad \texttt{semicolon}] = \verb+\addsemicolon\addspace+.
+\end{description}
+
+Cf.\ \mycolor{\texttt{nameaddon}} and
+\mycolor{\texttt{nameaddonformat}} in section~\ref{sec:authuseropts}.
+
 \mylittlespace This \mymarginpar{\texttt{nodates=true}} option means
-that for all entry types except \textsf{misc} and
-\mycolor{\textsf{dataset}} \textsf{biblatex-chicago} will
-automatically provide \verb+\bibstring{nodate}+ for any entry that
-doesn't otherwise provide a date for citations and for the heads of
-entries in the list of references.  If you set \texttt{nodates=false}
-either in your preamble (for global coverage) or in individual entries
-then the package won't perform this substitution.  (The bibstring
-expands to \enquote{\texttt{n.d.}} in English.)
+that for all entry types except \textsf{misc} and \textsf{dataset}
+\textsf{biblatex-chicago} will automatically provide
+\verb+\bibstring{nodate}+ for any entry that doesn't otherwise provide
+a date for citations and for the heads of entries in the list of
+references.  If you set \texttt{nodates=false} either in your preamble
+(for global coverage) or in individual entries then the package won't
+perform this substitution.  (The bibstring expands to
+\enquote{\texttt{n.d.}} in English.)
 
 \subsubsection{Style Options -- Preamble}
 \label{sec:authuseropts}
 
 These are parts of the specification that not everyone will wish to
-enable.  All except the sixth and eighth can be used even if you load
-the package in the old way via a call to \textsf{biblatex}, but most
-users can just place the appropriate string(s) in the options to the
-\cmd{usepackage\{biblatex-chicago\}} call in your preamble.
+enable.  All except the fifth, eighth, and twelfth can be used even if
+you load the package in the old way via a call to \textsf{biblatex},
+but most users can just place the appropriate string(s) in the options
+to the \cmd{usepackage\{biblatex-chicago\}} call in your preamble.
 
 \mylittlespace \textsf{Biblatex-chicago}
-\colmarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
+\mymarginpar{\texttt{alwaysrange}} now implements \textsf{biblatex's}
 enhanced date specifications, one part of which is the presentation of
 decades and centuries not as year ranges but as localized strings like
-\enquote{19th c.} or \enquote{1970s.}  The
-\mycolor{\texttt{alwaysrange}} option set to \texttt{true}, either in
-your preamble or in individual entries, simply tells the package to
-present the year range instead.  This allows you to use the efficient
-enhanced notations in the \textsf{date} field (\verb+{18XX}+ or
-\verb+{197X}+) without the localized strings appearing, should you
-require it.  The two options \mycolor{\texttt{centuryrange}} and
-\mycolor{\texttt{decaderange}} limit the same effect to centuries and
-decades, respectively.  Please see table~\ref{ad:date:extras}.
+\enquote{19th c.} or \enquote{1970s.}  The \texttt{alwaysrange} option
+set to \texttt{true}, either in your preamble or in individual
+entries, simply tells the package to present the year range instead.
+This allows you to use the efficient enhanced notations in the
+\textsf{date} field (\verb+{18XX}+ or \verb+{197X}+) without the
+localized strings appearing, should you require it.  The two options
+\texttt{centuryrange} and \texttt{decaderange} limit the same effect
+to centuries and decades, respectively.  Please see
+table~\ref{ad:date:extras}.
 
-\mylittlespace At \mymarginpar{\texttt{annotation}} the request of
-Emil Salim, I have added to this version of \textsf{biblatex-chicago}
-the ability to produce annotated reference lists.  If you turn this
-option on then the contents of your \textsf{annotation} (or
-\textsf{annote}) field will be printed after the reference.  (You can
-also use external files to store annotations -- please see
-\textsf{biblatex.pdf} \xA7~3.13.8 for details on how to do this.)  This
-functionality is currently in a beta state, so before you use it
-please have a look at the documentation for the \textsf{annotation}
-field, in section~\ref{sec:fields:authdate} above.
+\mylittlespace At \colmarginpar{\texttt{annotation}} the request of
+Emil Salim, I included in \textsf{biblatex-chicago} the ability to
+produce annotated reference lists.  More recently, Moritz Wemheuer
+brought to my attention a
+\href{https://tex.stackexchange.com/questions/528374/moving-addendum-field-to-the-end-in-biblatex-chicago/540755#540755}{StackExchange}
+question which suggested that the field might be useful in several
+other contexts as well, so I've modified the \texttt{annotation}
+option to allow the field to appear in the reference list
+(\texttt{=bib} or \texttt{=true}, the default, if no string is given),
+in long (legal) notes (\texttt{=notes}), in both (\texttt{=all}), or
+in neither (\texttt{=false}).  You can now set the option in the
+preamble both globally and per-type, and in the \textsf{options} field
+of individual entries.  There are two new options
+(\mycolor{\texttt{bibannotesep}} and \mycolor{\texttt{citeannotesep}})
+to allow you to choose the separator between the \textsf{annotation}
+and the rest of the entry, and also two new options
+(\mycolor{\texttt{formatbib}} and \mycolor{\texttt{entrybreak}}) to
+give you fine-grained control over the presentation of the reference
+list as a whole, including an annotated one.  Please have a look at
+the documentation for the latter two options just below, for the
+former two options in section~\ref{sec:authpreset}, and for the
+\textsf{annotation} field in section~\ref{sec:fields:authdate}.
+Please also see \textsf{biblatex.pdf} \S~3.13.8 for details on how to
+use external files to store annotations.
 
-\mylittlespace In \colmarginpar{\texttt{authortitle}} a few contexts
+\mylittlespace In \mymarginpar{\texttt{authortitle}} a few contexts
 --- classical references, some archival material, perhaps scientific
-data\-bases --- the provision of a date for citations may well be
+databases --- the provision of a date for citations may well be
 impossible, irrelevant, or both.  The \textsf{entrysubtype} value
 \texttt{classical} results in author-title citations for the entry
 containing it, but it modifies punctuation in those citations in a way
@@ -14439,21 +15130,32 @@
 that might be wrong for some sources, and it's also possible that you
 may need the \textsf{entrysubtype} field for some other purpose yet
 still wish to present author-title citations.  You can set
-\mycolor{\texttt{authortitle}} to \texttt{true} either for a specific
-entry type in the preamble or in the \textsf{options} field of
-individual entries to achieve this.  You can also use the citation
-commands \mycolor{\cmd{atcite}} and \mycolor{\cmd{atpcite}}, instead,
-if that's more convenient.  The \textsf{shorttitle} field provides a
-way to abbreviate long titles in this context.  Please note that
-\textsf{biblatex-chicago} by default sets this to \texttt{true} for
-the new \mycolor{\textsf{dataset}} entry type, so you can set it to
-\texttt{false} if you want to present such entries differently.
+\texttt{authortitle} to \texttt{true} either for a specific entry type
+in the preamble or in the \textsf{options} field of individual entries
+to achieve this.  You can also use the citation commands \cmd{atcite}
+and \cmd{atpcite}, instead, if that's more convenient.  The
+\textsf{shorttitle} field provides a way to abbreviate long titles in
+this context.  Please note that \textsf{biblatex-chicago} by default
+sets this to \texttt{true} for the \textsf{dataset} entry type, so
+you can set it to \texttt{false} if you want to present such entries
+differently.
 
-\mylittlespace This \colmarginpar{\texttt{centuryrange}} option works
-just like \mycolor{\texttt{alwaysrange}}, above, but only affects
-century presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+\mylittlespace Like \colmarginpar{\texttt{casechanger}} \texttt{mcite}
+and \texttt{natbib}, this is a standard \textsf{biblatex} option which
+\textsf{biblatex-chicago} simply passes through to that package.  In
+\textsf{biblatex} it defaults to \texttt{auto}, but there were, and
+possibly still are, cases when the old \texttt{latex2e} case-changing
+code can work around some bugs when using, for example, citation
+commands inside fields that have a case-changing element as an
+automatic part of their formatting (\textsf{note},
+\textsf{titleaddon}, \textsf{type}).  Cf.\ section~3.1.1 of
+\textsf{biblatex.pdf}.
 
-\mylittlespace The \colmarginpar{\texttt{cmsbreakurl}} \emph{Manual}
+\mylittlespace This \mymarginpar{\texttt{centuryrange}} option works
+just like \texttt{alwaysrange}, above, but only affects century
+presentation, not decade.  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace The \mymarginpar{\texttt{cmsbreakurl}} \emph{Manual}
 gives fairly specific instructions about breaking URLs across lines
 (14.18), so I have attempted to implement them by tweaking
 \textsf{biblatex's} default settings, which are found in
@@ -14462,8 +15164,8 @@
 instructions, nor do the changes I have made work well in all
 circumstances, being particularly unsightly if you happen to be using
 the \textsf{ragged2e} package.  For these reasons, I have made my
-changes dependent on a package option, \mycolor{\texttt{cmsbreakurl}},
-which you can set in your preamble.  I have placed all of this code in
+changes dependent on a package option, \texttt{cmsbreakurl}, which you
+can set in your preamble.  I have placed all of this code in
 \textsf{biblatex-chicago.sty}, so if you load the package with a call
 to \textsf{biblatex} instead, then URL line breaking will revert to
 the \textsf{biblatex} defaults.  See
@@ -14473,7 +15175,7 @@
 
 \mylittlespace This \mymarginpar{\texttt{cmsdate}} option used
 \emph{in the preamble} provides a method for simplifying the creation
-of data\-bases with a great many multi-date entries.  Despite warnings
+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
@@ -14558,10 +15260,31 @@
 package with a call to \textsf{biblatex} instead then you'll get the
 default \textsf{biblatex} compression style.
 
-\mylittlespace This \colmarginpar{\texttt{decaderange}} option works
-just like \mycolor{\texttt{alwaysrange}}, above, but only affects
-decade presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
+\mylittlespace This \colmarginpar{\texttt{datamodel}} is the standard
+\textsf{biblatex} option for loading the named data model file
+(excluding its\ .dbx extension).  After a request by Philipp Immel,
+you can now set this option when you load the Chicago styles with
+\verb+\usepackage{biblatex-chicago}+, and it will be passed through
+properly to \textsf{biblatex} itself.  Cf.\ \textsf{biblatex.pdf}
+\S~4.5.4.
 
+\mylittlespace This \mymarginpar{\texttt{decaderange}} option works
+just like \texttt{alwaysrange}, above, but only affects decade
+presentation, not century.  Cf.\ table~\ref{ad:date:extras}.
+
+\mylittlespace This \colmarginpar{\texttt{entrybreak}} option only
+makes sense when used in conjunction with the \texttt{annotenp} switch
+to the \mycolor{\texttt{formatbib}} option (below).  The latter allows
+\LaTeX\ to break a page inside an \textsf{annotation} field printed
+without starting a new paragraph, and it does so by allowing such a
+break in the entry only after a set number of lines, by default set to
+3.  The idea is that most reference list entries will fit within 3
+lines, so the break would generally be somewhere inside the
+\textsf{annotation}.  If your document needs a value different from 3,
+provide the integer using the \mycolor{\texttt{entrybreak}} option in
+your preamble.  Some experimentation may be needed to find the optimum
+number for a given document.
+
 \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the
 \emph{Manual} (14.19) recommends specific formatting for footnote (and
 endnote) marks, i.e., superscript in the text and in-line in foot- or
@@ -14577,6 +15300,68 @@
 course you also lose a fair amount of other formatting, as well.  See
 section~\ref{sec:loading:auth}, below.
 
+\mylittlespace The \colmarginpar{\texttt{formatbib}} \emph{Manual} in
+fact says very little about formatting issues in reference lists,
+e.g., whether to break entries across pages and whether to allow
+widows and orphans (single lines at the start or end of a page).  A
+quick and non-scientific survey of publications issued by the
+University of Chicago Press suggests that actual practices are
+extremely varied, so I've tried to provide a number of choices for
+users of \textsf{biblatex-chicago}, most of them available as keys to
+the new \mycolor{\texttt{formatbib}} preamble option, but a few of
+them also involving settings of the \mycolor{\texttt{bibannotesep}}
+and the \mycolor{\texttt{entrybreak}} options.  The keys of
+\mycolor{\texttt{formatbib}} are as follows:
+
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad max:] This is the \textsf{biblatex} default, so if you
+  don't set \mycolor{\texttt{formatbib}} at all it's what you get.  It
+  provides maximal intervention, disallowing entries broken across
+  pages, including even when an entry includes a lengthy annotation.
+\item[\qquad min:] This allows page breaks just about anywhere,
+  including inside entries, and it also allows widows and orphans, so
+  it will usually provide the most efficient use of available space on
+  the pages of your bibliography.
+\item[\qquad minwo:] This is like \texttt{min}, but discourages
+  widows and orphans.
+\item[\qquad annote:] This option treats annotations separately from
+  reference list entries, allowing them to be broken across pages
+  while the entry itself won't be.  It is intended for use with, and
+  will only properly work with, \mycolor{\texttt{bibannotesep}} set to
+  one of the modes that start a new paragraph for the annotation, to
+  wit, \texttt{par}, \texttt{vpar} (the default), \texttt{parbreak},
+  or \texttt{vparbreak}.  See below for the meaning of the
+  \enquote{\texttt{break}} options here.
+\item[\qquad annotenp:] This option attempts to treat annotations
+  separately from reference list entries in those settings of
+  \mycolor{\texttt{bibannotesep}} which don't involve starting a new
+  paragraph.  It works by setting the number of lines in an entry
+  after which page breaking is allowed.  By default entries will only
+  break after 3 lines, the idea being that most reference list entries
+  fit into three lines, so at that point you're likely to be inside
+  the annotation, but you can set the \mycolor{\texttt{entrybreak}}
+  option to any integer that works for your reference apparatus.
+\end{description}
+
+Please note that there is one possible break point that isn't directly
+addressed by these options, that is, the one between the main entry
+and the annotation when that annotation starts a new paragraph.  If
+you set \mycolor{\texttt{bibannotesep}} to \texttt{par} or
+\texttt{vpar}, then \LaTeX\ will try very hard not to break between
+entry and annotation, ensuring that the annotation at least starts on
+the same page as its entry.  If you use \texttt{parbreak} or
+\texttt{vparbreak}, \LaTeX\ is positively encouraged to break a page
+there, as is usual between paragraphs.
+
+\mylittlespace You can of course ignore the
+\mycolor{\texttt{formatbib}} option and provide your own settings.
+\textsf{Biblatex} uses the \cmd{bibsetup} command which you can renew
+in your preamble.  You can find a nice commentary on the default
+values set by the package in the file \textsf{biblatex.def}, which
+you'll find in the main \textsf{biblatex} directory of your \TeX\
+distribution.
+
 \mylittlespace This \mymarginpar{\texttt{genallnames}} option affects
 the choice of which names to present in the genitive case when using
 the \cmd{gentextcites} command.  Please see the documentation of that
@@ -14629,28 +15414,60 @@
 names, and in this position it always takes a comma, the presence of
 which is unaffected by this option.
 
-\mylittlespace This \mymarginpar{\texttt{natbib}} may look like the
-standard \textsf{biblatex} option, but to keep the coding of
-\textsf{biblatex-chicago.sty} simpler for the moment I have
-reimplemented it there, from whence it is merely passed on to
-\textsf{biblatex}.  If you load the Chicago style with
-\cmd{usepackage\{biblatex-chicago\}}, then the option should simply
-read \texttt{natbib}, rather than \texttt{natbib=true}.  The shorter
-form also works if you use \cmd{usepackage}
-\texttt{[style=chicago-authordate]\{bibla\-tex\}}, so I hope this
-requirement isn't too onerous.
+\mylittlespace This \colmarginpar{\texttt{nameaddon}} option
+determines where and when the \textsf{nameaddon }field will be
+printed.  There are three possible values, available globally, per
+type, and per entry:
+\begin{description}
+\setlength{\parskip}{-4pt}
+\item[\qquad \texttt{all}:] This is the default; if an entry has a
+  \textsf{nameaddon}, it will appear in the reference list.
+\item[\qquad \texttt{none}:] The field will not appear in the
+  reference list.
+\item[\qquad \texttt{first}:] Philipp Immel requested this as a way to
+  provide an \textsf{author's} dates in the \textsf{nameaddon} field
+  and only have them printed the first time that author appears in the
+  reference list.  The code tests for identical \textsf{nameaddon}
+  fields in works by identical \textsf{authors}, so other sorts of
+  \textsf{nameaddon} will be printed as usual.
+\end{description}
 
-\mylittlespace When \colmarginpar{\texttt{nodatebrackets}\\
+Cf.\ \mycolor{\texttt{nameaddonformat}} just below, and
+\mycolor{\texttt{nameaddonsep}} in section~\ref{sec:authpreset}.
+
+\mylittlespace This \colmarginpar{\texttt{nameaddon-\\format}} option,
+available globally, per type, and per entry, allows you to change the
+format of the \textsf{nameaddon} field on the fly, so its value should
+be a field format that \textsf{biblatex} understands.  This includes
+standard formats like \texttt{parens,\,brackets} or \texttt{emph}, and
+also custom formats that you provide in your preamble using
+\cmd{DeclareFieldFormat}, in case the standard ones aren't adequate.
+If you don't define this option, then the usual defaults apply, that
+is, no formatting in \textsf{online, review,} and
+\textsf{suppperiodical} entries, as well as in \textsf{misc} entries
+with an \textsf{entrysubtype}, while square brackets surround the
+field in all other entry types with the exception of \textsf{customc},
+which has its own rules and ignores this option. Cf.\
+\mycolor{\texttt{nameaddonsep}} in section~\ref{sec:authpreset}.
+
+\mylittlespace These \mymarginpar{\texttt{natbib}\\\texttt{mcite}} are
+the standard \textsf{biblatex} options, which formerly required
+slightly special handling when you loaded the Chicago style with
+\verb+\usepackage{biblatex-chicago}+.  Both the forms \texttt{natbib}
+and \texttt{natbib=true} (\texttt{mcite} \&\ \texttt{mcite=true})
+should now work.
+
+\mylittlespace When \mymarginpar{\texttt{nodatebrackets}\\
   \texttt{noyearbrackets}} you use \textsf{biblatex's} enhanced date
-specifications to present an uncertain date (\verb+{1956?}+), a
-\enquote{circa} date (\verb+{1956~}+), or one that is both at the same
-time (\verb+{1956%}+), the date that by default will appear in your
+specifications to present a \enquote{circa} date (\verb+{1956~}+), an
+uncertain date (\verb+{1956?}+), or one that is both at the same time
+(\verb+{1956%}+), the date that by default will appear in your
 documents will have square brackets around it.  This accords with the
 \emph{Manual's} instructions concerning such dates (15.44), but may in
 some circumstances prove syntactically awkward, or may perhaps be out
 of step with a specific house style.  These two options, which may
-appear in the preamble either for the whole document or for specific entry
-types, or in individual entries, allow you to control when these
+appear in the preamble either for the whole document or for specific
+entry types, or in individual entries, allow you to control when these
 brackets will appear.  The first controls, mainly, dates that appear
 in the body of an entry in the reference list, while the second
 controls dates in citations and at the head of entries in the
@@ -14667,7 +15484,7 @@
 fine-grained control of individual citations you'll probably want to
 use the \cmd{citereset} command, allied possibly with the
 \textsf{biblatex}\ \texttt{citereset} option, on which see
-\textsf{biblatex.pdf} \xA73.1.2.1.
+\textsf{biblatex.pdf} \S~3.1.2.1.
 
 \mylittlespace This \mymarginpar{\texttt{ordinalgb}} option, which
 only affects users of the \texttt{british} language, restores the
@@ -14688,7 +15505,7 @@
 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:manual\}\{chicago:comment\}}.  With this
-option enabled, \cmd{autocite[;\,some\,comment]\{citekey\}} will do.
+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
@@ -14699,17 +15516,17 @@
 \textsf{postnote} field of citation commands, not the \textsf{pages}
 field in your .bib file.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
-\mylittlespace This \colmarginpar{\texttt{seriesabbrev}} option
+\mylittlespace This \mymarginpar{\texttt{seriesabbrev}} option
 controls the printing, in the reference list, of the
-\mycolor{\textsf{shortseries}} field in place of the \textsf{series}
-field in book-like entries.  It is \texttt{false} by default, so as
-shipped \textsf{biblatex-chicago-authordate} will silently ignore such
-fields, but you can set it to \texttt{true} either in the preamble for
-the whole document or for specific entry types, or in individual
-entries, and it will appear in the reference list.  For more details,
-see the documentation of \mycolor{\textsf{shortseries}} in
+\textsf{shortseries} field in place of the \textsf{series} field in
+book-like entries.  It is \texttt{false} by default, so as shipped
+\textsf{biblatex-chicago-authordate} will silently ignore such fields,
+but you can set it to \texttt{true} either in the preamble for the
+whole document or for specific entry types, or in individual entries,
+and it will appear in the reference list.  For more details, see the
+documentation of \textsf{shortseries} in
 section~\ref{sec:fields:authdate}, above.
 
 \mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has
@@ -14732,7 +15549,7 @@
 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 \mymarginpar{\texttt{xrefurl}} Bj\xF6rk pointed
+\mylittlespace Stefan \mymarginpar{\texttt{xrefurl}} Bj\"{o}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
@@ -14890,8 +15707,8 @@
 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 \xA7\xA7~4.9.1 and 4.11.8 in
-\textsf{biblatex.pdf}.
+section~\ref{sec:international} below and also \S\S~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
@@ -14978,8 +15795,8 @@
 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}
-\xA73.1.2.2, for controlling the printing of some of these fields, and I
-have implemented others that are relevant to
+\S~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
@@ -15072,9 +15889,9 @@
 \item[date] The date of the decision.
 \item[location] The abbreviated name of the court, if it isn't clear
   from the reporter cited.  It will be associated with the
-  \textsf{date} in American cases, but not in Canadian or UK case (see
-  below).  Being a list field, it can contain more than one item, in
-  case you need a separate set of parentheses to identify a
+  \textsf{date} in American cases, but not in Canadian or UK cases
+  (see below).  Being a list field, it can contain more than one item,
+  in case you need a separate set of parentheses to identify a
   jurisdiction as well as a court name in Canadian or UK cases (cf.\
   uk:case:square).
 \end{description}}
@@ -15087,16 +15904,16 @@
 \begin{description}
 \setlength{\parskip}{-2pt}    
 \item[entrysubtype\{square\} \textrm{or} \{round\}] The \emph{Manual}
-  includes examples for citing cases in Canada and in the United
-  Kingdom, and the \texttt{square} \textsf{entrysubtype} identifies
-  the reporter either as Canadian or as a UK reporter for which the
-  year is essential to locating the case, that is, when \enquote{there
-    is either no volume number or the volumes for each year are
-    numbered anew, not cumulatively} (14.298).  The \texttt{round}
-  subtype, by contrast, identifies a UK reporter where the volumes are
-  numbered cumulatively, making the year inessential.  (The names
-  refer to the shapes of the brackets placed around the year in each
-  case.  Cf.\ canada:case, uk:case:round, and uk:case:square.)
+  includes examples for citing cases in the United Kingdom and in
+  Canada, and the \texttt{square} \textsf{entrysubtype} identifies the
+  reporter either as Canadian or as a UK reporter for which the year
+  is essential to locating the case, that is, when \enquote{there is
+    either no volume number or the volumes for each year are numbered
+    anew, not cumulatively} (14.298).  The \texttt{round} subtype, by
+  contrast, identifies a UK reporter where the volumes are numbered
+  cumulatively, making the year inessential.  (The names refer to the
+  shapes of the brackets placed around the year in each case.  Cf.\
+  canada:case, uk:case:round, and uk:case:square.)
 \item[origlocation \textrm{or} origpublisher] If you need to cite more
   than one reporter for a given case, then there are two
   possibilities.  Either the second (and subsequent) reporter(s)
@@ -15145,8 +15962,8 @@
   the same \textsf{title} but differ in other respects.  (Cf.\
   congress:publiclaw, congress:bill, and congress:report.)
 \item[number] Gives an identifying number to a \textsf{title} or a
-  \textsf{titleaddon}, prefixed with \cmd{bib\-string\{number\}}.  It
-  too can appear in short notes.
+  \textsf{titleaddon}, with \cmd{bibstring\{number\}} prefixed to it.
+  It too can appear in short notes.
 \item[note] This gives a section or other specifying information
   related to a \textsf{titleaddon} and \textsf{number}.  (Cf.\
   congress:publiclaw.)
@@ -15169,7 +15986,7 @@
   contain session information pertaining to a legislative publication.
   Elsewhere it will often contain just be a plain number, not unlike
   in \textsf{jurisdiction} entries.  (Cf.\ congress:debate:globe,
-  state:statute:okla, and uk:hansard.)
+  state\hc statute:okla, and uk:hansard.)
 \item[issue] This field can provide an identifying number in some
   circumstances, particularly when you don't want it prefixed by any
   bibstring --- cf.\ uk:command.
@@ -15190,10 +16007,10 @@
   associated with the \textsf{date} in long notes, but will appear
   elsewhere in short notes.  (Cf.\ state:statute:okla.)
 \item[usera] This specifies a particular edition, possibly from a
-  commercial electronic data\-base, of a legislative publication.  It
+  commercial electronic database, of a legislative publication.  It
   will be associated with the \textsf{date} in long notes but won't
   appear in short ones.  (Cf.\ congress:debate:new and
-  state:statute:ky.)
+  state:statute:ky.)\enlargethispage{\baselineskip}
 \item[addendum] You can use this field to specify the speaker at
   hearings or in debates, the Canadian or British jurisdiction of some
   laws if not otherwise clear from the citation, or possibly simply
@@ -15209,13 +16026,13 @@
     \setlength{\parskip}{-2pt}
   \item[canada] Identifies Canadian statutes (canada:statute).
   \item[constitution] For constitutions, be they federal, state, or
-    local (constitution:ar\-kansas and constitution:federal).
+    local (constitution\hc arkansas and constitution:federal).
     \textsf{Biber} will automatically detect if the \textsf{title}
     contains the string \texttt{Const} and provide the
     \textsf{entrysubtype} for you, but in other cases you'll have to
     provide it yourself.
   \item[hansard] Identifies UK parliamentary debates as published in
-    \emph{Hansard}.  (Cf.\ uk:\break hansard.)
+    \emph{Hansard}.  (Cf.\ uk\hc hansard.)
   \item[hearing] For congressional hearings (congress:hearing).
   \item[uk] Identifies UK statutes and command papers.  (Cf.\
     uk:command, uk:statute, and uk:statute:regnal.)
@@ -15276,13 +16093,12 @@
 \cmd{fullcite}, \cmd{footfullcite}, and \cmd{parenfullcite}.  The
 first prints the reference, the second does so in a footnote, and the
 third does so inside parentheses.  For both styles,
-\colmarginpar{\cmd{runcite}} there is a new command that you should
-use if you are citing a \textsf{jurisdiction} entry in the running
-flow of text rather than as a stand-alone citation, whether that text
-is in a note or in the main body (14.276).  This requires a different
-presentation of the \textsf{title} field, and using
-\mycolor{\cmd{runcite}} alerts \textsf{biblatex-chicago} to this
-circumstance.
+\mymarginpar{\cmd{runcite}} there is a new command that you should use
+if you are citing a \textsf{jurisdiction} entry in the running flow of
+text rather than as a stand-alone citation, whether that text is in a
+note or in the main body (14.276).  This requires a different
+presentation of the \textsf{title} field, and using \cmd{runcite}
+alerts \textsf{biblatex-chicago} to this circumstance.
 
 \subsection{Options}
 \label{sec:legal:options}
@@ -15291,17 +16107,18 @@
 notes in your document.  The default settings are indicated in the
 margins.
 
-\mylittlespace This \mymarginpar{legalnotes=true} option prevents the
-printing of legal citations in a bibliography or reference list, as
-the \emph{Bluebook} recommends.  You can change this to \texttt{false}
-in the preamble of your document, but you should be aware that the
-reference printed in the bibliography will be a clone of the long-note
-form, as the \emph{Bluebook} doesn't provide an alternative version.
+\mylittlespace This \mymarginpar{\texttt{legalnotes=true}} option
+prevents the printing of legal citations in a bibliography or
+reference list, as the \emph{Bluebook} recommends.  You can change
+this to \texttt{false} in the preamble of your document, but you
+should be aware that the reference printed in the bibliography will be
+a clone of the long-note form, as the \emph{Bluebook} doesn't provide
+an alternative version.
 
-\mylittlespace This \mymarginpar{noneshort=false} option controls the
-availability of the short form of the note, intended for use in
-subsequent citations of entries already presented in full notes.  By
-default, \textsf{biblatex-chicago} attempts to provide
+\mylittlespace This \mymarginpar{\texttt{noneshort=\\false}} option
+controls the availability of the short form of the note, intended for
+use in subsequent citations of entries already presented in full
+notes.  By default, \textsf{biblatex-chicago} attempts to provide
 \emph{Bluebook}-authorized short versions of citations in this
 situation, and some of the many \textsf{entrysubtypes} are at least
 partially designed to cope with the complexities of the specification.
@@ -15322,8 +16139,8 @@
 results in the presence of \textsf{shorthand} fields and/or the
 \texttt{shorthandfirst} and \texttt{short} options.
 
-\mylittlespace I \mymarginpar{short=false} have ported this option,
-already present in the notes \&\ bibliography style, to the
+\mylittlespace I \mymarginpar{\texttt{short=false}} have ported this
+option, already present in the notes \&\ bibliography style, to the
 author-date styles to allow users to present short notes from the very
 first citation.  I'm not certain what the use case might be for this,
 as it's intended for saving space in documents where short notes can
@@ -15330,7 +16147,7 @@
 point to references in a full bibliography.  Still, if for any reason
 you need this you can set the option to \texttt{true} in the preamble.
 
-\mylittlespace This \mymarginpar{supranotes=\\true} is a
+\mylittlespace This \mymarginpar{\texttt{supranotes=\\true}} is a
 \emph{Bluebook}-specific option, and it produces, for some entry types
 and subtypes, a back reference to the first, long note at the end of
 subsequent, short citations.  It takes the form \enquote{\emph{supra}
@@ -15350,14 +16167,15 @@
 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 Wouter Lancee
-has provided \textsf{cms-dutch.lbx}, thereby adding to the generous
-contributions of Gustavo Barros (\textsf{cms-brazilian.lbx}), Stefan
-Bj\xF6rk (\textsf{cms-swedish.lbx}), Antti-Juhani Kaijahano
+partial fulfillment of this request.  For this release Patrick
+Danilevici has provided \textsf{cms-romanian.lbx}, thereby adding to
+the generous contributions of Wouter Lancee (\textsf{cms-dutch.lbx}),
+Gustavo Barros (\textsf{cms-brazilian.lbx}), Stefan Bj\"{o}rk
+(\textsf{cms-swedish.lbx}), Antti-Juhani Kaijahano
 (\textsf{cms-finnish.lbx}), Baldur Kristinsson
-(\textsf{cms-icelandic.lbx}), and H\xE5kon Malmedal
-(\textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx}, and
-\textsf{cms-ny\-norsk.lbx}).  I include \textsf{cms-british.lbx} in
+(\textsf{cms-icelandic.lbx}), and H{\aa}kon Malmedal
+(\textsf{cms-norsk.lbx}, \textsf{cms-nynorsk.lbx}, and
+\textsf{cms-norwegian.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
@@ -15371,7 +16189,7 @@
 \mylittlespace Using \mymarginpar{\textbf{babel}} these facilities is
 fairly simple.  By default, and this functionality remains the same as
 it was in the previous release of \textsf{biblatex-chicago}, calls to
-\cmd{DeclareLanguage\-Mapping} in \textsf{biblatex-chicago.sty} will
+\cmd{DeclareLanguageMapping} in \textsf{biblatex-chicago.sty} will
 automatically load the American strings, and also \textsf{biblatex's}
 American-style punctuation tracking, when you:
 \begin{enumerate}
@@ -15383,7 +16201,7 @@
 \item Do not load \textsf{babel} at all.
 \end{enumerate}
 (This last is a change from the \textsf{biblatex} defaults --- cp.\
-\xA7~3.12.2 in \textsf{biblatex.pdf} --- but it seems to me reasonable,
+\S~3.12.2 in \textsf{biblatex.pdf} --- but it seems to me reasonable,
 in an American citation style, to expect this arrangement to work well
 for the majority of users.)
 
@@ -15396,14 +16214,15 @@
 the \texttt{british} option.
 
 \mylittlespace If you want to use Brazilian Portuguese, Dutch,
-Finnish, French, German, Icelandic, Norwegian, or Swedish strings in
-the reference apparatus, then you can load \textsf{babel} with
-\texttt{brazilian}, \texttt{dutch}, \texttt{finnish}, \texttt{french},
-\texttt{german}, \texttt{icelandic}, \texttt{ngerman}, \texttt{norsk},
-\texttt{nynorsk}, or \texttt{swedish} as the main document language.
-You no longer need any calls to \cmd{DeclareLanguageMapping} in your
-document preamble, since \textsf{biblatex-chicago.sty} automatically
-provides these if you load the package in the standard way.
+Finnish, French, German, Icelandic, Norwegian, Romanian, or Swedish
+strings in the reference apparatus, then you can load \textsf{babel}
+with \texttt{brazilian}, \texttt{dutch}, \texttt{finnish},
+\texttt{french}, \texttt{german}, \texttt{icelandic},
+\texttt{ngerman}, \texttt{norsk}, \texttt{nynorsk}, \texttt{romanian},
+or \texttt{swedish} as the main document language.  You no longer need
+any calls to \cmd{DeclareLanguageMapping} in your document preamble,
+since \textsf{biblatex-chicago.sty} automatically provides these if
+you load the package in the standard way.
 
 \mylittlespace You can also define which bibstrings to use on an
 entry-by-entry basis by using the \textsf{hyphenation} field in your
@@ -15451,9 +16270,10 @@
 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 Brazilian,
-Dutch, Finnish, Icelandic, Norwegian, and Swedish localizations in
-those instances.  If you have strong objections to any of the strings,
-or indeed to any of my formatting decisions, please let me know.
+Dutch, Finnish, Icelandic, Norwegian, Romanian, and Swedish
+localizations in those instances.  If you have strong objections to
+any of the strings, or indeed to any of my formatting decisions,
+please let me know.
 
 \section{One\,.bib Database, Two Chicago Styles}
 \label{sec:twostyles}
@@ -15553,11 +16373,11 @@
 For \mymarginpar{\textbf{endnotes}} users of the \textsf{endnotes}
 package --- or of \textsf{pagenote} --- \textsf{biblatex} offers
 extensive compatibility options.  Please read the documentation of the
-\texttt{notetype} option in \textsf{biblatex.pdf} \xA7~3.1.2.1.  If you
-are using the \mycolor{\texttt{noteref}} option with the notes \&\
-bibliography style and \textsf{endnotes}, please read the
-documentation in section~\ref{sec:endnoterefs} for your options, which
-include the \mycolor{\textsf{cmsendnotes.sty}} package.
+\texttt{notetype} option in \textsf{biblatex.pdf} \S~3.1.2.1.  If you
+are using the \texttt{noteref} option with the notes \&\ bibliography
+style and \textsf{endnotes}, please read the documentation in
+section~\ref{sec:endnoterefs} for your options, which include the
+\textsf{cmsendnotes.sty} package.
 
 \mylittlespace Another \mymarginpar{\textbf{memoir}} problem I have
 found occurs because the \textsf{memoir} class provides its own
@@ -15572,8 +16392,8 @@
 package, but in this case a simple workaround is to load
 \textsf{biblatex} \emph{after} you've loaded \textsf{ragged2e} in your
 document preamble.  The URL line-breaking code activated by
-\mycolor{\texttt{cmsbreakurl}} doesn't play well with
-\textsf{ragged2e}, and so far I've not found a workaround.
+\texttt{cmsbreakurl} doesn't play well with \textsf{ragged2e}, and so
+far I've not found a workaround.
 
 \section{TODO \&\ Known Bugs}
 \label{sec:bugs}
@@ -15601,10 +16421,17 @@
 
 \mylittlespace Kenneth L. Pearce has reported a bug that appears when
 using multiple citation commands inside the \textsf{annotation} field
-of annotated bibliographies.  If you run into this problem, he
-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.
+of annotated bibliographies.  I have tried to remedy this with the new
+\mycolor{\cmd{citeincite}} and \mycolor{\cmd{fullciteincite}}
+commands, which print short and long citations, respectively. The
+first is intended for use inside a small selection of fields, while
+the long version should only be used in the \textsf{annotation} field.
+See sections~\ref{sec:citecommands} and \ref{sec:cite:authordate},
+above, for details.  If you still encounter problems with these
+commands then it may be worth setting the \textsf{biblatex} option
+\texttt{casechanger=latex2e} in the preamble to see if that helps,
+though in my testing the two different case-changing backends are now
+equivalent in this regard.
 
 \mylittlespace Roger Hart, Pierric Sans, and a number of other users
 have reported a bug in the formatting of title fields.  This, as far
@@ -15615,6 +16442,11 @@
 set of curly braces \{\}\ at the start of the field, but I shall look
 into this further.
 
+\mylittlespace Patrick Danilevici's new Romanian localization
+(\mycolor{\textsf{cms-romanian.lbx}}) required some fairly extensive
+changes to the basic package code, so it's possible that I could
+improve the package's handling of other languages in a similar way.
+
 \mylittlespace This release fixes the formatting errors of which I am
 aware.  There remain the larger issues I've discussed throughout this
 documentation, which mainly represent my inability to make all of
@@ -15628,10 +16460,137 @@
 \section{Revision History}
 \label{sec:history}
 
-\textbf{2.0: Released \today}
+\textbf{2.1: Released \today}
 
+\mylittlespace This release contains several new features, some
+modifications for compatibility with the latest \textsf{biblatex}, and
+many bug fixes.  All styles require the latest \textsf{biblatex}
+(3.16) and \textsf{biber} (2.16).
+
+\begin{itemize}
+\item Patrick Danilevici has very generously provided a Romanian
+  localization for \textsf{bibla\-tex-chicago}
+  (\mycolor{\textsf{cms-romanian.lbx}}) to go with the
+  \textsf{romanian.lbx} he wrote for \textsf{biblatex} itself.  The
+  only hitch is that the latter file won't be in the standard
+  \textsf{biblatex} package until the next release, so you'll have to
+  grab it from
+  \href{https://github.com/plk/biblatex/tree/dev/tex/latex/biblatex/lbx}{GitHub}
+  until then.
+\item Moritz Wemheuer recommended that I include the standard
+  \textsf{biblatex} macro \texttt{begentry} at the start of all
+  drivers in both Chicago styles, with an empty definition by
+  default.  This allows users to redefine it in their preambles and
+  thereby inject their code into the driver before anything is printed.
+\item Moritz also drew my attention to a question on
+  \href{https://tex.stackexchange.com/questions/528374/moving-addendum-field-to-the-end-in-biblatex-chicago/540755#540755}{StackExchange}
+  which suggested that I should expand the applicability of the
+  \textsf{annotation} field, so I've modified the \texttt{annotation}
+  option in all styles to allow the field to appear both in
+  bibliography (reference list) and in long notes, and also added two
+  new options in all styles, \mycolor{\texttt{bibannotesep}} and
+  \mycolor{\texttt{citeannotesep}}, which allow you to define how the
+  \textsf{annotation} field will relate to the main entry.  The
+  options have different defaults, and although they have the same
+  pre-defined keys those keys may have slightly different meanings
+  depending on whether the \textsf{annotation} is to appear in notes
+  or bibliography.  Please see the docs of field and options in
+  sections~\ref{sec:annote}, \ref{sec:chicpreset}, \ref{sec:useropts},
+  \ref{sec:fields:authdate}, \ref{sec:authpreset}, and
+  \ref{sec:authuseropts}.
+\item On a related subject, I have included two new options in all
+  styles --- \mycolor{\texttt{formatbib}} and
+  \mycolor{\texttt{entrybreak}} --- which provide fine-grained control
+  of page breaking in bibliographies and reference lists.  Some of the
+  values of these options are designed to be used with specific values
+  of the \mycolor{\texttt{bibannotesep}} option, so please see the
+  documentation in sections~\ref{sec:useropts} and
+  \ref{sec:authuseropts}.
+\item In the notes \&\ bibliography style Fr.\ Norbert Keliher
+  requested a way to turn off the printing, in the first citation of a
+  work, of the introduction --- (hereafter cited as \ldots)\ --- of a
+  \textsf{shorthand} that will appear in subsequent citations.  The
+  \mycolor{\texttt{shorthandintro}} option is now available globally,
+  per type, and per entry to allow you to control the (non)appearance
+  of this clarifying notification.  By default, the first citation of
+  a work will continue to present the \textsf{shorthand} as it always
+  has.  Please see section~\ref{sec:useropts} for the details.
+\item Philipp Immel requested a feature involving the
+  \textsf{nameaddon} field, and pointed to a discussion on
+  StackExchange which suggested that others were also unsatisfied with
+  that field's functionality, so in this release I've provided three
+  new package options to allow users to mould it to their needs.  The
+  options are called \mycolor{\texttt{nameaddon}},
+  \mycolor{\texttt{nameaddonformat}}, and
+  \mycolor{\texttt{nameaddonsep}}, and you can find all the details in
+  the \textsf{nameaddon} docs in sections~\ref{sec:entryfields} and
+  \ref{sec:fields:authdate}, above.  Cf.\ also the discussions of the
+  options in sections~\ref{sec:chicpreset}, \ref{sec:useropts},
+  \ref{sec:authpreset}, and \ref{sec:authuseropts}.  Allow me to
+  emphasize that the package defaults remain exactly the same as
+  before, so that if you don't set any of the new options no changes
+  to your documents or\ .bib databases are necessary.
+\item Philipp Immel also requested a way to use the standard
+  \textsf{biblatex} option \texttt{datamodel} even when loading the
+  Chicago styles with
+  \verb+\usepackage{biblatex-chicago}+. Implementing this allowed me
+  to regularize how the standard \texttt{mcite} and \texttt{natbib}
+  options were passed through to \textsf{biblatex}, and also to
+  support the new \textsf{biblatex} \mycolor{\texttt{casechanger}}
+  option, which can help solve a bug reported by Peter Mukunda
+  Pasedach.  See sections~\ref{sec:useropts} and
+  \ref{sec:authuseropts}, above.
+\item The new \textsf{relatedtype} \mycolor{\texttt{short}} is
+  available in all styles to allow the presentation of short
+  references rather than full ones when using the \textsf{related}
+  mechanism. See sections~\ref{sec:related} and \ref{sec:authrelated}.
+\item In a similar vein, I have provided new
+  \mycolor{\cmd{citeincite}} and \mycolor{\cmd{fullciteincite}}
+  commands to allow you, in some contexts, to cite a related work
+  inside the fields of another entry, something which, although not
+  recommended, is common practice, and which has frequently not worked
+  quite right. The \mycolor{\cmd{citeincite}} and
+  \mycolor{\cmd{citeincites}} commands always present short citations,
+  and are available in several fields, while
+  \mycolor{\cmd{fullciteincite}} and \mycolor{\cmd{fullciteincites}}
+  always present long references, and are designed only to be used in
+  the \textsf{annotation} field for cases where an annotated
+  bibliography or reference list includes references to works not
+  cited in the main text. See sections~\ref{sec:citecommands} and
+  \ref{sec:cite:authordate} for the details.  If I've missed yet
+  further tricky corners in this functionality please let me know.
+\item After a request by Patrick Danilevici, I have added the four
+  fields \mycolor{\textsf{eventdate}}, \mycolor{\textsf{eventtitle}},
+  \mycolor{\textsf{eventtitleaddon}}, and \mycolor{\textsf{venue}} to
+  the \textsf{inproceedings}, \textsf{mvproceedings}, and
+  \textsf{proceedings} drivers in all styles, for compatibility with
+  standard \textsf{biblatex} usage.  See the docs of those entry types
+  in sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}.
+\item The \texttt{postnotepunct} option should generally work now,
+  both in more contexts and with arbitrary \textsf{postnote} field
+  contents.
+\item The \mycolor{\texttt{dashed}} option governing the use of the
+  3-em dash in bibliographies and reference lists is now available
+  globally, per type, and per entry.
+\end{itemize}
+
+Note on the 16th-edition files:
+\begin{itemize}
+\item These have been updated for compatibility with the latest
+  \textsf{biblatex} and \textsf{biber}, and there are also a number of
+  bug fixes included.  I haven't added any new functionality to the
+  files, so for instance if you want to use the new Romanian
+  localization you'll need the current 17th-edition styles.  With this
+  release I am marking the 16th-edition files as deprecated, and will
+  remove them in a future release.  Please consider moving your
+  documents to the current specification, where all of my development
+  time is now spent.\label{deprec:obsol}
+\end{itemize}
+
+\textbf{2.0: Released April 20, 2020}
+
 \mylittlespace Converting from the 16th to the 17th edition in your
-.bib files and \LaTeX\ documents:\label{deprec:obsol}
+.bib files and \LaTeX\ documents:
 \begin{itemize}
 \item The 17th edition of the \emph{Manual} no longer encourages use
   of \emph{ibid.}\ to replace repeated citations of the same work in
@@ -15747,7 +16706,7 @@
 author-date styles:
 \begin{itemize}
 \item Wouter Lancee has very generously provided a Dutch localization
-  for \textsf{biblatex-chicago}, called
+  for \textsf{biblatex-chi\-cago}, called
   \mycolor{\textsf{cms-dutch.lbx}}.  You can use it by including
   \enquote{\texttt{dutch}} when loading \textsf{babel}.  Gustavo
   Barros has also very kindly provided a much-revised version of his
@@ -16041,8 +17000,8 @@
 \item I am grateful to Gustavo Barros for providing a Brazilian
   Portuguese localization for \textsf{biblatex-chicago}, contained in
   the \mycolor{\textsf{cms-brazilian.lbx}} file.
-\item Gustavo also pointed out a couple of instances where the
-  package's \textsf{bibstrings} couldn't accommodate the needs of his
+\item Gustavo also pointed out some instances where the package's
+  \textsf{bibstrings} couldn't accommodate the needs of his
   localization, so with his help I've split the \texttt{recorded}
   string into \texttt{discrecorded} and \texttt{songrecorded}, then
   added it to all the .lbx files.  I've also added two new
@@ -16123,8 +17082,8 @@
   section~\ref{sec:useropts}, above, for the details, and note that
   \mycolor{\texttt{shortextrafield}} has to be set for the mechanism
   to print anything at all.
-\item User P\xE9t\xF9r spotted two long-standing bugs: first, that the
-  \texttt{url=false} option didn't stop the printing of the
+\item User P\'{e}t\`{u}r spotted two long-standing bugs: first, that
+  the \texttt{url=false} option didn't stop the printing of the
   \textsf{urldate}, and second that empty parentheses would appear in
   some circumstances around non-existent dates in the author-date
   styles.  I have fixed both.
@@ -16205,13 +17164,13 @@
   preamble or in individual entries, and should make this
   functionality simpler to activate than the \cmd{shorthandcite}
   command.
-\item Also in the notes \&\ bibliography style, Stefan Bj\xF6rk requested
-  a way to turn off the printing of \textsf{url}, \textsf{doi}, and
-  \textsf{eprint} information in notes but not in the bibliography.
-  The new \mycolor{\texttt{urlnotes}} option, which you can set to
-  \texttt{false} in the preamble or in individual entries, provides
-  this.  Please note that it does not apply to \textsf{online}
-  entries.
+\item Also in the notes \&\ bibliography style, Stefan Bj\"{o}rk
+  requested a way to turn off the printing of \textsf{url},
+  \textsf{doi}, and \textsf{eprint} information in notes but not in
+  the bibliography.  The new \mycolor{\texttt{urlnotes}} option, which
+  you can set to \texttt{false} in the preamble or in individual
+  entries, provides this.  Please note that it does not apply to
+  \textsf{online} entries.
 \item Several users pointed out the presence of warnings in .log files
   caused by deprecated grammar in the default Sorting Schemes of both
   styles.  These should now be fixed.
@@ -16239,10 +17198,10 @@
 Other New Features:
 
 \begin{itemize}
-\item Stefan Bj\xF6rk 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 Stefan Bj\"{o}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
@@ -16284,7 +17243,7 @@
   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\xE6rholt, and his generous
+\item Following a request by Arne Skj{\ae}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
@@ -16296,15 +17255,16 @@
   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\xF6rk 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 Stefan Bj\"{o}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
@@ -16344,7 +17304,7 @@
   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
+\item In addition to moving all the 15th-edition styles into the
   \texttt{obsolete} subdirectory, I have also reorganized the
   author-date style files, adding
   \mycolor{\textsf{chicago-dates-common.cbx}} which contains the code
@@ -16370,9 +17330,9 @@
   \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\xE6rholt and some macros
-  in \textsf{inproceedings} entries that had been missing for years.
-  I have provided some default values for counters in
+  in author-date citations spotted by Arne Skj{\ae}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
@@ -16430,7 +17390,7 @@
   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
+  cross-references in all the Chicago styles, and while I was working
   on that portion of the code it seemed an opportune moment to fulfill
   some feature requests bearing on the same area of functionality.
 \item First, following a request from Alexandre Roberts, I have added
@@ -16510,7 +17470,7 @@
   \textbf{incollection} entries can inherit from \textbf{book} entries
   the same way they inherit from \textbf{mvbook}.
 \item I've fixed a fair number of other bugs, including two in the
-  \emph{Ibidem} mechanism pointed out by Bernd Rellermeyer, one in the
+  \emph{Ibidem} mechanism identified by Bernd Rellermeyer, one in the
   printing of dates, and one in the \cmd{textcite} command in the
   notes \&\ bibliography style, these last two pointed out by Kenneth
   Beesley.  The presentation of all the periodical entry types
@@ -16682,7 +17642,7 @@
   parent entries.
 \item I discovered some unpleasant side effects of my arrangement of
   the \textsf{.lbx} files devoted to Norwegian, and reverted to the
-  arrangement as originally provided by H\xE5kon Malmedal.
+  arrangement as originally provided by H{\aa}kon Malmedal.
 \end{itemize}
 
 \textbf{0.9.9c: Released March 15, 2013}
@@ -16794,10 +17754,10 @@
   through it that it is still something of a work in progress, but it
   should cover most needs in that language very well.  If you would
   like to fill in some of the gaps please let me know.
-\item I am also grateful to H\xE5kon Malmedal for providing Norwegian
+\item I am also grateful to H{\aa}kon Malmedal for providing Norwegian
   localizations for \textsf{biblatex-chicago}, contained in the files
   \mycolor{\textsf{cms-norsk.lbx}},
-  \mycolor{\textsf{cms-norwe\-gian.lbx}}, and
+  \mycolor{\textsf{cms-norwegian.lbx}}, and
   \mycolor{\textsf{cms-nynorsk.lbx}}.
 \item I have added a new British localization
   (\mycolor{\textsf{cms-british.lbx}}) that should make it much
@@ -16887,7 +17847,7 @@
   fields.  This should reduce the instances where you need a
   \textsf{shortauthor} field to provide such a name.
 \item The Chicago-specific setting of another \textsf{Biber}-only
-  command, \mycolor{\cmd{DeclareSorting\-Scheme=cms}}, allows
+  command, \mycolor{\cmd{DeclareSortingScheme=cms}}, allows
   non-standard fields to be considered by \textsf{biblatex's} sorting
   algorithms, which should reduce the instances where you need a
   \textsf{sortkey} or the like in your entries.  If you aren't using
@@ -16900,7 +17860,7 @@
 \begin{itemize}
 \item All title fields now follow the rules for the notes \&\
   bibliography style as far as punctuation, formatting, and
-  capitalization are concerned.  \textsf{Biblatex-chicago-\break authordate}
+  capitalization are concerned.  \textsf{Biblatex-chicago-authordate}
   will deal with most of this automatically, but if you have any hand
   formatting of lowercase letters within curly braces in your .bib
   file, you will need to restore the headline-style capitalization
@@ -16927,7 +17887,7 @@
   with sorting in the reference list --- placing the
   \textsf{shorthand} also in a \textsf{sortkey} should do the trick.
 \item On the subject of \textbf{customc} entries, the \emph{Manual}
-  now recommends using cross-references in several contexts,
+  now recommends using cross-refer\-ences in several contexts,
   particularly when a single author uses more than one pseudonym.
   Adding \textsf{customc} entries makes this happen.
 \item There have been significant changes when presenting book-like
@@ -17004,13 +17964,13 @@
   mean that \textsf{biblatex} no longer requires assistance when
   alphabetizing such author-less entries.
 \item The Chicago-specific setting of the \textsf{Biber}-only command,
-  \mycolor{\cmd{DeclareSorting-\break Scheme=cms}}, allows
-  non-standard fields to be considered by \textsf{biblatex's} sorting
-  algorithms, which should reduce the instances where you need a
-  \textsf{sortkey} or the like in your entries.
+  \mycolor{\cmd{DeclareSortingScheme\break =cms}}, allows non-standard
+  fields to be considered by \textsf{biblatex's} sorting algorithms,
+  which should reduce the instances where you need a \textsf{sortkey}
+  or the like in your entries.
 \item The Chicago-specific setting of the \textsf{Biber}-only command
-  \mycolor{\cmd{DeclareLabel\-name}} allows \textsf{biblatex} to find
-  a name (\enquote{\textsf{label}}) for citations outside the standard
+  \mycolor{\cmd{DeclareLabelname}} allows \textsf{biblatex} to find a
+  name (\enquote{\textsf{label}}) for citations outside the standard
   name fields, including, notably, in the \textsf{name[a-c]} fields.
   This should reduce the instances where you need a
   \textsf{shortauthor} field to provide such a name.
@@ -17053,7 +18013,7 @@
 \item I have added a new \mycolor{\texttt{avdate}} option to the
   author-date style, set to \texttt{true} by default in
   \textsf{biblatex-chicago.sty}.  This alters the default setting of
-  \cmd{Declare\-Labelyear} in \textbf{music}, \textbf{review}, and
+  \cmd{DeclareLabelyear} in \textbf{music}, \textbf{review}, and
   \textbf{video} entries to take account of specialized instructions
   in the \emph{Manual} for finding dates to appear in citations and at
   the head of reference list entries.  Setting \texttt{avdate=false}
@@ -17090,7 +18050,7 @@
   new citation command, \mycolor{\cmd{shorthandcite}}, which prints
   the \textsf{shorthand} even in the first citation of a given work.
 \item Following suggestions by Roger Hart, I have implemented three
-  new field-exclu\-sion options in the notes \&\ bibliography style.
+  new field-exclusion options in the notes \&\ bibliography style.
   In all three cases, the field in question will always appear in the
   bibliography, but not in long notes, which may help to save space.
   The fields at stake are \textsf{addendum}, \textsf{note}, and
@@ -17108,7 +18068,7 @@
   which should now by default look a little better in a wider variety
   of fonts.
 \item At the request of Baldur Kristinsson, I have added
-  \cmd{DeclareLanguageMap\-ping} commands to
+  \cmd{DeclareLanguageMapping} commands to
   \textsf{biblatex-chicago.sty} for all the languages
   \textsf{biblatex-chicago} currently provides.  If you load the style
   in the standard way, you no longer need to provide these mappings
@@ -17218,11 +18178,11 @@
 \item Fixed the \cmd{smartcite} citation command in, and added a
   \cmd{smartcites} command to, \textsf{chicago-notes.cbx}, so that the
   notes \&\ bibliography style no longer prints parentheses around
-  citations produced using \cmd{autocite(s)} commands inside\break
+  citations produced using \cmd{autocite(s)} commands inside
   \cmd{footnote} commands.  Many thanks to Louis-Dominique Dubeau for
   pointing out this error.
 \item Rembrandt Wolpert and Aaron Lambert pointed out an issue with a
-  command (\cmd{lbx at fromlang}) that \textsf{biblatex} no longer
+  command (\cmd{lbx\\@fromlang}) that \textsf{biblatex} no longer
   defines, and Charles Schaum very kindly suggested a temporary
   workaround in a newsgroup post, a workaround that should no longer
   be necessary.
@@ -17341,7 +18301,7 @@
 \textbf{0.9.5a: Released September 7, 2010}
 \begin{itemize}
 \item Quick fix for an elementary and show-stopping mistake in
-  \textsf{biblatex-chica\-go.sty}, a mistake disguised if you load
+  \textsf{biblatex-chicago.sty}, a mistake disguised if you load
   \textsf{csquotes}, which I do in all my test files.  Mea culpa.
   Many thanks indeed to Israel Jacques and Emil Salim for pointing
   this out to me.
@@ -17418,7 +18378,7 @@
 \item Users of \textsf{biblatex-chicago-notes} no longer need a
   \textsf{shortauthor} field in author-less \textsf{manual} entries,
   or in author-less \textsf{article} or \textsf{review} entries with a
-  \texttt{maga\-zine} \textsf{entrysubtype}.  The package will now
+  \texttt{magazine} \textsf{entrysubtype}.  The package will now
   automatically take an author for short notes from the
   \textsf{organization} field for \textsf{manual} entries and from the
   \textsf{journaltitle} field for the others.  You can still use a
@@ -17480,7 +18440,7 @@
   you can also consult the documentation of those entry types above.
 \item The modified \textsf{csquotes.cfg} file I provided in earlier
   releases is now obsolete, and has been removed from the package.
-  Please upgrade to the latest version of \textsf{cs\-quotes} and, if
+  Please upgrade to the latest version of \textsf{csquotes} and, if
   you are still using my modified .cfg file, remove it from your \TeX\
   search path, or at the very least excise the code I provided.
 \end{itemize}
@@ -17567,9 +18527,9 @@
   \texttt{footmarkoff} package option when loading
   \textsf{biblatex-chicago}.
 \item Updates to Lehman's \textsf{csquotes} package have rendered my
-  modifications in \textsf{cs\-quotes.cfg} obsolete.  Please use the
-  latest version of \textsf{csquotes} (4.4a at time of writing) and
-  ignore my file, which will disappear in a later release.
+  modifications in \textsf{csquotes.\break cfg} obsolete.  Please use
+  the latest version of \textsf{csquotes} (4.4a at time of writing)
+  and ignore my file, which will disappear in a later release.
 \item At the request of Will Small, I have included some code, still
   in an alpha state, to allow you to specify, in the bibliography, the
   original publication details of essays which you are citing from
@@ -17591,7 +18551,7 @@
 \item The \textbf{single-letter bibstrings} (\cmd{bibstring\{a\}},
   \cmd{bibstring\{b\}}, etc.) are now obsolete.  You should replace
   any still present in your .bib file with \cmd{autocap} commands ---
-  see \xA7~3.8.4 of \textsf{biblatex.pdf}.
+  see \S~3.8.4 of \textsf{biblatex.pdf}.
 \end{itemize}
 
 Other New Features:
@@ -17629,11 +18589,11 @@
   package with the new default \cmd{usepackage\{biblatex-chicago\}};
   users loading it the old way get default \LaTeX\ formatting.
 \item At Matthew Lundin's request, I have added the citation command
-  \textbf{\textbackslash head\-lesscite}, which works like
+  \textbf{\textbackslash headlesscite}, which works like
   \cmd{headlessfullcite} but allows \textsf{biblatex} to decide
   whether to print the full or the short note.
 \item Fully adopted \textsf{biblatex's} system for providing
-  end-of-entry punctuation, which should solve some of the bugs users
+  end-of-entry punctuation, which will solve some of the bugs users
   have been finding.  See section~\ref{sec:otherhints}, above, and do
   please let me know if inconsistencies remain.
 \item Added a modified \textbf{csquotes.cfg} file to address issues
@@ -17818,4 +18778,5 @@
 %%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
+%%% TeX-engine: xetex
 %%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,18 +1,18 @@
 \documentclass[a4paper,12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-%\usepackage{endnotes}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% %\usepackage{endnotes}
+% \usepackage[latin1]{inputenc}
+\usepackage{fontspec}
 \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,cmsbreakurl]{biblatex-chicago}
+postnotepunct,compresspages,strict,annotation,cmsbreakurl]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
-\usepackage{lmodern}
-\usepackage{gentium}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -35,10 +35,22 @@
 \usepackage{xr-hyper}
 \externaldocument[cms-]{biblatex-chicago}%
 \externaldocument[trad-]{cms-trad-appendix}
-\usepackage[pdftex,hyperref,svgnames]{xcolor}
-\usepackage[pdftex,colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
+\usepackage[hyperref,svgnames]{xcolor}
+\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
 plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey,filecolor=Teal,
 baseurl=biblatex-chicago.pdf\#]{hyperref}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 \makeatletter
 \renewcommand{\section}{\@startsection{section}{1}{\z@}%
                                      {-3.25ex\@plus -1ex \@minus -.2ex}%
@@ -50,7 +62,7 @@
                                      {\normalfont\normalsize\bfseries}}
 \makeatother
 \usepackage{cmsdocs}
-\bibliography{dates-test}
+\addbibresource{dates-test.bib}
 %%\onehalfspacing
 %\tracingstats=2
 \begin{document}
@@ -89,7 +101,7 @@
 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.14) and \textsf{biblatex} (3.14), which contain
+\textsf{biber} (2.16) and \textsf{biblatex} (3.16), 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
@@ -223,13 +235,13 @@
 absent \textsf{date} will automatically provoke \textsf{biber} into
 searching for other sorts of dates in the entry, in the order
 \textsf{date, eventdate, origdate, urldate}: e.g.,
-\autocite{wikiped:bibtex}, which only has a \textsf{urldate}.  In
-five entry types --- \textsf{Music}, \textsf{Review},
-\textsf{Standard}, \textsf{SuppPeriodical}, and \textsf{Video} ---
-this search order is \textsf{eventdate, origdate, date, urldate}, as
-in these types the earliest date should take precedence (cf.\
+\autocite{wikiped:bibtex}, which only has a \textsf{urldate}.  In five
+entry types --- \textsf{Music}, \textsf{Review}, \textsf{Standard},
+\textsf{SuppPeriodical}, and \textsf{Video} --- this search order is
+\textsf{eventdate, origdate, date, urldate}, as in these types the
+earliest date should take precedence (cf.\
 page~\pageref{sec:audiovisual}, below).  You can also change the
-default search order, for all but the three types just mentioned, by
+default search order, for all but the five 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
@@ -565,8 +577,8 @@
   entrysubtype = {magazine},
   author = 	 {AC},
   eventdate = 	 {2008-07-01T10:18:00},
-  related = 	 {*\hyperlink{\getrefbykeydefault%
-{ellis:blog}{anchor}{}}{\{\colorbox{Gainsboro}{ellis:blog}\}}*},
+  related = 	 *\hyperlink{\getrefbykeydefault%
+{ellis:blog}{anchor}{}}{\{\colorbox{Gainsboro}{ellis:blog}\}}*,
   relatedtype =  {commenton}
 }
 \end{lstlisting}
@@ -629,9 +641,9 @@
   editor = 	 {Ross, W.~D.},
   nameb = 	 {Ross, W.~D.},
   origlanguage = {greek},
-  userf = 	 {*\hyperlink{\getrefbykeydefault%
+  userf = 	 *\hyperlink{\getrefbykeydefault%
 {aristotle:metaphy:gr}{anchor}{}}%
-{\{\colorbox{Gainsboro}{aristotle:metaphy:gr}\}}*},
+{\{\colorbox{Gainsboro}{aristotle:metaphy:gr}\}}*,
   maintitle = 	 {The Works of {Aristotle}, Translated into {English}},
   publisher =    {Clarendon Press},
   edition = 	 2,
@@ -868,8 +880,8 @@
   note = 	 {copy of an undated 78 rpm disc, 3:45},
   options = 	 {ptitleaddon=space},
   titleaddon = 	 {(speech)},
-  related = 	 {*\hyperlink{\getrefbykeydefault%
-{loc:leaders}{anchor}{}}{\{\colorbox{Gainsboro}{loc:leaders}\}}*},
+  related = 	 *\hyperlink{\getrefbykeydefault%
+{loc:leaders}{anchor}{}}{\{\colorbox{Gainsboro}{loc:leaders}\}}*,
   date = 	 {1920~},
   relatedstring = {in}
 }
@@ -1321,7 +1333,7 @@
   date = 	 1911,
   author = 	 {Schweitzer, Albert},
   origlocation = {London},
-  origpublisher = {Breitkopf \&\ H\xE4rtel},
+  origpublisher = {Breitkopf \&\ H*\"a*rtel},
   addendum = 	 {Citations refer to the Dover edition},
   options = 	 {cmsdate=both},
   translator = 	 {Newman, Ernest},
@@ -1376,12 +1388,12 @@
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=unsigned:ranke]
 *\adlnbackref{Review}{unsigned:ranke}*,
-  journaltitle = {Erg\xE4nzungsbl\xE4tter zur Allgemeinen Literatur-Zeitung},
+  journaltitle = {Erg*\"a*nzungsbl*\"a*tter zur Allgemeinen Literatur-Zeitung},
   entrysubtype = {magazine},
   date = 	 {1828-02},
-  title =	 {unsigned review of \mkbibemph{Geschichten der romanischen und germanischen V\xF6lker}, by {Leopold von Ranke}},
+  title =	 {unsigned review of \mkbibemph{Geschichten der romanischen und germanischen V*\"o*lker}, by {Leopold von Ranke}},
   number =	 {23--24},
-  shortjournal = {Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.}
+  shortjournal = {Erg*\"a*nzungsbl*\"a*tter z. Allg. Lit.-Ztg.}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=verdi:corsaro]
@@ -1423,8 +1435,8 @@
   author = 	 {White, E.~B.},
   title = 	 {EBW to Harold Ross},
   titleaddon = 	 {memorandum},
-  xref = 	 {*\hyperlink{\getrefbykeydefault%
-{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*},
+  xref = 	 *\hyperlink{\getrefbykeydefault%
+{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*,
   pages = 	 273,
   origdate = 	 {1946-05-02}
 }
@@ -1433,8 +1445,8 @@
 *\adlnbackref{Letter}{white:russ}*,
   author = 	 {White, E.~B.},
   title = 	 {EBW to B.~Russell},
-  xref =  {*\hyperlink{\getrefbykeydefault%
-{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*},
+  xref =  *\hyperlink{\getrefbykeydefault%
+{white:total}{anchor}{}}{\{\colorbox{Gainsboro}{white:total}\}}*,
   pages = 	 283,
   origdate = 	 {1946-09-02}
 }
@@ -1460,7 +1472,8 @@
 }
 \end{lstlisting}
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,25 +1,25 @@
 \documentclass[a4paper,12pt]{report}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-%\usepackage{endnotes}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% \usepackage{endnotes}
+\usepackage{fontspec}
+% \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,%
-cmsbreakurl]{biblatex-chicago}
+postnotepunct,compresspages,strict,cmsbreakurl]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
-\usepackage{lmodern}
-\usepackage{gentium}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
-\setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-\usepackage{url}
-\urlstyle{rm}
+\setmarginsrb{25mm}{20pt}{25.5mm}{.5in}{1pt}{2pt}{0pt}{2mm}
+% \usepackage{url}
+% \urlstyle{rm}
 \appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
 \hyphenation{evans-ton clem-ens mc-hugh ho-ro-witz}
@@ -31,7 +31,19 @@
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \usepackage[colorlinks,urlcolor=blue,citecolor=black,
 plainpages=false,breaklinks=true]{hyperref}
-\bibliography{dates-test}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
+\addbibresource{dates-test.bib}
 %%\onehalfspacing
 \begin{document}
 
@@ -533,7 +545,8 @@
 \printbibliography[notkeyword=nosample,title=References]
 
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,15 +1,15 @@
 \documentclass[a4paper,12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+\usepackage{fontspec}
+% \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 \usepackage[document]{ragged2e}
 \usepackage[notes,strict,backend=biber,autolang=other,%
-bibencoding=latin1,booklongxref=false,compresspages,%
-related=true]{biblatex-chicago}
-\usepackage{lmodern}
-\usepackage{gentium}
+booklongxref=false,compresspages,related=true]{biblatex-chicago}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
@@ -17,14 +17,26 @@
 \providecommand{\cmslink}[1]{#1}% If someone prints annotations
 \protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
     \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
-\usepackage[pdftex,hyperref,svgnames]{xcolor}
-\usepackage[pdftex,colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
+\usepackage[hyperref,svgnames]{xcolor}
+\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
 plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey,
 filecolor=Teal]{hyperref}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 %\appto\biburlsetup{\Urlmuskip=0mu plus 4mu\relax}
 \setlength{\dimen\footins}{9.5in}
 \defbibnote{legal}{(U.S.\ unless noted.)}
-\bibliography{legal-test}
+\addbibresource{legal-test.bib}
 %%\onehalfspacing
 \begin{document}
 
@@ -133,7 +145,8 @@
 
 \printbibliography[notkeyword=original]
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,15 +1,16 @@
 \documentclass[a4paper,12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+\usepackage{fontspec}
+% \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
 \usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
-bibencoding=latin1,booklongxref=false,compresspages,%
+booklongxref=false,compresspages,%
 noteref=section,noterefintro=introduction]{biblatex-chicago}
-\usepackage{lmodern}
-\usepackage{gentium}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -26,10 +27,22 @@
 \newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{xr-hyper}
 \externaldocument[cms-]{biblatex-chicago}%
-\usepackage[pdftex,hyperref,svgnames]{xcolor}
-\usepackage[pdftex,colorlinks,filecolor=Teal,citecolor=black,
+\usepackage[hyperref,svgnames]{xcolor}
+\usepackage[colorlinks,filecolor=Teal,citecolor=black,
 plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
 linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 \makeatletter
 \renewcommand{\section}{\@startsection{section}{1}{\z@}%
                                      {-3.25ex\@plus -1ex \@minus -.2ex}%
@@ -36,12 +49,12 @@
                                      {1.5ex \@plus .2ex}%
                                      {\normalfont\large\bfseries}}
 \newrobustcmd*{\cmssecref}[2][]{\marginpar{\href{\@baseurl%
-      \getrefbykeydefault{#2}{anchor}{}}{\small \xA7\,\getrefnumber{#2}}%
+      \getrefbykeydefault{#2}{anchor}{}}{\small \S\,\getrefnumber{#2}}%
       \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}%
 \makeatother
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \newcommand{\mylittlespace}{\vspace{5pt}}%.5\baselineskip}}
-\bibliography{notes-test}
+\addbibresource{notes-test.bib}
 %%\onehalfspacing
 %\tracingmacros=1
 \begin{document}
@@ -269,4 +282,5 @@
 %%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
+%%% TeX-engine: xetex
 %%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,16 +1,17 @@
 \documentclass[a4paper,12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% \usepackage[utopia]{mathdesign}
+\usepackage{fontspec}
 \usepackage{endnotes}
-\usepackage[latin1]{inputenc}
+% \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
 \usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
-bibencoding=latin1,booklongxref=false,annotation,%
-compresspages]{biblatex-chicago}
-\usepackage{lmodern}
-\usepackage{gentium}
+booklongxref=false,annotation,compresspages]{biblatex-chicago}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
@@ -30,10 +31,22 @@
 \newcommand{\mycolor}{}%[1]{\textcolor[HTML]{228B22}{#1}}
 \usepackage{xr-hyper}
 \externaldocument[cms-]{biblatex-chicago}%
-\usepackage[pdftex,hyperref,svgnames]{xcolor}
-\usepackage[pdftex,colorlinks,filecolor=Teal,citecolor=black,
+\usepackage[hyperref,svgnames]{xcolor}
+\usepackage[colorlinks,filecolor=Teal,citecolor=black,
 plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
 linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 \makeatletter
 \renewcommand{\@makeenmark}{\textcolor{DarkSlateGrey}{\textsf{\@theenmark}}}
 \renewcommand{\section}{\@startsection{section}{1}{\z@}%
@@ -44,7 +57,7 @@
 \usepackage{cmsdocs}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \newcommand{\mylittlespace}{\vspace{5pt}}%.5\baselineskip}}
-\bibliography{notes-test}
+\addbibresource{notes-test.bib}
 %%\onehalfspacing
 %\tracingstats=2
 \begin{document}
@@ -575,7 +588,7 @@
 *\lnbackref{Book}{7}*{furet:passing:eng,
   title = 	 {The Passing of an Illusion},
   year = 	 1999,
-  author = 	 {Furet, Fran\xE7ois},
+  author = 	 {Furet, Fran*\c{c}*ois},
   userf = 	 {furet:passing:fr},
   translator = 	 {Furet, Deborah},
   publisher = uchp,
@@ -584,13 +597,13 @@
 \end{lstlisting}%\enlargethispage{-\baselineskip}
 \begin{lstlisting}[language=BibTeX,label=furet:related]
 *\lnbackref{Book}{7}*{furet:related,
-  title = 	 {Le pass\xE9 d'une illusion},
+  title = 	 {Le pass*\'e* d'une illusion},
   year = 	 1995,
   related = 	 {*\hyperlink{\getrefbykeydefault%
 {furet:passing:eng}{anchor}{}}{\colorbox{Gainsboro}{furet:passing:eng}}*},
   relatedtype =  {bytranslator},
-  author = 	 {Furet, Fran\xE7ois},
-  publisher = {\xC9ditions Robert Laffont},
+  author = 	 {Furet, Fran*\c{c}*ois},
+  publisher = {*\'E*ditions Robert Laffont},
   location =  {Paris}
 }
 \end{lstlisting}
@@ -597,13 +610,13 @@
 \begin{lstlisting}[language=BibTeX,label=garaud:gatine]
 *\lnbackref{Article}{1}*{garaud:gatine,
   author =	 {Garaud, Marcel},
-  title =	 {Recherches sur les d\xE9frichements dans la G\xE2tine poitevine aux XIe et XIIe si\xE8cles},
-  journaltitle = {Bulletin de la Soci\xE9t\xE9 des antiquaires de l'Ouest},
+  title =	 {Recherches sur les d*\'e*frichements dans la G*\^a*tine poitevine aux XIe et XIIe si*\`e*cles},
+  journaltitle = {Bulletin de la Soci*\'e*t*\'e* des antiquaires de l'Ouest},
   year =	 1967,
   volume =	 9,
   series =	 4,
   pages =	 {11--27},
-  shorttitle =	 {Recherches sur les d\xE9frichements}
+  shorttitle =	 {Recherches sur les d*\'e*frichements}
 }
 \end{lstlisting}
 \begin{lstlisting}[language=BibTeX,label=genbank:db]
@@ -968,8 +981,9 @@
 %% \printshorthands
 
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
 %%% TeX-trailer-start: "^[^%\n]*\\\\printshorthands"
-%%% End: 
+%%% TeX-engine: luatex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,23 +1,33 @@
 \documentclass[a4paper,12pt]{report}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% \usepackage[latin1]{inputenc}
+\usepackage{fontspec}
+\usepackage{microtype}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
 %\usepackage[document]{ragged2e}
 \usepackage[notes,strict,backend=biber,autolang=other,cmsbreakurl,%
-bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago}
-\usepackage{lmodern}
-\usepackage{gentium}
+booklongxref=false,compresspages]{biblatex-chicago}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %%\usepackage[osf]{mathpazo}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
-\usepackage{setspace}
-\usepackage{vmargin} \setpapersize{A4}
-\setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
+% \usepackage{setspace}
+% \usepackage{vmargin} \setpapersize{A4}
+% \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
 \hyphenation{A-p-ril}
 %\renewcommand{\sfdefault}{phv}
 %\renewcommand{\ttdefault}{pcr}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[Scale = MatchLowercase]
+\setmonofont{lmmono9-regular.otf}
+% \usepackage{unicode-math}
+% \setmathfont{texgyrepagella-math.otf}
 % \usepackage{url}
 % \urlstyle{rm}
 %\def\UrlNoBreaks{\do\-}
@@ -25,9 +35,13 @@
 \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}
+% \appto\biburlsetup{\Urlmuskip=0mu plus 4mu\relax}
+\usepackage{typearea}
+\areaset[current]{460pt}{786pt}
 \setlength{\dimen\footins}{9.5in}\setlength{\parindent}{0pt}
-\bibliography{notes-test}
+\setlength{\footskip}{12pt}
+% \bibliography{notes-test}
+\addbibresource{notes-test.bib}
 %\tracingmacros=1
 %%\onehalfspacing
 \begin{document}
@@ -99,15 +113,15 @@
 note\autocite{ellet:galena} note\autocite{ellis:blog}
 note\autocite{emerson:nature} note\autocite{evanston:library}
 note\footnote{\headlessfullcite[3]{feydeau:farces}.}
-note\autocite{floyd:atom} note\autocite{euripides:orestes}.
+note\autocite{floyd:atom}.
 
-Note\autocite{frede:inproc} note\autocite{friedman:learning}
-note\autocite{evanston:library} note\autocite{feydeau:farces}
-note\autocite{floyd:atom} note\autocite{frede:inproc}
-note\autocite{friedman:learning} note\autocite{friends:leia}
-note\autocite{furet:passing:eng} note\autocite{garaud:gatine}
-note\autocite{garrett} note\autocite{genbank:db}
-note\autocite{naraya}.
+Note\autocite{euripides:orestes} note\autocite{frede:inproc}
+note\autocite{friedman:learning} note\autocite{evanston:library}
+note\autocite{feydeau:farces} note\autocite{floyd:atom}
+note\autocite{frede:inproc} note\autocite{friedman:learning}
+note\autocite{friends:leia} note\autocite{furet:passing:eng}
+note\autocite{garaud:gatine} note\autocite{garrett}
+note\autocite{genbank:db} note\autocite{naraya}.
 
 Note\autocite{gibbard} note\autocite{friends:leia}
 note\autocite{furet:passing:eng} note\autocite{garrett}
@@ -266,7 +280,8 @@
 
 \printbibliography[notkeyword=original]
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,25 +1,25 @@
 \documentclass[a4paper,12pt]{report}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-%\usepackage{endnotes}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% %\usepackage{endnotes}
+% \usepackage[latin1]{inputenc}
+\usepackage{fontspec}
 \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}
+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}
-\usepackage{gentium}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-\usepackage{url}
-\urlstyle{rm}
+% \usepackage{url}
+% \urlstyle{rm}
 \appto\bibsetup{\sloppy}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
@@ -29,11 +29,23 @@
 \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,
+\usepackage[hyperref,svgnames]{xcolor}
+\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=black,
 plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey]{hyperref}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
 \usepackage{cmsdocs}
-\bibliography{dates-test}
+\addbibresource{dates-test.bib}
 %%\onehalfspacing
 \begin{document}
 
@@ -104,7 +116,8 @@
 }
 \end{lstlisting}
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,24 +1,25 @@
 \documentclass[a4paper,12pt]{report}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-%\usepackage{endnotes}
-\usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+% \usepackage{textcomp}
+% %\usepackage{endnotes}
+% \usepackage[latin1]{inputenc}
+\usepackage{fontspec}
 \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]{biblatex-chicago}
+postnotepunct,compresspages,strict]{biblatex-chicago}
 % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
 % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
-\usepackage{lmodern}
-\usepackage{gentium}
+% \usepackage{lmodern}
+% \usepackage{gentium}
 %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
 \usepackage{ifthen}
 \usepackage{setspace}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
-\usepackage{url}
-\urlstyle{rm}
+% \usepackage{url}
+% \urlstyle{rm}
 \appto\bibsetup{\sloppy}
 \providecommand{\cmslink}[1]{#1}% In case someone prints the annotations.
 \hyphenation{evans-ton clem-ens mc-hugh ho-ro-witz}
@@ -30,7 +31,19 @@
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \usepackage[colorlinks,urlcolor=blue,citecolor=black,
 plainpages=false,breaklinks=true]{hyperref}
-\bibliography{dates-test}
+\setmainfont{GentiumPlus-R.ttf}[
+ItalicFont = GentiumPlus-I.ttf,
+BoldFont = GenBasB.ttf,
+BoldItalicFont = GenBasBI.ttf]
+\setsansfont{ClearSans-Regular.ttf}[
+BoldFont = ClearSans-Bold.ttf,
+ItalicFont = ClearSans-Italic.ttf,
+BoldItalicFont = ClearSans-BoldItalic.ttf,
+Scale = MatchLowercase]
+\setmonofont{lmmonoprop10-regular.otf}[
+BoldFont = lmmonoproplt10-bold.otf,
+HyphenChar={-}]
+\addbibresource{dates-test.bib}
 %%\onehalfspacing
 \begin{document}
 
@@ -522,7 +535,8 @@
 \printbibliography[notkeyword=nosample,title=References]
 
 \end{document}
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% TeX-engine: xetex
+%%% End:

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1410,7 +1410,7 @@
   title =        {\mkbibemph{Nicomachean ethics} VII. 11--12},
   subtitle =     {Pleasure},
   booktitle =    {Aristotle},
-  booksubtitle = {\mkbibquote{Nicomachean ethics}, Book VII},
+  booksubtitle = {\mkbibquote{Nicomachean ethics,} Book VII},
   series =       {Symposium Aristotelicum},
   editor =       {Carlo Natali},
   publisher =    {Oxford University Press},
@@ -1484,7 +1484,7 @@
 @Book{furet:passing:eng,
   title = 	 {The Passing of an Illusion},
   year = 	 1999,
-  author = 	 {Furet, Fran\xE7ois},
+  author = 	 {Furet, Fran\c{c}ois},
   translator = 	 {Furet, Deborah},
   publisher =    uchp,
   location =     {Chicago},
@@ -1499,12 +1499,12 @@
 }
 
 @Book{furet:passing:fr,
-  title = 	 {Le pass\xE9 d'une illusion},
+  title = 	 {Le pass\'{e} d'une illusion},
   year = 	 1995,
   related = 	 {furet:passing:eng},
   relatedtype =  {bytranslator},
-  author = 	 {Furet, Fran\xE7ois},
-  publisher =    {\xC9ditions Robert Laffont},
+  author = 	 {Furet, Fran\c{c}ois},
+  publisher =    {\'{E}ditions Robert Laffont},
   location =     {Paris},
   annotation = 	 {The original of the previous entry. The related
                   field calls that entry, and the relatedtype
@@ -1520,9 +1520,9 @@
 
 @Article{garaud:gatine,
   author =	 {Garaud, Marcel},
-  title =	 {Recherches sur les d\xE9frichements dans la G\xE2tine
-                  poitevine aux XIe et XIIe si\xE8cles},
-  journaltitle = {Bulletin de la Soci\xE9t\xE9 des antiquaires de l'Ouest},
+  title =	 {Recherches sur les d\'{e}frichements dans la G\^{a}tine
+                  poitevine aux XIe et XIIe si\`{e}cles},
+  journaltitle = {Bulletin de la Soci\'{e}t\'{e} des antiquaires de l'Ouest},
   year =	 1967,
   volume =	 9,
   langid =       {french},
@@ -2269,7 +2269,7 @@
 @Book{levistrauss:savage,
   title = 	 {The Savage Mind},
   year = 	 1962,
-  author = 	 {L\xE9vi-Strauss, Claude},
+  author = 	 {L\'{e}vi-Strauss, Claude},
   publisher =    {Weidenfeld \& Nicolson},
   location =     {Chicago: University of Chicago Press; London},
   annotation = 	 {A standard Book entry, showing a kludge in the
@@ -2424,11 +2424,11 @@
 
 @Book{maisonneuve:relations,
   title =	 {Les relations publiques},
-  subtitle =	 {Dans une soci\xE9t\xE9 en mouvance},
+  subtitle =	 {Dans une soci\'{e}t\'{e} en mouvance},
   year =	 1998,
-  author =	 {Maisonneuve, Danielle and Lamarche, Jean-Fran\xE7ois and
+  author =	 {Maisonneuve, Danielle and Lamarche, Jean-Fran\c{c}ois and
                   St-Amand, Yves},
-  publisher =	 {Presses de l'Universit\xE9 de Qu\xE9bec},
+  publisher =	 {Presses de l'Universit\'{e} de Qu\'{e}bec},
   location =	 {Sainte-Foy, QC},
   annotation = 	 {Standard Book entry, maintaining French
                   sentence-style capitalization.}
@@ -2887,7 +2887,7 @@
 }
 
 @Book{palmatary:pottery,
-  title =	 {The Pottery of {Maraj\xF3 Island, Brazil}},
+  title =	 {The Pottery of {Maraj\'{o} Island, Brazil}},
   year =	 1950,
   author =	 {Palmatary, Helen~C.},
   series =	 {Transactions of the American Philosophical Society},
@@ -3387,7 +3387,7 @@
   date = 	 1911,
   author = 	 {Schweitzer, Albert},
   origlocation = {London},
-  origpublisher = {Breitkopf \&\ H\xE4rtel},
+  origpublisher = {Breitkopf \&\ H\"{a}rtel},
   addendum = 	 {Citations refer to the Dover edition},
   options = 	 {cmsdate=both},
   translator = 	 {Newman, Ernest},
@@ -3736,11 +3736,11 @@
 }
 
 @Review{unsigned:ranke,
-  journaltitle = {Erg\xE4nzungsbl\xE4tter zur Allgemeinen Literatur-Zeitung},
+  journaltitle = {Erg\"{a}nzungsbl\"{a}tter zur Allgemeinen Literatur-Zeitung},
   entrysubtype = {magazine},
   date = 	 {1828-02},
   title =	 {unsigned review of \mkbibemph{Geschichten der
-                  romanischen und germanischen V\xF6lker}, by {Leopold von
+                  romanischen und germanischen V\"{o}lker}, by {Leopold von
                   Ranke}},
   number =	 {23--24},
   shortjournal =  {Erg\"anzungsbl\"atter z. Allg. Lit.-Ztg.},

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1206,7 +1206,7 @@
 @Book{furet:passing:eng,
   title = 	 {The Passing of an Illusion},
   year = 	 1999,
-  author = 	 {Furet, Fran\xE7ois},
+  author = 	 {Furet, Fran\c{c}ois},
   userf = 	 {furet:passing:fr},
   translator = 	 {Furet, Deborah},
   publisher = uchp,
@@ -1232,11 +1232,11 @@
 }
 
 @Book{furet:passing:fr,
-  title = 	 {Le pass\xE9 d'une illusion},
+  title = 	 {Le pass\'{e} d'une illusion},
   year = 	 1995,
   keywords = 	 {original},
-  author = 	 {Furet, Fran\xE7ois},
-  publisher = {\xC9ditions Robert Laffont},
+  author = 	 {Furet, Fran\c{c}ois},
+  publisher = {\'{E}ditions Robert Laffont},
   location =  {Paris},
   annote = 	 {The original of the previous entry. The keywords
                   field prevents it being printed separately in the
@@ -1244,12 +1244,12 @@
 }
 
 @Book{furet:related,
-  title = 	 {Le pass\xE9 d'une illusion},
+  title = 	 {Le pass\'{e} d'une illusion},
   year = 	 1995,
   related = 	 {furet:passing:eng},
   relatedtype =  {bytranslator},
-  author = 	 {Furet, Fran\xE7ois},
-  publisher = {\xC9ditions Robert Laffont},
+  author = 	 {Furet, Fran\c{c}ois},
+  publisher = {\'{E}ditions Robert Laffont},
   location =  {Paris},
   annote = 	 {This entry presents the same \textsf{Book} as
                   \texttt{furet:passing:fr}, but does so using the
@@ -1262,14 +1262,14 @@
 
 @Article{garaud:gatine,
   author =	 {Garaud, Marcel},
-  title =	 {Recherches sur les d\xE9frichements dans la G\xE2tine
-                  poitevine aux XIe et XIIe si\xE8cles},
-  journaltitle = {Bulletin de la Soci\xE9t\xE9 des antiquaires de l'Ouest},
+  title =	 {Recherches sur les d\'{e}frichements dans la G\^{a}tine
+                  poitevine aux XIe et XIIe si\`{e}cles},
+  journaltitle = {Bulletin de la Soci\'{e}t\'{e} des antiquaires de l'Ouest},
   year =	 1967,
   volume =	 9,
   series =	 4,
   pages =	 {11--27},
-  shorttitle =	 {Recherches sur les d\xE9frichements},
+  shorttitle =	 {Recherches sur les d\'{e}frichements},
   annote = 	 {An \textsf{Article} entry with \textsf{author},
                   \textsf{title}, \textsf{journaltitle},
                   \textsf{year}, \textsf{volume}, \textsf{series}, and
@@ -1977,7 +1977,7 @@
 @Book{levistrauss:savage,
   title = 	 {The Savage Mind},
   year = 	 1962,
-  author = 	 {L\xE9vi-Strauss, Claude},
+  author = 	 {L\'{e}vi-Strauss, Claude},
   publisher =    {Weidenfeld \& Nicolson},
   location =     {Chicago: University of Chicago Press; London},
   annote = 	 {A standard Book entry, showing a kludge in the
@@ -2088,11 +2088,11 @@
 
 @Book{maisonneuve:relations,
   title =	 {Les relations publiques},
-  subtitle =	 {Dans une soci\xE9t\xE9 en mouvance},
+  subtitle =	 {Dans une soci\'{e}t\'{e} en mouvance},
   year =	 1998,
-  author =	 {Maisonneuve, Danielle and Lamarche, Jean-Fran\xE7ois and
+  author =	 {Maisonneuve, Danielle and Lamarche, Jean-Fran\c{c}ois and
                   St-Amand, Yves},
-  publisher =	 {Presses de l'Universit\xE9 de Qu\xE9bec},
+  publisher =	 {Presses de l'Universit\'{e} de Qu\'{e}bec},
   location =	 {Sainte-Foy, QC},
   annote = 	 {Standard Book entry, maintaining French
                   capitalization.}
@@ -2452,7 +2452,7 @@
 }
 
 @Book{palmatary:pottery,
-  title =	 {The Pottery of Maraj\xF3 Island, Brazil},
+  title =	 {The Pottery of Maraj\'{o} Island, Brazil},
   year =	 1950,
   author =	 {Palmatary, Helen~C.},
   series =	 {Transactions of the American Philosophical Society},
@@ -2942,7 +2942,7 @@
   author = 	 {Schweitzer, Albert},
   volumes = 	 {2},
   origlocation = {London},
-  origpublisher = {Breitkopf \&\ H\xE4rtel},
+  origpublisher = {Breitkopf \&\ H\"{a}rtel},
   translator = 	 {Newman, Ernest},
   publisher =    {Dover},
   pubstate = 	 {reprint},
@@ -3174,11 +3174,11 @@
 }
 
 @Review{unsigned:ranke,
-  journaltitle = {Erg\xE4nzungsbl\xE4tter zur Allgemeinen Literatur-Zeitung},
+  journaltitle = {Erg\"{a}nzungsbl\"{a}tter zur Allgemeinen Literatur-Zeitung},
   entrysubtype = {magazine},
   date = 	 {1828-02},
   title =	 {unsigned review of \mkbibemph{Geschichten der
-                  romanischen und germanischen V\xF6lker}, by {Leopold von
+                  romanischen und germanischen V\"{o}lker}, by {Leopold von
                   Ranke}},
   shorttitle = 	 {unsigned review of von Ranke},
   number =	 {23--24},

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-% Copyright (c) 2009-2020 David Fussner.  This package is
+% Copyright (c) 2009-2021 David Fussner.  This package is
 % author-maintained.
 %
 % This work may be copied, distributed and/or modified under the
@@ -11,48 +11,64 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2020/04/20 v 3.14 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2021/03/27 v 3.16 biblatex style]
 
 \RequirePackage{etoolbox}
-\RequirePackage{nameref}
+\RequirePackage{nameref}% this already loads kvoptions
 \RequirePackage{xstring}
 
-\DeclareOption{authordate}{\def\cms at style{authordate}}
-\DeclareOption{notes}{\def\cms at style{notes}}
-\DeclareOption{authordate-trad}{\def\cms at style{authordatetrad}}
-\DeclareOption{authordate16}{\def\cms at style{authordateold}}
-\DeclareOption{notes16}{\def\cms at style{notesold}}
-\DeclareOption{authordate-trad16}{\def\cms at style{authordatetrold}}
-\DeclareOption*{\eappto\cms at options{\CurrentOption,}}
+\SetupKeyvalOptions{% Use kvoptions to set biblatex load-time opts
+  family=cms at ldt,
+  prefix=cms at ldt@}
+
+\DeclareVoidOption{authordate}{\def\cms at style{authordate}}
+\DeclareVoidOption{notes}{\def\cms at style{notes}}
+\DeclareVoidOption{authordate-trad}{\def\cms at style{authordatetrad}}
+\DeclareVoidOption{authordate16}{\def\cms at style{authordateold}}
+\DeclareVoidOption{notes16}{\def\cms at style{notesold}}
+\DeclareVoidOption{authordate-trad16}{\def\cms at style{authordatetrold}}
+\DeclareDefaultOption{\eappto\cms at options{\CurrentOption,}}
 \let\cms at options\empty
-\ExecuteOptions{notes}%
+\setkeys{cms at ldt}{notes}%
 
 \newtoggle{cms at nomark}
 \newtoggle{cms at urlbreak}
 
-\DeclareOption{footmarkoff}{\global\toggletrue{cms at nomark}}
-\DeclareOption{cmsbreakurl}{\global\toggletrue{cms at urlbreak}}
+\DeclareVoidOption{footmarkoff}{\global\toggletrue{cms at nomark}}
+\DeclareVoidOption{cmsbreakurl}{\global\toggletrue{cms at urlbreak}}
 
-\DeclareOption{natbib}{%
-  \PassOptionsToPackage{natbib}{biblatex}}
+\DeclareStringOption{natbib}[true]
+\DeclareStringOption{mcite}[true]
+\DeclareStringOption{casechanger}[auto]
+\DeclareStringOption{backend}[biber]
+\DeclareStringOption{datamodel}
 
-\DeclareOption{backend=biber}{%
-  \PassOptionsToPackage{\CurrentOption}{biblatex}}%
+\ProcessLocalKeyvalOptions{cms at ldt}
 
-\DeclareOption{backend=bibtex}{%
-  \PassOptionsToPackage{\CurrentOption}{biblatex}%
-  \def\blx at sorting@cms{1}}%
+\ifdefvoid{\cms at ldt@backend}%
+{\PassOptionsToPackage{backend=biber}{biblatex}}%
+{\PassOptionsToPackage{backend=\cms at ldt@backend}{biblatex}%
+  \ifdefstring{\cms at ldt@backend}{biber}%
+  {}%
+  {\def\blx at sorting@cms{1}}}
 
-\DeclareOption{backend=bibtex8}{%
-  \PassOptionsToPackage{\CurrentOption}{biblatex}%
-  \def\blx at sorting@cms{1}}%
+\ifx\cms at ldt@datamodel\@empty
+\else
+\PassOptionsToPackage{datamodel=\cms at ldt@datamodel}{biblatex}
+\fi
+\ifx\cms at ldt@mcite\@empty
+\else
+\PassOptionsToPackage{mcite=\cms at ldt@mcite}{biblatex}
+\fi
+\ifx\cms at ldt@natbib\@empty
+\else
+\PassOptionsToPackage{natbib=\cms at ldt@natbib}{biblatex}
+\fi
+\ifx\cms at ldt@casechanger\@empty
+\else
+\PassOptionsToPackage{casechanger=\cms at ldt@casechanger}{biblatex}
+\fi
 
-\DeclareOption{backend=bibtexu}{%
-  \PassOptionsToPackage{\CurrentOption}{biblatex}%
-  \def\blx at sorting@cms{1}}%
-
-\ProcessOptions*
-
 \def\cms at authordate{%
   \RequirePackage[style=chicago-authordate]{biblatex}%
   \ExecuteBibliographyOptions{%
@@ -222,6 +238,7 @@
 \DeclareLanguageMapping{icelandic}{cms-icelandic}
 \DeclareLanguageMapping{norsk}{cms-norsk}
 \DeclareLanguageMapping{nynorsk}{cms-nynorsk}
+\DeclareLanguageMapping{romanian}{cms-romanian}
 \DeclareLanguageMapping{swedish}{cms-swedish}
 
 \ifundef\bbl at loaded{\let\bbl at loaded\@empty}{}% For old versions of babel

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -4,7 +4,7 @@
 % the author-date (trad) style of the Chicago Manual of Style, 17th
 % edition.
 
-\ProvidesFile{chicago-authordate-trad.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
@@ -275,112 +275,77 @@
 
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{\MakeSentenceCase*{#1}}}
 
+\DeclareFieldFormat{title:hook:alt}{%
+  \iftoggle{cms at reprintmt}%
+  {\begingroup
+    \mkrelatedstringtext{%
+      \lbx at inittitlehook{#1}}%
+    \endgroup}%
+  {\lbx at inittitlehook{#1}}% Inside entries don't use main doc. lang.
+  \mkbibemph{\MakeSentenceCase*{#1}}}
+
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \MakeSentenceCase*{#1}}
 
 \DeclareFieldFormat{jtitle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \endgroup}
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1}%
+  \endgroup}
 
 \DeclareFieldFormat{muschapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{track}}%
-  \endgroup
-  \bibstring{track}~#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{track}}%
+    \bibstring{track}~#1}%
+  \endgroup}%
 
+\DeclareFieldFormat{volume:hook}{%
+  \begingroup
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{volume}}%
+    \bibstring{volume}~#1}%
+  \endgroup}%
+
+\DeclareFieldFormat{parttoo:hook}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring[\mkrelatedstringtext]{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat{part:hook}{%
+  \begingroup
+  \ifnumerals{#1}%
+  {\mkrelatedstringtext{%
+      \lbx at inittitlehook{\bibxstring{partvolume}}%
+      \bibstring{partvolume}~#1}}%
+  {\mkrelatedstringtext{\lbx at inittitlehook{#1}}%
+    \ifcapital{\MakeCapital{#1}}{#1}}%
+  \endgroup}
+
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
 \DeclareFieldFormat{jtnoformat}{#1}
@@ -398,11 +363,23 @@
         {\iffieldundef{journaltitle}%
           {\iffieldundef{maintitle}%
             {}%
-            {\DeclareFieldAlias{maintitle}{title:hook}}}%
+            {\toggletrue{cms at reprintmt}%
+              \ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)%
+                \OR\ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+                \ifentrytype{inproceedings}\OR\ifentrytype{letter}}%
+              {\DeclareFieldAlias{maintitle}{title:hook}}%
+              {\iffieldundef{volume}%
+                {\DeclareFieldAlias{part}{part:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}%
+                {\DeclareFieldAlias{volume}{volume:hook}%
+                  \DeclareFieldAlias{part}{parttoo:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}}}}%
           {\DeclareFieldAlias{jtnoformat}{jtitle:hook}%
             \DeclareFieldAlias{sjtnoformat}{title}%
             \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{injournaltitle}{default}%
             \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{inshortjournal}{series}%
             \DeclareFieldAlias{jtsnoformat}{jtitle:hook}}}%
         {\DeclareFieldAlias{booktitle}{title:hook}}}%
       {\DeclareFieldAlias{tnoformat}{jtitle:hook}%
@@ -417,8 +394,10 @@
       \ifentrytype{video}}%
     {\iffieldundef{title}%
       {\ifentrytype{music}%
-        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
-        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}}%
       {\DeclareFieldAlias[video]{title}{title:hook}%
         \DeclareFieldAlias[audio]{title}{title:hook}%
         \DeclareFieldAlias[music]{title}{title:hook}}}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad16.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -3,7 +3,7 @@
 % providing inline citations (and a reference list) for the
 % author-date (trad) style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate-trad16.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate-trad16.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common16}
@@ -246,93 +246,38 @@
 
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{\MakeSentenceCase*{#1}}}
 
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \MakeSentenceCase*{#1}}
 
 \DeclareFieldFormat{jtitle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \endgroup}
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1}%
+  \endgroup}
 
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -2,7 +2,7 @@
 % 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}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2021/03/27 v 3.16 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -21,6 +21,7 @@
   {\mkbibemph{\textbf{#1}}\isdot}}%
 
 \newlength{\lositemsep}
+\newbibmacro*{begentry}{}
 
 \defbibenvironment{bibliography}% New for 0.9a
   {\list
@@ -124,12 +125,15 @@
   {}}%
 
 \defbibcheck{shortjournal}{% Only one list
-  \iffieldundef{shortjournal}%
+  \ifthenelse{\iffieldundef{shortjournal}\OR%
+    \iffieldsequal{journaltitle}{shortjournal}\OR%
+    \(\iffieldundef{journaltitle}\AND\(\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}\OR\ifentrytype{jurisdiction}\)\)}%
   {\skipentry}%
-  {\ifcsdef{\strfield{shortjournal}=\strfield{journaltitle}}%
+  {\ifcsdef{\strfield{shortjournal}}%
     {\skipentry}%
     {\savefieldcs{shortjournal}%
-      {\strfield{shortjournal}=\strfield{journaltitle}}}}}%
+      {\strfield{shortjournal}}}}}%
 
 % \defbibcheck{shortjournal}{% Multiple lists
 %   \ifcsdef{cms at shjour}%
@@ -342,28 +346,35 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}}%
       {\printtext{\bibnamedash}%
         \ifentrytype{customc}%
         {\newunit}%
-        {\setunit{\addspace}}\printfield{nameaddon}}}%
+        {\setunit{\nameaddonpunct}}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
+      {\bibopenbracket\printnames{author}%
+        \ifentrytype{customc}%
+        {\bibclosebracket%
+          \usebibmacro{print+nameaddon}}%
+        {\usebibmacro{print+nameaddon}%
+          \bibclosebracket}%
         \savefield{fullhash}{\bbx at lasthash}}%
       {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+        {\bibopenbracket\printnames{author}\addquestion%
+          \ifentrytype{customc}%
+          {\bibclosebracket%
+            \usebibmacro{print+nameaddon}}%
+          {\usebibmacro{print+nameaddon}%
+            \bibclosebracket}%
           \savefield{fullhash}{\bbx at lasthash}}%
         {\iftoggle{cms at authorparens}%
           {\bibopenparen\printnames{author}%
-            \ifentrytype{customc}{}%
-            {\setunit{\addspace}\printfield{nameaddon}}\bibcloseparen%
             \ifentrytype{customc}%
-            {\newunit\printfield{nameaddon}}%
-            {}}%
+            {\bibcloseparen\usebibmacro{print+nameaddon}}%
+            {\usebibmacro{print+nameaddon}\bibcloseparen}}%
           {\printnames{author}%
-            \ifentrytype{customc}{\newunit}{\setunit{\addspace}}%
-            \printfield{nameaddon}}%
+            \usebibmacro{print+nameaddon}}%
           \savefield{fullhash}{\bbx at lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
@@ -376,21 +387,24 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}}%
-      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
+        \printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
+      {\bibopenbracket\printnames{author}%
+        \usebibmacro{print+nameaddon}\bibclosebracket%
         \savefield{fullhash}{\bbx at lasthash}}%
       {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+        {\bibopenbracket\printnames{author}\addquestion%
+          \usebibmacro{print+nameaddon}\bibclosebracket%
           \savefield{fullhash}{\bbx at lasthash}}%
         {\iftoggle{cms at authorparens}%
           {\bibopenparen\printnames{author}%
-            \setunit{\addspace}\printfield{nameaddon}\bibcloseparen}%
+            \usebibmacro{print+nameaddon}%
+            \bibcloseparen}%
           {\printnames{author}%
-            \setunit{\addspace}%
-            \printfield{nameaddon}}%
+            \usebibmacro{print+nameaddon}}%
           \savefield{fullhash}{\bbx at lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
@@ -408,17 +422,16 @@
         and
         togl {cms at namedash}%
       }%
-      {\iffieldundef{nameaddon}%
+      {\if at cms@nonameaddon%
         {\printtext{\bibnamedash}\editordelim}%
-        {\printtext{\bibnamedash}\setunit{\addspace}%
+        {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
           \printfield{nameaddon}\editordelim}}%
        {\iftoggle{cms at authorparens}%
          {\bibopenparen\printnames{editor}%
-           \setunit{\addspace}\printfield{nameaddon}%
+           \usebibmacro{print+nameaddon}%
            \bibcloseparen\editordelim}%
          {\printnames{editor}%
-           \setunit{\addspace}%
-           \printfield{nameaddon}\editordelim}%
+           \usebibmacro{print+nameaddon}\editordelim}%
         \savefield{fullhash}{\bbx at lasthash}}%
      \usebibmacro{editstrg}}}%
 
@@ -435,17 +448,16 @@
           and
           togl {cms at namedash}%
         }%
-        {\iffieldundef{nameaddon}%
+        {\if at cms@nonameaddon%
           {\printtext{\bibnamedash}\editordelim}%
-          {\printtext{\bibnamedash}\setunit{\addspace}%
+          {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
             \printfield{nameaddon}\editordelim}}%
         {\iftoggle{cms at authorparens}%
           {\bibopenparen\printnames{editor}%
-            \setunit{\addspace}\printfield{nameaddon}%
+            \usebibmacro{print+nameaddon}%
             \bibcloseparen\editordelim}%
           {\printnames{editor}%
-            \setunit{\addspace}%
-            \printfield{nameaddon}\editordelim}%
+            \usebibmacro{print+nameaddon}\editordelim}%
           \savefield{fullhash}{\bbx at lasthash}}%
         \usebibmacro{editstrg}}}%
     {\ifboolexpr{%
@@ -455,17 +467,16 @@
         and
         togl {cms at namedash}%
       }%
-      {\iffieldundef{nameaddon}%
+      {\if at cms@nonameaddon%
         {\printtext{\bibnamedash}\nameadelim}%
-        {\printtext{\bibnamedash}\setunit{\addspace}%
+        {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
           \printfield{nameaddon}\nameadelim}}%
       {\iftoggle{cms at authorparens}%
         {\bibopenparen\printnames[sortname]{namea}%
-          \setunit{\addspace}\printfield{nameaddon}%
+          \usebibmacro{print+nameaddon}%
           \bibcloseparen\nameadelim}%
         {\printnames[sortname]{namea}%
-          \setunit{\addspace}%
-          \printfield{nameaddon}\nameadelim}%
+          \usebibmacro{print+nameaddon}\nameadelim}%
         \savefield{fullhash}{\bbx at lasthash}}%
       \usebibmacro{parteditstrg}}}}
 
@@ -479,17 +490,16 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\nameadelim}%
-      {\printtext{\bibnamedash}\setunit{\addcomma}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\nameadelim}}%
     {\iftoggle{cms at authorparens}%
       {\bibopenparen\printnames[sortname]{namea}%
-        \setunit{\addspace}\printfield{nameaddon}%
+        \usebibmacro{print+nameaddon}%
         \bibcloseparen\nameadelim}%
       {\printnames[sortname]{namea}%
-        \setunit{\addspace}%
-        \printfield{nameaddon}\nameadelim}%
+        \usebibmacro{print+nameaddon}\nameadelim}%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{parteditstrg}}}
 
@@ -508,17 +518,16 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms at authorparens}%
       {\bibopenparen\printnames[sortname]{translator}%
-        \setunit{\addspace}\printfield{nameaddon}%
+        \usebibmacro{print+nameaddon}%
         \bibcloseparen\newcunit}%
       {\printnames[sortname]{translator}%
-        \setunit{\addspace}%
-        \printfield{nameaddon}\newcunit}%
+        \usebibmacro{print+nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{transstrg}}}
 
@@ -532,17 +541,16 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms at authorparens}%
       {\bibopenparen\printnames[sortname]{nameb}%
-        \setunit{\addspace}\printfield{nameaddon}%
+        \usebibmacro{print+nameaddon}%
         \bibcloseparen\newcunit}%
       {\printnames[sortname]{nameb}%
-        \setunit{\addspace}%
-        \printfield{nameaddon}\newcunit}%
+        \usebibmacro{print+nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{parttransstrg}}}
 
@@ -556,20 +564,53 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addcomma}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\iftoggle{cms at authorparens}%
       {\bibopenparen\printnames[sortname]{namec}%
-        \setunit{\addspace}\printfield{nameaddon}%
+        \usebibmacro{print+nameaddon}%
         \bibcloseparen\newcunit}%
       {\printnames[sortname]{namec}%
-        \setunit{\addspace}%
-        \printfield{nameaddon}\newcunit}%
+        \usebibmacro{print+nameaddon}\newcunit}%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{compilestrg}}}
 
+\newbibmacro*{print+nameaddon}{%
+  \ifboolexpr{%
+    togl {cms at nona}%
+    or
+    test {\iffieldundef{nameaddon}}%
+  }%
+  {}%
+  {\ifboolexpr{%
+      test {\iffieldequals{fullhash}{\bbx at lasthash}}%
+      and
+      test {\iffieldequals{nameaddon}{\cms at lastna}}%
+      and
+      togl {cms at subseqnona}%
+    }%
+    {}%
+    {\ifentrytype{customc}{\newunit}{\setunit{\nameaddonpunct}}%
+      \printfield{nameaddon}%
+      \savefield{nameaddon}{\cms at lastna}}}}%
+
+\def\if at cms@nonameaddon{%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at nona}%
+    or
+    (
+    test {\iffieldequals{nameaddon}{\cms at lastna}}%
+    and
+    togl {cms at subseqnona}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}%
+
 \renewcommand*{\revsdnamedelim}{\addcomma}
 
 \DeclareNameAlias{author}{sortname}% Needed in 0.9
@@ -610,7 +651,7 @@
           \ifentrytype{periodical}}%
         {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
             \newcunit}}%
-        {\ifentrytype{manual}%
+        {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}%
           {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
           {}}}%
       {\ifboolexpr{%
@@ -623,8 +664,8 @@
           )
         }%
         {\printnames{\thefield{labelnamesource}}\newunit}%
-        {\ifentrytype{customc}%
-          {\usebibmacro{justauthor}\setunit{\addspace}}%
+        {\ifthenelse{\ifentrytype{customc}\OR\ifentrytype{dataset}}%
+          {\usebibmacro{justauthor}}% Moved \addspace to field format (2.1)
           {\usebibmacro{author/editor}\newunit}}}%
       \printfield[lostitle]{title}%
       \finentry}}}
@@ -792,6 +833,55 @@
       \step[fieldsource=booktitle, final]
       \step[fieldset=sorttitle, origfieldval]
     }
+    \map[overwrite]{
+      \pertype{customc}
+      \step[fieldsource=title,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=title,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=titleaddon,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=titleaddon,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=annotation,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=annotation,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=annote,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=annote,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=addendum,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=addendum,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=note,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=note,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
     \map[overwrite]{% Backward compatibility kludges
       \step[fieldsource=year,
       match=\regexp{^\[(.+)\](.*)},
@@ -809,6 +899,7 @@
 \DeclareBibliographyDriver{article}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{mag+news+author}%
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
@@ -857,7 +948,8 @@
   {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
+{\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \ifundef{\bbx at lasthash}{\usebibmacro{mag+news+title}\newunit}{}%
@@ -866,7 +958,7 @@
   \ifundef{\bbx at lasthash}{}{\usebibmacro{mag+news+title}}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
-  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \setunit*{\newunitpunct}\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
@@ -908,6 +1000,7 @@
 
 \DeclareBibliographyDriver{artwork}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -956,6 +1049,7 @@
 
 \DeclareBibliographyDriver{audio}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -985,7 +1079,7 @@
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
-  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\newunitpunct}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
   {}%
@@ -1009,10 +1103,10 @@
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
       \printtext{%
-        \printfield{maintitle}%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
@@ -1055,6 +1149,7 @@
 
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1142,7 +1237,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1160,7 +1255,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1175,6 +1270,7 @@
 
 \DeclareBibliographyDriver{bookinbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1192,7 +1288,7 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
+  \setunit*{\newunitpunct}%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -1251,7 +1347,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1269,7 +1365,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1284,6 +1380,7 @@
 
 \DeclareBibliographyDriver{booklet}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1319,6 +1416,7 @@
 
 \DeclareBibliographyDriver{collection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{editor}%
   \newunit\newblock
@@ -1383,7 +1481,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1401,7 +1499,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1416,9 +1514,14 @@
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{justauthor}%
-  \iffieldundef{nameaddon}%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at nona}%
+  }%
   {\newunit}%
   {\setunit{\addspace}}%
   \usebibmacro{italtitle+stitle}%
@@ -1426,6 +1529,7 @@
 
 \DeclareBibliographyDriver{dataset}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1495,6 +1599,7 @@
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1543,6 +1648,7 @@
 
 \DeclareBibliographyDriver{inbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1550,9 +1656,9 @@
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx at lasthash{}{\usebibmacro{italtitle+stitle}}%
-  \setunit{\addperiod\addspace}% 16th ed.
+  \setunit{\newunitpunct}% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
@@ -1564,7 +1670,7 @@
       or
       togl {cms at crossref}%
     }%
-  {\setunit{\addperiod\addspace}%
+  {\setunit{\newunitpunct}%
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1611,7 +1717,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1629,7 +1735,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1644,6 +1750,7 @@
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1651,9 +1758,9 @@
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx at lasthash{}{\usebibmacro{italtitle+stitle}}%
-  \setunit{\addperiod\addspace}% 16th ed.
+  \setunit{\newunitpunct}% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
@@ -1665,7 +1772,7 @@
       or
       togl {cms at crossref}%
     }%
-  {\setunit{\addperiod\addspace}% Moved here.
+  {\setunit{\newunitpunct}% Moved here.
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1712,7 +1819,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1730,7 +1837,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1745,6 +1852,7 @@
 
 \DeclareBibliographyDriver{inproceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -1752,9 +1860,9 @@
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx at lasthash{}{\usebibmacro{italtitle+stitle}}%
-  \setunit{\addperiod\addspace}% 16th ed.
+  \setunit{\newunitpunct}% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
@@ -1766,7 +1874,7 @@
       or
       togl {cms at crossref}%
     }%
-  {\setunit{\addperiod\addspace}%
+  {\setunit{\newunitpunct}%
     \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
@@ -1777,6 +1885,14 @@
   \usebibmacro{ser+num}%
   \newunit\newblock
   \printfield{note}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{eventtitle}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{eventtitleaddon}%
+  \newcunit%
+  \printfield{venue}%
+  \newcunit\newblock
+  \printeventdate%
   \newunit\newblock
   \usebibmacro{bibreprint}%
   \usebibmacro{org+publ+loc+year}%
@@ -1806,7 +1922,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -1824,7 +1940,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -1839,6 +1955,7 @@
 
 \DeclareBibliographyDriver{inreference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{reference+title}%{italtitle+stitle}
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
@@ -1850,7 +1967,7 @@
   {}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
+  \setunit*{\newunitpunct}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1906,6 +2023,7 @@
 \DeclareBibliographyDriver{jurisdiction}{%
   \iffieldequalstr{entrysubtype}{square}% FIXME?
   {\usebibmacro{bibindex}%
+    \usebibmacro{begentry}%
     \usebibmacro{clegis+news+title}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
@@ -1963,6 +2081,7 @@
     \usebibmacro{finentry}}
   {\iffieldequalstr{entrysubtype}{round}% FIXME?
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -2019,6 +2138,7 @@
       {}%
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -2085,6 +2205,7 @@
 
 \DeclareBibliographyDriver{legal}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newcunit\newblock
   \usebibmacro{clegis+news+title}%
@@ -2150,6 +2271,7 @@
 \DeclareBibliographyDriver{legislation}{%
   \iffieldequalstr{entrysubtype}{uk}% FIXME?
   {\usebibmacro{bibindex}%
+    \usebibmacro{begentry}%
     \usebibmacro{author/editor}%
     \newcunit\newblock
     \usebibmacro{clegis+news+title}%
@@ -2213,6 +2335,7 @@
     \usebibmacro{finentry}}
   {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{author/editor}%
       \newcunit\newblock
       \usebibmacro{clegis+news+title}%
@@ -2269,6 +2392,7 @@
       {}%
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{author/editor}%
       \newcunit\newblock
       \usebibmacro{clegis+news+title}%
@@ -2341,6 +2465,7 @@
 
 \DeclareBibliographyDriver{letter}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -2356,7 +2481,7 @@
   \usebibmacro{language+transtitle}%
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
+  \setunit*{\newunitpunct}%
   \ifboolexpr{%
     test {\iffieldundef{crossref}}%
     or
@@ -2444,6 +2569,7 @@
 
 \DeclareBibliographyDriver{manual}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author+org}%
   \newunit\newblock
@@ -2487,6 +2613,7 @@
 
 \DeclareBibliographyDriver{misc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -2551,6 +2678,7 @@
 
 \DeclareBibliographyDriver{music}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -2609,10 +2737,10 @@
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
       \printtext{%
-        \printfield{maintitle}%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{ctitleaddonpunct}%
@@ -2670,6 +2798,7 @@
 
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -2775,6 +2904,7 @@
 
 \DeclareBibliographyDriver{patent}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author+holder}% + holder?
   \newunit\newblock
   \ifundef\bbx at lasthash{\usebibmacro{patenttitle+stitle}}{}%
@@ -2781,9 +2911,9 @@
   \usebibmacro{cmscitesortdate}%
   \newunit\newblock
   \ifundef\bbx at lasthash{}{\usebibmacro{patenttitle+stitle}}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \printfield{note}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{bibreprint}%
   \printfield{type}%
   \setunit{\addspace}%
@@ -2831,6 +2961,7 @@
 
 \DeclareBibliographyDriver{performance}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -2881,6 +3012,7 @@
 \DeclareBibliographyDriver{periodical}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \newunit\newblock
   \ifboolexpr{%
@@ -2942,7 +3074,8 @@
   {}%
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
+{\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \newunit\newblock
   \ifboolexpr{%
@@ -2975,7 +3108,7 @@
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
-  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \setunit*{\newunitpunct}\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
@@ -3009,6 +3142,7 @@
 
 \DeclareBibliographyDriver{proceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{editor}%
   \newunit\newblock
@@ -3038,6 +3172,14 @@
   \usebibmacro{ser+num}%
   \newunit\newblock
   \printfield{note}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{eventtitle}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{eventtitleaddon}%
+  \newcunit%
+  \printfield{venue}%
+  \newcunit\newblock
+  \printeventdate%
   \newunit\newblock
   \usebibmacro{bibreprint}%
   \usebibmacro{org+publ+loc+year}%
@@ -3067,7 +3209,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
@@ -3085,7 +3227,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{bibprexref}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
@@ -3100,6 +3242,7 @@
 
 \DeclareBibliographyDriver{reference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{reference+title}%{italtitle+stitle}
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
@@ -3111,7 +3254,7 @@
   {}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
+  \setunit*{\newunitpunct}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -3157,6 +3300,7 @@
 
 \DeclareBibliographyDriver{report}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -3202,6 +3346,7 @@
 
 \DeclareBibliographyDriver{review}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+author}}%
   {\usebibmacro{author/editor}}%
@@ -3299,6 +3444,7 @@
 
 \DeclareBibliographyDriver{standard}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \ifnameundef{author}%
   {\iflistundef{organization}%
@@ -3310,13 +3456,16 @@
         and
         togl {cms at namedash}%
       }%
-      {\iffieldundef{nameaddon}%
+      {\if at cms@nonameaddon%
         {\printtext{\bibnamedash}}%
-        {\printtext{\bibnamedash}\setunit{\addspace}%
+        {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
           \printfield{nameaddon}}}%
       {\iftoggle{cms at authorparens}%
-        {\bibopenparen\printlist{organization}\bibcloseparen}%
-        {\printlist{organization}}%
+        {\bibopenparen\printlist{organization}%
+          \usebibmacro{print+nameaddon}%
+          \bibcloseparen}%
+        {\printlist{organization}%
+          \usebibmacro{print+nameaddon}}%
         \savelist{organization}{\bbx at lasthash}}}}%
   {\usebibmacro{justauthor}}%
   \newunit\newblock
@@ -3387,6 +3536,7 @@
 
 \DeclareBibliographyDriver{suppbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author}%
   \newunit\newblock
@@ -3460,6 +3610,7 @@
 
 \DeclareBibliographyDriver{thesis}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -3469,9 +3620,9 @@
   \ifundef\bbx at lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \printfield{note}%
-  \setunit{\addperiod\addspace}\newblock%
+  \setunit{\newunitpunct}\newblock%
   \usebibmacro{bibreprint}%
   \usebibmacro{type+inst+year}%
   \newunit\newblock
@@ -3493,6 +3644,7 @@
 
 \DeclareBibliographyDriver{unpublished}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -3502,7 +3654,7 @@
   \ifundef\bbx at lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
   \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{byeditor+others}% Fix bug ???
   \newunit\newblock
   \usebibmacro{bibreprint}%
@@ -3540,6 +3692,7 @@
 
 \DeclareBibliographyDriver{video}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{shorthand:author}%
   \usebibmacro{author/editor}%
   \newunit\newblock
@@ -3567,17 +3720,17 @@
     \setunit{\addspace}\newblock%
     \usebibmacro{language+transtitle}%
     \usebibmacro{byauthor}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{part+editor+translator}}
-  {\setunit{\addperiod\addspace}% 16th ed.
+  {\setunit{\newunitpunct}% 16th ed.
     \usebibmacro{byauthor}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{part+editor+translator}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{chapinscore}%
     \usebibmacro{btitle+bstitle}}%
   \iffieldundef{booktitle}%
-  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\newunitpunct}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
   {}%
@@ -3601,10 +3754,10 @@
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
       \printtext{%
-        \printfield{maintitle}%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
@@ -3675,7 +3828,7 @@
   {\iffieldundef{doi}%
     {}%
     {\printfield{doi}%
-      \setunit*{\addperiod\addspace}\newblock%
+      \setunit*{\newunitpunct}\newblock%
       \clearfield{url}}}%
   {\ifboolexpr{%
       togl {cms at doi}%
@@ -3683,7 +3836,7 @@
       not test {\iffieldundef{doi}}%
     }%
     {\printfield{doi}%
-      \setunit*{\addperiod\addspace}\newblock}%
+      \setunit*{\newunitpunct}\newblock}%
     {}}%
   \ifboolexpr{%
     togl {cms at eprint}%
@@ -3691,7 +3844,7 @@
     not test {\iffieldundef{eprint}}%
   }%
   {\usebibmacro{eprint}%
-    \setunit*{\addperiod\addspace}\newblock}%
+    \setunit*{\newunitpunct}\newblock}%
   {}%
   \ifboolexpr{%
     togl {cms at url}%
@@ -4709,7 +4862,7 @@
         {\printfield{volume}}% Still print this w/o part or pages???
         {\ifthenelse{\iffieldnums{pages}%
             \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
-          {\printfield[default]{volume}%
+          {\printfield[shortvol]{volume}%
             \postvolpunct%
             \printfield{pages}}%
           {\printfield{volume}%
@@ -4781,7 +4934,7 @@
         {\iffieldundef{part}%
           {\ifthenelse{\iffieldnums{pages}%
               \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
-            {\newcunit\printfield[default]{volume}%
+            {\newcunit\printfield[shortvol]{volume}%
               \postvolpunct%
               \printfield{pages}}%
             {\newcunit\printfield{volume}%
@@ -4821,6 +4974,8 @@
     {}%
     {\printfield{volumes}}}}
 
+\def\cms at ofwrap#1{#1}
+
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}%
   {}%
@@ -4837,10 +4992,10 @@
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
       \printtext{%
-        \printfield{maintitle}%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
@@ -4878,10 +5033,10 @@
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
       \printtext{%
-        \printfield{maintitle}%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
@@ -4888,7 +5043,7 @@
       \printfield{maintitleaddon}}}}%
 
 \newbibmacro*{cjournal+ser+vol+num}[1]{% Moved to bbx
-  \usebibmacro{journal+sub}%
+  \usebibmacro{journal+sub}{in}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
@@ -4930,7 +5085,7 @@
   {\ifthenelse{\iffieldundef{bookpagination}\AND%
       \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}%
     {\setunit{\postvolpunct}}%
-    {\setunit{\addcolon\addspace}}}% This may not be universally correct.
+    {\setunit{\journalpagespunct}}}% This may not be universally correct.
   {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
       \iffieldundef{issue}%
       {\usebibmacro{date}%
@@ -4938,7 +5093,7 @@
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}%
+    \setunit{\journalpagespunct}}%
   \usebibmacro{eid+or+pages}}%
 
 \newbibmacro*{periodical+issue+year+pages}[1]{%
@@ -4957,7 +5112,7 @@
   {\ifthenelse{\iffieldundef{bookpagination}\AND%
       \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}%
     {\setunit{\postvolpunct}}%
-    {\setunit{\addcolon\addspace}}}%
+    {\setunit{\journalpagespunct}}}%
   {\printtext[parens]{%
       \iffieldundef{issue}%
       {\usebibmacro{date}%
@@ -4965,7 +5120,7 @@
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}%
+    \setunit{\journalpagespunct}}%
   \usebibmacro{eid+or+pages}}%
 
 \newbibmacro*{eid+or+pages}{%
@@ -5124,6 +5279,8 @@
 
 %%%% Related functionality from standard.bbx %%%%
 
+\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}}
+
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
 
@@ -5134,13 +5291,27 @@
   {\let\cms at related@hash\bbx at lasthash}{}}%
 \newbibmacro*{endrelated}{\ifcsdef{cms at related@hash}%
   {\global\let\bbx at lasthash\cms at related@hash%
-    \let\cms at related@hash\undefined}{}}%
+    \let\cms at related@hash\undefined}{}\global\undef\cbx at lasthash}%
 \newbibmacro*{begrelatedloop}{}
 \newbibmacro*{endrelatedloop}{}
 
+\renewcommand*{\begrelateddelim}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}}%
+  {\newcunitpunct}%
+  {\newunitpunct}}%
+
 \newcommand*{\begrelateddelimmaintitle}{\newunitpunct\par\nobreak}%
 \newcommand*{\begrelateddelimmaintitlenc}{\newunitpunct\par\nobreak}%
 
+% The idea here is to support standard multicite presentation via the
+% 'short' relatedtype mechanism.
+
+\newcommand*{\relateddelimshort}{%
+  \iffieldequals{fullhash}{\cbx at lasthash}%
+  {\ifbool{cms:atcite}{\addsemicolon\addspace}{\addcomma\addspace}}%
+  {\addsemicolon\addspace}}%
+
 \def\ifrelatedloop{%
   \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}%
     or test {\xifinlistcs{\strfield{clonesourcekey}}{bbx:relatedloop}} }}%
@@ -5197,14 +5368,14 @@
                test {\ifbibxstring{\thefield{relatedtype}s}}%
              }%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}s}}}%
                {\iffieldbibstring{relatedtype}%
                   {\printtext[\bbx at tempb]{%
-                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                     \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}}}}%
                   {}}}%
             {\iffieldbibstring{relatedstring}%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedstring}}}}%
                {\printfield[\bbx at tempb]{relatedstring}}}%
           \docsvfield{related}%
           \usebibmacro{endrelatedloop}}}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -3,7 +3,7 @@
 % intention of providing inline citations (and a reference list) for
 % the author-date style of the Chicago Manual of Style, 17th edition.
 
-\ProvidesFile{chicago-authordate.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
@@ -194,8 +194,10 @@
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\subtitlepunct}%
-      \printfield[sitnoformat]{issuesubtitle}}}}
+      \iftoggle{cms at origpublished}% Complications due to \smartof
+      {}%
+      {\setunit{\subtitlepunct}%
+        \printfield[sitnoformat]{issuesubtitle}}}}}
 
 %%%% Related macros that can't reside in common.cbx %%%%
 
@@ -220,94 +222,72 @@
 
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
+\DeclareFieldFormat{title:hook:alt}{%
+  \iftoggle{cms at reprintmt}%
+  {\begingroup
+    \mkrelatedstringtext{%
+      \lbx at inittitlehook{#1}}%
+    \endgroup}%
+  {\lbx at inittitlehook{#1}}% Inside entries don't use main doc. lang.
+  \mkbibemph{#1}}
+
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
-  \mkbibquote{#1}}
+  \iffieldundef{issuesubtitle}%
+  {\mkbibquote{#1}}%
+  {\mkbibquote{#1\subtitlepunct\printfield{issuesubtitle}}}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \endgroup}
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1}
+  \endgroup}
 
 \DeclareFieldFormat{muschapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{track}}%
-  \endgroup
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{track}}%
   \bibstring{track}~#1}%
+  \endgroup}
 
+\DeclareFieldFormat{volume:hook}{%
+  \begingroup
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{volume}}%
+    \bibstring{volume}~#1}%
+  \endgroup}%
+
+\DeclareFieldFormat{parttoo:hook}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring[\mkrelatedstringtext]{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat{part:hook}{%
+  \begingroup
+  \ifnumerals{#1}%
+  {\mkrelatedstringtext{%
+      \lbx at inittitlehook{\bibxstring{partvolume}}%
+      \bibstring{partvolume}~#1}}%
+  {\mkrelatedstringtext{\lbx at inittitlehook{#1}}%
+    \ifcapital{\MakeCapital{#1}}{#1}}%
+  \endgroup}
+
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
@@ -327,11 +307,23 @@
         {\iffieldundef{journaltitle}% Switch order for 17th ed.
           {\iffieldundef{maintitle}%
             {}%
-            {\DeclareFieldAlias{maintitle}{title:hook}}}%
+            {\toggletrue{cms at reprintmt}%
+              \ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)%
+                \OR\ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+                \ifentrytype{inproceedings}\OR\ifentrytype{letter}}%
+              {\DeclareFieldAlias{maintitle}{title:hook}}%
+              {\iffieldundef{volume}%
+                {\DeclareFieldAlias{part}{part:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}%
+                {\DeclareFieldAlias{volume}{volume:hook}%
+                  \DeclareFieldAlias{part}{parttoo:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}}}}%
           {\DeclareFieldAlias{jtnoformat}{title:hook}%
             \DeclareFieldAlias{sjtnoformat}{title}%
             \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{injournaltitle}{default}%
             \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{inshortjournal}{series}%
             \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
         {\DeclareFieldAlias{booktitle}{title:hook}}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
@@ -341,16 +333,16 @@
         \DeclareFieldAlias[music]{title}{default}%
         \DeclareFieldAlias{title}{default}%
         \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
-    {\iffieldundef{issuesubtitle}%
-      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
-        \DeclareFieldAlias{issuetitle}{default}}%
-      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+    {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+      \DeclareFieldAlias{issuetitle}{default}}}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%
       {\ifentrytype{music}%
-        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
-        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
         \DeclareFieldAlias[video]{title}{default}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.bbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -2,7 +2,7 @@
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style.
 
-\ProvidesFile{chicago-authordate16.bbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate16.bbx}[2021/03/27 v 3.16 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -4579,6 +4579,8 @@
 
 %%%% Related functionality from standard.bbx %%%%
 
+\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}}
+
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
 
@@ -4652,14 +4654,14 @@
                test {\ifbibxstring{\thefield{relatedtype}s}}%
              }%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}s}}}%
                {\iffieldbibstring{relatedtype}%
                   {\printtext[\bbx at tempb]{%
-                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                     \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}}}}%
                   {}}}%
             {\iffieldbibstring{relatedstring}%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedstring}}}}%
                {\printfield[\bbx at tempb]{relatedstring}}}%
           \docsvfield{related}%
           \usebibmacro{endrelatedloop}}}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate16.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -3,7 +3,7 @@
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate16.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-authordate16.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common16}
@@ -177,8 +177,10 @@
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\subtitlepunct}%
-      \printfield[sitnoformat]{issuesubtitle}}}}
+      \iftoggle{cms at origpublished}% Complications due to \smartof
+      {}%
+      {\setunit{\subtitlepunct}%
+        \printfield[sitnoformat]{issuesubtitle}}}}}
 
 %%%% Related macros that can't reside in common.cbx %%%%
 
@@ -203,75 +205,33 @@
 
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
-  \mkbibquote{#1}}
+  \iffieldundef{issuesubtitle}%
+  {\mkbibquote{#1}}%
+  {\mkbibquote{#1\subtitlepunct\printfield{issuesubtitle}}}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}
+  \endgroup}
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibstring{chapter}}%
+    \bibstring{chapter}~#1}
+  \endgroup}
 
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
@@ -306,10 +266,8 @@
         \DeclareFieldAlias[music]{title}{default}%
         \DeclareFieldAlias{title}{default}%
         \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
-    {\iffieldundef{issuesubtitle}%
-      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
-        \DeclareFieldAlias{issuetitle}{default}}%
-      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+    {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+       \DeclareFieldAlias{issuetitle}{default}}}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -4,7 +4,7 @@
 % list) for the two author-date styles of the Chicago Manual of Style,
 % 17th edition.
 
-\ProvidesFile{chicago-dates-common.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-dates-common.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -13,6 +13,8 @@
 \newbool{cms:bracket}
 \newbool{cms:extraparens}
 \newbool{cms:comma}
+\newbool{cms:atcite}
+\newbool{cms:tcit}
 
 \providecommand*{\mkibid}[1]{#1}
 
@@ -58,9 +60,12 @@
 \providetoggle{cms at headlessnote}% Keep
 \providetoggle{cms at noibid}% Keep
 \providetoggle{cms at namedash}
+\providetoggle{cms at nona}
+\providetoggle{cms at subseqnona}
 \providetoggle{cms at usecompiler}% Keep
 \providetoggle{cms at origpublished}% Keep
 \providetoggle{cms at annotation}% Keep
+\providetoggle{cms at cbxannote}
 \providetoggle{cms at postposit}% Keep
 \providetoggle{cms at fullshhand}%
 \providetoggle{cms at allshort}% For legal types
@@ -77,6 +82,7 @@
 \providetoggle{cms at related}
 \providetoggle{cms at linkit}
 \providetoggle{cms at authortitle}
+\providetoggle{cms at shortrelated}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
@@ -180,10 +186,133 @@
 \DeclareBiblatexOption{global,entry}[boolean]{hypertitle}[true]{%
   \settoggle{cms at linkit}{#1}}%
 
-\DeclareBibliographyOption[boolean]{annotation}[true]{%
-  \global\settoggle{cms at annotation}{#1}}%
+\DeclareBiblatexOption{global,type,entry}[string]{annotation}[true]{%
+  \ifcsdef{cms at opt@annot@#1}%
+  {\csuse{cms at opt@annot@#1}}%
+  {\blx at err@invopt{annotation=#1}{}}}%
+\def\cms at opt@annot at true{%
+  \toggletrue{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at false{%
+  \togglefalse{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at notes{%
+  \togglefalse{cms at annotation}%
+  \toggletrue{cms at cbxannote}}
+\def\cms at opt@annot at bib{%
+  \toggletrue{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at all{%
+  \toggletrue{cms at annotation}%
+  \toggletrue{cms at cbxannote}}
 
-\DeclareBibliographyOption[boolean]{dashed}[true]{%
+\DeclareBiblatexOption{global,type,entry}[string]{bibannotesep}[vpar]{%
+  \ifcsdef{cms at opt@bannsep@#1}%
+  {\csuse{cms at opt@bannsep@#1}}%
+  {\blx at err@invopt{bibannotesep=#1}{}}}
+\def\cms at opt@bannsep at none{%
+  \let\bibannotesep\@empty}%
+\def\cms at opt@bannsep at comma{%
+  \def\bibannotesep{\addcomma\addspace}}%
+\def\cms at opt@bannsep at colon{%
+  \def\bibannotesep{\addcolon\addspace}}%
+\def\cms at opt@bannsep at space{%
+  \def\bibannotesep{\addspace}}%
+\def\cms at opt@bannsep at semicolon{%
+  \def\bibannotesep{\addsemicolon\addspace}}%
+\def\cms at opt@bannsep at period{%
+  \def\bibannotesep{\addperiod\addspace}}%
+\def\cms at opt@bannsep at par{%
+  \def\bibannotesep{\addperiod\par\nobreak}}%
+\def\cms at opt@bannsep at vpar{%
+  \def\bibannotesep{\addperiod\par\nobreak \vskip \bibitemsep}}%
+\def\cms at opt@bannsep at parbreak{%
+  \def\bibannotesep{\addperiod\par}}%
+\def\cms at opt@bannsep at vparbreak{%
+  \def\bibannotesep{\addperiod\par \vskip \bibitemsep}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{citeannotesep}[period]{%
+  \ifcsdef{cms at opt@cannsep@#1}%
+  {\csuse{cms at opt@cannsep@#1}}%
+  {\blx at err@invopt{citeannotesep=#1}{}}}
+\def\cms at opt@cannsep at none{%
+  \let\citeannotesep\@empty}%
+\def\cms at opt@cannsep at comma{%
+  \def\citeannotesep{\addcomma\addspace}}%
+\def\cms at opt@cannsep at colon{%
+  \def\citeannotesep{\addcolon\addspace}}%
+\def\cms at opt@cannsep at space{%
+  \def\citeannotesep{\addspace}}%
+\def\cms at opt@cannsep at semicolon{%
+  \def\citeannotesep{\addsemicolon\addspace}}%
+\def\cms at opt@cannsep at period{%
+  \def\citeannotesep{\addperiod\addspace}}%
+\def\cms at opt@cannsep at par{%
+  \def\citeannotesep{\addperiod\par\nobreak}}%
+\def\cms at opt@cannsep at vpar{%
+  \def\citeannotesep{\addperiod\par\nobreak \vskip\p@}}%
+\def\cms at opt@cannsep at parbreak{%
+  \def\citeannotesep{\addperiod\par}}%
+\def\cms at opt@cannsep at vparbreak{%
+  \def\citeannotesep{\addperiod\par \vskip\p@}}%
+
+\DeclareBiblatexOption{global}[string]{formatbib}[max]{%
+  \ifcsdef{cms at opt@formatbib@#1}%
+  {\csuse{cms at opt@formatbib@#1}}%
+  {\blx at err@invopt{formatbib=#1}{}}}%
+\def\cms at opt@formatbib at max{}%
+\def\cms at opt@formatbib at min{%
+  \renewcommand*{\bibsetup}{%
+    \interlinepenalty=0\relax
+    \widowpenalty=0\relax
+    \@clubpenalty=0\relax
+    \clubpenalty=0\relax
+    \brokenpenalty=0\relax
+    \raggedbottom
+    \frenchspacing
+    \biburlsetup}}%
+\def\cms at opt@formatbib at minwo{%
+  \patchcmd\bibsetup%
+  {\interlinepenalty=5000\relax}%
+  {\interlinepenalty=0\relax}{}{}}%
+\def\cms at opt@formatbib at annote{%
+  \patchcmd\bibsetup%
+  {\interlinepenalty=5000\relax}%
+  {\interlinepenalty=0\relax}{}{}%
+  \AtEveryBibitem{%
+    \interlinepenalty=5000\relax}}%
+\def\cms at opt@formatbib at annotenp{%
+  \AtEndPreamble{%
+    \ifdefvoid{\cms at entrybreak}%
+    {\patchcmd\bibsetup%
+      {\interlinepenalty=5000\relax}%
+      {\interlinepenalties\cmspens{3}\relax}{}{}}%
+    {\patchcmd\bibsetup%
+      {\interlinepenalty=5000\relax}%
+      {\interlinepenalties\cmspens{\cms at entrybreak}\relax}{}{}}}}%
+
+\DeclareBiblatexOption{global}[integer]{entrybreak}[3]{%
+  \IfInteger{#1}%
+  {\numdef\cms at entrybreak{#1}}%
+  {\numdef\cms at entrybreak{3}\cms at warning@noline%
+    {'entrybreak=#1' isn't a valid option.\MessageBreak
+      This option only accepts integers.\MessageBreak
+      It has been set to the default '3'.\MessageBreak
+      Please see biblatex-chicago.pdf for\MessageBreak
+      more information}}}
+
+\def\cmspens at i#1{\space
+  \ifnum#1>\@ne\number5000
+  \expandafter\cmspens at i
+  \expandafter{\number\numexpr#1-\@ne\expandafter}%
+  \else
+  \ifnum#1>\z@\number10
+  \else\unspace
+  \fi\fi}
+
+\def\cmspens#1{\space #1\cmspens at i{#1}}
+
+\DeclareBiblatexOption{global,type,entry}[boolean]{dashed}[true]{%
   \settoggle{cms at namedash}{#1}}
 
 \DeclareBibliographyOption[boolean]{short}[true]{%
@@ -210,13 +339,8 @@
 \DeclareBibliographyOption[boolean]{compressyears}[true]{%
   \global\settoggle{cms at compyears}{#1}}%
 
-\DeclareBibliographyOption[string]{postnotepunct}[true]{%
-  \ifcsdef{cms at opt@ppunct@#1}%
-  {\csuse{cms at opt@ppunct@#1}}%
-  {\blx at err@invopt{postnotepunct=#1}{}}}%
-\def\cms at opt@ppunct at true{%
-  \global\toggletrue{cms at modpostnote}}%
-\def\cms at opt@ppunct at false{}%
+\DeclareBibliographyOption[boolean]{postnotepunct}[true]{%
+  \global\settoggle{cms at modpostnote}{#1}}%
 
 \DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
   \settoggle{blx at usenamec}{#1}}%
@@ -292,6 +416,32 @@
 \DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
   \settoggle{cms at ukord}{#1}}%
 
+% Controlling formatting of, and punctuation before, nameaddon fields %
+
+\DeclareBiblatexOption{global,type,entry}[string]{nameaddonformat}{%
+  \def\cms at naformat{#1}}
+
+\DeclareBiblatexOption{global,type,entry}[string]{nameaddonsep}[space]{%
+  \ifcsdef{cms at opt@nasep@#1}%
+    {\csuse{cms at opt@nasep@#1}}%
+    {\csuse{cms at opt@nasep at space}\cms at warning@noline%
+      {'nameaddonsep=#1' is not a valid option.\MessageBreak
+        The default - 'space' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms at opt@nasep at none{%
+  \let\nameaddonpunct\@empty}%
+\def\cms at opt@nasep at comma{%
+  \def\nameaddonpunct{\addcomma\addspace}}%
+\def\cms at opt@nasep at colon{%
+  \def\nameaddonpunct{\addcolon\addspace}}%
+\def\cms at opt@nasep at space{%
+  \def\nameaddonpunct{\addspace}}%
+\def\cms at opt@nasep at semicolon{%
+  \def\nameaddonpunct{\addsemicolon\addspace}}%
+\def\cms at opt@nasep at period{%
+  \def\nameaddonpunct{\addperiod\addspace}}%
+
 % Controlling punctuation before titleaddon fields %
 
 \DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
@@ -313,7 +463,7 @@
 \def\cms at opt@ptao at semicolon{%
   \def\ptitleaddonpunct{\addsemicolon\addspace}}%
 \def\cms at opt@ptao at period{%
-  \def\ptitleaddonpunct{\addperiod\addspace}}%
+  \def\ptitleaddonpunct{\newunitpunct}}%
 
 \DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
   \ifcsdef{cms at opt@ctao@#1}%
@@ -334,7 +484,7 @@
 \def\cms at opt@ctao at semicolon{%
   \def\ctitleaddonpunct{\addsemicolon\addspace}}%
 \def\cms at opt@ctao at period{%
-  \def\ctitleaddonpunct{\addperiod\addspace}}%
+  \def\ctitleaddonpunct{\newunitpunct}}%
 
 % The field-exclusion options %
 
@@ -372,12 +522,29 @@
 \DeclareBiblatexOption{global,type,entry}[boolean]{hidevolumes}[true]{%
   \settoggle{cms at hidevolumes}{#1}}%
 
+\DeclareBiblatexOption{global,type,entry}[string]{nameaddon}[all]{%
+  \ifcsdef{cms at gopt@na@#1}%
+  {\csuse{cms at gopt@na@#1}}%
+  {\csuse{cms at gopt@na at all}\cms at warning@noline%
+    {'nameaddon=#1' is not a valid option.\MessageBreak
+      The default - 'all' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms at gopt@na at all{}%
+\def\cms at gopt@na at none{%
+  \settoggle{cms at nona}{true}}%
+\def\cms at gopt@na at cite{\settoggle{cms at nona}{true}}%
+\def\cms at gopt@na at bib{}%
+\def\cms at gopt@na at first{\settoggle{cms at subseqnona}{true}}%
+\def\cms at gopt@na at citefirst{\settoggle{cms at nona}{true}}%
+\def\cms at gopt@na at bibfirst{\settoggle{cms at subseqnona}{true}}%
+
 \DeclareBiblatexOption{type,entry}[boolean]{authortitle}[true]{%
   \settoggle{cms at authortitle}{#1}}%
 
 \ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
   ctitleaddon,ptitleaddon,journalabbrev=notes,legalnotes,supranotes,%
-  dashed}%
+  dashed,bibannotesep,citeannotesep,nameaddonsep=space}%
 
 \ExecuteBibliographyOptions[standard]{useeditor=false,usenamec=false}%
 \ExecuteBibliographyOptions[dataset]{authortitle=true}%
@@ -393,6 +560,22 @@
         \map{
           \step[fieldsource=shorthand, final]
           \step[fieldset=sortname, origfieldval]}}}}%
+  {}%
+  \iftoggle{cms at strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split at prev{0}%
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split at prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split at prev{\the\insertpenalties}%
+    }}%
   {}}
 
 \DeclareLabeltitle[legislation]{%
@@ -559,23 +742,7 @@
   \settoggle{cms at switchdates}{#1}}%
 
 \DeclareBibliographyOption[boolean]{strict}[true]{%
-  \settoggle{cms at strict}{#1}%
-  \iftoggle{cms at strict}%
-  {\let\splitfootnoterule\footnoterule
-    \renewcommand\footnoterule{}%
-    \advance\skip\footins 4\p@\@plus2\p@\relax
-    \gdef\split at prev{0}%
-    \let\pagefootnoterule\footnoterule
-    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
-    \def\footnoterule{\relax
-      \ifnum\split at prev=\z@
-      \pagefootnoterule
-      \else
-      \splitfootnoterule
-      \fi
-      \xdef\split at prev{\the\insertpenalties}%
-    }}%
-  {}}%
+  \settoggle{cms at strict}{#1}}%
 
 \protected\def\blx at newcunit{%
   \iftoggle{blx at keepunit}%
@@ -670,7 +837,11 @@
           \usebibmacro{cmscitesortdate}%
           \usebibmacro{cite:reinit}}%
         {\iffieldequals{fullhash}{\cbx at lasthash}%
-          {\iffieldundef{postnote}%
+          {\ifboolexpr{%
+              test {\iffieldundef{postnote}}%
+              and
+              not bool {cms:atcite}%
+            }%
             {\setunit{\compcitedelim}}%
             {}%
             \usebibmacro{cmscitesortdate}}%
@@ -683,7 +854,8 @@
             {\savefield{fullhash}{\cbx at lasthash}}%
             {\savefield{fullhash}{\cbx at lastyear}}}}}%
       {\usebibmacro{cite:shorthand}}}}%
-  \setunit{\multicitedelim}}% ???
+  \ifnumless{\value{citecount}}{\value{citetotal}}%
+  {\setunit{\multicitedelim}}{}}% ???
 
 \newbibmacro*{cmsbracketname}{%
   \iffieldequalstr{authortype}{anon}%
@@ -720,7 +892,7 @@
   }% Altered for CMS
   {\iffieldequals{fullhash}{\cbx at lasthash}%
     {\iffieldundef{postnote}%
-      {\setunit{\compcitedelim}}%
+      {\setunit{\multicitedelim}}%
       {}%
       \usebibmacro{cite:label}}%
     {\usebibmacro{cite:label}%
@@ -728,7 +900,11 @@
       {\savefield{fullhash}{\cbx at lasthash}}%
       {}}}%
   {\iffieldequals{fullhash}{\cbx at lasthash}%
-    {\iffieldundef{postnote}%
+    {\ifboolexpr{%
+        test {\iffieldundef{postnote}}%
+        and
+        not bool {cms:atcite}%
+      }%
       {\setunit{\compcitedelim}}%
       {}%
       \usebibmacro{cmscitesortdate}}%
@@ -752,6 +928,8 @@
           togl {cms at authortitle}%
           or
           test {\iffieldequalstr{entrysubtype}{classical}}%
+          or
+          bool {cms:atcite}%
         }%
         {\setunit{\multicitedelim}}%
         {\setunit{\compcitedelim}}}}%
@@ -883,6 +1061,8 @@
             togl {cms at authortitle}%
             or
             test {\iffieldequalstr{entrysubtype}{classical}}%
+            or
+            bool {cms:atcite}%
           }%
           {\setunit{\multicitedelim}}%
           {\setunit{\compcitedelim}}}}%
@@ -898,7 +1078,9 @@
       {\iffieldequals{fullhash}{\cbx at lastyear}%
         {\setunit{\multicitedelim}%
           \global\undef\cbx at lastyear}%
-        {\setunit{\compcitedelim}}}%
+        {\ifbool{cms:atcite}%
+          {\setunit{\multicitedelim}}%
+          {\setunit{\compcitedelim}}}}%
       {\setunit{\multicitedelim}}%
       \printtext[bibhyperref]{%
         \printfield{shorthand}}}}%
@@ -992,7 +1174,7 @@
   \iffieldundef{postnote}%
   {}%
   {\savefield{fullhash}{\cbx at lastyear}%
-    \setunit{\postnotewrapper}%delim}%
+    \postnotewrapper%\setunit{\postnotewrapper}
     \printfield{postnote}}%
   \ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
   {\setunit{}%
@@ -1010,7 +1192,9 @@
   \iftoggle{cms at los}%
   {\iffieldequals{fullhash}{\cbx at lasthash}%
     {\printtext[cmshyper]{%
-        \setunit{\compcitedelim}%
+        \ifbool{cms:atcite}%
+        {\setunit{\multicitedelim}}%
+        {\setunit{\compcitedelim}}%
         \usebibmacro{cmscitesortdate}}}%
     {\printfield{shorthand}%
       \printtext[cmshyper]{%
@@ -1081,7 +1265,8 @@
             \printfield{booktitleaddon}%
             \iffieldundef{booktitleaddon}{}{\addcomma\addspace}}}%
         {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}}}}%
-  {\printtext[cmshyper]{\printfield{label}}}}%
+  {\printtext[cmshyper]{\printfield{label}}}%
+  \global\booltrue{cms:atcite}}%
 
 \newbibmacro*{cite:labelyear+extrayear}{%
   \ifboolexpr{ (
@@ -1217,7 +1402,8 @@
         {\toggletrue{cms at switchdates}%
           \usebibmacro{cmsciteyear}}%
         {\usebibmacro{cmsciteyear}}}}%
-    {\usebibmacro{cmsciteyear}}}}%
+    {\usebibmacro{cmsciteyear}}}%
+  \global\boolfalse{cms:atcite}}%
 
 \newbibmacro*{cmsciteyear}{%
   \ifentrytype{patent}% Fix for double year w/cmsdate
@@ -1228,7 +1414,13 @@
       {\usebibmacro{cite:bothyear+oldstyle}}%
       {\iftoggle{cms at bothlabelold}%
         {\usebibmacro{cite:bothyear+oldstyle}}%
-        {\iftoggle{cms at fulldate}%
+        {\ifboolexpr{%
+            togl {cms at fulldate}%
+            and
+            not test {\iffieldequalstr{labeldatesource}{year}}%
+            and
+            not test {\iffieldequalstr{labeldatesource}{origyear}}%
+          }%
           {\printtext[cmsyearhyper]{%
               \csuse{print\strfield{labeldatesource}date}%
               \iffieldundef{\strfield{labeldatesource}hour}%
@@ -1383,17 +1575,16 @@
   {}%
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\cmshypercite}% Intended for CustomC comments
+\DeclareCiteCommand{\atcite}
   {\usebibmacro{cite:init}%
-    \togglefalse{blx at skipbib}%
-    \togglefalse{cms at authortitle}%
     \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
+    \toggletrue{cms at authortitle}%
     \usebibmacro{cite}}
   {}%\multicitedelim
-  {}%\usebibmacro{postnote} Stops double printing
+  {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\atcite}
+\DeclareCiteCommand{\atpcite}[\mkbibparens]
   {\usebibmacro{cite:init}%
     \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -1402,15 +1593,78 @@
   {}%\multicitedelim
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\atpcite}[\mkbibparens]
+\DeclareCiteCommand{\citeincite}[\cmswrap]% Used in fields of other entries
   {\usebibmacro{cite:init}%
+    \usebibmacro{backref+check}%
+    \togglefalse{blx at skipbib}%
+    \togglefalse{cms at authortitle}%
+    \togglefalse{cms at fulldate}%
+    \usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citeincitef}[\cmswrapf]%
+  {\usebibmacro{cite:init}%
+    \usebibmacro{backref+check}%
+    \togglefalse{blx at skipbib}%
+    \togglefalse{cms at authortitle}%
+    \togglefalse{cms at fulldate}%
+    \usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\cmshypercite}[\cmswraphy]% For CustomC comments
+  {\usebibmacro{cite:init}%
+    \usebibmacro{backref+check}%
+    \togglefalse{blx at skipbib}%
+    \togglefalse{cms at authortitle}%
+    \togglefalse{cms at fulldate}%
     \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-    \toggletrue{cms at authortitle}%
     \usebibmacro{cite}}
   {}%\multicitedelim
-  {\usebibmacro{postnote}}
+  {}%\usebibmacro{postnote} Stops double printing
 
+\DeclareCiteCommand{\fullciteincite}% For use in annotation fields
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms at fullnote}%
+    \togglefalse{cms at shortnote}%
+    \usebibmacro{cite:driver}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\def\cmswrap#1{%
+  \ifbool{cbx:parens}{\global\booltrue{cms:tcit}}{}% For \textcites
+  \blx at initunit#1%
+  \ifdef{\blx at thepostpunct}%
+  {\ifdefvoid{\abx at field@postpunct}%
+    {\blx at dopostpunct}{}}%
+  {}%
+  \global\let\abx at field@postpunct\@empty%
+  \ifbool{cms:tcit}{\global\booltrue{cbx:parens}\global\boolfalse{cms:tcit}}%
+  {}}
+
+\def\cmswrapf#1{%
+  \ifbool{cbx:parens}{\global\booltrue{cms:tcit}}{}% For \textcites
+  \blx at initunit#1\ifdef{\blx at thepostpunct}{\cms at cicpunct}{}%
+  \ifbool{cms:tcit}{\global\booltrue{cbx:parens}\global\boolfalse{cms:tcit}}%
+  {}}
+
+\def\cmswraphy#1{%
+  \ifbool{cbx:parens}{\global\booltrue{cms:tcit}}{}% For \textcites
+  #1%
+  \ifbool{cms:tcit}{\global\booltrue{cbx:parens}\global\boolfalse{cms:tcit}}%
+  {}}
+
+\def\cms at cicpunct{}% Only needed in US; redefine in lbx
+
 %%% Commands, macros and formats for the Legal entry types %%%
 
 \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
@@ -1449,11 +1703,13 @@
 \DeclareCiteCommand{\runcite}% 17th ed.
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
+    \toggletrue{cms at fullnote}%
+    \togglefalse{cms at shortnote}%
     \toggletrue{cms at running@text}%
-    \usebibmacro{cite}%
+    \usebibmacro{cite:full}%
     \togglefalse{cms at running@text}}
   {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
+  {}%\usebibmacro{postnote}
 
 \newbibmacro*{cite:full}{%
   \iftoggle{cms at noneshort}%
@@ -1588,6 +1844,14 @@
         and
         not test {\iffieldint{volume}}%
         )
+        or
+        (
+        test {\iffieldundef{volume}}% Bug fix; correct?
+        and
+        test {\iffieldundef{series}}%
+        and
+        not test {\iffieldundef{titleaddon}}%
+        )
       }%
       {\ifboolexpr{%
           test {\iffieldundef{entrysubtype}}%
@@ -1962,6 +2226,10 @@
 
 \DeclareFieldFormat[jurisdiction,legal,legislation]{shortjournal}{#1\isdot}
 
+\DeclareFieldFormat{injournaltitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{inshortjournal}{\mkbibemph{#1}\isdot}
+
 \DeclareFieldFormat{jurisdictionser}{%
   \ifinteger{#1}%
   {\mkjuridordinal{#1}}%
@@ -1989,6 +2257,8 @@
 
 \DeclareFieldFormat{jourvol}{#1}
 
+\DeclareFieldFormat{shortvol}{#1}
+
 \DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
   \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
 
@@ -1997,11 +2267,7 @@
   {\bibsstring{part}~#1}%
   {#1\isdot}}%
 
-\DeclareFieldFormat[legal,legislation]{chapter}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
-    \iffieldequalstr{entrysubtype}{hansard}}%
-  {c\adddotspace #1}%
-  {\bibsstring{chapter}~#1}}%
+\DeclareFieldFormat[legal,legislation]{chapter}{c\adddotspace #1}%
 
 \DeclareFieldFormat[music]{chapter}{\bibstring{track}~#1}
 
@@ -2035,7 +2301,9 @@
 
 \DeclareFieldAlias[dataset]{citetitle}[dataset]{title}
 
-\DeclareFieldAlias[dataset]{lostitle}[dataset]{title}
+\DeclareFieldFormat[dataset]{lostitle}{%
+  \addspace% Instead of in shorthand driver (2.1)
+  \mkbibparens{\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
 %%% Textcite commands taken verbatim from authoryear-comp.cbx %%%
 
@@ -2163,6 +2431,21 @@
 \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
    {\footcitetext}{\setunit{\multicitedelim}}
 
+\DeclareCitePunctuationPosition{\citeincitef}{d}
+
+\DeclareCitePunctuationPosition{\cmshypercite}{d}
+
+\DeclareCitePunctuationPosition{\citeincitefs}{d}
+
+\DeclareMultiCiteCommand{\citeincites}[\cmswrap]{\citeincite}%
+{\setunit{\multicitedelim}}%
+
+\DeclareMultiCiteCommand{\citeincitefs}[\cmswrapf]{\citeincite}%
+{\setunit{\multicitedelim}}%
+
+\DeclareMultiCiteCommand{\fullciteincites}{\fullciteincite}%
+{\setunit{\multicitedelim}}
+
 \DeclareCiteCommand{\bibxrefcite}
   {\usebibmacro{cite:init}%
     \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?)
@@ -2188,13 +2471,7 @@
 
 \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
   {\usebibmacro{backref+check}%
-    \nopunct%\unspace%
-    \ifboolexpr{%
-      togl {cms at otherlang}%
-      and
-      not test {\iffieldundef{langid}}%
-    }%
-    {\addspace}{\unspace}%
+    \nopunct%\unspace% Remove otherlang test for 3.16.
     \savebibmacro{cmsbibsortdate}%
     \renewbibmacro*{cmsbibsortdate}{}}%
   {\usedriver
@@ -2259,29 +2536,29 @@
 \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
 
 \DeclareFieldFormat{postnote}{% Changed for page compression option
-  \ifboolexpr{%
-    togl {cms at comprange}%
-    and
-    test {\ifpages{#1}}%
-  }%
+  \ifpages{#1}% xetex and luatex revealed a bug in original logic
+  {\iftoggle{cms at comprange}%
+    {{\iffieldundef{pagination}%
+        {\mkcomprange{#1}}%
+        {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}}%
+    {{\iffieldundef{pagination}%
+        {\mknormrange{#1}}%
+        {\mknormrange[{\mkpageprefix[pagination]}]{#1}}}}}%
   {\iffieldundef{pagination}%
-    {\mkcomprange{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
     {#1}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat[inreference]{postnote}{%
-  \ifboolexpr{%
-    togl {cms at comprange}%
-    and
-    test {\ifpages{#1}}%
-  }%
+  \ifpages{#1}%
+  {\iftoggle{cms at comprange}%
+    {\iffieldundef{pagination}%
+      {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+      {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+    {\iffieldundef{pagination}%
+      {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+      {\mknormrange[{\mkpageprefix[pagination]}]{#1}}}}%
   {\iffieldundef{pagination}%
     {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat{pages}{%
@@ -2314,7 +2591,11 @@
   \usebibmacro{list:andothers}}
 
 \DeclareFieldFormat[customc]{title}{%
-  \iffieldundef{nameaddon}%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at nona}%
+  }%
   {\mkbibemph{\bibstring{see}}%
     \addspace%
     #1}%
@@ -2329,13 +2610,26 @@
     \addspace\cmshypercite{\cms at aa}}%
   {\ifnameundef{author}%
     {#1}%
-    {\iffieldundef{nameaddon}%
+    {\ifboolexpr{%
+        test {\iffieldundef{nameaddon}}%
+        or
+        togl {cms at nona}%
+      }%
       {\mkbibemph{\bibstring{see}}%
         \addspace%
         #1}%
       {\printfield{nameaddon}\addspace #1}}}}
 
-\DeclareFieldAlias[customc]{lostitle}[customc]{title}
+\DeclareFieldFormat[customc]{lostitle}{%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at nona}%
+  }%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {\addspace #1}}
 
 \DeclareFieldFormat{shortjournal}{\mkbibemph{#1}\isdot}
 
@@ -2346,8 +2640,11 @@
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
 
 \DeclareFieldFormat{note}{%
-  \ifcapital{\MakeCapital{#1}}{#1}}%
+  \if at cms@capital{#1}{\MakeCapital{#1}}{#1}}%
 
+\DeclareFieldFormat{capital}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}
+
 \DeclareFieldFormat
 [audio,manual,music,patent,report,suppbook,suppcollection,thesis,video]
 {type}{%
@@ -2459,14 +2756,34 @@
 
 \DeclareFieldAlias{userd}{titleaddon}% 16th ed.
 
-\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+\DeclareFieldFormat{nameaddon}{%
+  \ifdefvoid{\cms at naformat}%
+  {\mkbibbrackets{#1\bibsentence}}%
+  {\printtext[\cms at naformat]{#1\isdot}}}%
 
-\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{#1\bibsentence}%
+\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{%
+  \ifdefvoid{\cms at naformat}%
+  {#1\ifboolexpr{%(
+      test {\IfEndWith{\thefield{nameaddon}}{)}}%[
+      or
+      test {\IfEndWith{\thefield{nameaddon}}{]}}%
+    }%
+    {\bibsentence}{\isdot}}%
+  {\printtext[\cms at naformat]{#1\isdot}}}
 
 \DeclareFieldFormat[misc]{nameaddon}{%
   \iffieldundef{entrysubtype}%
-  {\mkbibbrackets{#1\bibsentence}}%
-  {#1\bibsentence}}
+  {\ifdefvoid{\cms at naformat}%
+    {\mkbibbrackets{#1\bibsentence}}%
+    {\printtext[\cms at naformat]{#1\isdot}}}%
+  {\ifdefvoid{\cms at naformat}%
+    {#1\ifboolexpr{%(
+        test {\IfEndWith{\thefield{nameaddon}}{)}}%[
+        or
+        test {\IfEndWith{\thefield{nameaddon}}{]}}%
+      }%
+      {\bibsentence}{\isdot}}%
+    {\printtext[\cms at naformat]{#1\isdot}}}}
 
 \DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
   \ifbibstring{#1}%
@@ -2483,7 +2800,7 @@
 \DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
 
 \DeclareFieldFormat{titleaddon}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+  \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
 
 \DeclareFieldAlias{booktitleaddon}{titleaddon}
 
@@ -2515,13 +2832,36 @@
 \DeclareFieldFormat{shortseries}{#1\isdot}
 
 \DeclareFieldFormat{addendum}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+  \if at cms@capital{#1}{\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.
+% There was unfortunate interaction between the case-changing code and
+% cite commands when the latter were at the beginning of the
+% field. This modified \ifcapital will be used in the fields in which
+% the \citeincite(f|s) commands can appear.
 
-\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+\newrobustcmd*{\if at cms@capital}[1]{%
+  \noexpandarg
+  \StrChar{#1}{1}[\cms at char]%
+  \ifboolexpr{%
+    test {\ifcapital}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincite}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincites}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincitef}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincitefs}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}%
+}
 
+% For annotation fixes move all code for separators to the entrytail
+% macro, below.
+
+\DeclareFieldFormat{annotation}{#1}%
+
 \DeclareFieldFormat{part}{%
   \ifnumerals{#1}%
   {\addcomma\addspace\bibstring{partvolume}~#1}%
@@ -2544,12 +2884,20 @@
     and
     not togl {cms at linkit}%
   }%
-  {#1}%
+  {\iftoggle{cms at shortrelated}%
+    {\ifentryinbib{\strfield{clonesourcekey}}%
+      {\bibhyperref[\strfield{clonesourcekey}]{#1}}%
+      {#1}}%
+    {#1}}%
   {\bibhyperref{#1}}}%
 
 \DeclareFieldFormat{cmsyearhyper}{% Only link when in ref list
   \iftoggle{blx at skipbib}
-  {#1}%
+  {\iftoggle{cms at shortrelated}%
+    {\ifentryinbib{\strfield{clonesourcekey}}%
+      {\bibhyperref[\strfield{clonesourcekey}]{#1}}%
+      {#1}}%
+    {#1}}%
   {\bibhyperref{#1}}}%
 
 %%%% Related field formats from biblatex.def %%%%
@@ -2582,7 +2930,7 @@
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}%
-  \addspace}%
+  }%\addspace
 
 %%%% Commands, for users and internal %%%%
 
@@ -2690,6 +3038,8 @@
             test {\ifdefstring\blx at languagename{brazilian}}%
             or
             test {\ifdefstring\blx at languagename{brazil}}%
+            or
+            test {\ifdefstring\blx at languagename{romanian}}%
           }%
           {\ifboolexpr{%
               test {\iffieldundef{#1dateunspecified}}%
@@ -2817,6 +3167,8 @@
     {\addcomma\addspace}%
     {\addcomma\addspace\bibstring{and}\addspace}}}
 
+\newcommand*{\journalpagespunct}{\addcolon\space}% Make it configurable
+
 \renewcommand*{\postnotedelim}{% Cf. N&B style
   \ifboolexpr{%
     test {\ifciteibid}%
@@ -2834,30 +3186,49 @@
     {\togglefalse{cms at inlineibid}%
       \iffieldundef{prenote}% Bug fix
       {}%
-      {\cms at testspace}}%
+      {\setunit{\cms at testspace}}}%
     {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
       {\DeclareNumChars*{abcdeABCDE:}%
         \iffieldpages{postnote}%
-        {\cms at testspace}%
-        {\addcomma\addspace}}%
-      {\addcomma\addspace}\DeclareNumChars{.}}}}
+        {\setunit{\cms at testspace}}%
+        {\newcunit}}%
+      {\newcunit}\DeclareNumChars{.}}}}
 
 \newcommand*{\postnotewrapper}{%
-  \iftoggle{cms at modpostnote}%
+  \iftoggle{cms at modpostnote}% Multiple bugs in v 2.0.
   {\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}}}%
+    {\togglefalse{blx at unit}%
+      \expandarg
+      \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+      \iffieldstart{postnote}{\ }%
+      {\setunit{\addcomma}}%
+      {\newcunit}}%
+    {\iffieldstart{postnote}{;}%
+      {\togglefalse{blx at unit}%
+        \expandarg
+        \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+        \iffieldstart{postnote}{\ }%
+        {\setunit{\addsemicolon}}%
+        {\setunit{\addsemicolon\addspace}}}%
+      {\iffieldstart{postnote}{:}%
+        {\togglefalse{blx at unit}%
+          \expandarg
+          \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+          \iffieldstart{postnote}{\ }%
+          {\setunit{\addcolon}}%
+          {\setunit{\addcolon\addspace}}}%
+        {\iffieldstart{postnote}{.}%
+          {\togglefalse{blx at unit}%
+            \expandarg
+            \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+            \iffieldstart{postnote}{\ }%
+            {\setunit{\addperiod}}%
+            {\newunit}}%
+          {\postnotedelim}}}}}%
   {\postnotedelim}}%
 
 \newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
@@ -2949,18 +3320,41 @@
 %%%% Formatting macros, called both by cbx and bbx %%%%
 
 \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
-  \ifbibliography
+  \ifboolexpr{%
+    togl {cms at annotation}%
+    or
+    togl {cms at cbxannote}%
+  }%
     {\usebibmacro{entrytail}}%
     {}%
   \finentry}
 
 \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
-  \newunit\newblock
-  \iftoggle{cms at annotation}%
-    {\usebibmacro{annotation}%
-     \newunit\newblock}%
-    {}}%
+  \ifbibliography%
+  {\iftoggle{cms at annotation}%
+    {\togglefalse{blx at unit}%
+      \togglefalse{blx at keepunit}%
+      \setunit{\bibannotesep}%
+      \usebibmacro{annotation}%
+      \newunit\newblock}%
+    {\newunit}}%
+  {\iftoggle{cms at cbxannote}%
+    {\togglefalse{blx at unit}%
+      \togglefalse{blx at keepunit}%
+      \setunit{\citeannotesep}%
+      \usebibmacro{annotation}%
+      \newunit\newblock}%
+    {\newunit}}}%
 
+% From biblatex.def; biblatex 3.15 toggled blx at bibliography off here,
+% but we still need to be able to test it in Chicago, at least with
+% the current code, so redefine the macro.
+
+\renewbibmacro*{annotation}{%
+  \iffieldundef{annotation}%
+  {\printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}}%
+  {\printfield{annotation}}}
+
 \newbibmacro*{author+holder}{%
   \ifnameundef{author}%
     {\let\bbx at lasthash\undefined}%
@@ -2978,7 +3372,7 @@
     {\bibstring{by}\addspace%
      \printnames[byauthor]{author}}}
 
-\newbibmacro*{byauthorpunct}{%
+\newbibmacro*{byauthorpunct}{% Obsolete?
   \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
   {\addperiod\addspace}%
   {\newcunit}}
@@ -3091,7 +3485,7 @@
       togl {cms at namedash}%
     }%
     {\printtext{\bibnamedash}}%
-    {\usebibmacro{journal+sub}%
+    {\usebibmacro{journal+sub}{}%
       \setunit*{\addspace}%
       \printlist[periodplace]{location}%
       \savefield{journaltitle}{\bbx at lasthash}}}%
@@ -3163,7 +3557,7 @@
     {\bibstring{by#2}}%
     {\ifbibxstring{by\thefield{#1type}}%
       {\bibstring{by\thefield{#1type}}}%
-      {\printtext[note]{\thefield{#1type}}}}}%
+      {\printtext[capital]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbytypestrg}[2]{%
   \iffieldundef{#1type}%
@@ -3170,7 +3564,7 @@
     {\bibstring{cby#2}}%
     {\ifbibxstring{cby\thefield{#1type}}%
       {\bibstring{cby\thefield{#1type}}}%
-      {\printtext[note]{\thefield{#1type}}}}}%
+      {\printtext[capital]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbyeditor}{%
   \ifnameundef{editor}%
@@ -3396,7 +3790,11 @@
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
-    {\addspace\bibstring{of}\setunit{\addspace}}}}%
+    {\iftoggle{cms at origpublished}%
+      {\DeclareFieldAlias{booktitle}{title:hook}}%
+      {\DeclareFieldAlias{booktitle}{title:hook:alt}}%
+      \addspace\bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}}}}%
 
 \newbibmacro*{chap+as+track}{%
   \iffieldundef{chapter}%
@@ -3410,7 +3808,7 @@
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
-    {\addspace\bibstring{on}\setunit{\addspace}}}}%
+    {\addspace\bibstring[\cms at ofwrap]{on}\setunit{\addspace}}}}%
 
 \newbibmacro*{music+origdate}{%
   \iffieldequalstr{pubstate}{reprint}% 17th ed.
@@ -3630,7 +4028,7 @@
     {\printdate}%
     {\printorigdate}}}%
 
-\newbibmacro*{journal+sub}{%
+\newbibmacro*{journal+sub}[1]{%
   \iffieldundef{journaltitle}%
     {}%
     {\ifboolexpr{%
@@ -3648,9 +4046,9 @@
         togl {cms at bibjtabb}%
         ))
       }%
-      {\clearlist{location}\printtext[shortjournal]{%
+      {\clearlist{location}\printtext[#1shortjournal]{%
           \printfield[jtsnoformat]{shortjournal}}}%
-      {\printtext[journaltitle]{%
+      {\printtext[#1journaltitle]{%
           \printfield[jtnoformat]{journaltitle}%
           \setunit{\subtitlepunct}%
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
@@ -3699,7 +4097,7 @@
     \usebibmacro{cmsyear}}}
 
 \newbibmacro*{mag+date+issue}{%
-  \usebibmacro{journal+sub}%
+  \usebibmacro{journal+sub}{in}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \newunit\newblock
@@ -3792,8 +4190,8 @@
 \renewbibmacro*{postnote}{%
   \iffieldundef{postnote}%
   {}%
-  {\setunit{\postnotewrapper}%delim}%
-  \printfield{postnote}}}
+  {\postnotewrapper%\setunit{\postnotewrapper}
+    \printfield{postnote}}}
 
 \newbibmacro*{part+editor+translator}{%
   \ifnameundef{namea}%
@@ -3884,7 +4282,7 @@
     {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
       {\bibstring{\thefield{editortype}s}}%
       {\bibstring{\thefield{editortype}}}}%
-    {\printtext[note]{\thefield{editortype}}}}%
+    {\printtext[capital]{\thefield{editortype}}}}%
   \clearname{editor}}
 
 \newbibmacro*{parteditstrg}{%
@@ -3919,7 +4317,7 @@
     {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
       {\bibstring{\thefield{nameatype}s}}%
       {\bibstring{\thefield{nameatype}}}}%
-    {\printtext[note]{\thefield{nameatype}}}}%
+    {\printtext[capital]{\thefield{nameatype}}}}%
   \clearname{namea}}
 
 \newbibmacro*{clearpublin}{%
@@ -3944,7 +4342,7 @@
     \clearfield{titleaddon}%
     \clearfield{usere}%
     \clearlist{language}%
-    \ifentrytype{music}%
+    \ifthenelse{\ifentrytype{music}\OR\ifentrytype{audio}}%
     {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
       \clearfield{eventmonth}}%
     {}}%
@@ -3953,7 +4351,12 @@
     {\clearfield{year}\clearfield{month}\clearfield{season}}%
     {\clearfield{origyear}\clearfield{origmonth}\clearfield{origseason}}%
     \clearfield{origlocation}}%
-  {}%
+  {\ifthenelse{\ifentrytype{article}\OR\ifentrytype{periodical}\OR%
+      \ifentrytype{review}\OR\ifentrytype{suppperiodical}}%
+    {\iffieldundef{issuetitle}% For reprintfrom (?)
+      {\clearname{editor}\clearfield{note}\renewbibmacro*{bibreprint}{}}%
+      {}}%
+    {}}%
   \clearfield{reprinttitle}%
 }
 
@@ -3980,7 +4383,7 @@
       test {\iflistundef{publisher}}%
     }%
       {}%
-      {\setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+      {\setunit{\addspace\bibstring[\mkrelatedstringtext]{bypublisher}\space}%
        \printlist{publisher}%
        \setunit{\addcomma\space}%
        \iflistsequal{location}{savedlocation}%
@@ -3992,13 +4395,13 @@
     \usebibmacro{at+every+item}%
     \renewbibmacro*{name:hook}[1]{%
       \ifnumequal{\value{listcount}}{1}%
-        {\begingroup
-         \mkrelatedstring%
-         \lbx at initnamehook{#1}%
-         \endgroup}%
-        {}}%
+      {\begingroup
+        \mkrelatedstringtext{%
+          \lbx at initnamehook{##1}}%
+        \endgroup}%
+      {}}%
     \printnames[bytranslator]{translator}%
-    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}%
+    \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\space}%
     \clearname{translator}%
     \usebibmacro{cite:origfull}}}%
 
@@ -4070,21 +4473,27 @@
 
 \newbibmacro*{related:commenton}[1]{% 17th ed.
   \togglefalse{cms at fulldate}% Let cloned entry set it
+  \togglefalse{cms at authortitle}% Ditto
+  \toggletrue{cms at shortrelated}% This allows us to provide a hyperlink
   \entrydata*{#1}{%
-    \cmshypercite{\strfield{clonesourcekey}}}}
+    \ifnumequal{\value{bbx:relatedcount}}{1}%
+    {\global\boolfalse{cms:atcite}\usebibmacro{cite:reinit}}{}%
+    \usebibmacro{cite}}}
 
-\providetoggle{cms at otherlang}
+\newbibmacro*{related:short}[1]{% For cross-refs in ref list
+  \togglefalse{cms at fulldate}% Let cloned entry set it
+  \togglefalse{cms at authortitle}% Ditto
+  \toggletrue{cms at shortrelated}% This allows us to provide a hyperlink
+  \entrydata*{#1}{%
+    \nocite{\thefield{clonesourcekey}}% Ensure it appears in ref list
+    \ifnumequal{\value{bbx:relatedcount}}{1}%
+    {\global\boolfalse{cms:atcite}\usebibmacro{cite:reinit}}{}%
+    \usebibmacro{cite}}}
 
-\apptocmd\blx at opt@autolang at other%
-{\toggletrue{cms at otherlang}}%
-{\blx at 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}}
+\providetoggle{cms at reprintmt}%
 
 \newbibmacro*{cite:origfull}{%
-  \printtext[cmshypertarget]{%
+  \printtext[cmshypertarget]{% Field format is spurious
     \usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \clearname{author}\clearfield{userf}\clearfield{shorthand}%
@@ -4093,7 +4502,7 @@
     {\thefield{entrytype}}}}
 
 \newbibmacro*{cite:origpubl}{%
-  \printtext[cmshypertarget]{%
+  \printtext[cmshypertarget]{% Field format is spurious
     \usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}\clearfield{shorthand}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -4,7 +4,7 @@
 % for the two author-date styles of the Chicago Manual of Style, 16th
 % edition.
 
-\ProvidesFile{chicago-dates-common16.cbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-dates-common16.cbx}[2021/03/27 v 3.16 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -1242,6 +1242,8 @@
   {}%
   {\usebibmacro{postnote}}
 
+\def\cms at cicpunct{}%
+
 %%% Commands, macros and formats for the Legal entry types %%%
   
 \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
@@ -1965,12 +1967,6 @@
 \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
   {\usebibmacro{backref+check}%
     \nopunct%\unspace%
-    \ifboolexpr{%
-      togl {cms at otherlang}%
-      and
-      not test {\iffieldundef{langid}}%
-    }%
-    {\addspace}{\unspace}%
     \savebibmacro{cmsbibsortdate}%
     \renewbibmacro*{cmsbibsortdate}{}}%
   {\usedriver
@@ -2304,7 +2300,7 @@
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}%
-  \addspace}%
+  }%\addspace
 
 %%%% Commands, for users and internal %%%%
 
@@ -3602,7 +3598,7 @@
       test {\iflistundef{publisher}}%
     }%
       {}%
-      {\setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+      {\setunit{\addspace\bibstring[\mkrelatedstringtext]{bypublisher}\space}%
        \printlist{publisher}%
        \setunit{\addcomma\space}%
        \iflistsequal{location}{savedlocation}%
@@ -3614,13 +3610,13 @@
     \usebibmacro{at+every+item}%
     \renewbibmacro*{name:hook}[1]{%
       \ifnumequal{\value{listcount}}{1}%
-        {\begingroup
-         \mkrelatedstring%
-         \lbx at initnamehook{#1}%
-         \endgroup}%
-        {}}%
+      {\begingroup
+        \mkrelatedstringtext{%
+          \lbx at initnamehook{##1}}%
+        \endgroup}%
+      {}}%
     \printnames[bytranslator]{translator}%
-    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}%
+    \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\space}%
     \clearname{translator}%
     \usebibmacro{cite:origfull}}}%
 
@@ -3690,15 +3686,15 @@
       \newcunit}%
     \usebibmacro{date}}}%
 
-\providetoggle{cms at otherlang}
+% \providetoggle{cms at otherlang}
 
-\apptocmd\blx at opt@autolang at other%
-{\toggletrue{cms at otherlang}}%
-{\blx at 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}}
+% \apptocmd\blx at opt@autolang at other%
+% {\toggletrue{cms at otherlang}}%
+% {\blx at 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]{%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -2,7 +2,7 @@
 % Lehman's standard.bbx.  It provides the bibliography formatting for
 % the Chicago notes + bibliography style.
 
-\ProvidesFile{chicago-notes.bbx}[2020/04/20 v 3.14 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2021/03/27 v 3.16 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -20,6 +20,7 @@
   {\mkbibemph{\textbf{#1}}\isdot}}%
 
 \newlength{\lositemsep}
+\newbibmacro*{begentry}{}
 
 \defbibenvironment{bibliography}% New for 0.9a
   {\list
@@ -252,12 +253,6 @@
 \InitializeBibliographyStyle{%
   \let\bbx at lasthash\undefined}
 
-%%%% Bibliography-specific bibstrings %%%%
-% \NewBibliographyString{note,preface,subsection,subsections,selfpublished,%
-%   commenton,printed,track,choreographer,choreographers,cbychoreographer,%
-%   bychoreographer}%
-%% Now below %%
-
 %%%% Author, Editor, Translator, and Compiler  Macros %%%%
 
 \renewbibmacro*{name:last-first}[4]{%
@@ -388,23 +383,30 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}}%\addperiod\addspace
       {\printtext{\bibnamedash}%
         \ifentrytype{customc}%
         {\newunit}%
-        {\setunit{\addspace}}\printfield{nameaddon}}}%
+        {\setunit{\nameaddonpunct}}\printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
+      {\bibopenbracket\printnames{author}%
+        \ifentrytype{customc}%
+        {\bibclosebracket%
+          \usebibmacro{print+nameaddon}}%
+        {\usebibmacro{print+nameaddon}%
+          \bibclosebracket}%
         \savefield{fullhash}{\bbx at lasthash}}%
       {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+        {\bibopenbracket\printnames{author}\addquestion%
+          \ifentrytype{customc}%
+          {\bibclosebracket%
+            \usebibmacro{print+nameaddon}}%
+          {\usebibmacro{print+nameaddon}%
+            \bibclosebracket}%
           \savefield{fullhash}{\bbx at lasthash}}%
         {\printnames{author}%
-          \ifentrytype{customc}%
-          {\ifbibliography{\newunit}{\newcunit}}%
-          {\setunit{\addspace}}%
-          \printfield{nameaddon}%
+          \usebibmacro{print+nameaddon}%
           \savefield{fullhash}{\bbx at lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
@@ -417,18 +419,20 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}}%\addperiod\addspace
-      {\printtext{\bibnamedash}\setunit{\addspace}\printfield{nameaddon}}}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
+        \printfield{nameaddon}}}%
     {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
+      {\bibopenbracket\printnames{author}%
+        \usebibmacro{print+nameaddon}\bibclosebracket%
         \savefield{fullhash}{\bbx at lasthash}}%
       {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
+        {\bibopenbracket\printnames{author}\addquestion%
+          \usebibmacro{print+nameaddon}\bibclosebracket%
           \savefield{fullhash}{\bbx at lasthash}}%
         {\printnames{author}%
-          \setunit{\addspace}%
-          \printfield{nameaddon}%
+          \usebibmacro{print+nameaddon}%
           \savefield{fullhash}{\bbx at lasthash}}}}}}
 
 \newbibmacro*{pickeditor}{%
@@ -446,13 +450,12 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\editordelim}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\editordelim}}%
     {\printnames{editor}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}\editordelim%
+      \usebibmacro{print+nameaddon}\editordelim%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{editstrg}}}
 
@@ -469,13 +472,12 @@
           and
           togl {cms at namedash}%
         }%
-        {\iffieldundef{nameaddon}%
+        {\if at cms@nonameaddon%
           {\printtext{\bibnamedash}\editordelim}%
-          {\printtext{\bibnamedash}\setunit{\addspace}%
+          {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
             \printfield{nameaddon}\editordelim}}%
         {\printnames{editor}%
-          \setunit{\addspace}%
-          \printfield{nameaddon}\editordelim%
+          \usebibmacro{print+nameaddon}\editordelim%
           \savefield{fullhash}{\bbx at lasthash}}%
         \usebibmacro{editstrg}}}%
     {\ifboolexpr{%
@@ -485,13 +487,12 @@
         and
         togl {cms at namedash}%
       }%
-      {\iffieldundef{nameaddon}%
+      {\if at cms@nonameaddon%
         {\printtext{\bibnamedash}\nameadelim}%
-        {\printtext{\bibnamedash}\setunit{\addspace}%
+        {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
           \printfield{nameaddon}\nameadelim}}%
       {\printnames[sortname]{namea}%
-        \setunit{\addspace}%
-        \printfield{nameaddon}\nameadelim%
+        \usebibmacro{print+nameaddon}\nameadelim%
         \savefield{fullhash}{\bbx at lasthash}}%
       \usebibmacro{parteditstrg}}}}%
 
@@ -505,13 +506,12 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\nameadelim}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\nameadelim}}%
     {\printnames[sortname]{namea}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}\nameadelim%
+      \usebibmacro{print+nameaddon}\nameadelim%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{parteditstrg}}}
 
@@ -530,13 +530,12 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\printnames[sortname]{translator}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}\newcunit%
+      \usebibmacro{print+nameaddon}\newcunit%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{transstrg}}}
 
@@ -550,13 +549,12 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\printnames[sortname]{nameb}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}\newcunit%
+      \usebibmacro{print+nameaddon}\newcunit%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{parttransstrg}}}
 
@@ -570,16 +568,74 @@
       and
       togl {cms at namedash}%
     }%
-    {\iffieldundef{nameaddon}%
+    {\if at cms@nonameaddon%
       {\printtext{\bibnamedash}\newcunit}%
-      {\printtext{\bibnamedash}\setunit{\addspace}%
+      {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
         \printfield{nameaddon}\newcunit}}%
     {\printnames[sortname]{namec}%
-      \setunit{\addspace}%
-      \printfield{nameaddon}\newcunit%
+      \usebibmacro{print+nameaddon}\newcunit%
       \savefield{fullhash}{\bbx at lasthash}}%
     \usebibmacro{compilestrg}}}
 
+\newbibmacro*{print+nameaddon}{%
+  \ifbibliography%
+  {\ifboolexpr{%
+      togl {cms at bibnona}%
+      or
+      test {\iffieldundef{nameaddon}}%
+    }%
+    {}%
+    {\ifboolexpr{%
+        test {\iffieldequals{fullhash}{\bbx at lasthash}}%
+        and
+        test {\iffieldequals{nameaddon}{\cms at lastna}}%
+        and
+        togl {cms at subseqnona}%
+      }%
+      {}%
+      {\ifentrytype{customc}{\newunit}{\setunit{\nameaddonpunct}}%
+        \printfield{nameaddon}%
+        \savefield{nameaddon}{\cms at lastna}}}}%
+  {\ifboolexpr{%
+      togl {cms at citenona}%
+      or
+      test {\iffieldundef{nameaddon}}%
+    }%
+    {\let\cms at lastna\undefined}%
+    {\ifboolexpr{%
+        test {\iffieldequals{nameaddon}{\cms at lastna}}%
+        and
+        test {\cms at ifciteidem}%
+        and
+        togl {cms at subseqnona}%
+      }%
+      {}%
+      {\ifentrytype{customc}{\newcunit}{\setunit{\nameaddonpunct}}%
+        \printfield{nameaddon}%
+        \savefield{nameaddon}{\cms at lastna}}}}}
+
+\def\if at cms@nonameaddon{%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at bibnona}%
+    or
+    (
+    test {\iffieldequals{nameaddon}{\cms at lastna}}%
+    and
+    togl {cms at subseqnona}%
+    )
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}}%
+
+\def\cms at ifciteidem{%
+  \ifbool{citetracker}%
+    {\iftoggle{blx at footnote}%
+       {\iffieldequals{fullhash}\blx at lasthash@foot}%
+       {\iffieldequals{fullhash}\blx at lasthash@text}}%
+    {\@secondoftwo}}
+
 \renewcommand*{\revsdnamedelim}{\addcomma}
 
 \DeclareNameAlias{author}{sortname}% Needed in 0.9
@@ -601,7 +657,7 @@
         {\printlist{organization}\newcunit}%
         {}}}%
     {\ifthenelse{\ifentrytype{customc}\OR\ifentrytype{dataset}}%
-      {\usebibmacro{justauthor}\setunit{\addspace}}%
+      {\usebibmacro{justauthor}}% Moved \addspace to field format (2.1)
       {\usebibmacro{author/editor}\newunit}}%
     \ifboolexpr{%
       test {\ifentrytype{video}}%
@@ -795,6 +851,46 @@
       final]
       \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
     }
+    \map[overwrite]{
+      \step[fieldsource=titleaddon,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=titleaddon,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=annotation,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=annotation,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=annote,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=annote,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=addendum,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=addendum,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=note,
+      match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
+      replace=\regexp{\\citeincitef$1$2\}}]
+      \step[fieldsource=note,
+      match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
+      replace=\regexp{\\citeincitefs$1$6\}}]
+    }
     \map[overwrite, foreach=related]{
       \pertype{mvbook}
       \pertype{mvcollection}
@@ -876,6 +972,7 @@
 \DeclareBibliographyDriver{article}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{mag+news+author}%
   \newunit\newblock
   \usebibmacro{mag+news+title}%
@@ -920,12 +1017,13 @@
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{mag+news+title}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
-  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \setunit*{\newunitpunct}\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
@@ -965,6 +1063,7 @@
 
 \DeclareBibliographyDriver{artwork}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -1013,6 +1112,7 @@
 
 \DeclareBibliographyDriver{audio}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -1028,7 +1128,7 @@
   \usebibmacro{chapinscore}%
   \usebibmacro{btitle+bstitle}%
   \iffieldundef{booktitle}%
-  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\newunitpunct}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
   {}%
@@ -1051,11 +1151,11 @@
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[noformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit\newblock
@@ -1093,6 +1193,7 @@
 
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
@@ -1179,7 +1280,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
@@ -1201,7 +1302,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -1220,6 +1321,7 @@
 
 \DeclareBibliographyDriver{bookinbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -1235,7 +1337,7 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
+  \setunit*{\newunitpunct}%
   \ifboolexpr{%
     not togl {cms at related}%
     or
@@ -1306,7 +1408,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
@@ -1328,7 +1430,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -1366,7 +1468,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\csuse{cms at shortmtkey}}%
     \usebibmacro{xrefpostnote}%
@@ -1377,6 +1479,7 @@
 
 \DeclareBibliographyDriver{booklet}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -1409,6 +1512,7 @@
 
 \DeclareBibliographyDriver{collection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
@@ -1480,7 +1584,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
@@ -1502,7 +1606,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -1521,8 +1625,13 @@
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{justauthor}%
-  \iffieldundef{nameaddon}%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at bibnona}%
+  }%
   {\newunit}%
   {\setunit{\addspace}}%
   \usebibmacro{italtitle+stitle}%
@@ -1530,6 +1639,7 @@
 
 \DeclareBibliographyDriver{dataset}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \setunit{\addspace}\newblock%
   \printtext[parens]{%
@@ -1601,6 +1711,7 @@
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -1653,14 +1764,15 @@
 
 \DeclareBibliographyDriver{inbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
   \usebibmacro{language+transtitle}%
-  \setunit{\addperiod\addspace}% 16th ed.
+  \setunit{\newunitpunct}% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
     not togl {cms at related}%
@@ -1683,7 +1795,7 @@
       or
       togl {cms at bibcrossref}%
     }%
-  {\setunit{\addperiod\addspace}%
+  {\setunit{\newunitpunct}%
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -1731,7 +1843,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{xref}}%
@@ -1786,7 +1898,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
     \bibxrefcite{\csuse{cms at shortmtkey}}%
@@ -1798,6 +1910,7 @@
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
@@ -1876,7 +1989,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{xref}}%
@@ -1899,7 +2012,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
@@ -1931,7 +2044,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
     \bibxrefcite{\csuse{cms at shortmtkey}}%
@@ -1943,14 +2056,15 @@
 
 \DeclareBibliographyDriver{inproceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
-  \setunit{\addperiod\addspace}% 16th ed.
+  \setunit{\newunitpunct}% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{part+editor+translator}%
   \ifboolexpr{%
     not togl {cms at related}%
@@ -1973,7 +2087,7 @@
       or
       togl {cms at bibcrossref}%
     }%
-  {\setunit{\addperiod\addspace}%
+  {\setunit{\newunitpunct}%
   \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
@@ -1984,6 +2098,14 @@
   \usebibmacro{ser+num}%
   \newunit\newblock
   \printfield{note}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{eventtitle}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{eventtitleaddon}%
+  \newcunit%
+  \printfield{venue}%
+  \newcunit\newblock
+  \printeventdate%
   \newunit\newblock
   \usebibmacro{org+publ+loc+year}%
   \newunit\newblock
@@ -2014,7 +2136,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{xref}}%
@@ -2037,7 +2159,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
@@ -2069,7 +2191,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
     \bibxrefcite{\csuse{cms at shortmtkey}}%
@@ -2081,6 +2203,7 @@
 
 \DeclareBibliographyDriver{inreference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iftoggle{cms at mtvolpunct}{\newcunit}{}%
   \usebibmacro{italtitle+stitle}%
   \usebibmacro{related:mtpunct}%\newunit\newblock
@@ -2091,7 +2214,7 @@
   {}%
   \usebibmacro{related:mtpunct}%\newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
+  \setunit*{\newunitpunct}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -2153,6 +2276,7 @@
 
 \DeclareBibliographyDriver{letter}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \printtext[title]{%
@@ -2165,7 +2289,7 @@
   \usebibmacro{language+transtitle}%
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
+  \setunit*{\newunitpunct}%
   \ifboolexpr{%
     not togl {cms at related}%
     or
@@ -2287,7 +2411,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
     \bibxrefcite{\csuse{cms at shortmtkey}}%
@@ -2299,6 +2423,7 @@
 
 \DeclareBibliographyDriver{manual}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{bibauthor+org}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -2339,6 +2464,7 @@
 
 \DeclareBibliographyDriver{misc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \iffieldundef{entrysubtype}%
@@ -2398,6 +2524,7 @@
 
 \DeclareBibliographyDriver{music}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -2441,11 +2568,11 @@
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[noformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit\newblock
@@ -2497,6 +2624,7 @@
 
 \DeclareBibliographyDriver{mvbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{related:mtpunct}%\newunit\newpunct%
   \usebibmacro{italtitle+stitle}%
@@ -2580,7 +2708,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{xref}}%
     \usebibmacro{xrefpostnote}%
@@ -2602,7 +2730,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -2628,6 +2756,7 @@
 
 \DeclareBibliographyDriver{mvcollection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{related:mtpunct}%\newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -2705,7 +2834,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{xref}}%
     \usebibmacro{xrefpostnote}%
@@ -2727,7 +2856,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -2753,6 +2882,7 @@
 
 \DeclareBibliographyDriver{mvproceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{related:mtpunct}%\newunit\newblock%
   \usebibmacro{italtitle+stitle}%
@@ -2794,6 +2924,14 @@
   {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
     \newunit\newblock
     \printfield{note}%
+    \setunit*{\addcomma\addspace}%
+    \printfield{eventtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{eventtitleaddon}%
+    \newcunit%
+    \printfield{venue}%
+    \newcunit\newblock
+    \printeventdate%
     \newunit\newblock
     \usebibmacro{org+publ+loc+year}%
     \newunit\newblock
@@ -2824,7 +2962,7 @@
       test {\ifpunctmark{*}}%
     }%
     {\setunit{\addspace\bibsentence}}%
-    {\setunit{\addperiod\addspace}}%
+    {\setunit{\newunitpunct}}%
     \usebibmacro{xrefprenote}% Volume fix
     \bookbibxrefcite{\thefield{xref}}%
     \usebibmacro{xrefpostnote}%
@@ -2846,7 +2984,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -2872,6 +3010,7 @@
 
 \DeclareBibliographyDriver{mvreference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{italtitle+stitle}%
   \newunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
@@ -2942,6 +3081,7 @@
 
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \IfBeginWith{\thefield{title}}{CCCCCC}%
@@ -3013,6 +3153,7 @@
 
 \DeclareBibliographyDriver{patent}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author+holder}% + holder?
   \newunit\newblock
   \iffieldundef{title}%
@@ -3025,9 +3166,9 @@
     \printfield{titleaddon}}%
   \setunit{\addspace}\newblock%
   \usebibmacro{language+transtitle}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \printfield{note}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \printfield{type}%
   \setunit{\addspace}%
   \printfield{number}%
@@ -3068,6 +3209,7 @@
 
 \DeclareBibliographyDriver{performance}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
@@ -3115,6 +3257,7 @@
 \DeclareBibliographyDriver{periodical}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \newunit\newblock
   \usebibmacro{issuetitle}%
@@ -3141,13 +3284,14 @@
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
+{\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \newunit\newblock
   \usebibmacro{issuetitle}%
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
-  \setunit*{\addperiod\addspace}\newblock% 16th ed.
+  \setunit*{\newunitpunct}\newblock% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
@@ -3180,6 +3324,7 @@
 
 \DeclareBibliographyDriver{proceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{related:mtpunct}%
   \usebibmacro{italtitle+stitle}%
@@ -3207,6 +3352,14 @@
   \usebibmacro{ser+num}%
   \newunit\newblock
   \printfield{note}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{eventtitle}%
+  \setunit{\ctitleaddonpunct}%
+  \printfield{eventtitleaddon}%
+  \newcunit%
+  \printfield{venue}%
+  \newcunit\newblock
+  \printeventdate%
   \newunit\newblock
   \usebibmacro{org+publ+loc+year}%
   \newunit\newblock
@@ -3237,7 +3390,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{xref}}%
   \usebibmacro{xrefpostnote}%
@@ -3259,7 +3412,7 @@
     test {\ifpunctmark{*}}%
   }%
   {\setunit{\addspace\bibsentence}}%
-  {\setunit{\addperiod\addspace}}%
+  {\setunit{\newunitpunct}}%
   \usebibmacro{xrefprenote}% Volume fix
   \bookbibxrefcite{\thefield{crossref}}%
   \usebibmacro{xrefpostnote}%
@@ -3278,6 +3431,7 @@
 
 \DeclareBibliographyDriver{reference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iftoggle{cms at mtvolpunct}{\newcunit}{}%
   \usebibmacro{italtitle+stitle}%
   \usebibmacro{related:mtpunct}%\newunit\newblock
@@ -3288,7 +3442,7 @@
   {}%
   \usebibmacro{related:mtpunct}%
   \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
+  \setunit*{\newunitpunct}% need asterisk?
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -3335,6 +3489,7 @@
 
 \DeclareBibliographyDriver{report}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \iffieldequalstr{entrysubtype}{unpublished}%
@@ -3379,6 +3534,7 @@
 
 \DeclareBibliographyDriver{review}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{mag+news+author}}%
   {\usebibmacro{author/editor}}%
@@ -3468,6 +3624,7 @@
 
 \DeclareBibliographyDriver{standard}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \ifnameundef{author}%
   {\iflistundef{organization}%
     {}%
@@ -3478,8 +3635,12 @@
         and
         togl {cms at namedash}%
       }%
-      {\printtext{\bibnamedash}}%
+      {\if at cms@nonameaddon%
+        {\printtext{\bibnamedash}}%
+        {\printtext{\bibnamedash}\setunit{\nameaddonpunct}%
+          \printfield{nameaddon}}}%
       {\printlist{organization}%
+        \usebibmacro{print+nameaddon}%
         \savelist{organization}{\bbx at lasthash}}}}%
   {\usebibmacro{justauthor}}%
   \newunit\newblock
@@ -3547,6 +3708,7 @@
 
 \DeclareBibliographyDriver{suppbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author}%
   \newunit\newblock
   \usebibmacro{inforaft}%
@@ -3611,6 +3773,7 @@
 
 \DeclareBibliographyDriver{thesis}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
@@ -3618,9 +3781,9 @@
   \usebibmacro{language+transtitle}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \printfield{note}%
-  \setunit{\addperiod\addspace}\newblock%
+  \setunit{\newunitpunct}\newblock%
   \usebibmacro{type+inst+year}%
   \newunit\newblock
   \printfield{addendum}%
@@ -3643,6 +3806,7 @@
 
 \DeclareBibliographyDriver{unpublished}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \newunit\newblock
   \usebibmacro{title+stitle}%
@@ -3650,7 +3814,7 @@
   \usebibmacro{language+transtitle}%
   \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
   \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
-  \setunit{\addperiod\addspace}%
+  \setunit{\newunitpunct}%
   \usebibmacro{byeditor+others}%
   \newunit\newblock%
   \printfield{howpublished}%
@@ -3689,6 +3853,7 @@
 
 \DeclareBibliographyDriver{video}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \ifboolexpr{%
     test {\iffieldequalstr{entrysubtype}{tvepisode}}%
     and
@@ -3710,9 +3875,9 @@
     \usebibmacro{title+stitle}%
     \setunit{\addspace}\newblock%\bibsentence
     \usebibmacro{language+transtitle}%
-    \setunit{\addperiod\addspace}% 16th ed.
+    \setunit{\newunitpunct}% 16th ed.
     \usebibmacro{byauthor}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{part+editor+translator}}%
   {\usebibmacro{author/editor}%
     \newunit\newblock
@@ -3726,15 +3891,15 @@
     \printfield{titleaddon}%\usebibmacro{title+stitle}%
     \setunit{\addspace}\newblock%\bibsentence
     \usebibmacro{language+transtitle}%
-    \setunit{\addperiod\addspace}% 16th ed.
+    \setunit{\newunitpunct}% 16th ed.
     \usebibmacro{byauthor}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{part+editor+translator}%
-    \setunit{\addperiod\addspace}%
+    \setunit{\newunitpunct}%
     \usebibmacro{chapinscore}%
     \usebibmacro{btitle+bstitle}}%
   \iffieldundef{booktitle}%
-  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\newunitpunct}}% Fix customc?
   {\setunit{\addcomma\addspace}}%
   \iffieldundef{edition}%
   {}%
@@ -3757,11 +3922,11 @@
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[noformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}%
   \newcunit\newblock
@@ -3827,7 +3992,7 @@
   {\iffieldundef{doi}%
     {}%
     {\printfield{doi}%
-      \setunit*{\addperiod\addspace}\newblock%
+      \setunit*{\newunitpunct}\newblock%
       \clearfield{url}}}%
   {\ifboolexpr{%
       togl {cms at doi}%
@@ -3835,7 +4000,7 @@
       not test {\iffieldundef{doi}}%
     }%
     {\printfield{doi}%
-      \setunit*{\addperiod\addspace}\newblock}%
+      \setunit*{\newunitpunct}\newblock}%
     {}}%
   \ifboolexpr{%
     togl {cms at eprint}%
@@ -3843,7 +4008,7 @@
     not test {\iffieldundef{eprint}}%
   }%
   {\usebibmacro{eprint}%
-    \setunit*{\addperiod\addspace}\newblock}%
+    \setunit*{\newunitpunct}\newblock}%
   {}%
   \ifboolexpr{%
     togl {cms at url}%
@@ -3914,7 +4079,7 @@
         {\printfield{volume}}% Still print this w/o part or pages???
         {\ifthenelse{\iffieldnums{pages}\AND%
             \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
-          {\printfield[default]{volume}%
+          {\printfield[shortvol]{volume}%
             \postvolpunct%
             \printfield{pages}}%
           {\printfield{volume}%
@@ -3953,11 +4118,11 @@
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[noformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
@@ -3980,11 +4145,11 @@
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[noformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
@@ -4002,7 +4167,7 @@
   {\iffieldundef{number}%
     {\ifthenelse{\iffieldundef{bookpagination}\AND\iffieldundef{eid}}%
       {\setunit{\postvolpunct}}%
-      {\setunit{\addcolon\addspace}}%
+      {\setunit{\journalpagespunct}}%
       \usebibmacro{eid+or+pages}}%
     {\newcunit\usebibmacro{eid+or+pages}}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
@@ -4020,7 +4185,7 @@
       {\printfield{issue}%
         \setunit{\addspace}%
         \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\journalpagespunct}%
     \usebibmacro{eid+or+pages}}}}
 
 \newbibmacro*{eid+or+pages}{%
@@ -4785,6 +4950,8 @@
 
 %%%% Related functionality from standard.bbx %%%%
 
+\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}}
+
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
 \newcounter{cms at reviewcount}%
@@ -4951,14 +5118,14 @@
                test {\ifbibxstring{\thefield{relatedtype}s}}%
              }%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}s}}}%
                {\iffieldbibstring{relatedtype}%
                   {\printtext[\bbx at tempb]{%
-                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                     \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}}}}%
                   {}}}%
             {\iffieldbibstring{relatedstring}%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedstring}}}}%
                {\printfield[\bbx at tempb]{relatedstring}}}%
           \docsvfield{related}%
           \usebibmacro{endrelatedloop}}}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -4,7 +4,7 @@
 % formatted according to the specifications of the Chicago Manual of
 % Style.
 
-\ProvidesFile{chicago-notes.cbx}[2020/04/20 v 3.14 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2021/03/27 v 3.16 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -58,6 +58,9 @@
 \providetoggle{cms at noibid}
 \providetoggle{cms at noidem}
 \providetoggle{cms at namedash}
+\providetoggle{cms at bibnona}
+\providetoggle{cms at citenona}
+\providetoggle{cms at subseqnona}
 \providetoggle{cms at useibid}
 \providetoggle{cms at usecompiler}
 \providetoggle{cms at shorthandibid}
@@ -65,9 +68,12 @@
 \providetoggle{cms at fullshhand}
 \providetoggle{cms at inheritshhand}
 \providetoggle{cms at firstshort}
+\providetoggle{cms at noshintro}
+\providetoggle{cms at shandonly}
 \providetoggle{cms at origpublished}
 \providetoggle{cms at loccit}
 \providetoggle{cms at annotation}
+\providetoggle{cms at cbxannote}
 \providetoggle{cms at postposit}
 \providetoggle{cms at legalnotes}% For legal types
 \providetoggle{cms at supranotes}% Ditto
@@ -95,6 +101,7 @@
 \providetoggle{cms at blogurl}% For 17th ed. blogs w/ comments
 \providetoggle{cms at related}
 \providetoggle{cms at citerel}
+\providetoggle{cms at reprintfrom}% maintitle type w/in relatedfrom type
 \providetoggle{cms at gencite}
 \providetoggle{cms at genallnames}
 
@@ -102,6 +109,16 @@
   \iffieldundef{userc}%
   {}%
   {\nocite{\thefield{userc}}}%
+  \ifboolexpr{%
+    togl {cms at subseqnona}%
+    and
+    not togl {cms at citenona}%
+    and
+    test {\ifciteseen}%
+    and
+    not togl {cms at noneshort}%
+  }%
+  {\global\let\cms at lastna\undefined}{}%
   \global\togglefalse{cms at loccit}%
   \global\csundef{@cmsst}%
   \ifboolexpr{%
@@ -157,9 +174,132 @@
 \DeclareBiblatexOption{global,entry}[boolean]{genallnames}[true]{%
   \settoggle{cms at genallnames}{#1}}
 
-\DeclareBibliographyOption{annotation}[true]{%
-  \global\toggletrue{cms at annotation}}
+\DeclareBiblatexOption{global,type,entry}[string]{annotation}[true]{%
+  \ifcsdef{cms at opt@annot@#1}%
+  {\csuse{cms at opt@annot@#1}}%
+  {\blx at err@invopt{annotation=#1}{}}}%
+\def\cms at opt@annot at true{%
+  \toggletrue{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at false{%
+  \togglefalse{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at notes{%
+  \togglefalse{cms at annotation}%
+  \toggletrue{cms at cbxannote}}
+\def\cms at opt@annot at bib{%
+  \toggletrue{cms at annotation}%
+  \togglefalse{cms at cbxannote}}
+\def\cms at opt@annot at all{%
+  \toggletrue{cms at annotation}%
+  \toggletrue{cms at cbxannote}}
 
+\DeclareBiblatexOption{global,type,entry}[string]{bibannotesep}[vpar]{%
+  \ifcsdef{cms at opt@bannsep@#1}%
+  {\csuse{cms at opt@bannsep@#1}}%
+  {\blx at err@invopt{bibannotesep=#1}{}}}
+\def\cms at opt@bannsep at none{%
+  \let\bibannotesep\@empty}%
+\def\cms at opt@bannsep at comma{%
+  \def\bibannotesep{\addcomma\addspace}}%
+\def\cms at opt@bannsep at colon{%
+  \def\bibannotesep{\addcolon\addspace}}%
+\def\cms at opt@bannsep at space{%
+  \def\bibannotesep{\addspace}}%
+\def\cms at opt@bannsep at semicolon{%
+  \def\bibannotesep{\addsemicolon\addspace}}%
+\def\cms at opt@bannsep at period{%
+  \def\bibannotesep{\addperiod\addspace}}%
+\def\cms at opt@bannsep at par{%
+  \def\bibannotesep{\addperiod\par\nobreak}}%
+\def\cms at opt@bannsep at vpar{%
+  \def\bibannotesep{\addperiod\par\nobreak \vskip \bibitemsep}}%
+\def\cms at opt@bannsep at parbreak{%
+  \def\bibannotesep{\addperiod\par}}%
+\def\cms at opt@bannsep at vparbreak{%
+  \def\bibannotesep{\addperiod\par \vskip \bibitemsep}}%
+
+\DeclareBiblatexOption{global,type,entry}[string]{citeannotesep}[period]{%
+  \ifcsdef{cms at opt@cannsep@#1}%
+  {\csuse{cms at opt@cannsep@#1}}%
+  {\blx at err@invopt{citeannotesep=#1}{}}}
+\def\cms at opt@cannsep at none{%
+  \let\citeannotesep\@empty}%
+\def\cms at opt@cannsep at comma{%
+  \def\citeannotesep{\addcomma\addspace}}%
+\def\cms at opt@cannsep at colon{%
+  \def\citeannotesep{\addcolon\addspace}}%
+\def\cms at opt@cannsep at space{%
+  \def\citeannotesep{\addspace}}%
+\def\cms at opt@cannsep at semicolon{%
+  \def\citeannotesep{\addsemicolon\addspace}}%
+\def\cms at opt@cannsep at period{%
+  \def\citeannotesep{\addperiod\addspace}}%
+\def\cms at opt@cannsep at par{%
+  \def\citeannotesep{\addperiod\par\nobreak}}%
+\def\cms at opt@cannsep at vpar{%
+  \def\citeannotesep{\addperiod\par\nobreak \vskip\p@}}%
+\def\cms at opt@cannsep at parbreak{%
+  \def\citeannotesep{\addperiod\par}}%
+\def\cms at opt@cannsep at vparbreak{%
+  \def\citeannotesep{\addperiod\par \vskip\p@}}%
+
+\DeclareBiblatexOption{global}[string]{formatbib}[max]{%
+  \ifcsdef{cms at opt@formatbib@#1}%
+  {\csuse{cms at opt@formatbib@#1}}%
+  {\blx at err@invopt{formatbib=#1}{}}}%
+\def\cms at opt@formatbib at max{}%
+\def\cms at opt@formatbib at min{%
+  \renewcommand*{\bibsetup}{%
+    \interlinepenalty=0\relax
+    \widowpenalty=0\relax
+    \@clubpenalty=0\relax
+    \clubpenalty=0\relax
+    \brokenpenalty=0\relax
+    \raggedbottom
+    \frenchspacing
+    \biburlsetup}}%
+\def\cms at opt@formatbib at minwo{%
+  \patchcmd\bibsetup%
+  {\interlinepenalty=5000\relax}%
+  {\interlinepenalty=0\relax}{}{}}%
+\def\cms at opt@formatbib at annote{%
+  \patchcmd\bibsetup%
+  {\interlinepenalty=5000\relax}%
+  {\interlinepenalty=0\relax}{}{}%
+  \AtEveryBibitem{%
+    \interlinepenalty=5000\relax}}%
+\def\cms at opt@formatbib at annotenp{%
+  \AtEndPreamble{%
+    \ifdefvoid{\cms at entrybreak}%
+    {\patchcmd\bibsetup%
+      {\interlinepenalty=5000\relax}%
+      {\interlinepenalties\cmspens{3}\relax}{}{}}%
+    {\patchcmd\bibsetup%
+      {\interlinepenalty=5000\relax}%
+      {\interlinepenalties\cmspens{\cms at entrybreak}\relax}{}{}}}}%
+
+\DeclareBiblatexOption{global}[integer]{entrybreak}[3]{%
+  \IfInteger{#1}%
+  {\numdef\cms at entrybreak{#1}}%
+  {\numdef\cms at entrybreak{3}\cms at warning@noline%
+    {'entrybreak=#1' isn't a valid option.\MessageBreak
+      This option only accepts integers.\MessageBreak
+      It has been set to the default '3'.\MessageBreak
+      Please see biblatex-chicago.pdf for\MessageBreak
+      more information}}}
+
+\def\cmspens at i#1{\space
+  \ifnum#1>\@ne\number5000
+  \expandafter\cmspens at i
+  \expandafter{\number\numexpr#1-\@ne\expandafter}%
+  \else
+  \ifnum#1>\z@\number10
+  \else\unspace
+  \fi\fi}
+
+\def\cmspens#1{\space #1\cmspens at i{#1}}
+
 \DeclareBibliographyOption[boolean]{noibid}[true]{%
   \global\toggletrue{cms at noibid}}
 
@@ -166,7 +306,7 @@
 \DeclareBibliographyOption[boolean]{useibid}[true]{%
   \global\toggletrue{cms at useibid}}
 
-\DeclareBibliographyOption[boolean]{dashed}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{dashed}[true]{%
   \settoggle{cms at namedash}{#1}}
 
 \DeclareBibliographyOption[boolean]{short}[true]{%
@@ -830,17 +970,23 @@
   \settoggle{cms at fullshhand}{#1}}
 
 \DeclareBibliographyOption[boolean]{inheritshorthand}[true]{%
-  \settoggle{cms at inheritshhand}{#1}%
-  \iftoggle{cms at inheritshhand}%
-  {\DeclareDataInheritance{*}{*}{%
-  \inherit{shorthand}{shorthand}
-  \inherit{shorthandintro}{shorthandintro}
-  }}%
-  {}}%
+  \settoggle{cms at inheritshhand}{#1}}%
 
 \DeclareBiblatexOption{global,entry}[boolean]{shorthandfirst}[true]{%
   \settoggle{cms at firstshort}{#1}}
 
+\DeclareBiblatexOption{global,type,entry}[string]{shorthandintro}[full]{%
+  \ifcsdef{cms at opt@shhintro@#1}%
+  {\csuse{cms at opt@shhintro@#1}}%
+  {\blx at err@invopt{shorthandintro=#1}{}}}
+\def\cms at opt@shhintro at full{%
+  \togglefalse{cms at noshintro}%
+  \togglefalse{cms at shandonly}}%
+\def\cms at opt@shhintro at short{%
+  \toggletrue{cms at shandonly}}%
+\def\cms at opt@shhintro at none{%
+  \toggletrue{cms at noshintro}}%
+
 \DeclareBibliographyOption[boolean]{compresspages}[true]{%
   \global\settoggle{cms at comprange}{#1}}%
 
@@ -847,13 +993,8 @@
 \DeclareBibliographyOption[boolean]{compressyears}[true]{%
   \global\settoggle{cms at compyears}{#1}}%
 
-\DeclareBibliographyOption[string]{postnotepunct}[true]{%
-  \ifcsdef{cms at opt@ppunct@#1}%
-  {\csuse{cms at opt@ppunct@#1}}%
-  {\blx at err@invopt{postnotepunct=#1}{}}}%
-\def\cms at opt@ppunct at true{%
-  \global\toggletrue{cms at modpostnote}}%
-\def\cms at opt@ppunct at false{}%
+\DeclareBibliographyOption[boolean]{postnotepunct}[true]{%
+  \global\settoggle{cms at modpostnote}{#1}}%
 
 \DeclareBiblatexOption{global,entry}[boolean]{usecompiler}[true]{%
   \settoggle{blx at usenamec}{#1}}
@@ -1007,6 +1148,52 @@
   \settoggle{cms at bookseries}{#1}%
   \settoggle{cms at notefield}{#1}}%
 
+\DeclareBibliographyOption[string]{nameaddon}[all]{%
+  \ifcsdef{cms at gopt@na@#1}%
+  {\csuse{cms at gopt@na@#1}}%
+  {\csuse{cms at gopt@na at all}\cms at warning@noline%
+    {'nameaddon=#1' is not a valid global\MessageBreak
+      option. The default - 'all' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms at gopt@na at all{}%
+\def\cms at gopt@na at none{%
+  \settoggle{cms at bibnona}{true}%
+  \settoggle{cms at citenona}{true}}%
+\def\cms at gopt@na at cite{\settoggle{cms at bibnona}{true}}%
+\def\cms at gopt@na at bib{\settoggle{cms at citenona}{true}}%
+\def\cms at gopt@na at first{\settoggle{cms at subseqnona}{true}}%
+\def\cms at gopt@na at citefirst{%
+  \settoggle{cms at bibnona}{true}%
+  \settoggle{cms at subseqnona}{true}}%
+\def\cms at gopt@na at bibfirst{%
+  \settoggle{cms at citenona}{true}%
+  \settoggle{cms at subseqnona}{true}}%
+
+\DeclareTypeOption[string]{nameaddon}[all]{%
+  \ifcsdef{cms at opt@na@#1}%
+  {\csuse{cms at opt@na@#1}}%
+  {\csuse{cms at opt@na at all}\cms at warning@noline%
+    {'nameaddon=#1' is not a valid type\MessageBreak
+      option. The default - 'all' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+\def\cms at opt@na at all{}%
+\def\cms at opt@na at none{%
+  \settoggle{cms at bibnona}{true}%
+  \settoggle{cms at citenona}{true}}%
+\def\cms at opt@na at cite{\settoggle{cms at bibnona}{true}}%
+\def\cms at opt@na at bib{\settoggle{cms at citenona}{true}}%
+
+\DeclareEntryOption[string]{nameaddon}[all]{%
+  \ifcsdef{cms at opt@na@#1}%
+  {\csuse{cms at opt@na@#1}}%
+  {\csuse{cms at opt@na at all}\cms at warning@noline%
+    {'nameaddon=#1' is not a valid entry\MessageBreak
+      option. The default - 'all' - has been set.\MessageBreak
+      Please see biblatex-chicago.pdf for valid\MessageBreak
+      option keys}}}%
+
 \DeclareBiblatexOption{global,type,entry}[string]{related}[bib]{%
   \ifcsdef{cms at opt@rel@#1}%
   {\csuse{cms at opt@rel@#1}}%
@@ -1057,6 +1244,32 @@
 \def\cms at opt@shxp at period{%
   \def\shortextrapunct{\addperiod\addspace}}%
 
+% Controlling formatting of, and punctuation before, nameaddon fields %
+
+\DeclareBiblatexOption{global,type,entry}[string]{nameaddonformat}{%
+  \def\cms at naformat{#1}}
+
+\DeclareBiblatexOption{global,type,entry}[string]{nameaddonsep}[space]{%
+  \ifcsdef{cms at opt@nasep@#1}%
+    {\csuse{cms at opt@nasep@#1}}%
+    {\csuse{cms at opt@nasep at space}\cms at warning@noline%
+      {'nameaddonsep=#1' is not a valid option.\MessageBreak
+        The default - 'space' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms at opt@nasep at none{%
+  \let\nameaddonpunct\@empty}%
+\def\cms at opt@nasep at comma{%
+  \def\nameaddonpunct{\addcomma\addspace}}%
+\def\cms at opt@nasep at colon{%
+  \def\nameaddonpunct{\addcolon\addspace}}%
+\def\cms at opt@nasep at space{%
+  \def\nameaddonpunct{\addspace}}%
+\def\cms at opt@nasep at semicolon{%
+  \def\nameaddonpunct{\addsemicolon\addspace}}%
+\def\cms at opt@nasep at period{%
+  \def\nameaddonpunct{\addperiod\addspace}}%
+
 % Controlling punctuation before titleaddon fields %
 
 \DeclareBiblatexOption{global,type,entry}[string]{ptitleaddon}[period]{%
@@ -1078,7 +1291,7 @@
 \def\cms at opt@ptao at semicolon{%
   \def\ptitleaddonpunct{\addsemicolon\addspace}}%
 \def\cms at opt@ptao at period{%
-  \def\ptitleaddonpunct{\addperiod\addspace}}%
+  \def\ptitleaddonpunct{\newunitpunct}}%
 
 \DeclareBiblatexOption{global,type,entry}[string]{ctitleaddon}[comma]{%
   \ifcsdef{cms at opt@ctao@#1}%
@@ -1099,7 +1312,7 @@
 \def\cms at opt@ctao at semicolon{%
   \def\ctitleaddonpunct{\addsemicolon\addspace}}%
 \def\cms at opt@ctao at period{%
-  \def\ctitleaddonpunct{\addperiod\addspace}}%
+  \def\ctitleaddonpunct{\newunitpunct}}%
 
 % Controlling punctuation before shorthand in notes %
 
@@ -1130,10 +1343,14 @@
 
 \ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
   related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes,%
-  legalnotes,supranotes,shortextrapunct,dashed}
+  legalnotes,supranotes,shortextrapunct,dashed,bibannotesep,citeannotesep,%
+  nameaddonsep=space}
 
 \ExecuteBibliographyOptions[standard]{useeditor=false,usenamec=false}%
 
+\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{%
+  shorthandintro=full}%
+
 \iftoggle{cms at legalnotes}%
 {\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
 {}%
@@ -1147,26 +1364,9 @@
 
 \DeclareBibliographyOption{cmsdate}{}%
 
-\DeclareBibliographyOption[boolean]{strict}[true]{%
-  \settoggle{cms at strict}{#1}%
-  \iftoggle{cms at strict}%
-  {\let\splitfootnoterule\footnoterule
-    \renewcommand\footnoterule{}%
-    \advance\skip\footins 4\p@\@plus2\p@\relax
-    \gdef\split at prev{0}
-    \let\pagefootnoterule\footnoterule
-    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
-    \def\footnoterule{\relax
-      \ifnum\split at prev=\z@
-      \pagefootnoterule
-      \else
-      \splitfootnoterule
-      \fi
-      \xdef\split at prev{\the\insertpenalties}%
-    }}%
-  {}}
+\DeclareBiblatexOption{global}[boolean]{strict}[true]{%
+  \settoggle{cms at strict}{#1}}%
 
-
 \protected\def\blx at newcunit{%
   \iftoggle{blx at keepunit}%
   {}%
@@ -1266,7 +1466,11 @@
        {\usebibmacro{cite:shorthand}%
          \usebibmacro{cite:save}%
          \global\toggletrue{cms at noidem}}%
-       {\iftoggle{cms at allshort}%
+       {\ifboolexpr{%
+           togl {cms at allshort}%
+           and
+           not togl {cms at noneshort}%
+         }%
          {\global\toggletrue{cms at shortnote}%
            \global\togglefalse{cms at fullnote}%
            \global\toggletrue{cms at printshhand}%
@@ -1537,6 +1741,8 @@
     togl {cms at supranotes}%
     and
     test {\iffootnote}%
+    and
+    test {\ifciteseen}%
   }%
   {\newcunit%
     \printtext{\bibstring{supranote}\addnbspace%
@@ -1563,6 +1769,14 @@
         and
         not test {\iffieldint{volume}}%
         )
+        or
+        (
+        test {\iffieldundef{volume}}% Bug fix; correct?
+        and
+        test {\iffieldundef{series}}%
+        and
+        not test {\iffieldundef{titleaddon}}%
+        )
       }%
       {\ifboolexpr{%
           test {\iffieldundef{entrysubtype}}%
@@ -1601,6 +1815,8 @@
     and
     test {\iffootnote}%
     and
+    test {\ifciteseen}%
+    and
     (
     test {\iffieldequalstr{entrysubtype}{un}}%
     or
@@ -1809,6 +2025,8 @@
     and
     togl {cms at supranotes}%
     and
+    test {\ifciteseen}%
+    and
     (
     test {\ifentrytype{legal}}%
     or
@@ -1824,23 +2042,33 @@
   {\newcunit%
     \printtext{\bibstring{supranote}\addnbspace%
       \ref{cbx@\csuse{cbx at f@\thefield{entrykey}}}%
-      \newcunit}}% ??
-  {}}%
+      \iffieldundef{postnote}{}{\printunit{\addcomma\addspace}}}}% ??
+  {}}% The printunit is for when a shorthand is also an ibidem.
 
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
-  \iffieldundef{shorthand}%
+  \ifboolexpr{%
+    test {\iffieldundef{shorthand}}%
+    or
+    togl {cms at noshintro}% option shorthandintro=none
+    or
+    togl {cms at noneshort}% mainly for Bluebook
+  }%
   {}%
-  {\iffieldundef{shorthandintro}%
+  {\iftoggle{cms at shandonly}% option shorthandintro=short
     {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
         \ifentrytype{legislation}}%
-      {\printtext[brackets]{%
-        \bibstring{hereinafter}\addspace%
-        \printfield{shorthand}}}%
-      {\printtext[parens]{%
-        \bibstring{citedas}\addspace%
-        \printfield{shorthand}}}}%
-    {%\addspace%\setunit{\addspace}% Ditto
-      \printfield{shorthandintro}}}}
+      {\printtext[brackets]{\printfield{shorthand}}}%
+      {\printtext[parens]{\printfield{shorthand}}}}%
+    {\iffieldundef{shorthandintro}%
+      {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+          \ifentrytype{legislation}}%
+        {\printtext[brackets]{%
+            \bibstring{hereinafter}\addspace%
+            \printfield{shorthand}}}%
+        {\printtext[parens]{%
+            \bibstring{citedas}\addspace%
+            \printfield{shorthand}}}}%
+      {\printfield{shorthandintro}}}}}
 
 \newbibmacro*{cite:ibid}{%
   \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
@@ -1988,7 +2216,7 @@
       \ifthenelse{\iffieldundef{pagination}\AND%
         \iffieldundef{bookpagination}}%
       {\setunit{\postvolpunct}}%
-      {\setunit{\addcolon\addspace}}}}}}%
+      {\setunit{\journalpagespunct}}}}}}%
 
 %% Macros from verbose.cbx %%
 
@@ -2166,21 +2394,18 @@
     \ifhyperref%
     {\hypertarget{cite.\the\c at refsection @\abx at field@entrykey}{}}%
     {}%
-    \nopunct%
-    \ifboolexpr{%
-      togl {cms at otherlang}%
-      and
-      not test {\iffieldundef{langid}}%
-    }%
-    {\addspace}{\unspace}}%\unspace Put \nopunct and \unspace here for 0.8e.
+    \nopunct% Remove otherlang test for 3.16
+  }%\unspace Put \nopunct and \unspace here for 0.8e.
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}\clearfield{shorthand}%
       \usebibmacro{cms:titlehook}%
+      \global\toggletrue{cms at reprintfrom}%
       \toggletrue{cms at fullnote}\toggletrue{cms at headlessnote}%
       \toggletrue{cms at origpublished}\frenchspacing}%
     {cite:\thefield{entrytype}}%
-    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}%
+    \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}%
+    \global\togglefalse{cms at reprintfrom}}%
   {\multicitedelim}%
   {\finentry}
 
@@ -2258,8 +2483,80 @@
 
 \DeclareMultiCiteCommand{\surnamecites}{surnamecite}{\multicitedelim}
 
+\DeclareCitePunctuationPosition{\citeincitef}{d}
+
+\DeclareCitePunctuationPosition{\citeincitefs}{d}
+
+\DeclareMultiCiteCommand{\citeincites}[\cmswrap]%
+{citeincite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\citeincitefs}[\cmswrapf]%
+{citeincitef}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\fullciteincites}[\cmsfwrap]%
+{fullciteincite}{\multicitedelim}
+
+\DeclareCiteCommand{\citeincite}[\cmswrap]
+{\usebibmacro{backref+check}%
+  \usebibmacro{prenote}}%
+{\toggletrue{cms at shortnote}%
+  \togglefalse{cms at fullnote}%
+  \toggletrue{cms at noidem}%
+  \usebibmacro{citeindex}%
+  \usebibmacro{cite:short}{\thefield{entrytype}}%
+  \usebibmacro{cite:save}}
+{\multicitedelim}
+{\usebibmacro{postnote}}%
+
+\DeclareCiteCommand{\citeincitef}[\cmswrapf]
+{\usebibmacro{backref+check}%
+  \usebibmacro{prenote}}%
+{\toggletrue{cms at shortnote}%
+  \togglefalse{cms at fullnote}%
+  \toggletrue{cms at noidem}%
+  \usebibmacro{citeindex}%
+  \usebibmacro{cite:short}{\thefield{entrytype}}%
+  \usebibmacro{cite:save}}
+{\multicitedelim}
+{\usebibmacro{postnote}}%
+
+\DeclareCiteCommand{\fullciteincite}[\cmsfwrap]
+{\usebibmacro{backref+check}%
+  \usebibmacro{prenote}}%
+{\usebibmacro{citeindex}%
+  \toggletrue{cms at fullnote}%
+  \togglefalse{cms at shortnote}%
+  \usebibmacro{footcite:save}%
+  \usebibmacro{cite:full}%
+  \usebibmacro{cite:save}}
+{\multicitedelim}
+{}
+
+\def\cmsfwrap#1{\clearfield{prenote}#1}%
+
+\def\cmswrap#1{%
+  \gundef{\cms at pncic}%
+  \savefield{postnote}{\cms at pncic}%
+  \clearfield{postnote}\clearfield{prenote}%
+  \begingroup#1\endgroup%
+  \ifdef{\blx at thepostpunct}%
+  {\ifdefvoid{\abx at field@postpunct}%
+    {\blx at dopostpunct}{}}%
+  {}%
+  \global\let\abx at field@postnote\cms at pncic%
+  \global\let\abx at field@postpunct\@empty}%
+
+\def\cmswrapf#1{%
+  \gundef{\cms at pncic}%
+  \savefield{postnote}{\cms at pncic}%
+  \clearfield{postnote}\clearfield{prenote}%
+  \begingroup#1\ifdef{\blx at thepostpunct}{\cms at cicpunct}{}\endgroup
+  \global\let\abx at field@postnote\cms at pncic}%
+
+\def\cms at cicpunct{}% Only needed in US; redefine in lbx
+
 \DeclareCiteCommand{\shortcite}
-  {\usebibmacro{prenote}}
+  {\usebibmacro{prenote}}%
   {\toggletrue{cms at shortnote}%
     \togglefalse{cms at fullnote}%
     \usebibmacro{citeindex}%
@@ -2266,7 +2563,7 @@
     \usebibmacro{cite:short}{\thefield{entrytype}}%
     \usebibmacro{cite:save}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}}%
 
 \DeclareCiteCommand*{\shortcite}
   {\boolfalse{citetracker}%
@@ -2576,6 +2873,7 @@
 \DeclareBibliographyDriver{cite:article}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{cmag+news+author}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{cmag+news+title}%
@@ -2620,6 +2918,7 @@
     {}%
   \usebibmacro{finentry}}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{cmag+news+title}%
@@ -2668,6 +2967,7 @@
 
 \DeclareBibliographyDriver{cite:artwork}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -2720,6 +3020,7 @@
 
 \DeclareBibliographyDriver{cite:audio}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
@@ -2757,12 +3058,12 @@
       \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[mtnoformat]{maintitle}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[smtnoformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}
       \printfield{maintitleaddon}}}
   \newcunit
@@ -2804,6 +3105,7 @@
 
 \DeclareBibliographyDriver{cite:book}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -2938,6 +3240,7 @@
 
 \DeclareBibliographyDriver{cite:bookinbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -3091,6 +3394,7 @@
 
 \DeclareBibliographyDriver{cite:booklet}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -3124,6 +3428,7 @@
 
 \DeclareBibliographyDriver{cite:collection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -3237,9 +3542,14 @@
 
 \DeclareBibliographyDriver{cite:customc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{justauthor}%
-  \iffieldundef{nameaddon}%
-  {\newcunit}
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at citenona}%
+  }%
+  {\newcunit}%
   {\setunit{\addspace}}%
   \usebibmacro{italtitle+stitle}%
   \usebibmacro{finentry}}
@@ -3246,6 +3556,7 @@
 
 \DeclareBibliographyDriver{cite:dataset}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \iftoggle{cms at headlessnote}{}{\setunit{\addspace}\newblock}%
   \printtext[parens]{%
@@ -3319,6 +3630,7 @@
 
 \DeclareBibliographyDriver{cite:image}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -3371,6 +3683,7 @@
 
 \DeclareBibliographyDriver{cite:inbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
@@ -3511,6 +3824,7 @@
 
 \DeclareBibliographyDriver{cite:incollection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock%
   \usebibmacro{ctitle+stitle}%
@@ -3651,6 +3965,7 @@
 
 \DeclareBibliographyDriver{cite:inproceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{ctitle+stitle}%
@@ -3696,6 +4011,14 @@
       \usebibmacro{cser+num}%
       \newcunit\newblock
       \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \printfield{eventtitle}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{eventtitleaddon}%
+      \newcunit%
+      \printfield{venue}%
+      \newcunit\newblock
+      \printeventdate%
       \setunit{\addspace}\newblock%
       \printtext[parens]{%
         \usebibmacro{org+publ+loc+year}}%
@@ -3787,6 +4110,7 @@
 
 \DeclareBibliographyDriver{cite:inreference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldundef{clonesourcekey}{}{\newcunit}%
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
@@ -3847,6 +4171,7 @@
 \DeclareBibliographyDriver{cite:jurisdiction}{%
   \iffieldequalstr{entrysubtype}{square}% FIXME?
   {\usebibmacro{bibindex}%
+    \usebibmacro{begentry}%
     \usebibmacro{clegis+news+title}%
     \setunit{\addspace}%
     \usebibmacro{language+transtitle}%
@@ -3908,6 +4233,7 @@
     \usebibmacro{finentry}}
   {\iffieldequalstr{entrysubtype}{round}% FIXME?
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -3968,6 +4294,7 @@
       {}%
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{clegis+news+title}%
       \setunit{\addspace}%
       \usebibmacro{language+transtitle}%
@@ -4038,6 +4365,7 @@
 
 \DeclareBibliographyDriver{cite:legal}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{clegis+news+title}%
@@ -4107,6 +4435,7 @@
 \DeclareBibliographyDriver{cite:legislation}{%
   \iffieldequalstr{entrysubtype}{uk}% FIXME?
   {\usebibmacro{bibindex}%
+    \usebibmacro{begentry}%
     \usebibmacro{author/editor}%
     \usebibmacro{hlpunct}%\newcunit\newblock
     \usebibmacro{clegis+news+title}%
@@ -4174,6 +4503,7 @@
     \usebibmacro{finentry}}
   {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{author/editor}%
       \usebibmacro{hlpunct}%\newcunit\newblock
       \usebibmacro{clegis+news+title}%
@@ -4234,6 +4564,7 @@
       {}%
       \usebibmacro{finentry}}
     {\usebibmacro{bibindex}%
+      \usebibmacro{begentry}%
       \usebibmacro{author/editor}%
       \usebibmacro{hlpunct}%\newcunit\newblock
       \usebibmacro{clegis+news+title}%
@@ -4310,6 +4641,7 @@
 
 \DeclareBibliographyDriver{cite:letter}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \savefield{fullhash}{\bbx at lasthash}%
   \printtext[title]{%
     \printfield[noformat]{title}}%
@@ -4452,6 +4784,7 @@
 
 \DeclareBibliographyDriver{cite:manual}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author+org}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -4495,6 +4828,7 @@
 
 \DeclareBibliographyDriver{cite:misc}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \iffieldundef{entrysubtype}%
@@ -4556,6 +4890,7 @@
 
 \DeclareBibliographyDriver{cite:music}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -4598,12 +4933,12 @@
       \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[mtnoformat]{maintitle}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[smtnoformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit
@@ -4657,6 +4992,7 @@
 
 \DeclareBibliographyDriver{cite:mvbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -4797,6 +5133,7 @@
 
 \DeclareBibliographyDriver{cite:mvcollection}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -4931,6 +5268,7 @@
 
 \DeclareBibliographyDriver{cite:mvproceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -4976,6 +5314,14 @@
     {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
       \newcunit\newblock
       \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \printfield{eventtitle}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{eventtitleaddon}%
+      \newcunit%
+      \printfield{venue}%
+      \newcunit\newblock
+      \printeventdate%
       \setunit{\addspace}\newblock%
       \printtext[parens]{%
         \usebibmacro{org+publ+loc+year}}%
@@ -5062,6 +5408,7 @@
 
 \DeclareBibliographyDriver{cite:mvreference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
   \iffieldundef{edition}%
@@ -5128,6 +5475,7 @@
 
 \DeclareBibliographyDriver{cite:online}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \IfBeginWith{\thefield{title}}{CCCCCC}%
@@ -5204,6 +5552,7 @@
 
 \DeclareBibliographyDriver{cite:patent}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author+holder}% +holder?
   \usebibmacro{hlpunct}%\newcunit\newblock
   \iffieldundef{title}%
@@ -5264,6 +5613,7 @@
 
 \DeclareBibliographyDriver{cite:performance}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
@@ -5313,6 +5663,7 @@
 \DeclareBibliographyDriver{cite:periodical}{%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{issuetitle}%
@@ -5349,6 +5700,7 @@
   {}%
   \usebibmacro{finentry}}%
   {\usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{issuetitle}%
@@ -5391,6 +5743,7 @@
 
 \DeclareBibliographyDriver{cite:proceedings}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -5422,6 +5775,14 @@
       \usebibmacro{cser+num}%
       \newcunit\newblock
       \usebibmacro{cnotefield}%
+      \newcunit\newblock
+      \printfield{eventtitle}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{eventtitleaddon}%
+      \newcunit%
+      \printfield{venue}%
+      \newcunit\newblock
+      \printeventdate%
       \setunit{\addspace}\newblock%
       \printtext[parens]{%
         \usebibmacro{org+publ+loc+year}}%
@@ -5501,6 +5862,7 @@
 
 \DeclareBibliographyDriver{cite:reference}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldundef{clonesourcekey}{}{\newcunit}%
   \usebibmacro{citaltitle+stitle}%
   \newcunit\newblock
@@ -5553,6 +5915,7 @@
 
 \DeclareBibliographyDriver{cite:report}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \iffieldequalstr{entrysubtype}{unpublished}%
@@ -5600,6 +5963,7 @@
 
 \DeclareBibliographyDriver{cite:review}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldequalstr{entrysubtype}{magazine}%
   {\usebibmacro{cmag+news+author}}%
   {\usebibmacro{author/editor}}%
@@ -5707,12 +6071,14 @@
 
 \DeclareBibliographyDriver{cite:standard}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \iffieldundef{entrysubtype}%
   {}%
   {\ifnameundef{author}%
     {\iflistundef{organization}%
       {}%
-      {\printlist{organization}}}%
+      {\printlist{organization}%
+        \usebibmacro{print+nameaddon}}}%
     {\usebibmacro{justauthor}}%
     \usebibmacro{hlpunct}}%\setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
@@ -5782,6 +6148,7 @@
 
 \DeclareBibliographyDriver{cite:suppbook}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author}%
   \usebibmacro{hlpunct}%\newcunit\newblock
   \usebibmacro{inforaft}%
@@ -5845,6 +6212,7 @@
 
 \DeclareBibliographyDriver{cite:thesis}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{ctitle+stitle}%
@@ -5880,6 +6248,7 @@
 
 \DeclareBibliographyDriver{cite:unpublished}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \usebibmacro{author/editor}%
   \usebibmacro{hlpunct}%\setunit{\addcomma\addspace}\newblock
   \usebibmacro{ctitle+stitle}%
@@ -5929,6 +6298,7 @@
 
 \DeclareBibliographyDriver{cite:video}{%
   \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
   \ifboolexpr{%
     test {\iffieldequalstr{entrysubtype}{tvepisode}}%
     and
@@ -5984,12 +6354,12 @@
       \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[mtnoformat]{maintitle}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[smtnoformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
   \newcunit
@@ -6158,29 +6528,29 @@
 %% comprange code moved to .sty
 
 \DeclareFieldFormat{postnote}{% Changed for page compression option
-  \ifboolexpr{%
-    togl {cms at comprange}%
-    and
-    test {\ifpages{#1}}%
-  }%
+  \ifpages{#1}% xetex and luatex revealed a bug in original logic
+  {\iftoggle{cms at comprange}%
+    {{\iffieldundef{pagination}%
+        {\mkcomprange{#1}}%
+        {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}}%
+    {{\iffieldundef{pagination}%
+        {\mknormrange{#1}}%
+        {\mknormrange[{\mkpageprefix[pagination]}]{#1}}}}}%
   {\iffieldundef{pagination}%
-    {\mkcomprange{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
     {#1}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat[inreference]{postnote}{%
-  \ifboolexpr{%
-    togl {cms at comprange}%
-    and
-    test {\ifpages{#1}}%
-  }%
+  \ifpages{#1}%
+  {\iftoggle{cms at comprange}%
+    {\iffieldundef{pagination}%
+      {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+      {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+    {\iffieldundef{pagination}%
+      {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
+      {\mknormrange[{\mkpageprefix[pagination]}]{#1}}}}%
   {\iffieldundef{pagination}%
-    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
-    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
-  {\iffieldundef{pagination}%
-    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
+    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \newrobustcmd*{\mkjuridprefix}[1]{%
@@ -6251,7 +6621,21 @@
   \mkbibemph{#1}\isdot}
 
 \DeclareFieldFormat[customc]{title}{%
-  \iffieldundef{nameaddon}%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    (
+    test {\ifbibliography}%
+    and
+    togl {cms at bibnona}%
+    )
+    or
+    (
+    test {\ifcitation}%
+    and
+    togl {cms at citenona}%
+    )
+  }%
   {\mkbibemph{\bibstring{see}}%
     \addspace%
     #1}%
@@ -6258,13 +6642,26 @@
   {#1}}
 
 \DeclareFieldFormat[customc]{citetitle}{%
-  \iffieldundef{nameaddon}%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at citenona}%
+  }%
   {\mkbibemph{\bibstring{see}}%
     \addspace%
     #1}%
   {\printfield{nameaddon}\addspace #1}}
 
-\DeclareFieldAlias[customc]{lostitle}[customc]{title}
+\DeclareFieldFormat[customc]{lostitle}{%
+  \ifboolexpr{%
+    test {\iffieldundef{nameaddon}}%
+    or
+    togl {cms at bibnona}%
+  }%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {\addspace #1}}
 
 \DeclareFieldFormat[misc]{title}{%
   \iffieldundef{entrysubtype}%
@@ -6288,6 +6685,7 @@
   \mkbibparens{\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
 \DeclareFieldFormat[dataset]{lostitle}{%
+  \addspace% Instead of in shorthand driver (2.1)
   \mkbibparens{\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
 \DeclareFieldFormat[review,suppperiodical]{title}{%
@@ -6387,8 +6785,11 @@
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
 
 \DeclareFieldFormat{note}{%
-  \ifcapital{\MakeCapital{#1}}{#1}}%
+  \if at cms@capital{#1}{\MakeCapital{#1}}{#1}}%
 
+\DeclareFieldFormat{capital}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}
+
 \DeclareFieldFormat
 [audio,manual,music,patent,report,suppbook,suppcollection,thesis,video]
 {type}{%
@@ -6502,14 +6903,34 @@
 
 \DeclareFieldAlias{userd}{titleaddon}% 16th ed.
 
-\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+\DeclareFieldFormat{nameaddon}{%
+  \ifdefvoid{\cms at naformat}%
+  {\mkbibbrackets{#1\bibsentence}}%
+  {\printtext[\cms at naformat]{#1\isdot}}}%
 
-\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{#1\bibsentence}
+\DeclareFieldFormat[online,review,suppperiodical]{nameaddon}{%
+  \ifdefvoid{\cms at naformat}%
+  {#1\ifboolexpr{%(
+      test {\IfEndWith{\thefield{nameaddon}}{)}}%[
+      or
+      test {\IfEndWith{\thefield{nameaddon}}{]}}%
+    }%
+    {\bibsentence}{\isdot}}%
+  {\printtext[\cms at naformat]{#1\isdot}}}
 
 \DeclareFieldFormat[misc]{nameaddon}{%
   \iffieldundef{entrysubtype}%
-  {\mkbibbrackets{#1\bibsentence}}%
-  {#1\bibsentence}}
+  {\ifdefvoid{\cms at naformat}%
+    {\mkbibbrackets{#1\bibsentence}}%
+    {\printtext[\cms at naformat]{#1\isdot}}}%
+  {\ifdefvoid{\cms at naformat}%
+    {#1\ifboolexpr{%(
+        test {\IfEndWith{\thefield{nameaddon}}{)}}%[
+        or
+        test {\IfEndWith{\thefield{nameaddon}}{]}}%
+      }%
+      {\bibsentence}{\isdot}}%
+    {\printtext[\cms at naformat]{#1\isdot}}}}
 
 \DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
   \ifbibstring{#1}%
@@ -6544,7 +6965,7 @@
 \DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
 
 \DeclareFieldFormat{titleaddon}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%
+  \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}%
 
 \DeclareFieldAlias{booktitleaddon}{titleaddon}
 
@@ -6559,10 +6980,14 @@
 
 \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}\isdot}
 
+\DeclareFieldFormat{injournaltitle}{\mkbibemph{#1}\isdot}
+
 \DeclareFieldFormat{issuetitle}{\mkbibquote{#1\isdot}}
 
 \DeclareFieldFormat{shortjournal}{\mkbibemph{#1}\isdot}
 
+\DeclareFieldFormat{inshortjournal}{\mkbibemph{#1}\isdot}
+
 \DeclareFieldFormat[periodical]{shorttitle}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldFormat{jourser}{%
@@ -6608,6 +7033,8 @@
 
 \DeclareFieldFormat{jourvol}{#1}
 
+\DeclareFieldFormat{shortvol}{#1}
+
 \DeclareFieldFormat{sernum}{%
   \ifnumeral{#1}%
   {\addnbspace #1}%
@@ -6618,16 +7045,39 @@
 \DeclareFieldFormat{shortseries}{#1\isdot}
 
 \DeclareFieldFormat{addendum}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+  \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}
 
 \DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
   \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
 
-% This works better here than in the entrytail macro -- userf use is
-% no longer a problem, though the page breaking still isn't ideal.
+% There was unfortunate interaction between the case-changing code and
+% cite commands when the latter were at the beginning of the
+% field. This modified \ifcapital will be used in the fields in which
+% the \citeincite(s) commands can appear.
 
-\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+\newrobustcmd*{\if at cms@capital}[1]{%
+  \noexpandarg
+  \StrChar{#1}{1}[\cms at char]%
+  \ifboolexpr{%
+    test {\ifcapital}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincite}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincitef}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincites}}%
+    and
+    not test {\ifdefstring{\cms at char}{\citeincitefs}}%
+  }%
+  {\@firstoftwo}%
+  {\@secondoftwo}%
+}
 
+% For annotation fixes move all code for separators to the entrytail
+% macro, below.
+
+\DeclareFieldFormat{annotation}{#1}%
+
 \DeclareFieldFormat{part}{% xref revision ???
   \ifnumerals{#1}%
   {\addcomma\addspace\bibstring{partvolume}~#1}%
@@ -6723,10 +7173,14 @@
       not togl {blx at skipbib}%
     }%
     {\printtext[bibhyperref]{#1}}%
-    {#1}}%
+    {\ifentryinbib{\thefield{clonesourcekey}}%
+      {\printtext{\bibhyperref[\abx at field@clonesourcekey]{#1}}}%
+      {#1}}}%
   {\iftoggle{cms at allshort}%
     {\iftoggle{blx at skipbib}{#1}{\printtext[bibhyperref]{#1}}}%
-    {\printtext[bibhyperlink]{#1}}}}%
+    {\iffieldundef{clonesourcekey}%
+      {\printtext[bibhyperlink]{#1}}%
+      {\printtext{\bibhyperlink{\abx at field@clonesourcekey}{#1}}}}}}%
 
 \newrobustcmd*{\cmsshhyper}[1]{%
   \iffootnote%
@@ -6765,7 +7219,7 @@
     {#1}}%
   \ifentrytype{jurisdiction}%
   {\newcunit}%
-  {\printunit{\relatedpunct}}}% Issue w/ printunit. Our bug?
+  {\iftoggle{smartof}{}{\printunit{\relatedpunct}}}}% Issue w/ printunit.
 
 \DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
   \ifboolexpr{%
@@ -6776,8 +7230,7 @@
   {#1}%
   {\ifcapital%
     {\MakeCapital{#1}}%
-    {#1}}%
-  \addspace}%
+    {#1}}}%
 
 %%%% Commands, for users and internal %%%%
 
@@ -6815,7 +7268,7 @@
 \newcommand*{\reprintpunct}{%
   \iftoggle{cms at fullnote}%
   {\setunit*{\addsemicolon\addspace}}%
-  {\setunit*{\addperiod\addspace}}}
+  {\setunit*{\newunitpunct}}}
 
 \newcommand*{\encypunct}{% for named entries in an encyclopedia
   \iftoggle{cms at fullnote}%
@@ -6931,7 +7384,9 @@
     {\addcomma\addspace}%
     {\addcomma\addspace\bibstring{and}\addspace}}}%
 
-\renewcommand*{\postnotedelim}{%
+\newcommand*{\journalpagespunct}{\addcolon\space}% Make it configurable
+
+\renewcommand*{\postnotedelim}{% v 2.1: Made all punct use units
   \ifboolexpr{%
     test {\ifciteibid}%
     and
@@ -6943,14 +7398,14 @@
     test {\ifentrytype{legislation}}%
     )
   }%
-  {\addspace}%
+  {\setunit{\addspace}}%
   {\iftoggle{cms at shortnote}%
     {\iffieldequalstr{entrysubtype}{classical}%
       {\DeclareNumChars*{abcdeABCDE:}% Makes classical
         \iffieldpages{postnote}% test more accurate. See 17.253.
-        {\addspace}%
-        {\addcomma\addspace}\DeclareNumChars{.}}%
-      {\addcomma\addspace}}% 16th ed -- no more volumes test.
+        {\setunit{\addspace}}%
+        {\newcunit}\DeclareNumChars{.}}%
+      {\newcunit}}% 16th ed -- no more volumes test.
     {\iftoggle{cms at fullnote}%
       {\ifthenelse{\(\ifentrytype{article}\OR
           \ifentrytype{review}\OR
@@ -6957,26 +7412,45 @@
           \ifentrytype{periodical}\OR
           \ifentrytype{suppperiodical}\)\AND\NOT
           \iffieldequalstr{entrysubtype}{magazine}}%
-        {\addcolon\addspace}%
-        {\addcomma\addspace}}%
-      {\addcomma\addspace}}}}%
+        {\setunit{\journalpagespunct}}%
+        {\newcunit}}%
+      {\newcunit}}}}%
 
 \newcommand*{\postnotewrapper}{%
-  \iftoggle{cms at modpostnote}%
+  \iftoggle{cms at modpostnote}% Multiple bugs in v 2.0.
   {\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}}}%
+    {\togglefalse{blx at unit}%
+      \expandarg
+      \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+      \iffieldstart{postnote}{\ }%
+      {\setunit{\addcomma}}%
+      {\newcunit}}%
+    {\iffieldstart{postnote}{;}%
+      {\togglefalse{blx at unit}%
+        \expandarg
+        \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+        \iffieldstart{postnote}{\ }%
+        {\setunit{\addsemicolon}}%
+        {\setunit{\addsemicolon\addspace}}}%
+      {\iffieldstart{postnote}{:}%
+        {\togglefalse{blx at unit}%
+          \expandarg
+          \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+          \iffieldstart{postnote}{\ }%
+          {\setunit{\addcolon}}%
+          {\setunit{\addcolon\addspace}}}%
+        {\iffieldstart{postnote}{.}%
+          {\togglefalse{blx at unit}%
+            \expandarg
+            \StrGobbleLeft{\abx at field@postnote}{1}[\abx at field@postnote]%
+            \iffieldstart{postnote}{\ }%
+            {\setunit{\addperiod}}%
+            {\newunit}}%
+          {\postnotedelim}}}}}%
   {\postnotedelim}}%
 
 \newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from
@@ -7077,7 +7551,11 @@
 
 \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
   \togglefalse{cms at switchdates}%
-  \ifbibliography
+  \ifboolexpr{%
+    togl {cms at annotation}%
+    or
+    togl {cms at cbxannote}%
+  }%
     {\usebibmacro{entrytail}}%
     {}%
   \finentry}
@@ -7154,12 +7632,31 @@
   {}}%
 
 \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
-  \newunit\newblock
-  \iftoggle{cms at annotation}%
-    {\usebibmacro{annotation}%
-     \newunit\newblock}%
-    {}}%
+  \ifbibliography%
+  {\iftoggle{cms at annotation}%
+    {\togglefalse{blx at unit}%
+      \togglefalse{blx at keepunit}%
+      \setunit{\bibannotesep}%
+      \usebibmacro{annotation}%
+      \newunit\newblock}%
+    {\newunit}}%
+  {\iftoggle{cms at cbxannote}%
+    {\togglefalse{blx at unit}%
+      \togglefalse{blx at keepunit}%
+      \setunit{\citeannotesep}%
+      \usebibmacro{annotation}%
+      \newunit\newblock}%
+    {\newunit}}}%
 
+% From biblatex.def; biblatex 3.15 toggled blx at bibliography off here,
+% but we still need to be able to test it in Chicago, at least with
+% the current code, so redefine the macro.
+
+\renewbibmacro*{annotation}{%
+  \iffieldundef{annotation}%
+    {\printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}}%
+    {\printfield{annotation}}}
+
 \newbibmacro*{author+holder}{%
   \ifnameundef{author}%
     {}%
@@ -7182,7 +7679,7 @@
     {\bibstring{byauthor}\addspace%
      \printnames[byauthor]{author}}}}
 
-\newbibmacro*{byauthorpunct}{%
+\newbibmacro*{byauthorpunct}{% Obsolete?
   \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
   {\addperiod\addspace}%
   {\newcunit}}
@@ -7254,7 +7751,7 @@
       togl {cms at namedash}%
     }%
     {\printtext{\bibnamedash}}%
-    {\usebibmacro{journal+sub}%
+    {\usebibmacro{journal+sub}{}%
       \setunit*{\addspace}%
       \printlist[periodplace]{location}%
       \savefield{journaltitle}{\bbx at lasthash}}}%
@@ -7346,7 +7843,7 @@
     {\bibstring{by#2}}%
     {\ifbibxstring{by\thefield{#1type}}%
       {\bibstring{by\thefield{#1type}}}%
-      {\printtext[note]{\thefield{#1type}}}}}%
+      {\printtext[capital]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbytypestrg}[2]{%
   \iffieldundef{#1type}%
@@ -7353,7 +7850,7 @@
     {\bibstring{cby#2}}%
     {\ifbibxstring{cby\thefield{#1type}}%
       {\bibstring{cby\thefield{#1type}}}%
-      {\printtext[note]{\thefield{#1type}}}}}%
+      {\printtext[capital]{\thefield{#1type}}}}}%
 
 \newbibmacro*{cbyeditor}{%
   \ifnameundef{editor}%
@@ -7618,7 +8115,9 @@
         and
         not test {\IfBeginWith{\thefield{relatedtype}}{maintitl}}%
       }%
-      {\printfield{volume}%
+      {\DeclareFieldAlias{citetitle}{title:hook:alt}%
+        \DeclareFieldAlias{shorthand}{shorthand:hook}%
+        \printfield{volume}%
         \clearfield{volume}%
         \global\let\cbx at incollvol\undefined% Volume fix
         \printfield{part}%
@@ -7626,7 +8125,7 @@
         \global\let\cbx at incollpart\undefined% Volume fix
         \setunit{\addspace}%
         \bibstring{ofseries}%
-        \setunit{\addspace}}%
+        \iftoggle{smartof}{}{\setunit{\addspace}}}%
       {\bibstring{in}\setunit{\addspace}}}%
     {\iffieldundef{part}%
       {\ifcsdef{cbx at incollpart}%
@@ -7637,13 +8136,17 @@
         test {\IfBeginWith{\thefield{entrytype}}{mv}}%
         and
         not test {\IfBeginWith{\thefield{relatedtype}}{maintitl}}%
+        and
+        togl {cms at xrefpart}%
       }%
-      {\printfield[xrefpart]{part}%
+      {\DeclareFieldAlias{citetitle}{title:hook:alt}%
+        \DeclareFieldAlias{shorthand}{shorthand:hook}%
+        \printfield[xrefpart]{part}%
         \clearfield{part}%
         \global\let\cbx at incollpart\undefined% Volume fix
         \setunit{\addspace}%
         \bibstring{ofseries}%
-        \setunit{\addspace}}%
+        \iftoggle{smartof}{}{\setunit{\addspace}}}%
       {\bibstring{in}\setunit{\addspace}}}}%
   {\iffieldundef{part}%
     {\ifcsdef{cbx at incollpart}%
@@ -7652,7 +8155,9 @@
     {}%
     \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
       \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
-    {\printfield{volume}%
+    {\DeclareFieldAlias{citetitle}{title:hook:alt}%
+      \DeclareFieldAlias{shorthand}{shorthand:hook}%
+      \printfield{volume}%
       \clearfield{volume}%
       \global\let\cbx at incollvol\undefined% Volume fix
       \printfield{part}%
@@ -7660,7 +8165,7 @@
       \global\let\cbx at incollpart\undefined% Volume fix
       \setunit{\addspace}%
       \bibstring{ofseries}%
-      \setunit{\addspace}}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}}%
     {\bibstring{in}\setunit{\addspace}}}}%
 
 \newbibmacro*{chapincoll}{%
@@ -7691,7 +8196,13 @@
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
-    {\addspace\bibstring{of}\setunit{\addspace}}}}%
+    {\iftoggle{cms at reprintfrom}%
+      {\DeclareFieldAlias{btnoformat}{title:hook}}%
+      {\DeclareFieldAlias{btnoformat}{title:hook:alt}}%
+      \DeclareFieldAlias{sbtnoformat}{title}%
+      \DeclareFieldAlias{booktitle}{default}%
+      \addspace\bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}}}}%
 
 \newbibmacro*{chap+as+track}{%
   \iffieldundef{chapter}%
@@ -7705,7 +8216,7 @@
   {\printfield{chapter}\clearfield{chapter}%
     \iffieldundef{booktitle}%
     {}%
-    {\addspace\bibstring{on}\setunit{\addspace}}}}%
+    {\addspace\bibstring[\cms at ofwrap]{on}\setunit{\addspace}}}}%
 
 \newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
   \ifboolexpr{%
@@ -7878,8 +8389,10 @@
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\subtitlepunct}%
-      \printfield[sitnoformat]{issuesubtitle}}}}
+      \iftoggle{cms at reprintfrom}% Complications due to \smartof
+      {}%
+      {\setunit{\subtitlepunct}%
+        \printfield[sitnoformat]{issuesubtitle}}}}}
 
 \newbibmacro*{btitle+bstitle}{%
   \iffieldundef{booktitle}%
@@ -8079,7 +8592,7 @@
       {\bibstring{origedition}%
         \setunit{\addspace}%
         \printlist[edlang]{origlanguage}%
-        \addcolon%
+        \addcolon\addspace%
         \origfullcite{\thefield{userf}}%
         \usebibmacro{endrelated}%
         \newunit}%
@@ -8128,7 +8641,7 @@
     {\ifthenelse{\iffieldundef{pagination}\AND%
         \iffieldundef{bookpagination}\AND\iffieldundef{eid}}%
       {\setunit{\postvolpunct}}%
-      {\setunit{\addcolon\addspace}}}%
+      {\setunit{\journalpagespunct}}}%
     {\addcomma\addspace}}%
   {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed.
     {\newcunit%
@@ -8310,7 +8823,7 @@
     {\printorigdate}}}%
 
 \newbibmacro*{cjournal+ser+vol+num}{%
-  \usebibmacro{journal+sub}%
+  \usebibmacro{journal+sub}{in}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
@@ -8357,7 +8870,7 @@
   \setunit{\addcomma\addspace}% need * here?
   \printfield[journum]{number}}% Move eid field for 17th ed.
 
-\newbibmacro*{journal+sub}{%
+\newbibmacro*{journal+sub}[1]{%
   \iffieldundef{journaltitle}%
     {}%
     {\ifboolexpr{%
@@ -8375,9 +8888,9 @@
         togl {cms at bibjtabb}%
         ))
       }%
-      {\clearlist{location}\printtext[shortjournal]{%
+      {\clearlist{location}\printtext[#1shortjournal]{%
           \printfield[jtsnoformat]{shortjournal}}}%
-      {\printtext[journaltitle]{%
+      {\printtext[#1journaltitle]{%
           \printfield[jtnoformat]{journaltitle}%
           \setunit{\subtitlepunct}%
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
@@ -8467,7 +8980,7 @@
     \usebibmacro{cmsyear}}}
 
 \newbibmacro*{cmag+date+issue}{%
-  \usebibmacro{journal+sub}%
+  \usebibmacro{journal+sub}{in}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \newcunit\newblock
@@ -8485,7 +8998,7 @@
   \usebibmacro{date+issue}}
 
 \newbibmacro*{mag+date+issue}{%
-  \usebibmacro{journal+sub}%
+  \usebibmacro{journal+sub}{in}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \newunit\newblock
@@ -8540,6 +9053,8 @@
   \newcunit\newblock
   \usebibmacro{date+issue}}
 
+\def\cms at ofwrap#1{#1}
+
 \newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}%
   {}%
@@ -8557,12 +9072,12 @@
       \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
-      \printtext[maintitle]{%
-        \printfield[mtnoformat]{maintitle}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[smtnoformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
@@ -8587,12 +9102,12 @@
       \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}%
-      \bibstring{ofseries}%
-      \setunit{\addspace}%
-      \printtext[maintitle]{%
-        \printfield[mtnoformat]{maintitle}%
+      \bibstring[\cms at ofwrap]{ofseries}%
+      \iftoggle{smartof}{}{\setunit{\addspace}}%
+      \printtext[default]{%
+        \printfield[title:hook:alt]{maintitle}%
         \setunit{\subtitlepunct}%
-        \printfield[smtnoformat]{mainsubtitle}}%
+        \printfield[title]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
 
@@ -8747,7 +9262,7 @@
           {\iffieldundef{part}%
             {\ifthenelse{\iffieldnums{pages}\AND%
                 \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
-              {\newcunit\printfield[default]{volume}%
+              {\newcunit\printfield[shortvol]{volume}%
                 \postvolpunct%
                 \printfield{pages}}%
               {\newcunit\printfield{volume}%
@@ -8764,7 +9279,7 @@
       {\iffieldundef{part}%
         {\ifthenelse{\iffieldnums{postnote}\AND%
             \iffieldundef{pagination}\AND\iffieldnums{volume}}%
-          {\newcunit\printfield[default]{volume}%
+          {\newcunit\printfield[shortvol]{volume}%
             \postvolpunct%
             \usebibmacro{semel:postnote}}%
           {\newcunit\printfield{volume}%
@@ -8925,7 +9440,7 @@
   \iffieldundef{part}%
   {\ifthenelse{\iffieldnums{pages}\AND%
       \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
-    {\newcunit\printfield[default]{volume}%
+    {\newcunit\printfield[shortvol]{volume}%
       \postvolpunct%
       \printfield{pages}}%
     {\newcunit\printfield{volume}%
@@ -8940,7 +9455,7 @@
   \iffieldundef{part}%
   {\ifthenelse{\iffieldnums{postnote}\AND%
       \iffieldundef{pagination}\AND\iffieldnums{volume}}%
-    {\newcunit\printfield[default]{volume}%
+    {\newcunit\printfield[shortvol]{volume}%
       \postvolpunct%
       \usebibmacro{semel:postnote}}%
     {\newcunit\printfield{volume}%
@@ -9003,7 +9518,7 @@
 
 \newbibmacro*{hlpunct}{%
   \iftoggle{cms at headlessnote}%
-  {}%
+  {\iftoggle{cms at reprintfrom}{\setunit{\addspace}}{}}%
   {\newcunit\newblock}}
 
 \newbibmacro*{journalprenote}{%
@@ -9115,6 +9630,11 @@
 }
 
 \AtEndPreamble{%
+  \iftoggle{cms at inheritshhand}%
+  {\DeclareDataInheritance{*}{*}{%
+      \inherit{shorthand}{shorthand}
+      \inherit{shorthandintro}{shorthandintro}
+    }}{}%
   \iftoggle{cms at blogurl}% 17th ed. blogs w/ comments
   {\DeclareDataInheritance{article}{review,suppperiodical}{%
       \inherit{url}{url}%
@@ -9125,6 +9645,29 @@
     {\toggletrue{cms at endnote}\enoteformat}
     {}
     {\blx at err@patch{'endnotes' package}}}%
+  {}%
+  \iftoggle{cms at strict}%
+  {\let\splitfootnoterule\footnoterule
+    \renewcommand\footnoterule{}%
+    \advance\skip\footins 4\p@\@plus2\p@\relax
+    \gdef\split at prev{0}
+    \let\pagefootnoterule\footnoterule
+    % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+    \def\footnoterule{\relax
+      \ifnum\split at prev=\z@
+      \pagefootnoterule
+      \else
+      \splitfootnoterule
+      \fi
+      \xdef\split at prev{\the\insertpenalties}%
+    }}%
+  {}%
+  \ifboolexpr{% Needed for nameaddon 'first' option in notes
+    test {\ifdefvoid{\blx at idemtracker}}%
+    and
+    togl {cms at subseqnona}%
+  }%
+  {\let\blx at idemtracker\blx at idemtracker@context}%
   {}}%
 
 \DeclareDataInheritance{*}{*}{%
@@ -9276,7 +9819,7 @@
     {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}%
       {\bibstring{\thefield{editortype}s}}%
       {\bibstring{\thefield{editortype}}}}%
-    {\printtext[note]{\thefield{editortype}}}}%
+    {\printtext[capital]{\thefield{editortype}}}}%
   \clearname{editor}}%
 
 \newbibmacro*{parteditstrg}{%
@@ -9311,7 +9854,7 @@
     {\ifthenelse{\value{namea}>1\OR\ifandothers{namea}}%
       {\bibstring{\thefield{nameatype}s}}%
       {\bibstring{\thefield{nameatype}}}}%
-    {\printtext[note]{\thefield{nameatype}}}}%
+    {\printtext[capital]{\thefield{nameatype}}}}%
   \clearname{namea}}%
 
 \newbibmacro*{clearorigin}{%
@@ -9361,7 +9904,7 @@
     \clearfield{titleaddon}%
     \clearfield{usere}%
     \clearlist{language}%
-    \ifentrytype{music}%
+    \ifthenelse{\ifentrytype{music}\OR\ifentrytype{audio}}%
     {\clearfield{note}\clearfield{howpublished}\clearfield{eventyear}%
       \clearfield{eventmonth}}%
     {}}%
@@ -9396,6 +9939,11 @@
     {\newcunitpunct}%
     {\newunitpunct}}}
 
+\newcommand*{\relateddelimshort}{%
+  \ifnumequal{\value{bbx:relatedcount}}{\value{bbx:relatedtotal}}%
+    {\addsemicolon\addspace\bibstring{and}\space}%
+    {\addsemicolon\addspace}}%
+
 \newbibmacro*{related:reviewof}[1]{%
   \iftoggle{cms at shortnote}%
   {\entrydata*{#1}{%
@@ -9555,13 +10103,13 @@
     \usebibmacro{at+every+item}%
     \renewbibmacro*{name:hook}[1]{%
       \ifnumequal{\value{listcount}}{1}%
-        {\begingroup
-         \mkrelatedstring%
-         \lbx at initnamehook{#1}%
-         \endgroup}
-        {}}%
+      {\begingroup
+        \mkrelatedstringtext{%
+          \lbx at initnamehook{##1}}%
+        \endgroup}%
+      {}}%
     \printnames[bytranslator]{translator}%
-    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\addspace}%
+    \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\addspace}%
     \clearname{translator}%
     \usebibmacro{cite:origfull}}}%
 
@@ -9595,7 +10143,9 @@
     \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
       \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
     {\iffieldundef{volumes}{}{\savefield*{volumes}{\cms at mtvolumes}}%
-      \bibstring{in}\nopunct}%
+      \iftoggle{cms at reprintfrom}%
+      {}%
+      {\bibstring{in}\nopunct}}%
     {\ifcsdef{cms at mtvolumes}{\restorefield{savedvolumes}{\cms at mtvolumes}}{}%
       \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
       {\ifthenelse{\iffieldundef{volumes}\AND\iffieldundef{savedvolumes}}%
@@ -9637,8 +10187,12 @@
         \ifcsequal{cms at mtnamec}{cms at mtsecnamec}%
         {\clearname{namec}}%
         {}}%
-      {}}%
-    \ifbibliography%
+      {}\iftoggle{cms at reprintfrom}{\newcunit}{}}%
+    \ifboolexpr{%
+      test {\ifbibliography}%
+      and
+      not togl {cms at reprintfrom}%
+    }%
     {\printtext[cmsdefrelhypertarget]{%
         \usedriver%
         {\ifnameundef{savedauthor}%
@@ -9804,7 +10358,7 @@
     }%
     {}%
     {\midsentence% Why is this kludge necessary?
-      \setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+      \setunit{\addspace\bibstring[\mkrelatedstringtext]{bypublisher}\space}%
       \printlist{publisher}%
       \setunit{\addcomma\space}%
       \iflistsequal{location}{savedlocation}%
@@ -9811,96 +10365,85 @@
       {}%
       {\printlist{location}}}}}
 
+\newbibmacro*{related:short}[1]{% For cross-refs in bib.
+  \entrydata*{#1}{%
+    \toggletrue{cms at noidem}%
+    \togglefalse{cms at fullnote}%
+    \toggletrue{cms at shortnote}%
+    \usebibmacro{cite:short}{\thefield{entrytype}}}}%
+
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
+\DeclareFieldFormat{title:hook:alt}{%
+  \iftoggle{cms at reprintmt}%
+  {\begingroup
+    \mkrelatedstringtext{%
+      \lbx at inittitlehook{#1}}%
+    \endgroup}%
+  {\lbx at inittitlehook{#1}}% Inside entries don't use main doc. lang.
+  \mkbibemph{#1}}
+
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
-  \mkbibquote{#1}}
+  \iffieldundef{issuesubtitle}%
+  {\mkbibquote{#1}}%
+  {\mkbibquote{#1\subtitlepunct\printfield{issuesubtitle}}}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \endgroup}%
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{chapter}}%
+    \bibstring{chapter}~#1}
+  \endgroup}%
 
 \DeclareFieldFormat{muschapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{track}}%
-  \endgroup
-  \bibstring{track}~#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{track}}%
+    \bibstring{track}~#1}%
+  \endgroup}
 
+\DeclareFieldFormat{volume:hook}{%
+  \begingroup
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{volume}}%
+    \bibstring{volume}~#1}%
+  \endgroup}%
+
+\DeclareFieldFormat{parttoo:hook}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring[\mkrelatedstringtext]{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat{part:hook}{%
+  \begingroup
+  \ifnumerals{#1}%
+  {\mkrelatedstringtext{%
+      \lbx at inittitlehook{\bibxstring{partvolume}}%
+      \bibstring{partvolume}~#1}}%
+  {\mkrelatedstringtext{\lbx at inittitlehook{#1}}%
+    \ifcapital{\MakeCapital{#1}}{#1}}%
+  \endgroup}
+
+\DeclareFieldFormat{shorthand:hook}{%
+  \lbx at inittitlehook{#1}%
+  #1}
+
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
 \DeclareFieldFormat{stnoformat}{#1}
@@ -9913,16 +10456,8 @@
 \DeclareFieldFormat{btnoformat}{#1}
 \DeclareFieldFormat{mtnoformat}{#1}
 
-\providetoggle{cms at otherlang}
+\providetoggle{cms at reprintmt}
 
-\apptocmd\blx at opt@autolang at other%
-{\toggletrue{cms at otherlang}}%
-{\blx at 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%
@@ -9933,14 +10468,35 @@
       {\iffieldundef{booktitle}%
         {\iffieldundef{journaltitle}% Switched order for 17th ed.
           {\iffieldundef{maintitle}%
-            {}%
-            {\DeclareFieldAlias{mtnoformat}{title:hook}%
-              \DeclareFieldAlias{smtnoformat}{title}%
-              \DeclareFieldAlias{maintitle}{default}}}%
+            {\ifthenelse{\iffieldequalstr{relatedtype}{maintitle}\OR%
+                \iffieldequalstr{relatedtype}{maintitlenc}}%
+              {\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}}%
+              {}}%
+            {\toggletrue{cms at reprintmt}%
+              \ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)%
+                \OR\ifentrytype{inbook}\OR\ifentrytype{incollection}\OR%
+                \ifentrytype{inproceedings}\OR\ifentrytype{letter}}%
+              {\DeclareFieldAlias{mtnoformat}{title:hook}%
+                \DeclareFieldAlias{smtnoformat}{title}%
+                \DeclareFieldAlias{maintitle}{default}}%
+              {\iffieldundef{volume}%
+                {\DeclareFieldAlias{part}{part:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}%
+                {\DeclareFieldAlias{volume}{volume:hook}%
+                  \DeclareFieldAlias{part}{parttoo:hook}%
+                  \let\cms at ofwrap\mkrelatedstringtext}}}}%
           {\DeclareFieldAlias{jtnoformat}{title:hook}%
             \DeclareFieldAlias{sjtnoformat}{title}%
             \DeclareFieldAlias{journaltitle}{default}%
+            \DeclareFieldAlias{injournaltitle}{default}%
             \DeclareFieldAlias{shortjournal}{series}%
+            \DeclareFieldAlias{inshortjournal}{series}%
             \DeclareFieldAlias{jtsnoformat}{title:hook}}}%
         {\DeclareFieldAlias{btnoformat}{title:hook}%
           \DeclareFieldAlias{sbtnoformat}{title}%
@@ -9952,16 +10508,16 @@
         \DeclareFieldAlias[music]{title}{default}%
         \DeclareFieldAlias{title}{default}%
         \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
-    {\iffieldundef{issuesubtitle}%
-      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
-        \DeclareFieldAlias{issuetitle}{default}}%
-      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+    {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+      \DeclareFieldAlias{issuetitle}{default}}}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%
       {\ifentrytype{music}%
-        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}}%
-        {\DeclareFieldAlias{chapter}{avchapter:hook}}}%
+        {\DeclareFieldAlias[music]{chapter}{muschapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}%
+        {\DeclareFieldAlias{chapter}{avchapter:hook}%
+          \let\cms at ofwrap\mkrelatedstringtext}}%
       {\DeclareFieldAlias{tnoformat}{title:hook}%
         \DeclareFieldAlias{stnoformat}{citetitle}%
         \DeclareFieldAlias[video]{title}{default}%
@@ -9983,10 +10539,12 @@
     \usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}\clearfield{shorthand}%
+      \clearfield{crossref}\clearfield{xref}%
+      \toggletrue{cms at bookcitexref}\global\toggletrue{cms at reprintfrom}%
       \toggletrue{cms at fullnote}\toggletrue{cms at headlessnote}%
       \toggletrue{cms at origpublished}\frenchspacing%
       \usebibmacro{cms:titlehook}}%
-    {cite:\thefield{entrytype}}}}
+    {cite:\thefield{entrytype}}}\global\togglefalse{cms at reprintfrom}}%
 
 \newbibmacro*{cite:related:full}{%
   \printtext[cmsdefrelhypertarget]{%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -2,7 +2,7 @@
 % standard.bbx It provides the bibliography formatting for the Chicago
 % notes + bibliography style.
 
-\ProvidesFile{chicago-notes16.bbx}[2020/04/20 v 3.14 biblatex
+\ProvidesFile{chicago-notes16.bbx}[2021/03/27 v 3.16 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -3644,6 +3644,8 @@
 
 %%%% Related functionality from standard.bbx %%%%
 
+\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}}
+
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
 
@@ -3714,14 +3716,14 @@
                test {\ifbibxstring{\thefield{relatedtype}s}}%
              }%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}s}}}%
                {\iffieldbibstring{relatedtype}%
                   {\printtext[\bbx at tempb]{%
-                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}%
+                     \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}}}}%
                   {}}}%
             {\iffieldbibstring{relatedstring}%
                {\printtext[\bbx at tempb]{%
-                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}%
+                  \bibstring[\mkrelatedstringtext]{\thefield{relatedstring}}}}%
                {\printfield[\bbx at tempb]{relatedstring}}}%
           \docsvfield{related}%
           \usebibmacro{endrelatedloop}}}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -3,7 +3,7 @@
 % of providing footnote citations and a bibliography formatted
 % according to the specifications of the Chicago Manual of Style.
 
-\ProvidesFile{chicago-notes16.cbx}[2020/04/20 v 3.14 biblatex citation style]
+\ProvidesFile{chicago-notes16.cbx}[2021/03/27 v 3.16 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -1285,13 +1285,7 @@
     \ifhyperref%
     {\hypertarget{cite.\the\c at refsection @\abx at field@entrykey}{}}%
     {}%
-    \nopunct%
-    \ifboolexpr{%
-      togl {cms at otherlang}%
-      and
-      not test {\iffieldundef{langid}}%
-    }%
-    {\addspace}{\unspace}}%\unspace Put \nopunct and \unspace here for 0.8e.
+    \nopunct}%\unspace Put \nopunct and \unspace here for 0.8e.
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}\clearfield{shorthand}%
@@ -1444,6 +1438,8 @@
 \DeclareMultiCiteCommand{\headlessparenshortcites}[\mkbibparens]%
 {headlessparenshortcite}{\multicitedelim}
 
+\def\cms at cicpunct{}%
+
 %% Textcite commands adapted from verbose.cbx %%
 
 \DeclareCiteCommand{\cbx at textcite}
@@ -4472,7 +4468,7 @@
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}%
-  \addspace}%
+}%\addspace
 
 %%%% Commands, for users and internal %%%%
 
@@ -5481,8 +5477,10 @@
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\subtitlepunct}%
-      \printfield[sitnoformat]{issuesubtitle}}}}
+      \iftoggle{cms at origpublished}% Complications due to \smartof
+      {}%
+      {\setunit{\subtitlepunct}%
+        \printfield[sitnoformat]{issuesubtitle}}}}}
 
 \newbibmacro*{btitle+bstitle}{%
   \iffieldundef{booktitle}%
@@ -6496,7 +6494,7 @@
 
 \newbibmacro*{hlpunct}{%
   \iftoggle{cms at headlessnote}%
-  {}%
+  {\iftoggle{cms at origpublished}{\setunit{\addspace}}{}}%
   {\newcunit\newblock}}
 
 \newbibmacro*{journalprenote}{%
@@ -6906,13 +6904,13 @@
     \usebibmacro{at+every+item}%
     \renewbibmacro*{name:hook}[1]{%
       \ifnumequal{\value{listcount}}{1}%
-        {\begingroup
-         \mkrelatedstring%
-         \lbx at initnamehook{#1}%
-         \endgroup}
-        {}}%
+      {\begingroup
+        \mkrelatedstringtext{%
+          \lbx at initnamehook{##1}}%
+        \endgroup}%
+      {}}%
     \printnames[bytranslator]{translator}%
-    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\addspace}%
+    \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\addspace}%
     \clearname{translator}%
     \usebibmacro{cite:origfull}}}%
 
@@ -6991,7 +6989,7 @@
     }%
     {}%
     {\midsentence% Why is this kludge necessary?
-      \setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
+      \setunit{\addspace\bibstring[\mkrelatedstringtext]{bypublisher}\space}%
       \printlist{publisher}%
       \setunit{\addcomma\space}%
       \iflistsequal{location}{savedlocation}%
@@ -7000,75 +6998,33 @@
 
 \DeclareFieldFormat{title:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
   \mkbibemph{#1}}
 
 \DeclareFieldFormat{ititle:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{#1}}%
   \endgroup
-  \mkbibquote{#1}}
+  \iffieldundef{issuesubtitle}%
+  {\mkbibquote{#1}}%
+  {\mkbibquote{#1\subtitlepunct\printfield{issuesubtitle}}}}
 
 \DeclareFieldFormat{chapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{chapter}}%
+    \bibstring{chapter}~#1\addspace\bibstring{in}}%
+  \endgroup}%
 
 \DeclareFieldFormat{avchapter:hook}{%
   \begingroup
-  \mkrelatedstring%
-  \ifboolexpr{%
-    togl {cms at otherlang}%
-    and
-    not test {\iffieldundef{langid}}%
-  }%
-  {\unspace}{}%
-  \ifdefstring{\blx at main@language}{french}%
-  {}%
-  {\iftoggle{smartof}%
-    {\let\lbx at inittitlehook\lbx at fr@smartof}%
-    {}}%
-  \lbx at inittitlehook{\bibstring{chapter}}%
-  \endgroup
-  \bibstring{chapter}~#1}%
+  \mkrelatedstringtext{%
+    \lbx at inittitlehook{\bibxstring{chapter}}%
+    \bibstring{chapter}~#1}
+  \endgroup}%
 
 \DeclareFieldFormat{sitnoformat}{#1}
 \DeclareFieldFormat{sjtnoformat}{#1}
@@ -7082,15 +7038,15 @@
 \DeclareFieldFormat{btnoformat}{#1}
 \DeclareFieldFormat{mtnoformat}{#1}
 
-\providetoggle{cms at otherlang}
+% \providetoggle{cms at otherlang}
 
-\apptocmd\blx at opt@autolang at other%
-{\toggletrue{cms at otherlang}}%
-{\blx at 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}}
+% \apptocmd\blx at opt@autolang at other%
+% {\toggletrue{cms at otherlang}}%
+% {\blx at 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%
@@ -7121,10 +7077,8 @@
         \DeclareFieldAlias[music]{title}{default}%
         \DeclareFieldAlias{title}{default}%
         \DeclareFieldAlias[periodical]{shorttitle}{series}}}%
-    {\iffieldundef{issuesubtitle}%
-      {\DeclareFieldAlias{itnoformat}{ititle:hook}%
-        \DeclareFieldAlias{issuetitle}{default}}%
-      {\DeclareFieldAlias{issuetitle}{ititle:hook}}}}%
+    {\DeclareFieldAlias{itnoformat}{ititle:hook}%
+      \DeclareFieldAlias{issuetitle}{default}}}%
   {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
       \ifentrytype{video}}%
     {\iffieldundef{title}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-american.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -9,6 +9,8 @@
   \savecommand\mkdaterangecompextra%
   \savecommand\mkdaterangeterseextra%
   \savecommand\mkdaterangefullextra%
+  \savecommand\cms at cicpunct%
+  \def\cms at cicpunct{\ifcitation{}{\addperiod\printunit{\space\bibsentence}}}%
   \def\introductionname{Introduction}%
   \def\sectionname{Section}%
   \def\subsectionname{Subsection}%
@@ -125,6 +127,7 @@
   \restorecommand\mkdaterangecompextra%
   \restorecommand\mkdaterangeterseextra%
   \restorecommand\mkdaterangefullextra%
+  \restorecommand\cms at cicpunct%
 }
 
 \DeclareBibliographyStrings{%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-brazilian.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-brazilian.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Strings provided by native speaker Gustavo Barros.

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-british.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-british.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 \InheritBibliographyExtras{british}
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-dutch.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-dutch.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-dutch.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Strings provided by native speaker Wouter Lancee.

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-finnish.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-finnish.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Antti-Juhani Kaijanaho).

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-french.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -81,9 +81,10 @@
   afterwordto = {{postface \`a}{postf\adddot\ \`a}},
   forewordto = {{pr\'eface \`a}{pr\'ef\adddot\ \`a}},
   introductionto = {{introduction \`a}{introd\adddot\ \`a}},
-  partvolume = {{\unspace}{\unspace}},
+  partvolume = {{livre}{livre}},
   by = {{par}{par}},
   of = {{de}{de}},
+  ofseries = {{\smartof}{\smartof}},
   on = {{sur}{sur}},
   compiler = {{comp\adddot}{comp\adddot}},
   compilers = {{comp\adddot}{comp\adddot}},

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-german.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-icelandic.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-icelandic.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Baldur Kristinsson).

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-ngerman.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-norsk.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-norsk.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -421,7 +421,7 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
-  track = {{sporet}{sporet}},
+  track = {{spor}{spor}},
   cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
   cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
       brasiliansk-portugisisk av}},

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-norwegian.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-norwegian.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -421,7 +421,7 @@
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
-  track = {{sporet}{sporet}},
+  track = {{spor}{spor}},
   cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
   cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
       brasiliansk-portugisisk av}},

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-nynorsk.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-nynorsk.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).

Added: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-romanian.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-romanian.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-romanian.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -0,0 +1,758 @@
+\ProvidesFile{cms-romanian.lbx}[2021/03/27 v 3.16 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Strings provided by native speaker Patrick Danilevici, creator of
+% - the main romanian.lbx file in biblatex.
+
+\InheritBibliographyExtras{romanian}
+
+\DeclareBibliographyExtras{%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \savecommand\mkdaterangecompextra%
+  \savecommand\mkdaterangeterseextra%
+  \savecommand\mkdaterangefullextra%
+  \savecommand\cms at datelong%
+  \savecommand\postvolpunct%
+  \savecommand\journalpagespunct%
+  \savecommand\bibdaterangesep%
+  \toggletrue{cms at postposit}%
+  \def\introductionname{Introducere}%
+  \def\sectionname{Secțiune}%
+  \def\subsectionname{Subsecțiune}%
+  \def\forewordname{Prefață}%
+  \def\notesname{Note}%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
+  \savefieldformat{postnote}%
+  \savefieldformat{pages}%
+  \savefieldformat{shortvol}%
+  \savefieldformat{jourvol}%
+  \savefieldformat{injournaltitle}%
+  \savefieldformat{inshortjournal}%
+  \savefieldformat{part}%
+  \savefieldformat{part:hook}%
+  \savefieldformat{parttoo:hook}%
+  \renewrobustcmd*{\bibdaterangesep}{\bibrangedash}
+  \DeclareFieldFormat{postnote}{%
+    \ifpages{#1}%
+    {\iffieldequalstr{entrysubtype}{classical}%
+      {\iftoggle{cms at comprange}%
+        {\mkcomprange{#1}}%
+        {\mknormrange{#1}}}%
+      {\iftoggle{cms at comprange}%
+        {\mkpageprefix[pagination][\mkcomprange]{#1}}%
+        {\mkpageprefix[pagination][\mknormrange]{#1}}}}%
+    {\iffieldequalstr{entrysubtype}{classical}%
+      {#1}%
+      {\mkpageprefix[pagination]{#1}}}}%
+  \DeclareFieldFormat{pages}{%
+    \ifboolexpr{%
+      togl {cms at comprange}%
+      and
+      test {\ifpages{#1}}%
+    }%
+    {\mkpageprefix[bookpagination][\mkcomprange]{#1}}%
+    {\mkpageprefix[bookpagination]{#1}}}%
+  \DeclareFieldAlias{shortvol}{volume}%
+  \DeclareFieldFormat{jourvol}{\addcomma\space\bibstring{volume}\space #1}%
+  \DeclareFieldFormat{injournaltitle}{%
+    \ifthenelse{\iffieldundef{issuetitle}\AND\iffieldundef{note}}%
+    {\bibstring{in}\space\mkbibemph{#1}\isdot}%
+    {\mkbibemph{#1}\isdot}}%
+  \DeclareFieldFormat{part}{%
+    \ifinteger{#1}
+    {\addcomma\addspace\bibstring{partvolume}~\mkcmsrompart{#1}}%
+    {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \DeclareFieldFormat{parttoo:hook}{%
+    \ifinteger{#1}%
+    {\addcomma\addspace%
+      \bibstring[\mkrelatedstringtext]{partvolume}~\mkcmsrompart{#1}}%
+    {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \DeclareFieldFormat{part:hook}{%
+    \begingroup
+    \ifinteger{#1}%
+    {\mkrelatedstringtext{%
+        \lbx at inittitlehook{\bibxstring{partvolume}}%
+        \bibstring{partvolume}~\mkcmsrompart{#1}}}%
+    {\mkrelatedstringtext{\lbx at inittitlehook{#1}}%
+      \ifcapital{\MakeCapital{#1}}{#1}}%
+    \endgroup}%
+  \protected\def\mkcmsrompart#1{%
+    \ifnumgreater{#1}{1}
+    {\autocap{a}~#1-a}
+    {#1}}%
+  \protected\def\cmsmkdecade#1#2{%
+    \dateeraprintpre{#2year}%
+    \bibsstring{decade}%
+    \printdelim{dateaddelim}%
+    \stripzeros{\thefield{#2year}}%
+    \cmsdateeraprint{#2endyear}\clearfield{#2endyear}%
+    \ifbool{cms:extraparens}%
+    {\usebibmacro{cmsparensextradate}%
+      \global\boolfalse{cms:extraparens}}%
+    {\usebibmacro{cmsextradate}}}%
+  \protected\def\cmsmkcentury#1{%
+    \ifnumequal{\thefield{#1year}}{1}%
+    {}{\dateeraprintpre{#1year}}%
+    \bibsstring{century}%
+    \printdelim{dateaddelim}%
+    \csuse{mkcmscentury}{#1year}%
+    \cmsdateeraprint{#1endyear}\clearfield{#1endyear}%
+    \usebibmacro{cmsparensextradate}%
+    \global\boolfalse{cms:extraparens}}%
+  \protected\def\mkcmscentury#1{%
+    \MakeUppercase{\romannumeral\numexpr\thefield{#1}/100+1}-lea}%
+  \protected\def\mkdaterangecomp{%
+    \cms at mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \cms at mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \cms at mkbibrangefull}%
+  \protected\def\mkdaterangecompextra{%
+    \cms at mkyearrangeextra[]{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \cms at mkyearrangeextra[]{short}}%
+  \protected\def\mkdaterangefullextra{%
+    \cms at mkyearrangeextra[1]}%
+  \def\cms at datelong#1{\csname print#1date\endcsname}%
+  \renewcommand*{\postvolpunct}{\addcomma\space}%
+  \renewcommand*{\journalpagespunct}{\addcomma\space}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%
+  \restorecommand\mkdaterangecompextra%
+  \restorecommand\mkdaterangeterseextra%
+  \restorecommand\mkdaterangefullextra%
+  \restorecommand\cms at datelong%
+  \restorecommand\postvolpunct%
+  \restorecommand\journalpagespunct%
+  \restorecommand\bibdaterangesep%
+  \togglefalse{cms at postposit}%
+  \restorefieldformat{postnote}%
+  \restorefieldformat{pages}%
+  \restorefieldformat{shortvol}%
+  \restorefieldformat{jourvol}%
+  \restorefieldformat{injournaltitle}%
+  \restorefieldformat{inshortjournal}%
+  \restorefieldformat{part}%
+  \restorefieldformat{part:hook}%
+  \restorefieldformat{parttoo:hook}%
+}
+
+\DeclareBibliographyStrings{%
+  inherit = {romanian},
+  afterwordto = {{postfață la}{postf\adddot\space la}},
+  forewordto = {{prefață la}{pref\adddot\space la}},
+  introductionto = {{introducere la}{introd\adddot\space la}},
+  partvolume = {{partea}{partea}},
+  by = {{de}{de}},
+  of = {{la}{la}},
+  on = {{în}{în}},
+  compiler = {{red\adddot}{red\adddot}},
+  compilers = {{red\adddot}{red\adddot}},
+  transcompiler = {{trad\adddot\addspace și alcăt\adddot}%
+    {trad\adddot\addspace și alcăt\adddot}},
+  transcompilers = {{trad\adddot\addspace și alcăt\adddot}%
+    {trad\adddot\addspace și alcăt\adddot}},
+  editortranscompiler = {{ed\adddot\addcomma\addspace
+      trad\adddot\addcomma\addspace și alcăt\adddot}%
+    {ed\adddot\addcomma\addspace
+      trad\adddot\addcomma\addspace și alcăt\adddot}},
+  editorcompiler = {{ed\adddot\addspace și alcăt\adddot}%
+    {ed\adddot\addspace și alcăt\adddot}},
+  editortranslator = {{ed\adddot\addspace și trad\adddot}%
+    {ed\adddot\addspace și trad\adddot}},
+  editortranscompilers = {{ed\adddot\addcomma\addspace
+      trad\adddot\addcomma\addspace și alcăt\adddot}%
+    {ed\adddot\addcomma\addspace
+      trad\adddot\addcomma\addspace și alcăt\adddot}},
+  editorcompilers = {{ed\adddot\addspace și alcăt\adddot}%
+    {ed\adddot\addspace și alcăt\adddot}},
+  editortranslators = {{ed\adddot\addspace și trad\adddot}%
+    {ed\adddot\addspace și trad\adddot}},
+  conductor = {{dirij\adddot}{dirij\adddot}},
+  conductors = {{dirij\adddot}{dirij\adddot}},
+  director = {{regiz\adddot}{regiz\adddot}},
+  directors = {{regiz\adddot}{regiz\adddot}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{ed\adddot}{ed\adddot}},
+  editors = {{ed\adddot}{ed\adddot}},
+  choreographer = {{coreogr\adddot}{coreogr\adddot}},
+  choreographers = {{coreogr\adddot}{coreogr\adddot}},
+  ibidem = {{ibid\adddot}{id\adddot}},% Shorter for legal
+  origpub = {{publicare originală ca\addspace}%
+    {pub\adddot\ orig\adddot\ ca\addspace}},
+  origpubin = {{prima ediție}%
+    {prima ed\adddot}},
+  origpublin = {{publicare originală în\addspace}%
+    {pub\adddot\ orig\adddot\addspace în\addspace}},
+  origpubyear = {{publicare originală în\addspace}%
+    {pub\adddot\ orig\adddot\addspace}},
+  origpubyearalt = {{prima ediție\addspace}%
+    {prima ed\adddot\addspace}},
+  origreleaseyear = {{lansare originală în\addspace}%
+    {lans\adddot\ orig\addspace}},
+  origshownyear = {{prezentare originală în\addspace}%
+    {prez\adddot\ orig\addspace}},
+  origedition ={{ediție}{ed\adddot}},
+  revisededition = {{ed\adddot\addspace reviz\adddot}%
+    {ed\adddot\addspace reviz\adddot}},
+  broadcast = {{difuzare}{difuzare}},
+  songrecorded = {{înregistrat}{înregistrat}},
+  discrecorded = {{înregistrat}{înregistrat}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{{}f\adddot d\adddot}{{}f\adddot d\adddot}},
+  commonera      = {{era noastră}{e\adddot n\adddot}}, %long
+  beforecommonera= {{înaintea erei noastre}{î\adddot e\adddot n\adddot}}, %long 
+  annodomini     = {{Anul Domnului}{AD}}, % long
+  beforechrist   = {{înainte de Hristos}{î\adddot Hr\adddot}}, % long
+  circa          = {{circa}{cca\adddot}}, % long
+  am             = {{am}{a\adddot m\adddot}},  % 
+  pm             = {{pm}{p\adddot m\adddot}},
+  decade         = {{anii}{anii}}, % very good %
+  century        = {{secolul al}{sec\adddotspace al}}, % 
+  pseudonym      = {{pseud\adddot}{pseud\adddot}},
+  patentfiled    = {{depus}{depus}},
+  patentissued   = {{eliberat}{eliberat}},
+  inlang         = {{în\addspace}{în\addspace}},
+  edamerican     = {{engleză}{engleză}},
+  edbrazilian    = {{braziliană}{braziliană}},
+  edbulgarian    = {{bulgară}{bulgară}},
+  edcatalan      = {{catalană}{catalană}},
+  edcroatian     = {{croată}{croată}},
+  edczech        = {{cehă}{cehă}},
+  eddanish       = {{daneză}{daneză}},
+  eddutch        = {{olandeză}{olandeză}},
+  edenglish      = {{engleză}{engleză}},
+  edestonian     = {{estonă}{estonă}},
+  edfinnish      = {{finlandeză}{finlandeză}},
+  edfrench       = {{franceză}{franceză}},
+  edgalician     = {{galeză}{galeză}},
+  edgerman       = {{germană}{germană}},
+  edgreek        = {{greacă}{greacă}},
+  editalian      = {{italiană}{italiană}},
+  edjapanese     = {{japoneză}{japoneză}},
+  edlatin        = {{latină}{latină}},
+  ednorwegian    = {{norvegiană}{norvegiană}},
+  edportuguese   = {{portugheză}{portugheză}},
+  edrussian      = {{rusă}{rusă}},
+  edslovak       = {{slovacă}{slovacă}},
+  edslovene      = {{slovenă}{slovenă}},
+  edspanish      = {{spaniolă}{spaniolă}},
+  edswedish      = {{suedeză}{suedeză}},
+  edukrainian    = {{ucraineană}{ucraineană}},
+  translator = {{trad\adddot}{trad\adddot}},
+  translators = {{trad\adddot}{trad\adddot}},
+  redactor = {{red\adddot}{red\adddot}},
+  redactors = {{red\adddot}{red\adddot}},
+  founder          = {{fond\adddot}{fond\adddot}},
+  founders         = {{fond\adddot}{fond\adddot}},
+  continuator      = {{cont\adddot}{cont\adddot}}, % ?
+  continuators     = {{cont\adddot}{cont\adddot}}, % ?
+  collaborator     = {{colab\adddot}{colab\adddot}},  % ?
+  collaborators    = {{colab\adddot}{colab\adddot}}, % ?
+  annotator        = {{adnot\adddot}{adnot\adddot}},
+  annotators       = {{adnot\adddot}{adnot\adddot}},
+  review = {{recenzie}{recenzie}},
+  reviewof = {{recenzie la}{recenzie la}},
+  commenton = {{comentariu la}{comentariu la}},
+  reprint = {{republicare}{repub\adddot}},
+  printed = {{publicare}{publicare}},% 17th ed.
+  selfpublished = {{publicare personală}{publ\adddot pers\adddot}},
+  shorthands = {{Abrevieri}{Abrevieri}},
+  newseries = {{s\adddot n\adddot}{s\adddot n\adddot}},
+  urlseen = {{accesat}{accesat}},
+  cbynone = {{}{}},
+  cbyauthor = {{de}{de}},
+  cbyeditor = {{ed\adddot}{ed\adddot}},
+  cbytranslator     = {{trad\adddot\addspace\lbx at cfromlang}%
+    {trad\adddot\addspace\lbx at cfromlang}},
+  cbycompiler = {{alcăt\adddot}{alcăt\adddot}},
+  cbyredactor = {{red\adddot}{red\adddot}},
+  cbycommentator = {{coment\adddot}{coment\adddot}},
+  cbyannotator = {{adnot\addot}{adnot\addot}},
+  cbyfounder        = {{fond\adddot}{fond\adddot}},
+  cbycontinuator    = {{cont\adddot}{cont\adddot}},
+  cbycollaborator   = {{în colab\adddotspace cu}%
+    {în colab\adddotspace cu}},
+  cbyconductor = {{dirij\adddot}{dirij\adddot}},
+  cbydirector = {{regiz\adddot}{regiz\adddot}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbychoreographer = {{coreogr\adddot}{coreogr\adddot}},
+  cbyeditortr    = {{ed\adddot\space și
+      trad\adddot\addspace\lbx at cfromlang}%
+    {ed\adddot\space și trad\adddot\addspace\lbx at cfromlang}},
+  cbyeditorcp = {{ed\adddot\space și alcăt\adddot}%
+    {ed\adddot\space și alcăt\adddot}},
+  cbyeditorco    = {{ed\adddot\space și coment\adddot}%
+    {ed\adddot\space și coment\adddot}},
+  cbyeditoran = {{ed\adddot\space și adnot\adddot}%
+    {ed\adddot\space și adnot\adddot}},
+  cbyeditorin = {{ed.,\addabbrvspace cu o introducere de}%
+    {ed.,\addabbrvspace cu o introducere de}},
+  cbyeditorfo = {{ed.,\addabbrvspace cu o prefață de}%
+    {ed.,\addabbrvspace cu o prefață de}},
+  cbyeditoraf = {{ed.,\addabbrvspace cu o postfață de}%
+    {ed.,\addabbrvspace cu o postfață de}},
+  cbyeditortrcp = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și
+      alcăt\adddot}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt\adddot}},
+  cbyeditortrco = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și
+    coment\adddot}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment\adddot}},
+  cbyeditortran = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și
+    adnot\adddot}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot\adddot}},
+  cbyeditortrin = {{ed\adddot\space și trad.\addspace\lbx at fromlang,
+			cu o introducere de}%
+    {ed\adddot\space și trad.\addspace\lbx at fromlang, cu
+      o introducere de}},
+  cbyeditortrfo = {{ed\adddot\space și trad.\addspace\lbx at fromlang, cu
+      o prefață de}%
+    {ed\adddot\space și trad.\addspace\lbx at fromlang, cu
+      o prefață de}},
+  cbyeditortraf = {{ed\adddot\space și trad.\addspace\lbx at fromlang, cu
+      o postfață de}%
+    {ed\adddot\space și trad.\addspace\lbx at fromlang, cu
+      o postfață de}},
+  cbyeditorcpco = {{ed.,\addabbrvspace alcăt., și coment\adddot}%
+    {ed.,\addabbrvspace alcăt., și coment\adddot}},
+  cbyeditorcpan = {{ed.,\addabbrvspace alcăt., și adnot\adddot}%
+    {ed.,\addabbrvspace alcăt., și adnot\adddot}},
+  cbyeditorcpin = {{ed\adddot\space și alcăt., cu o introducere
+      de}%
+    {ed\adddot\space și alcăt., cu o introducere de}},
+  cbyeditorcpfo = {{ed\adddot\space și alcăt., cu o prefață de}%
+    {ed\adddot\space și alcăt., cu o prefață de}},
+  cbyeditorcpaf = {{ed\adddot\space și alcăt., cu o postfață de}%
+    {ed\adddot\space și alcăt., cu o postfață de}},
+  cbyeditorcpcoin = {{ed.,\addabbrvspace alcăt., și coment., cu o
+      introducere de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o introducere de}},
+  cbyeditorcpcofo = {{ed.,\addabbrvspace alcăt., și coment., cu o
+      prefață de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o prefață de}},
+  cbyeditorcpcoaf = {{ed.,\addabbrvspace alcăt., și coment., cu o
+      postfață de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o postfață de}},
+  cbyeditorcpanin = {{ed.,\addabbrvspace alcăt., și adnot., cu o
+      introducere de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o introducere de}},
+  cbyeditorcpanfo = {{ed.,\addabbrvspace alcăt., și adnot., cu o
+      prefață de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o prefață de}},
+  cbyeditorcpanaf = {{ed.,\addabbrvspace alcăt., și adnot., cu o
+      postfață de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o postfață de}},
+  cbyeditortrcpco = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și coment\adddot}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment\adddot}},
+  cbyeditortrcpan = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și adnot\adddot}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot\adddot}},
+  cbyeditortrcpin = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și
+      alcăt., cu o introducere de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt.,
+      cu o introducere de}},
+  cbyeditortrcpfo = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și
+      alcăt., cu o prefață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt.,
+      cu o prefață de}},
+  cbyeditortrcpaf = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și
+      alcăt., cu o postfață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt.,
+      cu o postfață de}},
+  cbyeditortrcpcoin = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și coment., cu o introducere de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment., cu o introducere de}},
+  cbyeditortrcpcofo = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și coment., cu o prefață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment.,cu o prefață de}},
+  cbyeditortrcpcoaf = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și coment., cu o postfață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment., cu o postfață de}},
+  cbyeditortrcpanin = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și adnot., cu o introducere de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot., cu o introducere de}},
+  cbyeditortrcpanfo = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și adnot., cu o prefață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot., cu o prefață de}},
+  cbyeditortrcpanaf = {{ed.,\addabbrvspace trad.\addspace\lbx at fromlang,
+      alcăt., și adnot., cu o postfață de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot., cu o postfață de}},
+  cbyeditorcoin = {{ed\adddot\space și coment., cu o introducere de}%
+    {ed\adddot\space și coment., cu o introducere de}},
+  cbyeditorcofo = {{ed\adddot\space și coment., cu o prefață de}%
+    {ed\adddot\space și coment., cu o prefață de}},
+  cbyeditorcoaf = {{ed\adddot\space și coment., cu o postfață de}%
+    {ed\adddot\space și coment., cu o postfață de}},
+  cbyeditoranin = {{ed\adddot\space și adnot., cu o introducere de}%
+    {ed\adddot\space și adnot., cu o introducere de}},
+  cbyeditoranfo = {{ed\adddot\space și adnot., cu o prefață de}%
+    {ed\adddot\space și adnot., cu o prefață de}},
+  cbyeditoranaf = {{ed\adddot\space și adnot., cu o postfață de}%
+    {ed\adddot\space și adnot., cu o postfață de}},
+  cbyeditortrcoin = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o introducere de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o introducere de}},
+  cbyeditortrcofo = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o prefață de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o prefață de}},
+  cbyeditortrcoaf = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o postfață de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și coment., cu
+    o postfață de}},
+  cbyeditortranin = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o introducere de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o introducere de}},
+  cbyeditortranfo = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o prefață de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o prefață de}},
+  cbyeditortranaf = {{ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o postfață de}%
+  {ed.,\addabbrvspace
+    trad\adddot\addspace\lbx at fromlang\finalandcomma\space și adnot., cu
+    o postfață de}},
+  cbytranslatorcp = {{trad\adddot\addspace\lbx at fromlang\ și alcăt\adddot}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt\adddot}},
+  cbytranslatorco = {{trad\adddot\addspace\lbx at fromlang\ și coment\adddot}%
+    {trad\adddot\addspace\lbx at fromlang\ și coment\adddot}},
+  cbytranslatoran = {{trad\adddot\addspace\lbx at fromlang\ și adnot\adddot}%
+    {trad\adddot\addspace\lbx at fromlang\ și adnot\adddot}},
+  cbytranslatorin = {{trad\adddot\addspace\lbx at fromlang, cu o
+      introducere de}%
+    {trad\adddot\addspace\lbx at fromlang, cu o introducere de}},
+  cbytranslatorfo = {{trad\adddot\addspace\lbx at fromlang, cu o
+      prefață de}%
+    {trad\adddot\addspace\lbx at fromlang, cu o prefață de}},
+  cbytranslatoraf = {{trad\adddot\addspace\lbx at fromlang, cu o
+      postfață de}%
+    {trad\adddot\addspace\lbx at fromlang, cu o postfață de}},
+  cbytranslatorcoin = {{trad\adddot\addspace\lbx at fromlang\ și coment.,
+      cu o introducere de}%
+    {trad\adddot\addspace\lbx at fromlang\ și coment., cu o introducere de}},
+  cbytranslatorcofo = {{trad\adddot\addspace\lbx at fromlang\ și coment.,
+      cu o prefață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și coment., cu o prefață de}},
+  cbytranslatorcoaf = {{trad\adddot\addspace\lbx at fromlang\ și coment.,
+      cu o postfață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și coment., cu o postfață de}},
+  cbytranslatoranin = {{trad\adddot\addspace\lbx at fromlang\ și adnot.,
+      cu o introducere de}%
+    {trad\adddot\addspace\lbx at fromlang\ și adnot., cu o introducere de}},
+  cbytranslatoranfo = {{trad\adddot\addspace\lbx at fromlang\ și adnot.,
+      cu o prefață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și adnot., cu o prefață de}},
+  cbytranslatoranaf = {{trad\adddot\addspace\lbx at fromlang\ și adnot.,
+      cu o postfață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și adnot., cu o postfață de}},
+  cbytranslatorcpco = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      coment\adddot}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment\adddot}},
+  cbytranslatorcpan = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      adnot\adddot}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot\adddot}},
+  cbytranslatorcpin = {{trad\adddot\addspace\lbx at fromlang\ și alcăt.,
+      cu o introducere de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o introducere de}},
+  cbytranslatorcpfo = {{trad\adddot\addspace\lbx at fromlang\ și alcăt.,
+      cu o prefață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o prefață de}},
+  cbytranslatorcpaf = {{trad\adddot\addspace\lbx at fromlang\ și alcăt.,
+      cu o postfață de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o postfață de}},
+  cbytranslatorcpcoin = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      coment., cu o introducere de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment.,
+      cu o introducere de}},
+  cbytranslatorcpcofo = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      coment., cu o prefață de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment.,
+      cu o prefață de}},
+  cbytranslatorcpcoaf = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      coment., cu o postfață de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment.,
+      cu o postfață de}},
+  cbytranslatorcpanin = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      adnot., cu o introducere de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot.,
+      cu o introducere de}},
+  cbytranslatorcpanfo = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      adnot., cu o prefață de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot.,
+      cu o prefață de}},
+  cbytranslatorcpanaf = {{trad\adddot\addspace\lbx at fromlang, alcăt., și
+      adnot., cu o postfață de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot.,
+      cu o postfață de}},
+  cbycompilerco = {{alcăt\adddot\space și coment\adddot}%
+    {alcăt\adddot\space și coment\adddot}},
+  cbycompileran = {{alcăt\adddot\space și adnot\adddot}%
+    {alcăt\adddot\space și adnot\adddot}},
+  cbycompilerin = {{alcăt.,\addabbrvspace cu o introducere de}%
+    {alcăt.,\addabbrvspace cu o introducere de}},
+  cbycompilerfo = {{alcăt.,\addabbrvspace cu o prefață de}%
+    {alcăt.,\addabbrvspace cu o prefață de}},
+  cbycompileraf = {{alcăt.,\addabbrvspace cu o postfață de}%
+    {alcăt.,\addabbrvspace cu o postfață de}},
+  cbycompilercoin = {{alcăt\adddot\space și coment., cu o
+      introducere de}%
+    {alcăt\adddot\space și coment., cu o introducere de}},
+  cbycompilercofo = {{alcăt\adddot\space și coment., cu o prefață de}%
+    {alcăt\adddot\space și coment., cu o prefață de}},
+  cbycompilercoaf = {{alcăt\adddot\space și coment., cu o postfață de}%
+    {alcăt\adddot\space și coment., cu o postfață de}},
+  cbycompileranin = {{alcăt\adddot\space și adnot., cu o
+      introducere de}%
+    {alcăt\adddot\space și adnot., cu o introducere de}},
+  cbycompileranfo = {{alcăt\adddot\space și adnot., cu o prefață de}%
+    {alcăt\adddot\space și adnot., cu o prefață de}},
+  cbycompileranaf = {{alcăt\adddot\space și adnot., cu o postfață de}%
+    {alcăt\adddot\space și adnot., cu o postfață de}},
+  volume = {{vol\adddot}{vol\adddot}},
+  volumes = {{vol\adddot}{vol\adddot}},
+  jourvol = {{vol\adddot}{vol\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{s\adddot a\adddot}{s\adddot a\adddot}},
+  edition = {{ed\adddot}{ed\adddot}},
+  version = {{versiune}{v\adddot}},
+  page = {{p\adddot}{p\adddot}},
+  pages = {{pp\adddot}{pp\adddot}},
+  column = {{col\adddot}{col\adddot}},
+  columns = {{col\adddot}{col\adddot}},
+  line = {{linie}{linie}},
+  lines = {{linii}{linii}},
+  paragraph = {{\P}{\P}},
+  paragraphs = {{\P\P}{\P\P}},
+  section = {{\S}{\S}},
+  sections = {{\S\S}{\S\S}},
+  subsection = {{\S}{\S}},
+  subsections = {{\S\S}{\S\S}},
+  preface = {{prefață}{pref\adddot}},
+  note = {{notă}{n\adddot}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace notă\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{în continuare}{în continuare}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{cap\adddot}{cap\adddot}},%
+  part = {{parte}{part\adddot}},%  for legal citations
+  track = {{pista}{pista}},
+  mathesis = {{teză de dizerație}{teză de dizerație}},
+  phdthesis = {{teză de doct\adddot}{teză de doct\adddot}},
+  techreport = {{raport tehnic}{raport tehnic}},
+  cfromamerican     = {{din engleză de}{din engleză de}},
+  cfrombrazilian    = {{din braziliană de}{din braziliană
+      de}},
+  cfrombulgarian    = {{din bulgară de}{din bulgară de}},
+  cfromcatalan      = {{din catalană de}{din catalană de}},
+  cfromcroatian     = {{din croată de}{din croată de}},
+  cfromczech        = {{din cehă de}{din cehă de}},
+  cfromdanish       = {{din daneză de}{din daneză de}},
+  cfromdutch        = {{din olandeză de}{din olandeză de}},
+  cfromenglish      = {{din engleză de}{din engleză de}},
+  cfromestonian     = {{din estonă de}{din estonă de}},
+  cfromfinnish      = {{din finlandeză de}{din finlandeză de}},
+  cfromfrench       = {{din franceză de}{din franceză de}},
+  cfromgalician     = {{din galeză de}{din galeză de}},
+  cfromgerman       = {{din germană de}{din germană de}},
+  cfromgreek        = {{din greacă de}{din greacă de}},
+  cfromitalian      = {{din italiană de}{din italiană de}},
+  cfromjapanese     = {{din japoneză de}{din japoneză de}},
+  cfromlatin        = {{din latină de}{din latină de}},
+  cfromnorwegian    = {{din norvegiană de}{din norvegiană
+      de}},
+  cfrompolish       = {{din poloneză de}{din poloneză de}},
+  cfromportuguese   = {{din portugheză de}{din portugheză
+      de}},
+  cfromrussian      = {{din rusă de}{din rusă de}},
+  cfromslovak       = {{din slovacă de}{din slovacă de}},
+  cfromslovene      = {{din slovenă de}{din slovenă de}},
+  cfromspanish      = {{din spaniolă de}{din spaniolă de}},
+  cfromswedish      = {{din suedeză de}{din suedeză de}},
+  cfromukrainian    = {{din ucraineană de}{din ucraineană de}},
+  bynone = {{}{}},
+  bycompiler = {{alcătuire de}{alcăt\adddot}},
+  byconductor = {{dirijat de}{dirij\adddot}},
+  bydirector = {{regizat de}{regiz\adddot}},
+  byproducer = {{produs de}{prod\adddot}},
+  bychoreographer = {{coreografie de}{coreogr\adddot}},
+  byeditorcp = {{editare și alcătuire de}{ed\adddot\space și alcăt\adddot}},
+  byeditortrcp = {{editare, traducere \lbx at fromlang, și alcătuire de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt\adddot}},
+  byeditortrcpco = {{editare, traducere \lbx at fromlang, alcătuire, și
+      comentarii de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment\adddot}},
+  byeditortrcpan = {{editare, traducere \lbx at fromlang, alcătuire, și
+      adnotări de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot\adddot}},
+  byeditortrcpin = {{editare, traducere \lbx at fromlang, și alcătuire, cu
+      o introducere, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt\adddot,
+      cu o introducere, de}},
+  byeditortrcpfo = {{editare, traducere \lbx at fromlang, și alcătuire, cu o
+      prefață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt\adddot,
+      cu o prefață, de}},
+  byeditortrcpaf = {{editare, traducere \lbx at fromlang, și alcătuire, cu
+      o postfață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, și alcăt\adddot,
+      cu o postfață, de}},
+  byeditortrcpcoin = {{editare, traducere \lbx at fromlang, alcătuire, și
+      comentarii, cu o introducere, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment\adddot, cu o introducere, de}},
+  byeditortrcpcofo = {{editare, traducere \lbx at fromlang, alcătuire, și
+      comentarii, cu o prefață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment\adddot, cu o prefață, de}},
+  byeditortrcpcoaf = {{editare, traducere \lbx at fromlang, alcătuire, și
+      comentarii, cu o postfață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și coment\adddot, cu o postfață, de}},
+  byeditortrcpanin = {{editare, traducere \lbx at fromlang, alcătuire, și
+      adnotări, cu o introducere, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot\adddot, cu o introducere, de}},
+  byeditortrcpanfo = {{editare, traducere \lbx at fromlang, alcătuire, și
+      adnotări, cu o prefață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot\adddot, cu o prefață, de}},
+  byeditortrcpanaf = {{editare, traducere \lbx at fromlang, alcătuire, și
+      adnotări, cu o postfață, de}%
+    {ed.,\addabbrvspace trad.\addspace\lbx at fromlang, alcăt.,
+      și adnot\adddot, cu o postfață, de}},
+  byeditorcpco = {{editare, alcătuire, și comentarii de}%
+    {ed.,\addabbrvspace alcăt., și coment\adddot}},
+  byeditorcpan = {{editare, alcătuire, și adnotări de}%
+    {ed.,\addabbrvspace alcăt., și adnot\adddot}},
+  byeditorcpin = {{editare și alcătuire, cu o introducere, de}%
+    {ed\adddot\space și alcăt., cu o introducere, de}},
+  byeditorcpfo = {{editare și alcătuire, cu o prefață, de}%
+    {ed\adddot\space și alcăt., cu o prefață, de}},
+  byeditorcpaf = {{editare și alcătuire, cu o postfață, de}%
+    {ed\adddot\space și alcăt., cu o postfață, de}},
+  byeditorcpcoin = {{editare, alcătuire, și comentarii, cu o
+      introducere, de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o introducere, de}},
+  byeditorcpcofo = {{editare, alcătuire, și comentarii, cu o prefață,
+      de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o prefață, de}},
+  byeditorcpcoaf = {{editare, alcătuire, și comentarii, cu o
+      postfață, de}%
+    {ed.,\addabbrvspace alcăt., și coment., cu o postfață, de}},
+  byeditorcpanin = {{editare, alcătuire, și adnotări, cu o
+      introducere, de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o introducere, de}},
+  byeditorcpanfo = {{editare, alcătuire, și adnotări, cu o prefață,
+      de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o prefață, de}},
+  byeditorcpanaf = {{editare, alcătuire, și adnotări, cu o
+      postfață, de}%
+    {ed.,\addabbrvspace alcăt., și adnot., cu o postfață, de}},
+  bytranslatorcp = {{traducere \lbx at fromlang\ și alcătuire de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt\adddot}},
+  bytranslatorcpco = {{traducere \lbx at fromlang, alcătuire, și
+      comentarii de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment\adddot}},
+  bytranslatorcpan = {{traducere \lbx at fromlang, alcătuire, și
+      adnotări de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot\adddot}},
+  bytranslatorcpin = {{traducere \lbx at fromlang\  și alcătuire, cu o
+      introducere, de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o introducere, de}},
+  bytranslatorcpfo = {{traducere \lbx at fromlang\ și alcătuire, cu o
+      prefață, de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o prefață, de}},
+  bytranslatorcpaf = {{traducere \lbx at fromlang\ și alcătuire, cu o
+      postfață, de}%
+    {trad\adddot\addspace\lbx at fromlang\ și alcăt., cu o postfață, de}},
+  bytranslatorcpcoin = {{traducere \lbx at fromlang, alcătuire, și comentarii,
+      cu o introducere, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment., cu o
+      introducere, de}},
+  bytranslatorcpcofo = {{traducere \lbx at fromlang, alcătuire, și comentarii,
+      cu o prefață, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment.,
+      cu o prefață, de}},
+  bytranslatorcpcoaf = {{traducere \lbx at fromlang, alcătuire, și comentarii,
+      cu o postfață, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și coment., cu o
+      postfață, de}},
+  bytranslatorcpanin = {{traducere \lbx at fromlang, alcătuire, și adnotări,
+      cu o introducere, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot., cu o
+      introducere, de}},
+  bytranslatorcpanfo = {{traducere \lbx at fromlang, alcătuire, și adnotări,
+      cu o prefață, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot.,
+      cu o prefață, de}},
+  bytranslatorcpanaf = {{traducere \lbx at fromlang, alcătuire, și adnotări,
+      cu o postfață, de}%
+    {trad\adddot\addspace\lbx at fromlang, alcăt., și adnot.,
+      cu o postfață, de}},
+  bycompilerco = {{alcătuire și comentarii de}%
+    {alcăt\adddot\space și coment\adddot}},
+  bycompileran = {{alcătuire și adnotări de}%
+    {alcăt\adddot\space și adnot\adddot}},
+  bycompilerin = {{alcătuire, cu o introducere, de}%
+    {alcăt\adddot, cu o introducere, de}},
+  bycompilerfo = {{alcătuire, cu o prefață, de}%
+    {alcăt\adddot, cu o prefață, de}},
+  bycompileraf = {{alcătuire, cu o postfață, de}%
+    {alcăt\adddot, cu o postfață, de}},
+  bycompilercoin = {{alcătuire și comentarii, cu o introducere, de}%
+    {alcăt\adddot\space și coment\adddot, cu o introducere, de}},
+  bycompilercofo = {{alcătuire și comentarii, cu o prefață, de}%
+    {alcăt\adddot\space și coment\adddot, cu o prefață, de}},
+  bycompilercoaf = {{alcătuire și comentarii, with an afterword, de}%
+    {alcăt\adddot\space și coment\adddot, cu o postfață, de}},
+  bycompileranin = {{alcătuire și adnotări, cu o introducere, de}%
+    {alcăt\adddot\space și adnot\adddot, cu o introducere, de}},
+  bycompileranfo = {{alcătuire și adnotări, cu o prefață, de}%
+    {alcăt\adddot\space și adnot\adddot, cu o prefață, de}},
+  bycompileranaf = {{alcătuire și adnotări, cu o postfață, de}%
+    {alcăt\adddot\space şi adnot\adddot, cu o postfață, de}},
+}
+
+\endinput

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,4 +1,4 @@
-\ProvidesFile{cms-swedish.lbx}[2020/04/20 v 3.14 biblatex localization]
+\ProvidesFile{cms-swedish.lbx}[2021/03/27 v 3.16 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Stefan Bj\"{o}rk).

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty	2021-04-04 01:44:43 UTC (rev 58715)
@@ -374,7 +374,7 @@
   \hyperlink{\getrefbykeydefault{#1}{anchor}{}}%
   {\texttt{#1}}}
 
-\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep%
+\DeclareFieldFormat{annotation}{%\addperiod\par\nobreak \vskip \bibitemsep%
   \hyperlink{\getrefbykeydefault{\cmsdoc at entrykey}{anchor}{}}%
   {\small{\textbf{[\cmsdocref at entry]\addspace}}}\small#1}
 
@@ -382,7 +382,7 @@
 %%% biblatex-chicago.pdf.
 
 \newrobustcmd*{\cmssecref}[2][]{\marginpar{\href{\@baseurl%
-      \getrefbykeydefault{#2}{anchor}{}}{\small \xA7\,\getrefnumber{#2}}%
+      \getrefbykeydefault{#2}{anchor}{}}{\small \S\,\getrefnumber{#2}}%
       \ifblank{#1}{}{\scriptsize,\, s.v.\\[1pt]\enquote{#1}}}}
 \newrobustcmd*{\cmspagref}[1]{\marginpar{\href{\@baseurl%
       page.\getpagerefnumber{#1}}{p.~\getpagerefnumber{#1}}}}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty	2021-04-03 23:59:46 UTC (rev 58714)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsendnotes.sty	2021-04-04 01:44:43 UTC (rev 58715)
@@ -1,6 +1,6 @@
 % Copyright (c) 2003 John Lavagnino
 %               2003 Ulrich Dirr
-%               2020 David Fussner
+%               2020-2021 David Fussner
 %
 % This package is currently maintained by David Fussner.
 %
@@ -28,7 +28,7 @@
 % Please see biblatex-chicago.pdf for details of how to use this
 % package.
 
-\ProvidesPackage{cmsendnotes}[2020/04/20 v 3.14 biblatex auxiliary package]
+\ProvidesPackage{cmsendnotes}[2021/03/27 v 3.16 biblatex auxiliary package]
 
 \RequirePackage{kvoptions}
 \RequirePackage{endnotes}



More information about the tex-live-commits mailing list.