windycity (28mar19)

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

9 files changed, 458 insertions, 267 deletions

diff --git a/Master/texmf-dist/doc/latex/windycity/CHANGES.md b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
index 6fdfc886de9..e979f5a29be 100644
--- a/Master/texmf-dist/doc/latex/windycity/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
@@ -2,10 +2,24 @@
 
 Versions of Windy City are indicated by release date. The most recent
 date below is the current version, which is available on
-[CTAN](https://www.ctan.org/pkg/windycity "CTAN"). Changes since then,
-if any, are listed below under "Latest" and indicate updates to [Windy
-City's repository](https://github.com/brianchase/windycity "GitHub:
-brianchase/windycity") on [GitHub](https://github.com "GitHub").
+[CTAN](https://www.ctan.org/pkg/windycity "CTAN: pkg/windycity").
+Changes since then, if any, are listed below under "Latest" and
+indicate updates to Windy City's [repository on
+GitHub](https://github.com/brianchase/windycity "GitHub:
+brianchase/windycity").
+
+## 2019-03-27
+
+* fixed a bug that could prevent names in the 'editora' field from
+  printing in the author's position
+* fixed typos that broke the 'mathesis' entry type
+* fixed 'mathesis' and 'phdthesis' entry types so that they don't need
+  a 'type' field to distinguish the MA from the PhD (only the 'thesis'
+  entry type needs it)
+* improved support for newspapers and magazines with issue numbers
+  (see updated documentation on how to implement it)
+* added support for citing a newspaper's edition, such as 'Sunday Book
+  Review'
 
 ## 2019-02-21
 
@@ -52,8 +66,8 @@ brianchase/windycity") on [GitHub](https://github.com "GitHub").
 * changed processing of spacing and punctuation around 'postnote' for
   all citations
 * added support for swapping the place of an author with an editor or
-  translator, as in CMS 14.104
-* extended the previous to cover a similar case in CMS 14.122
+  translator, as in CMOS 14.104
+* extended the previous to cover a similar case in CMOS 14.122
 * improved handling of name lists and cross-referencing
 * removed no longer maintained citation commands
 * other bug fixes and housekeeping
@@ -106,7 +120,7 @@ brianchase/windycity") on [GitHub](https://github.com "GitHub").
 
 * fixed 'noauth' entry option (it should only affect notes)
 * fixed 'inst+loc+date'
-* following CMS, made 'cite:short' print just a work's title without
+* following CMOS, made 'cite:short' print just a work's title without
   the name of the collection
 * fixed name formatting for affixes like 'Jr.' in notes (no comma
   before them, unlike in bibliographies, where names are inverted)
@@ -142,10 +156,11 @@ brianchase/windycity") on [GitHub](https://github.com "GitHub").
 * put back preamble options 'useeditor' and 'usetranslator', which
   are necessary after all (double ugh!)
 * more readable and arguably simpler date processing for periodicals
-* added preamble option 'ibid' to prepare for the 17th edition of CMS
+* added preamble option 'ibid' to prepare for the 17th edition of CMOS
 * updated windycity.tex to reflect the last point, also to make use of
   optionlist
-* remove unused entries from windycity.bib for the 15th edition of CMS
+* remove unused entries from windycity.bib for the 15th edition of
+  CMOS
 
 ## 2018-11-13
 
@@ -153,8 +168,8 @@ brianchase/windycity") on [GitHub](https://github.com "GitHub").
   for endday field)
 * fixed spacing between volumes and pages in author-date system for
   periodicals
-* support names of anonymous authors as in CMS 14.80 (16th edition)
-  and CMS 14.79 (17th edition)
+* support names of anonymous authors as in CMOS 14.80 (16th edition)
+  and CMOS 14.79 (17th edition)
 
 ## 2018-11-09
 
diff --git a/Master/texmf-dist/doc/latex/windycity/README.md b/Master/texmf-dist/doc/latex/windycity/README.md
index 8a0ceb4869e..499b3cc1808 100644
--- a/Master/texmf-dist/doc/latex/windycity/README.md
+++ b/Master/texmf-dist/doc/latex/windycity/README.md
@@ -26,28 +26,62 @@ guide](http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/windycity/d
 
 If you already know how to use
 [biblatex](http://www.ctan.org/pkg/biblatex "biblatex"), getting
-started with Windy City is easy. Locate
-[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") on your
-system, and copy Windy City's files into their respective directories:
+started with Windy City is easy. The first task is to confirm that
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") and Windy City
+are installed properly on your system. Since both are included in some
+distributions of [LaTeX](https://en.wikipedia.org/wiki/LaTeX "LaTeX"),
+you might be able to skip this step.
+
+Windy City consists of four files:
+
+* [windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx "windycity.dbx")
+* [windycity.bbx](https://github.com/brianchase/windycity/blob/master/bbx/windycity.bbx "windycity.bbx")
+* [windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx "windycity.cbx")
+* [american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx "american-windycity.lbx")
+
+If you need to install Windy City on your system, you may copy its
+files to one of several places. One option is to locate
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") on your system
+and use its directories:
 
 * .../biblatex/[windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx "windycity.dbx")
 * .../biblatex/bbx/[windycity.bbx](https://github.com/brianchase/windycity/blob/master/bbx/windycity.bbx "windycity.bbx")
 * .../biblatex/cbx/[windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx "windycity.cbx")
 * .../biblatex/lbx/[american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx "american-windycity.lbx")
 
-Next, tell [biblatex](http://www.ctan.org/pkg/biblatex "biblatex") to
-load Windy City with the load-time option `style`:
+If you prefer not to mix Windy City's files with
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex")'s, another
+option is to find where your distribution of
+[LaTeX](https://en.wikipedia.org/wiki/LaTeX "LaTeX") keeps
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex")'s third-party
+style files and proceed accordingly. Yet another option is to install
+Windy City in your local `texmf`. Its location will depend on your
+system and preferences. For a one-off compilation, say, to give Windy
+City a trial run on a single document, you can copy Windy City's files
+to the document's root directory.
+
+After copying the files to one of those places — or another of your
+choosing — remember that for every option but the last (a document's
+root directory), you need to update your `texmf` file name database.
+
+To compile a document with Windy City, tell
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") to load it
+with the load-time option `style`:
 
 ```
 \usepackage[style=windycity]{biblatex}
 ```
 
+Typically, this goes in a document's preamble or in one of its style
+files.
+
 For some entries in your bibliography database, you may need to add
-fields or make other adjustments to get the right output. However,
-since Windy City relies as much as possible on standard BibTeX fields,
-and secondarily on [biblatex](http://www.ctan.org/pkg/biblatex
-"biblatex") fields, you may not need to make major changes. The
-examples in this document and its accompanying bibliography database,
+fields or make other adjustments to get the right output. But since
+Windy City relies as much as possible on standard
+[BibTeX](http://www.bibtex.org "BibTeX") fields, and secondarily on
+[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") fields, you
+may not need to make major changes. The examples in this document and
+its accompanying bibliography database,
 [windycity.bib](https://github.com/brianchase/windycity/blob/master/doc/windycity.bib
 "windycity.bib"), should serve as a guide for how to manage your input
 for nearly every circumstance that the style is meant to handle.
@@ -66,6 +100,5 @@ warranties of merchantability and fitness for a particular purpose.
 
 ## Requirements
 
-* [TeX Live](http://www.tug.org/texlive "TeX Live")
 * [biblatex](http://www.ctan.org/pkg/biblatex "biblatex") 3.8 or higher
 
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib b/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
index 976badc97f3..ce666baf5c6 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
@@ -3,7 +3,7 @@
 @Book{chicago2017,
   author = {{University of Chicago Press}},
   title = {The Chicago Manual of Style},
-  shorthand = {\emph{CMS}},
+  shorthand = {\emph{CMOS}},
   shorthandintro = {\addperiod\space Hereafter, \printfield{shorthand}},
   edition = {17},
   address = {Chicago},
@@ -11,7 +11,7 @@
   year = {2017}
 }
 
-% Examples not in CMS
+% Examples not in CMOS
 
 @Book{doe2010a,
   options = {skipbib},
@@ -1126,7 +1126,7 @@
   author = {Tauber, Abraham},
   title = {Spelling Reform in the United States},
   type = {phdthesis},
-  institution = {Columbia University},
+  institution = {Colum\-bia University},
   year = {1958},
   howpublished = {microfilm}
 }
@@ -1589,7 +1589,7 @@
   year = {2008},
   origlocation = {New York},
   origyear = {1909},
-  sortyear = {1910},
+  sortyear = {1910},% sort after james1909
   url = {http://www.gutenberg.org/ebooks/432}
 }
 @Book{james1909,
@@ -2020,7 +2020,7 @@
   title = {Deconstructing Dinner},
   journal = {New York Times},
   date = {2006-04-23},
-%  section = {Sunday Book Review},% FIX: no such field
+  edition = {Sunday Book Review},
   url = {http://www.nytimes.com/2006/04/23/books/review/23kamp.html},
   crossref = {pollan2006}
 }
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf b/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
index d3d0e7db81c..d30b0165549 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty b/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
index d645c574b7d..7e7fa9e8e49 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
@@ -1,4 +1,4 @@
-% Last modified: Wed 20 Feb 2019 05:58:18 PM CST
+% Last modified: Wed 27 Mar 2019 01:19:37 PM CDT
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{windycity}
 \RequirePackage{ifxetex}
@@ -91,6 +91,11 @@
 \usepackage[inline]{enumitem}
 \setlist[enumerate,itemize]{noitemsep}
 
+% Allow line breaks in '\item[]':
+\newcommand{\tshortstack}{\@ifnextchar[\@tshortstack{\@tshortstack[c]}}%
+\let\@tshortstack\@shortstack
+\patchcmd\@tshortstack\vbox\vtop{}{}%
+
 \newenvironment{citebib}
   {\begin{enumerate}[%
      before=\RaggedRight\citereset\newrefsegment\small,
@@ -225,6 +230,17 @@
 \emergencystretch=1em
 \hyphenation{bib-la-tex Chi-ca-go}
 \usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, \op, etc.
+\renewenvironment*{marglist}
+  {\list{}{%
+     \setlength{\labelwidth}{\marglistwidth}%
+% Commented next line for normal paragraphing:
+%     \setlength{\labelsep}{\marglistsep}%
+     \setlength{\leftmargin}{0pt}%
+% Added next line for normal paragraphing:
+     \setlength{\parsep}{0pt}%
+     \setlength{\listparindent}{\parindent}%
+     \renewcommand*{\makelabel}[1]{\hss\marglistfont##1}}}
+  {\endlist}
 \renewenvironment*{optionlist}
   {\list{}{%
      \setlength{\labelwidth}{\marglistwidth}%
@@ -236,7 +252,6 @@
      \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
    \ltd@optionlist}
   {\endlist}
-     \setlength{\itemsep}{0pt}%
 \renewenvironment*{typelist}
   {\list{}{%
      \setlength{\labelwidth}{\marglistwidth}%
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex b/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
index d7082e7e337..f73f2da5042 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
@@ -1,4 +1,4 @@
-% Last modified: Thu 21 Feb 2019 03:04:32 PM CST
+% Last modified: Thu 28 Mar 2019 09:28:40 AM CDT
 \documentclass[11pt,letterpaper,oneside]{article}
 \usepackage{windycity}
 
@@ -8,7 +8,7 @@
 \author{Brian Michael Chase}
 \email{brianmichaelchase@gmail.com}
 \website{https://github.com/brianchase/windycity}
-\version{2019-02-21}
+\version{2019-03-27}
 \maketitle
 \begingroup
 \hypersetup{linkcolor=black}
@@ -26,20 +26,20 @@ or \url{https://www.latex-project.org/lppl/}.}
 Windy City is a style for \biblatex that formats notes,
 bibliographies, parenthetical citations, and reference lists according
 to the 17th edition of \textit{The Chicago Manual of Style}
-(\textit{CMS}).\footnote{\cite{chicago2017}} It accurately handles a
+(\textit{CMOS}).\footnote{\cite{chicago2017}} It accurately handles a
 wide range of citations in different formats and includes a set of
 options and commands to support special circumstances. It also has
 extensive support for citing and arranging different kinds of editors,
 translators, and compilers within a single citation. These features
 make Windy City especially suitable for academic work.
 
-The following sections assume familiarity with \textit{CMS} and
+The following sections assume familiarity with \textit{CMOS} and
 \biblatex. Section \ref{overview} gives a brief overview of the
 style's features. Section \ref{edtrans} discusses the assignment and
 placement of editors, translators, and compilers. Section
 \ref{collections} discusses several issues with collections, including
 options for formatting citations of individual volumes. Sections
-\ref{notes} and \ref{paren} reproduce examples from \textit{CMS}
+\ref{notes} and \ref{paren} reproduce examples from \textit{CMOS}
 Chapters 14 and 15, respectively, with occasional commentary and
 references to other sections.
 
@@ -58,8 +58,29 @@ might be of more immediate interest.
 \subsection{Getting Started}
 
 If you already know how to use \biblatex, getting started with Windy
-City is easy. Locate \biblatex on your system, and copy Windy City's
-files into their respective directories:
+City is easy. The first task is to confirm that \biblatex and Windy
+City are installed properly on your system. Since both are included in
+some distributions of \LaTeX, you might be able to skip this step.
+
+Either way, please consider downloading the most recent release of
+Windy City from \begingroup \hypersetup{urlcolor=blue}
+\href{https://www.ctan.org/pkg/windycity}{its home on CTAN}. More
+recent but potentially less reliable updates are available from Windy
+City's \href{https://github.com/brianchase/windycity}{repository on
+GitHub}.\endgroup
+
+Windy City consists of four files:
+
+\begin{itemize}[before=\small]
+\item \file{windycity.dbx}
+\item \file{windycity.bbx}
+\item \file{windycity.cbx}
+\item \file{american-windycity.lbx}
+\end{itemize}
+
+\noindent If you need to install Windy City on your system, you may
+copy its files to one of several places. One option is to locate
+\biblatex on your system and use its directories:
 
 \begin{itemize}[before=\small,label=]
 \item \ldots\path{/biblatex/windycity.dbx}
@@ -68,18 +89,34 @@ files into their respective directories:
 \item \ldots\path{/biblatex/lbx/american-windycity.lbx}
 \end{itemize}
 
-\noindent Next, tell \biblatex to load Windy City with the load-time
-option \opt{style}:
+If you prefer not to mix Windy City's files with \biblatex's, another
+option is to find where your distribution of \LaTeX\ keeps \biblatex's
+third-party style files and proceed accordingly. Yet another option is
+to install Windy City in your local \path{texmf}. Its location will
+depend on your system and preferences. For a one-off compilation, say,
+to give Windy City a trial run on a single document, you can copy
+Windy City's files to the document's root directory.
+
+After copying the files to one of those places---or another of your
+choosing---remember that for every option but the last (a document's
+root directory), you need to update your \path{texmf} file name
+database.
+
+To compile a document with Windy City, tell \biblatex to load it with
+the load-time option \opt{style}:
 
 \begin{verbatim}
    \usepackage[style=windycity]{biblatex}
 \end{verbatim}
 
+\noindent Typically, this goes in a document's preamble or in one of
+its style files.
+
 For some entries in your bibliography database, you may need to add
-fields or make other adjustments to get the right output. However,
-since Windy City relies as much as possible on standard \BibTeX
-fields, and secondarily on \biblatex fields, you may not need to make
-major changes. The examples in this document and its accompanying
+fields or make other adjustments to get the right output. But since
+Windy City relies as much as possible on standard \BibTeX\ fields, and
+secondarily on \biblatex fields, you may not need to make major
+changes. The examples in this document and its accompanying
 bibliography database, \file{windycity.bib}, should serve as a guide
 for how to manage your input for nearly every circumstance that the
 style is meant to handle.
@@ -87,7 +124,7 @@ style is meant to handle.
 \subsection{The Default Format}
 \label{default}
 
-For a first set of examples, consider a passage from \textit{CMS}
+For a first set of examples, consider a passage from \textit{CMOS}
 \ref{14.30}:
 
 \begin{citeonly}
@@ -120,7 +157,7 @@ previously cited works:
 \end{bibonly}
 
 \noindent You may also print a bibliography in the author-date format,
-what \textit{CMS} calls a reference list:
+what \textit{CMOS} calls a reference list:
 
 \begin{refonly}
 \nocite{kaiser1964,morley1995,schwartz1992}
@@ -166,9 +203,9 @@ All bibliographic data resides in \file{windycity.bib}.
 \subsection{Short Citations}
 \label{short}
 
-Aside from the author-date format, \textit{CMS} offers scant
+Aside from the author-date format, \textit{CMOS} offers scant
 documentation of alternative formats. Nevertheless, there are
-alternatives. Consider this example from \textit{CMS}
+alternatives. Consider this example from \textit{CMOS}
 \ref{14.34}:\footnote{Switching formats within a document isn't a
 feature of the style. For demonstration purposes, though, it's
 possible.}
@@ -224,12 +261,12 @@ eleventh note, where the title is the key mark of distinction, the
 author's name. To use this format, start \biblatex with the preamble
 option \opt{short}. See Section \ref{preops} for more information.
 
-\textit{CMS} \ref{14.34} also shows how to render the passage above
-with \textit{ibid.} Unlike previous editions of \textit{CMS}, the 17th
-edition discourages its use. As such, \textit{ibid.} is no longer part
-of Windy City's default format. Enable it with the preamble option
-\opt{ibid} (again, see Section \ref{preops}). Options \opt{short} and
-\opt{ibid} together give the following:
+\textit{CMOS} \ref{14.34} also shows how to render the passage above
+with \textit{ibid.} Unlike previous editions of \textit{CMOS}, the
+17th edition discourages its use. As such, \textit{ibid.} is no longer
+part of Windy City's default format. Enable it with the preamble
+option \opt{ibid} (again, see Section \ref{preops}). Options
+\opt{short} and \opt{ibid} together give the following:
 
 \begin{citeonly}
 \AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}}
@@ -299,7 +336,7 @@ Solomon} immediately after a citation of her \textit{Beloved}. In a
 context like that, do you really need to remind readers of the
 author's full name? If you think not, change \opt{idemtracker} to an
 appropriate value (see Section 3.1.2.3 of \biblatex's user
-guide).\footnote{\textit{CMS} seems to have no policy on this point.
+guide).\footnote{\textit{CMOS} seems to have no policy on this point.
 In the 16th edition, however, Figure 14.3 shows consecutive citations
 of works by the same author, both of which give the author's full
 name.}
@@ -328,11 +365,11 @@ discussion of multivolume works, see Section \ref{multivolume}.
 
 \noindent Use this option to shorten the first citation of each work.
 The resulting format consists mainly of the author's name and the
-work's title. According to \textit{CMS}, this approach is optional for
-documents with complete bibliographies. (See \textit{CMS} \ref{14.23},
-also 14.29--14.36.) You may use \opt{firstshort} in conjunction with
-\opt{ibid}. However, it adds nothing to \opt{short}, which has the
-same effect on first citations.
+work's title. According to \textit{CMOS}, this approach is optional
+for documents with complete bibliographies. (See \textit{CMOS}
+\ref{14.23}, also 14.29--14.36.) You may use \opt{firstshort} in
+conjunction with \opt{ibid}. However, it adds nothing to \opt{short},
+which has the same effect on first citations.
 
 \optitem[false]{ibid}{\opt{true}, \opt{false}}
 
@@ -340,10 +377,10 @@ same effect on first citations.
 on the same page receive an \textit{ibid}. The qualification ``on the
 same page'' means that \textit{ibid.} always refers to a work cited on
 the current page without an \textit{ibid.} The latter is not a
-requirement of \textit{CMS} but seems reasonable, since it prevents
+requirement of \textit{CMOS} but seems reasonable, since it prevents
 readers from having to look at another page to determine the referent
 of an \textit{ibid.} For examples of its output, see Section
-\ref{short} and \ref{14.34}. As of the 17th edition, \textit{CMS}
+\ref{short} and \ref{14.34}. As of the 17th edition, \textit{CMOS}
 discourages the use of \textit{ibid.} (see \ref{14.34}).
 
 \optitem[false]{isbn}{\opt{true}, \opt{false}}
@@ -374,9 +411,9 @@ bibliography, their results may overlap.
 \optitem[false]{reflist}{\opt{true}, \opt{false}}
 
 \noindent Use this option to print a bibliography in the author-date
-format, what \textit{CMS} calls a reference list. If you choose
+format, what \textit{CMOS} calls a reference list. If you choose
 parenthetical citations over notes, consider using \opt{reflist} to
-maintain consistency with \textit{CMS}. Again, another way to print a
+maintain consistency with \textit{CMOS}. Again, another way to print a
 reference list is to pass \opt{env=reflist} to
 \cmd{printbibliography}. See Section \ref{overview} for more
 information.
@@ -384,13 +421,13 @@ information.
 \optitem[false]{short}{\opt{true}, \opt{false}}
 
 \noindent As shown in Section \ref{short}, this option prints
-citations in a short format (see \textit{CMS} \ref{14.34}). The use of
-\opt{short} has one feature in common with \opt{ibid}: Just as
+citations in a short format (see \textit{CMOS} \ref{14.34}). The use
+of \opt{short} has one feature in common with \opt{ibid}: Just as
 \textit{ibid.} appears only for consecutive citations of a work on the
 same page, and so never refers to a citation on a previous page,
 \opt{short} drops the title from consecutive citations of a work on
 the same page, never in reference to a citation on a previous page. As
-with \textit{ibid.}, this feature isn't required by \textit{CMS}, but
+with \textit{ibid.}, this feature isn't required by \textit{CMOS}, but
 it prevents readers from having to look at a previous page to
 determine which title a citation refers to.
 
@@ -428,7 +465,7 @@ For options that affect the format of every work, see Section
 \optitem[false]{anonauth}{\opt{true}, \opt{false}}
 
 \noindent This option prints the author's name of an anonymously
-published work in brackets, as in this example from \textit{CMS}
+published work in brackets, as in this example from \textit{CMOS}
 \ref{14.79}:
 
 \begin{citebib}
@@ -438,7 +475,7 @@ published work in brackets, as in this example from \textit{CMS}
 \optitem[false]{anonqauth}{\opt{true}, \opt{false}}
 
 \noindent Similar to the previous but adds a question mark after the
-author's name, as in this example from \textit{CMS} \ref{14.79}:
+author's name, as in this example from \textit{CMOS} \ref{14.79}:
 
 \begin{citebib}
 \item \cite{hawkes1834}
@@ -461,12 +498,12 @@ work's entry, though, like an ISBN, before an annotation. To print the
 
 \optitem[false]{listvols}{\opt{true}, \opt{false}}
 
-\noindent \textit{CMS} offers some flexibility over whether a long
-citation gives a work's total number of volumes (see \textit{CMS}
+\noindent \textit{CMOS} offers some flexibility over whether a long
+citation gives a work's total number of volumes (see \textit{CMOS}
 \ref{14.118}). Windy City replicates this in a roundabout way: By
 default, it prints the \bibfield{volumes} field in certain long
 citations only if the \bibfield{postnote} field is empty. This does a
-better job of matching examples in \textit{CMS} than a simpler policy
+better job of matching examples in \textit{CMOS} than a simpler policy
 would. For the rest, use \opt{listvols}. It prints the
 \bibfield{volumes} field in those citations no matter what the
 \bibfield{postnote} contains. For more information, see Section
@@ -476,7 +513,7 @@ would. For the rest, use \opt{listvols}. It prints the
 
 \noindent This option tells the style to bypass the author's position
 of a work in notes and bibliographies. Citations will begin with the
-title's position. Below is an example from \textit{CMS} \ref{14.105}:
+title's position. Below is an example from \textit{CMOS} \ref{14.105}:
 
 \begin{citebib}
 \item \cite{chaucer1966}
@@ -501,7 +538,7 @@ translator, use \opt{swapauth}. This option works for \bibtype{book},
 
 \optitem[false]{swaptrans}{\opt{true}, \opt{false}}
 
-\noindent According to \textit{CMS}, if a work has an editor and a
+\noindent According to \textit{CMOS}, if a work has an editor and a
 translator, their names should appear in citations in the order in
 which they appear on the work's title page (\ref{14.104}). By default,
 the style lists editors first. Entries with the option
@@ -549,7 +586,7 @@ you've loaded with \biblatex.
 
 Use this command to cite a work without printing anything in the
 author's position. It comes in handy when the context makes the
-author's name clear. From \textit{CMS} \ref{14.78}:
+author's name clear. From \textit{CMOS} \ref{14.78}:
 
 \begin{citebib}
 \item \cite*[233]{franklin1868}
@@ -566,7 +603,7 @@ note but otherwise functions like \cmd{footcite}.
 Use this command to print a parenthetical citation without the
 author's position. The most likely contexts for this are passages in
 which the author receives explicit mention. Here's an example from
-\textit{CMS} \ref{15.25}:
+\textit{CMOS} \ref{15.25}:
 
 \begin{quote} Fiorina et al. \parencite*{fiorina2005} and Fischer and
 Hout \parencite*{fischer2006} reach more or less the same conclusions.
@@ -584,57 +621,6 @@ The source for the passage above contains:
 
 \end{ltxsyntax}
 
-\subsection{Additional Data Fields}
-\label{datafields}
-
-Windy City uses several data fields that aren't available with
-\biblatex. Some of them are for Windy City's internal use in
-cross-referencing and aren't listed below, as they're not meant for
-use in a bibliography database. The fields below are different: You
-can use them to store information in a bibliography database that you
-want to appear in citations. Without these fields, quite a few
-citations in this document wouldn't match their counterparts in
-\textit{CMS}.
-
-\begin{marglist}
-
-\item[blogtitle/blogsubtitle]
-
-The name of a blog goes in \bibfield{blogtitle} and
-\bibfield{blogsubtitle}. Using already existing fields for this
-information would have been preferable. But since blog posts take the
-usual \bibfield{title} and \bibfield{subtitle} fields, and since blogs
-may have host names of different types, nothing else seemed suitable.
-
-\item[editoraddon] Use this field to include additional editorial
-information about a book. It's available for \bibtype{book},
-\bibtype{incollection}, and \bibfield{review} entry types and their
-aliases. (For information on aliases in Windy City, see Section
-\ref{entrytypes}.) When applicable, its content appears after the
-names of a book's editors and translators without intervening
-punctuation. For an example, see Section \ref{entryops}, where the
-citation of \textit{Chaucer Life-Records} prints this
-\bibfield{editoraddon}: ``from materials compiled by John M. Manly and
-Edith Richert, with the assistance of Lilian J. Redstone et al.''
-
-\item[seriesaddon] This field is for additional information about a
-book's series. That includes information about the run of a series,
-such as \textit{2nd ser.} and \textit{n.s.}. For examples, see
-\textit{CMS} \ref{14.123} and \ref{14.126}. Keep in mind that, for
-journals, which occasionally have a series but no series name,
-information like \textit{2nd ser.} and \textit{n.s.} go in the
-\bibfield{series} field.
-
-\item[shortmaintitle] This field is for the short form of a
-\bibfield{maintitle}. Use it in a bibliography database when a work's
-\bibfield{maintitle} may occupy the position of a regular title in a
-short citation and needs a short form. This should only happen with
-certain works in collections. See, for example, the citation of
-\textit{The Complete Tales of Henry James} in Section
-\ref{multivolume}.
-
-\end{marglist}
-
 \subsection{Entry Types}
 \label{entrytypes}
 
@@ -690,7 +676,7 @@ One comment about \bibtype{reference} and \bibtype{inreference}
 entries: You may cross-reference \bibtype{inreference} entries to
 \bibtype{reference} entries, as with articles in books, but you can
 get the same output using one or the other entry type alone. Take an
-example from \textit{CMS} \ref{14.232}:
+example from \textit{CMOS} \ref{14.232}:
 
 \begin{citeonly}
 \item \cite{salvation1980}
@@ -731,7 +717,7 @@ For unusually complicated citations, or those just not supported by
 the style, consider using the \bibtype{misc} entry type. The style
 formats these entries with a small number of fields but in way that
 makes it a fallback for almost anything. The example below is from
-\textit{CMS} 14.264:
+\textit{CMOS} 14.264:
 
 \begin{citebib}
 \item \cite{roosevelt1959}
@@ -760,7 +746,7 @@ quotation marks.
 \end{verbatim}
 
 You may also use the \bibtype{misc} entry type to cross-reference
-entries in a bibliography, as in \textit{CMS} \ref{14.81} and
+entries in a bibliography, as in \textit{CMOS} \ref{14.81} and
 \ref{14.82}.
 
 \begin{bibonly}
@@ -788,6 +774,134 @@ automatic cross-referencing in notes and bibliographies see Section
 \ref{notes}, \ref{14.108}; Section \ref{paren}, \ref{15.42}; and
 Section \ref{collections}.
 
+For more information on entry types---specifically, on the use of
+certain data fields with them---see Section \ref{datafields}.
+
+\subsection{Data Fields}
+\label{datafields}
+
+As Windy City has grown to support more citations, it has had to add
+data fields that aren't recognized by \BibTeX\ or \biblatex. It also
+uses some standard ones in perhaps unexpected ways.
+
+\subsubsection{Additional Data Fields}
+\label{datafields}
+
+Some of Windy City's additional or nonstandard data fields are for its
+internal handling of cross-referencing. Those fields aren't listed
+below, as they're not meant for use in a bibliography database. The
+rest store information that's crucial for correct formatting. Without
+them, quite a few citations in this document wouldn't match their
+counterparts in \textit{CMOS}.
+
+\begin{marglist}
+
+\item[\smash{\tshortstack[l]{blogtitle\\blogsubtitle}}] The name of a
+blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Of
+course, already existing fields would have been preferable for this
+purpose. But since blog posts take the usual \bibfield{title} and
+\bibfield{subtitle}, and since blogs may have host names of different
+sorts, new fields seemed necessary.
+
+\item[editoraddon] Use this field to include additional editorial
+information about a book. It's available for \bibtype{book},
+\bibtype{incollection}, and \bibfield{review} entry types and their
+aliases. (For information on aliases in Windy City, see Section
+\ref{entrytypes}.) When applicable, its content appears after the
+names of a book's editors and translators without intervening
+punctuation. For an example, see Section \ref{entryops}, where the
+citation of \textit{Chaucer Life-Records} prints this
+\bibfield{editoraddon}: ``from materials compiled by John M. Manly and
+Edith Richert, with the assistance of Lilian J. Redstone et al.''
+
+\item[seriesaddon] This field is for additional information about a
+book's series. That includes information about the run of a series,
+such as \textit{2nd ser.} and \textit{n.s.}. For examples, see
+\textit{CMOS} \ref{14.123} and \ref{14.126}. Keep in mind that, for
+journals, which occasionally have a series but no series name,
+information like \textit{2nd ser.} and \textit{n.s.} go in the
+\bibfield{series} field.
+
+\item[shortmaintitle] This field is for the short form of a
+\bibfield{maintitle}. Use it in a bibliography database when a work's
+\bibfield{maintitle} may occupy the position of a regular title in a
+short citation and needs a short form. This should only happen with
+certain works in collections. See, for example, the citation of
+\textit{The Complete Tales of Henry James} in Section
+\ref{multivolume}.
+
+\end{marglist}
+
+\subsubsection{Other Data Fields}
+\label{fieldscon}
+
+Examples in this document don't always make it clear how Windy City
+uses standard data fields. The list below discusses some of them.
+
+\begin{marglist}
+
+\item[edition] To indicate a numbered edition of a work, put the
+number of the edition in this field---for example, \textit{2} for a
+second edition. To indicate a revised edition, enter either
+\textit{revised} or \textit{rev. ed.}. Both options give the same
+output. You may also use the field to indicate a newspaper's edition,
+such as\textit{Sunday Book Review} (see \textit{CMOS} \ref{14.202}).
+
+\item[issue] Windy City uses this field with the \bibtype{article},
+\bibtype{online}, and \bibtype{review} entry types to record a work's
+season of publication (spring, summer, autumn/fall, winter). The
+\bibtype{date} field also records seasons---but the value \textit{23},
+for the third season, returns \textit{Autumn}. To print \textit{Fall},
+use an \bibfield{issue} field with that value. In other words, for the
+output \textit{Fall 2013}, a work's bibliography database entry should
+contain:
+
+\begin{verbatim}
+   issue = {Fall},
+   date = {2013},
+\end{verbatim}
+
+\noindent Whereas for \textit{Autumn 2013}, use either:
+
+\begin{verbatim}
+   date = {2013-23},
+\end{verbatim}
+
+\noindent Or:
+
+\begin{verbatim}
+   issue = {Autumn},
+   date = {2013},
+\end{verbatim}
+
+\noindent Remember that when \bibfield{date} contains just a year of
+publication, you may use the classic \bibfield{year} field instead.
+
+\item[series] See the comments for \bibfield{seriesaddon} in Section
+\ref{datafields}.
+
+\item[type] With the \bibtype{thesis} entry type, Windy City uses the
+\bibfield{type} field to distinguish a Master's thesis from a PhD
+dissertation. For the latter, \bibtype{type} should have the values
+\textit{phdthesis} or \textit{PhD diss.}. For the former, use
+\textit{mathesis} or \textit{master's thesis}. No \bibfield{type}
+field is needed for the \bibtype{mathesis} and \bibtype{phdthesis}
+entry types.
+
+In rare cases, the \bibfield{type} field is necessary for the
+\bibtype{article} and \bibtype{review} entry types when a work's
+bibliographic information doesn't allow Windy City to distinguish a
+journal article from a magazine or newspaper article. This happens
+when a magazine or newspaper article has an issue number. Normally,
+Windy City would respond by printing the issue number before the date
+and enclosing the date in parentheses. But the issue number needs to
+go first, and the date shouldn't be in parentheses. The workaround is
+to include a \bibfield{type} field with the value \textit{newsmag}.
+For an example, see \textit{CMOS} \ref{14.204} and compare it with the
+citation of Beattie in \ref{14.171}.
+
+\end{marglist}
+
 \section{Editors, Translators, and Compilers}
 \label{edtrans}
 
@@ -804,7 +918,7 @@ For the most part, Windy City associates the \bibfield{editor} and
 scope of an entry. In most cases, then, you can assign editors and
 translators simply by adding the \bibfield{editor} and
 \bibfield{translator} fields to a database entry. Below is the entry
-for an example in \textit{CMS} \ref{14.104}:
+for an example in \textit{CMOS} \ref{14.104}:
 
 \begin{verbatim}
    @Collection{adorno1999,
@@ -832,7 +946,7 @@ translator, in that order, after the authors and title.
 Cross-referencing introduces a bit more complexity, though the
 principle is the same: Within the scope of an entry, the style
 associates \bibfield{editor} and \bibfield{translator} with the lowest
-level title. In this example from \textit{CMS} \ref{14.30}, an essay
+level title. In this example from \textit{CMOS} \ref{14.30}, an essay
 is cross-referenced to a collection:
 
 \begin{verbatim}
@@ -903,7 +1017,7 @@ Sometimes, you need to designate the role of an editor with the field
 compiler to an entry, add the compiler's name to an available field
 for an editor, then add an appropriate \bibfield{editortype} field
 with the value \textit{compiler}. It may help to see the bibliography
-database entry for an example in \textit{CMS} \ref{14.103}:
+database entry for an example in \textit{CMOS} \ref{14.103}:
 
 \begin{verbatim}
    @Book{schechter2011,
@@ -923,7 +1037,7 @@ database entry for an example in \textit{CMS} \ref{14.103}:
 
 Follow the same pattern for editors of a \bibfield{maintitle},
 \bibfield{series}, or \bibfield{issuetitle}. Here's an example from
-\textit{CMS} \ref{14.123}:
+\textit{CMOS} \ref{14.123}:
 
 \begin{verbatim}
    @Book{allen2009,
@@ -1005,7 +1119,7 @@ you may want to reverse the order. For that, use the entry option
 If a work has no author, but has an editor, the style will print the
 editor's name in the author's position. The same happens if a work has
 no author but has a translator. The following are examples from
-\textit{CMS} \ref{14.103}:
+\textit{CMOS} \ref{14.103}:
 
 \begin{citebib}
 \item \cite[100]{egan2014}
@@ -1029,7 +1143,7 @@ in the author's position:
 Similarly, if a work's editors and translators are identical, the
 style will print the editors' role first, as in \textit{edited and
 translated by}\ldots Reverse them with \opt{swaptrans}. From
-\textit{CMS} \ref{14.104}:
+\textit{CMOS} \ref{14.104}:
 
 \begin{citebib}
 \item \cite{menchu1999}
@@ -1040,7 +1154,7 @@ above apply to compilers: If a work has compilers and translators,
 compilers' names will print first, unless you use \opt{swaptrans}.
 
 In rare cases, you may want to swap the position of an author and an
-editor or translator. \textit{CMS} \ref{14.104} gives an example:
+editor or translator. \textit{CMOS} \ref{14.104} gives an example:
 
 \begin{citebib}
 \item \cite{pound1953}
@@ -1084,7 +1198,7 @@ the entry for the previous example:
 \label{collections}
 
 Before you cite a collection or one of its volumes, you need to
-consider how you want the citation to look (\textit{CMS} gives you
+consider how you want the citation to look (\textit{CMOS} gives you
 options) and whether the collection should count as a single work or
 as a composite. These issues have implications for how you structure
 entries in your bibliography database and how you use citation
@@ -1098,7 +1212,7 @@ publication information that differs from the collection's. When
 preparing your bibliography database, the most basic choice to make
 about a work in a collection is which publication information has
 priority, the collection's or the volume's. Consider an example from
-\textit{CMS} \ref{14.119}:
+\textit{CMOS} \ref{14.119}:
 
 \begin{citebib}
 \item \cite{armstrong2014}
@@ -1106,8 +1220,8 @@ priority, the collection's or the volume's. Consider an example from
 
 \noindent The editor and title of the volume precede the editor and
 title of the collection. In notes and bibliographies in the default
-format, \textit{CMS} gives you the option of reversing this order.
-(See especially \textit{CMS} \ref{14.119}, \ref{14.121}, and
+format, \textit{CMOS} gives you the option of reversing this order.
+(See especially \textit{CMOS} \ref{14.119}, \ref{14.121}, and
 \ref{14.122}, and compare \ref{14.144} and \ref{15.41}.) Windy City
 does as well, with the entry or preamble option \opt{swapvol}.
 
@@ -1137,9 +1251,9 @@ below, the volume has priority:
 \end{citeonly}
 
 Notice the appearance of the volume number in the second note above,
-separated from the page citation with a colon. When the collection has
+separated from the page citation by a colon. When the collection has
 priority, the volume number should appear in the citation. There are
-enough examples in \textit{CMS} to make that clear. But when the
+enough examples in \textit{CMOS} to make that clear. But when the
 volume has priority, the volume number is at best optional but
 probably incorrect. (It could cause confusion, since the collection is
 what comes in volumes, not the volumes themselves.) In any event,
@@ -1147,14 +1261,14 @@ Windy City prints the volume number only when the collection has
 priority, that is, when \opt{swapvol} is \textit{true}.
 
 Sometimes, you may want collections to have priority in every case. If
-so, compile your documents with the \opt{swapvol} preamble option,
+so, compile documents with the \opt{swapvol} preamble option,
 which acts globally, affecting all relevant citations. More likely,
 though, you'll want to give priority to the collection when citing
 some works but not others. That's why there's a \opt{swapvol} entry
 option for changing individual citations.
 
 A good candidate for the entry option is this example from
-\textit{CMS} \ref{14.118}:
+\textit{CMOS} \ref{14.118}:
 
 \begin{citebib}
 \item \cite*{james1963.5}
@@ -1198,7 +1312,7 @@ This drawback shouldn't affect \bibfield{bookinbook},
 entries when they're cross-referenced to works that are changed by
 \opt{swapvol}. They should have their own authors or titles that Windy
 City can use for proper sorting. As for examples, it seems that
-\textit{CMS} gives exactly one in \ref{14.120}:
+\textit{CMOS} gives exactly one in \ref{14.120}:
 
 \begin{citebib}
 \item \cite[169--71]{king2014}
@@ -1220,7 +1334,7 @@ In the second set of examples above, Windy City doesn't print the
 volume number before the page reference. That's because, with or
 without \opt{swapvol}, the citation is directly to the work's title,
 not to the collection. The same goes for articles, chapters, books,
-and other works of this type. Further, consistent with \textit{CMS}
+and other works of this type. Further, consistent with \textit{CMOS}
 \ref{14.108} and \ref{15.42}, Windy City cross-references previously
 cited volumes.
 
@@ -1249,7 +1363,7 @@ cited volumes.
 How does Windy City determine which entries in a bibliography database
 work with \opt{swapvol}? To keep things simple, let's focus on
 individual volumes of a collection, rather than works collected in
-them, like articles and chapters. Below are the entries for an earlier
+them, like articles and chapters. Below are entries for an earlier
 example:
 
 \begin{verbatim}
@@ -1349,7 +1463,7 @@ a whole, cross-referencing to \bibtype{bookinbook} or \bibtype{inbook}
 entries is probably simpler. The other way is simpler if you plan to
 cite just one work in one volume.
 
-As mentioned in \textit{CMS} \ref{15.41}, reference lists should give
+As mentioned in \textit{CMOS} \ref{15.41}, reference lists should give
 priority to the volume, not to the collection. Nevertheless, Windy
 City doesn't prevent you from using \opt{swapvol} with \opt{reflist}.
 Either way, remember that when a volume and a collection have
@@ -1364,13 +1478,13 @@ which in turn requires you to use the \bibtype{bookinbook} or
 A final issue concerns whether you want long citations to give a
 work's total number of volumes. Whereas entries in a bibliography
 almost always give that number (the exceptions are those that work
-with \opt{swapvol}), doing so in notes is optional (per \textit{CMS}
+with \opt{swapvol}), doing so in notes is optional (per \textit{CMOS}
 \ref{14.118}).
 
 Here's what Windy City does: Apart from entries that work with
 \opt{swapvol}, it prints the \bibfield{volumes} field in long
 citations only if the \bibfield{postnote} field is empty. That's not a
-requirement of \textit{CMS}. But there are several reasons for
+requirement of \textit{CMOS}. But there are several reasons for
 preferring this approach. If the \bibfield{postnote} is empty,
 printing the total preserves the correspondence between the long
 citation and its entry in the bibliography. This prevents the
@@ -1381,13 +1495,13 @@ include a volume number (see Section \ref{multivolume}). Including a
 volume number makes it less important, arguably, to include the total
 number of volumes. The main benefit, anyway, is that Windy City's
 approach is consistent with citations of \textit{The Lisle Letters} in
-\textit{CMS} \ref{14.117} and \ref{14.118}. No simpler rule would be.
+\textit{CMOS} \ref{14.117} and \ref{14.118}. No simpler rule would be.
 
 Confused? All you need to know is that, barring exceptions for
 \opt{swapvol}, if you want to print a work's total number of volumes
 without regard to the \bibfield{postnote}, use the entry option
 \opt{listvols}. Windy City uses it to match some examples in
-\textit{CMS}, such as in \ref{14.59}:
+\textit{CMOS}, such as in \ref{14.59}:
 
 \begin{citeonly}
 \item \cite[1:126]{shurtleff1853}
@@ -1396,11 +1510,11 @@ without regard to the \bibfield{postnote}, use the entry option
 \subsection{Collections as Single Works}
 \label{multivolume}
 
-Although its discussion is a bit obscure, \textit{CMS} treats some
+Although its discussion is a bit obscure, \textit{CMOS} treats some
 multivolume collections as single works---but only, it seems, if every
 volume of the collection has the same title and publication date. To
 illustrate the distinction between a collection that counts as a
-single work and one that doesn't, \textit{CMS} gives the following
+single work and one that doesn't, \textit{CMOS} gives the following
 examples in \ref{14.118}:
 
 \begin{citeonly}
@@ -1440,8 +1554,8 @@ as a whole. Here's the entry for \textit{The Lisle Letters}:
 
 To cite a particular volume of the collection, include the volume
 number in the citation's \bibfield{postnote}. For citations of pages,
-remember the format from \textit{CMS} \ref{14.118}: Volume numbers and
-pages are separated with a colon. Here's the source for the first
+remember the format from \textit{CMOS} \ref{14.118}: Volume numbers
+and pages are separated with a colon. Here's the source for the first
 citation of \textit{The Lisle Letters}:
 
 \begin{verbatim}
@@ -1450,7 +1564,7 @@ citation of \textit{The Lisle Letters}:
 
 \noindent To cite a volume by itself, without a page reference, or to
 cite chapters, sections, and other parts of the work, remember to use
-the appropriate abbreviations (for some examples, see \textit{CMS}
+the appropriate abbreviations (for some examples, see \textit{CMOS}
 \ref{14.120}, 15.23, and \ref{15.41}):
 
 \begin{verbatim}
@@ -1472,7 +1586,7 @@ shows the default output for two such citations of the collection:
 For collections like \textit{The Complete Tales of Henry James}, which
 don't count as single works, every volume needs to have its own entry
 in the bibliography database. Here's the entry for the volume cited in
-\textit{CMS} \ref{14.118}:
+\textit{CMOS} \ref{14.118}:
 
 \begin{verbatim}
    @Collection{james1963.5,
@@ -1507,7 +1621,7 @@ entry, not multiple, cross-referenced entries. For \textit{The
 Complete Tales Henry James}, cross-referencing would result in errors
 because, with different titles and publication dates, not all
 publication data for the collection is true of each volume. To cite
-the collection as a whole, as in \textit{CMS} \ref{14.117}, add a
+the collection as a whole, as in \textit{CMOS} \ref{14.117}, add a
 separate entry:
 
 \begin{verbatim}
@@ -1561,7 +1675,7 @@ accordingly:
 \item \cite{spinoza1900.1.1}
 \end{citebib}
 
-\noindent If instead \bibfield{volume} were within the scope of
+\noindent If \bibfield{volume} were within the scope of
 \bibfield{spinoza1900.1.1}, Windy City would assume that \textit{A
 Theological-Political Treatise} is volume one of \textit{The Chief
 Works of Benedict de Spinoza}, that it's a volume of a collection,
@@ -1576,13 +1690,13 @@ correctly citing a work like this requires cross-referencing an
 output.) Only then would Windy City associate \bibfield{volume} with
 the right \bibfield{title}.
 
-\section{Examples from \emph{CMS} Chap. 14, ``Notes and
+\section{Examples from \emph{CMOS} Chap. 14, ``Notes and
 Bibliography''}
 \label{notes}
 
-Examples in this section reproduce those in \textit{CMS} Chapter 14.
+Examples in this section reproduce those in \textit{CMOS} Chapter 14.
 To help with cross-checking, subsection numbers and headings are from
-\textit{CMS}.
+\textit{CMOS}.
 
 \subsection{Basic Format, with Examples and Variations}
 \setcounter{subsection}{14}
@@ -1708,10 +1822,10 @@ Chicago. All rights reserved. Reprinted by permission]{manet1992}
 You may override the default announcement of a \bibfield{shorthand} by
 adding your preferred content to \bibfield{shorthandintro}. For an
 example, one that prints the announcement in a separate sentence, see
-the first citation of \textit{CMS} in this document's introduction.
+the first citation of \textit{CMOS} in this document's introduction.
 
 Note that Windy City doesn't automatically italicize a
-\bibfield{shorthand}. Per \textit{CMS} 14.60, a shorthand should be
+\bibfield{shorthand}. Per \textit{CMOS} 14.60, a shorthand should be
 italicized if the title that it abbreviates is also italicized. Set
 this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
 
@@ -2004,8 +2118,8 @@ On how to make an author and editor swap places, see Section
 % refsegment without using \nocite.
 
 % Unlike article entries, incollection entries don't automatically
-% print page ranges. That seems right, though CMS isn't entirely clear
-% on this point. See note for 'cite:pages' in windycity.cbx.
+% print page ranges. That seems right, though CMOS isn't entirely
+% clear on this point. See note for 'cite:pages' in windycity.cbx.
 
 \begin{citebib}
 \item \cite[84--87]{keating1968}
@@ -2067,7 +2181,7 @@ On how to make an author and editor swap places, see Section
 \begin{citebib}
 \item \cite[152--53]{barzun1994}
 \item \cite{bahadur2014}
-% CMS prints the original date in the wrong place:
+% CMOS prints the original date in the wrong place:
 %\item \cite{emerson1985}
 \item \cite{schweitzer1966}
 \end{citebib}
@@ -2075,11 +2189,11 @@ On how to make an author and editor swap places, see Section
 \subsubsection{Microform editions}
 % 14.115 Microform editions
 
-Farwell's citation fails to match \textit{CMS} because the
+Farwell's citation fails to match \textit{CMOS} because the
 \bibfield{howpublished} field, which seems like the best choice to
 contain \textit{microfiche}, follows the \bibfield{postnote} field,
 which contains \textit{p. 67, 3C12}. This order is necessary
-elsewhere, such as in \textit{CMS} \ref{14.163}.
+elsewhere, such as in \textit{CMOS} \ref{14.163}.
 
 \begin{citebib}
 \item \cite[p. 67, 3C12]{farwell1997}
@@ -2141,12 +2255,12 @@ For a discussion of how to handle these types of works, see Section
 \label{14.120}
 
 There are some peculiarities with the first example. In the book, but
-not online, \textit{CMS} errs in printing `.ed' rather than `editeb
+not online, \textit{CMOS} errs in printing `.ed' rather than `editeb
 by' in the bibliography and neglects to invert the author's name. More
 worrisome are the striking differences between the note and
 bibliography. They may represent alternative ways of formatting the
 data, as other examples do. But the note seems inconsistent with
-\textit{CMS} \ref{14.118}, and so doesn't make much sense as an
+\textit{CMOS} \ref{14.118}, and so doesn't make much sense as an
 alternative. Windy City ignores it and in both cases follows the
 example of the bibliography.
 
@@ -2373,9 +2487,9 @@ bibliography database entry. Here's an example from the source:
 \subsubsection{Freely available electronic editions of older works}
 % 14.162 Freely available electronic editions of older works
 
-The first example comes close to \textit{CMS}, except that, consistent
-with \ref{14.114} and \ref{15.40}, it lists the edition by Project
-Gutenberg as a reprint.
+The first example comes close to \textit{CMOS}, except that,
+consistent with \ref{14.114} and \ref{15.40}, it lists the edition by
+Project Gutenberg as a reprint.
 
 \begin{citebib}
 \item \cite[bk. 6, chap. 1]{james2008}
@@ -2400,10 +2514,10 @@ Gutenberg as a reprint.
 \label{14.171}
 
 The note for Harper includes the month of publication. Windy City
-includes it in the bibliography as well, even though \textit{CMS}
-omits it. As for Lock's entry, \textit{CMS} clearly errs in printing
+includes it in the bibliography as well, even though \textit{CMOS}
+omits it. As for Lock's entry, \textit{CMOS} clearly errs in printing
 the surname twice. Also, for Wilder's article, Windy City prints
-\textit{nos.} before \textit{1/2}, not \textit{no.}, as \textit{CMS}
+\textit{nos.} before \textit{1/2}, not \textit{no.}, as \textit{CMOS}
 has it. To print the correct season, Wilder's entry in the
 bibliography database includes \textit{Fall} in the \bibfield{issue}
 field. Using the \bibfield{date} field with \textit{2013-23} would
@@ -2581,11 +2695,7 @@ entry. To get the format for the series, you'd need to use the
 \setcounter{subsubsection}{201}
 \subsubsection{Book reviews}
 % 14.202 Book reviews
-
-At present, Windy City has no place to print information about a
-section or edition of a newspaper or magazine. Thus, \textit{Sunday
-Book Review} is missing from the second example. It does, however,
-show success at formatting a review with a title.
+\label{14.202}
 
 \begin{citebib}
 \item \cite[B13--B14]{ratliff1999}
@@ -2596,11 +2706,10 @@ show success at formatting a review with a title.
 \setcounter{subsubsection}{203}
 \subsubsection{Unsigned reviews}
 % 14.204 Unsigned reviews
+\label{14.204}
 
-The date below should appear immediately after the newspaper's title
-and not in parentheses. Nevertheless, it's consistent with other types
-of articles. In particular, see the citation of Beattie in
-\ref{14.171}.
+On the use of the \bibfield{type} field to format this example
+correctly, see Section \ref{fieldscon}.
 
 \begin{citebib}
 \item \cite{zeitung1828}
@@ -2615,7 +2724,7 @@ of articles. In particular, see the citation of Beattie in
 % 14.208 Citing blog posts and blogs
 \label{14.208}
 
-In \textit{CMS}, one citation refers to \textit{The Chronicle of
+In \textit{CMOS}, one citation refers to \textit{The Chronicle of
 Higher Education} and another to \textit{Chronicle of Higher
 Education}. The latter appears in \ref{15.51}, so it's probably
 correct.
@@ -2689,7 +2798,7 @@ Some reference works show full publication information in the same way
 as books. Use the \bibtype{book} entry type for them. The first three
 citations below are different. They need the \bibtype{reference} or
 \bibtype{inreference} entry type. See Section \ref{entrytypes} for
-more information. Following the suggestion in \textit{CMS} 14.232,
+more information. Following the suggestion in \textit{CMOS} 14.232,
 \bibtype{reference} and \bibtype{inreference} works don't appear in
 bibliographies and reference lists.
 
@@ -2707,7 +2816,7 @@ bibliographies and reference lists.
 
 Like some of the reference works in the previous section, the ones
 below need the \bibtype{reference} or \bibtype{inreference} entry
-type. As odd as it may seem, but consistent with \textit{CMS}, they,
+type. As odd as it may seem, but consistent with \textit{CMOS}, they,
 too, aren't included in bibliographies and reference lists. See
 Section \ref{entrytypes} for more information.
 
@@ -2758,14 +2867,14 @@ Section \ref{entrytypes} for more information.
 \item \cite[269]{zukofsky1931}, quoted in \cite[78]{costello1981}
 \end{citebib}
 
-\section{Examples from \emph{CMS} Chap. 15, ``Author-Date
+\section{Examples from \emph{CMOS} Chap. 15, ``Author-Date
 References''}
 \label{paren}
 
-Examples in this section reproduce those in \textit{CMS} Chapter 15.
+Examples in this section reproduce those in \textit{CMOS} Chapter 15.
 To help with cross-checking, subsection numbers and headings are from
-\textit{CMS}. Since parenthetical citations are relatively simple, and
-since the format of references lists is derivative of the default,
+\textit{CMOS}. Since parenthetical citations are relatively simple,
+and since the format of references lists is derivative of the default,
 the examples below are more selective than those in the previous
 section.
 
@@ -2816,7 +2925,7 @@ section.
 % 15.22 Text citations—basic form
 \label{15.22}
 
-Ignore the error in \textit{CMS}: In reference lists, a title goes
+Ignore the error in \textit{CMOS}: In reference lists, a title goes
 after the year, not before.
 
 \begin{citeref}
@@ -2902,7 +3011,7 @@ entry options.
 \subsubsection{Organization as author in author-date references}
 % 15.37 Organization as author in author-date references
 
-In the reference list, \textit{CMS} errs in printing `:1997' after
+In the reference list, \textit{CMOS} errs in printing `:1997' after
 `ISO 4'. Compare it with the nearly identical example in \ref{14.84}.
 
 \begin{citeref}
@@ -2960,7 +3069,7 @@ In the reference list, \textit{CMS} errs in printing `:1997' after
 % 15.47 Parentheses or comma with issue number
 
 In the second example, Windy City prints a colon after the journal
-number. \textit{CMS} prints a comma there---likely an error.
+number. \textit{CMOS} prints a comma there---likely an error.
 
 \begin{citeref}
 \item \parencite{glass2014}
@@ -2990,7 +3099,7 @@ between a volume number and a page reference.
 % 15.51 Citing blogs in author-date format
 \label{15.51}
 
-\textit{CMS} seems mistaken in printing a period after
+\textit{CMOS} seems mistaken in printing a period after
 \textit{Chronicle of Higher Education} instead of a comma. Compare
 with \ref{14.208} and \ref{15.42}.
 
diff --git a/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
index 284fa58298d..284fa58298d 100644
--- a/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx
+++ b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
diff --git a/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx
index 1af95c29e6a..d9584ac81a5 100644
--- a/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx
+++ b/Master/texmf-dist/tex/latex/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Thu 21 Feb 2019 09:27:06 AM CST
+% Last modified: Wed 27 Mar 2019 10:37:54 AM CDT
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -18,7 +18,7 @@
    {}
    {\PackageError{biblatex}
       {Outdated 'biblatex' package}
-      {Windy City 2019-02-21 is for biblatex v3.8 and above.\MessageBreak
+      {Windy City 2019-03-27 is for biblatex v3.8 and above.\MessageBreak
        You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
        This is a fatal error. I'm aborting now.}%
     \endinput}%
@@ -131,7 +131,7 @@
 \DeclareEntryOption[boolean]{swapvol}[true]{%
   \settoggle{swapvol}{#1}}%
 
-% For setting 'minbibnames' and such, see CMS, 17th ed., 14.76 and
+% For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and
 % 15.29.
 
 \ExecuteBibliographyOptions{%
@@ -409,7 +409,7 @@
 
 % Affixes like 'Jr.', should appear last, delimited with a comma, when
 % inverted, as in a bibliography, but not otherwise, as in a note. See
-% CMS, 17th ed., 6.43 and 16.41, as well as the example in 14.75.
+% CMOS, 17th ed., 6.43 and 16.41, as well as the example in 14.75.
 
 \renewbibmacro*{name:family-given}[4]{%
   \ifuseprefix
@@ -544,7 +544,7 @@
 \DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize
 
 % A shorthand should be italicized if the title that it abbreviates is
-% also italicized. See CMS, 17th ed., 14.60. Set this in the
+% also italicized. See CMOS, 17th ed., 14.60. Set this in the
 % bibliography database with '\emph{}' or '\mkbibemph{}'.
 
 \DeclareFieldFormat{shorthand}{#1}
@@ -594,10 +594,10 @@
 \DeclareBibliographyAlias{cite:suppbook}{cite:incollection}
 \DeclareBibliographyAlias{cite:suppcollection}{cite:incollection}
 
-\DeclareBibliographyAlias{mastersthesis}{thesis}
+\DeclareBibliographyAlias{mathesis}{thesis}
 \DeclareBibliographyAlias{phdthesis}{thesis}
 \DeclareBibliographyAlias{unpublished}{thesis}
-\DeclareBibliographyAlias{cite:mastersthesis}{cite:thesis}
+\DeclareBibliographyAlias{cite:mathesis}{cite:thesis}
 \DeclareBibliographyAlias{cite:phdthesis}{cite:thesis}
 \DeclareBibliographyAlias{cite:unpublished}{cite:thesis}
 
@@ -735,14 +735,12 @@
                and test {\ifnameundef{editora}}}
     {\toggletrue{noed}}%
     {\ifnameundef{editor}
-       {\renewcommand*{\xeditor}{editora}}%
-       {\renewcommand*{\xeditor}{editor}}%
-     \usebibmacro{test:xeditor:a}{ap}%
-     \iftoggle{noed}
-       {}
-       {\ifdefstring{\xeditor}{editor}
-          {\usebibmacro{test:editor:authpos}}%
-          {\usebibmacro{test:editora:authpos}}}}}
+       {\usebibmacro{test:editora:authpos}}%
+       {\usebibmacro{test:editor:authpos}%
+        \iftoggle{noed}
+          {\global\togglefalse{noed}%
+           \usebibmacro{test:editora:authpos}}%
+          {}}}}
 
 \newbibmacro*{test:xeditor:a}[1]{%
   \ifboolexpr{ test {\ifnameundef{\xeditor}}
@@ -771,24 +769,30 @@
           {}}}}
 
 \newbibmacro*{test:editor:authpos}{%
-  \ifboolexpr{ togl {collection:ib}
-               and togl {swapvol}
-               and not test {\ifnameundef{editora}}}
-    {\renewcommand*{\xeditor}{editora}%
-     \usebibmacro{test:editora:authpos}}%
-    {\ifboolexpr{ togl {swapvol}
-                  and ( togl {collection:icbk}
-                  or togl {collection:icib} )}
-       {\renewcommand*{\xeditor}{editora}%
-        \usebibmacro{test:editora:authpos}}%
-       {}}}
+  \renewcommand*{\xeditor}{editor}%
+  \usebibmacro{test:xeditor:a}{ap}%
+  \iftoggle{noed}
+    {}
+    {\ifboolexpr{ togl {collection:ib}
+                  and togl {swapvol}
+                  and not test {\ifnameundef{editora}}}
+       {\toggletrue{noed}}%
+       {\ifboolexpr{ togl {swapvol}
+                     and ( togl {collection:icbk}
+                     or togl {collection:icib} )}
+          {\toggletrue{noed}}%
+          {}}}}
 
 \newbibmacro*{test:editora:authpos}{%
-  \ifboolexpr{ togl {collection:ib}
-               and not togl {swapvol}
-               and test {\ifnameundef{editor}}}
-    {\toggletrue{noed}}%
-    {}}
+  \renewcommand*{\xeditor}{editora}%
+  \usebibmacro{test:xeditor:a}{ap}%
+  \iftoggle{noed}
+    {}
+    {\ifboolexpr{ togl {collection:ib}
+                  and not togl {swapvol}
+                  and test {\ifnameundef{editor}}}
+       {\toggletrue{noed}}%
+       {}}}
 
 \newbibmacro*{test:trans:authpos}{%
   \usebibmacro{trans+transa+transb}%
@@ -915,7 +919,7 @@
        {\usebibmacro{test:editora}}%
        {\usebibmacro{test:editor}%
         \iftoggle{noed}
-          {\global\togglefalse{noed}%
+          {\togglefalse{noed}%
            \usebibmacro{test:editora}}%
           {}}}}
 
@@ -928,13 +932,13 @@
         \usebibmacro{test:editorb}}%
        {\usebibmacro{test:editora}%
         \iftoggle{noed}
-          {\global\togglefalse{noed}%
+          {\togglefalse{noed}%
            \renewcommand*{\xeditor}{editorb}%
            \usebibmacro{test:editorb}}%
           {}}}
     {\usebibmacro{test:editor}%
      \iftoggle{noed}
-       {\global\togglefalse{noed}%
+       {\togglefalse{noed}%
         \usebibmacro{test:editora}}%
        {}}}
 
@@ -1084,7 +1088,7 @@
     {\anona\pluga\printnames[\cbx@deflabel]{%
        \cbx@namelist}\plugb\anonb}}%
 
-% A screen name should precede 'nameaddon'. See CMS, 17th ed., 14.208.
+% A screen name precedes 'nameaddon'. See CMOS, 17th ed., 14.208.
 
 \newbibmacro*{handle}{%
   \iffieldundef{handle}
@@ -1339,7 +1343,7 @@
 %%  Dates and Times  %%
 %%%%%%%%%%%%%%%%%%%%%%%
 
-\newbibmacro*{issue+month+etc}{%
+\newbibmacro*{issue+month+etc}[1]{%
   \iffieldundef{year}
     {\iffieldundef{month}
        {}
@@ -1353,11 +1357,15 @@
         \iffieldundef{month}
           {\usebibmacro{issue+season+year}}%
           {\usebibmacro{month+day+year}}}
-       {\setunit{\space}%
-        \iffieldundef{month}
-          {\usebibmacro{reflist+issue+season}}%
-          {\printtext[parens]{%
-             \usebibmacro{month+day+year}}}}}}
+       {\iffieldundef{month}
+          {\setunit{\space}%
+           \usebibmacro{reflist+issue+season}}%
+          {\ifstrequal{#1}{noparens}
+             {\newunit
+              \usebibmacro{month+day+year}}%
+             {\setunit{\space}%
+              \printtext[parens]{%
+                \usebibmacro{month+day+year}}}}}}}
 
 \newbibmacro*{month+day+year}{%
   \usebibmacro{month+endmonth}%
@@ -1431,7 +1439,7 @@
        \space
        \printfield{year}}}}
 
-% Per CMS, 17th ed., 14.119, print the publication year of the
+% Per CMOS, 17th ed., 14.119, print the publication year of the
 % last-mentioned title.
 
 \newbibmacro*{year+bookyear}{%
@@ -1520,7 +1528,7 @@
 % the DeclareLabeldate for reference lists. The macro below makes the
 % output consistent in those cases but can cause problems with
 % sorting. Resolve them with '\sortyear'. Also, end dates go here. See
-% CMS, 17th ed., 15.37 and 15.41. Although '\printlabeldate' prints
+% CMOS, 17th ed., 15.37 and 15.41. Although '\printlabeldate' prints
 % them, the workaround needs to run 'endyear', which can cause
 % problems not only with sorting but with 'extralabeldate'.
 
@@ -1611,7 +1619,7 @@
   \usebibmacro{author+title+ed+note}%
   \newunit
   \usebibmacro{websites}%
-  \usebibmacro{issue+month+etc}%
+  \usebibmacro{issue+month+etc}{}%
   \usebibmacro{doi+finentry+etc}}%
 
 \DeclareBibliographyDriver{patent}{%
@@ -1667,11 +1675,15 @@
   \iftoggle{journalfirst}
     {\newunit}%
     {\setunit{\addcomma\space}}%
-  \usebibmacro{periodical:number}%
-  \usebibmacro{issue+month+etc}}%
+  \iffieldequalstr{type}{newsmag}
+    {\usebibmacro{issue+month+etc}{noparens}%
+     \usebibmacro{periodical:number}}%
+    {\usebibmacro{periodical:number}%
+     \usebibmacro{issue+month+etc}{}}%
+  \usebibmacro{edition}{noformat}}%
 
 % If an article has an electronic article ID, don't print its page
-% range in the bibliography. See CMS, 17th ed., 14.174.
+% range in the bibliography. See CMOS, 17th ed., 14.174.
 
 \newbibmacro*{colon+pages+etc}{%
   \ifboolexpr{ test {\iffieldundef{pages}}
@@ -1701,7 +1713,7 @@
                and togl {swapvol}}
     {\usebibmacro{maintitle+editor}%
      \usebibmacro{note}%
-     \usebibmacro{edition}%
+     \usebibmacro{edition}{}%
      \usebibmacro{volume+number+etc}%
      \let\xtitle\empty
      \usebibmacro{longtitle+titleaddon}%
@@ -1726,7 +1738,7 @@
         \usebibmacro{part}%
         \usebibmacro{maintitle+editor}%
         \usebibmacro{note}%
-        \usebibmacro{edition}}}
+        \usebibmacro{edition}{}}}
   \usebibmacro{date+loc+etc}%
   \usebibmacro{origtitle}}%
 
@@ -1794,7 +1806,7 @@
     {\usebibmacro{edtrans:b}}}
 
 \newbibmacro*{inst+loc+date}{%
-  \usebibmacro{type}%
+  \usebibmacro{thesis+type}%
   \setunit{\addcomma\space}%
   \iflistundef{institution}
     {\printfield{venue}}%
@@ -1848,8 +1860,8 @@
     {\nopunct\printtext[parens]{%
        \printlist{location}}\space}}%
 
-% On how to format the issue number of periodicals, see CMS, 17th ed.,
-% 14.171 and 15.47.
+% On how to format the issue number of periodicals, see CMOS, 17th
+% ed., 14.171 and 15.47.
 
 \newbibmacro*{periodical:number}{%
   \iffieldundef{number}
@@ -1955,13 +1967,16 @@
      \renewcommand*{\cbx@namelist}{author}%
      \usebibmacro{printnames+etc}}}
 
-\newbibmacro*{edition}{%
+\newbibmacro*{edition}[1]{%
   \iffieldundef{edition}
     {}
     {\newunit
      \iffieldbibstring{edition}
        {\bibstring{\thefield{edition}}}
-       {\printfield{edition}}}}
+       {\ifstrequal{#1}{noformat}
+          {\setunit{\addcomma\space}%
+           \printfield[noformat]{edition}}%
+          {\printfield{edition}}}}}
 
 \newbibmacro*{date+loc+etc}{%
   \ifboolexpr{ test {\iflistundef{location}}
@@ -2060,12 +2075,16 @@
      \renewcommand*{\cbx@namelist}{bookauthor}%
      \usebibmacro{printnames+etc}}}
 
-\newbibmacro*{type}{%
-  \iffieldundef{type}
-    {}
-    {\iffieldbibstring{type}
-       {\bibstring{\thefield{type}}}
-       {\printfield{type}}}}
+\newbibmacro*{thesis+type}{%
+  \ifentrytype{mathesis}
+    {\bibstring{mathesis}}%
+    {\ifentrytype{phdthesis}
+       {\bibstring{phdthesis}}%
+       {\iffieldundef{type}
+         {}
+         {\iffieldbibstring{type}
+            {\bibstring{\thefield{type}}}
+            {\printfield{type}}}}}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Fourth and Higher Tier Macros  %%
@@ -2183,7 +2202,7 @@
 
 \newbibmacro*{note+edition+etc}{%
   \usebibmacro{note}%
-  \usebibmacro{edition}%
+  \usebibmacro{edition}{}%
   \usebibmacro{volumes}%
   \usebibmacro{bookseries}%
   \usebibmacro{pages}%
diff --git a/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx b/Master/texmf-dist/tex/latex/windycity/windycity.cbx
index cd2beed0f40..a33e9e13b6b 100644
--- a/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx
+++ b/Master/texmf-dist/tex/latex/windycity/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Thu 21 Feb 2019 09:35:25 AM CST
+% Last modified: Wed 27 Mar 2019 10:38:04 AM CDT
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -18,7 +18,7 @@
    {}
    {\PackageError{biblatex}
       {Outdated 'biblatex' package}
-      {Windy City 2019-02-21 is for biblatex v3.8 and above.\MessageBreak
+      {Windy City 2019-03-27 is for biblatex v3.8 and above.\MessageBreak
        You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
        This is a fatal error. I'm aborting now.}%
     \endinput}%
@@ -324,7 +324,7 @@
     {\let\cbx@keyhash\empty}%
     {\savefield{crossref}{\cbx@keyhash}}}
 
-% See CMS, 17th ed., 14.174, 14.177, 14.185, and 14.188.
+% See CMOS, 17th ed., 14.174, 14.177, 14.185, and 14.188.
 
 \newbibmacro*{colon+comma+etc}{%
   \ifboolexpr{ test {\iffieldundef{pages}}
@@ -366,12 +366,12 @@
      \usebibmacro{doi+url+etc}}}
 
 % If the postnote is empty, print the page ranges of journal articles.
-% See CMS, 17th ed., 14.153, 14.167, and 14.174. As for incollection
+% See CMOS, 17th ed., 14.153, 14.167, and 14.174. As for incollection
 % and inbook entries, 14.106 seems to suggest the same, but the
 % example in 14.30 suggests otherwise. The examples in 14.108 only
-% muddy the waters further. For magazines, CMS is clear that the range
-% can be left out. To do so, simply omit it from your bibliography
-% database.
+% muddy the waters further. For magazines, CMOS is clear that the
+% range can be left out. To do so, simply omit it from your
+% bibliography database.
 
 \newbibmacro*{cite:pages}{%
   \iffieldundef{pages}
@@ -455,7 +455,7 @@
   \usebibmacro{author+title+ed+note}%
   \setunit*{\newunitpunct}% needs '*'
   \usebibmacro{websites}%
-  \usebibmacro{issue+month+etc}%
+  \usebibmacro{issue+month+etc}{}%
   \newunit}%
 
 \DeclareBibliographyDriver{cite:patent}{%
@@ -466,7 +466,7 @@
 
 \DeclareBibliographyDriver{cite:reference}{%
   \printlist{organization}%
-  \usebibmacro{edition}%
+  \usebibmacro{edition}{}%
   \usebibmacro{refworks}%
   \newunit
   \bibstring{subverbo}\space