CTAN sync 202010010304

9 files changed, 578 insertions, 329 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
index 86f7765a37..45050c65fc 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
@@ -8,6 +8,22 @@ indicate updates to Windy City's [repository on
 GitHub](https://github.com/brianchase/windycity "GitHub:
 brianchase/windycity").
 
+## 2020-09-29
+
+* better punctuation handling in parenthetical citations, allowing
+examples in *CMOS* 15.24 and 15.30 (17th ed.)
+* for `@reference` and `@inreference` entries, added support for
+printing the `organization` field in the author's position of short
+citations, fixing many of them (most of them? it was bad!)
+* also for `@reference` and `@inreference` entries, allowed the
+`author` field to substitute for `organization` (not recommended but
+could prevent confusion in some cases)
+* fixed `\cites` and `\parencites` for consecutive citations of the
+same author (most seriously affecting parenthetical citations but also
+standard and short citations in different ways)
+* fixed parenthetical citations not printing volume numbers for
+certain collections
+
 ## 2020-09-07
 
 * added support for revisers and expanded combinations of editor and
@@ -34,11 +50,11 @@ brianchase/windycity").
   forewords, and introductions)
 * fixed placement of `edition` relative to editors, translators, and
   such
-* fixed short citations of @Review entries failing to print a review's
+* fixed short citations of `@review` entries failing to print a review's
   title
-* fixed output of @InReference entries when they cross-reference a
-  previously cited @Reference entry
-* fixed mismatch in output between `@Article` and `@Periodical` entry
+* fixed output of `@inreference` entries when they cross-reference a
+  previously cited `@reference` entry
+* fixed mismatch in output between `@article` and `@periodical` entry
   types
 * fixed `\parencite` failing to print names in `afterwords`,
   `forewords`, and `introduction` fields
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/README.md b/macros/latex/contrib/biblatex-contrib/windycity/README.md
index 1c8cd656f6..f4c5df8cab 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/README.md
+++ b/macros/latex/contrib/biblatex-contrib/windycity/README.md
@@ -43,8 +43,8 @@ If you need to install Windy City on your system, you have several
 options. For a one-off compilation, say, to give Windy City a trial
 run on a single document, you could copy Windy City's files to the
 document's root directory. Beyond that, your best option is to install
-it in your local \path{texmf}. Copy the files to a directory of your
-choosing, then update your \path{texmf} file name database.
+it in your local `texmf`. Copy the files to a directory of your
+choosing, then 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
@@ -59,20 +59,20 @@ files.
 
 For some entries in your bibliography database, you may need to add
 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.
+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,
+[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.
 
 ## License
 
-Copyright (c) 2019 Brian Michael Chase. Under the terms of the [LaTeX
-Project Public License](http://www.latex-project.org/lppl.txt
-"lppl.txt"), version 1.3, permission is granted to copy, distribute,
-or modify this software. See also
-<https://www.latex-project.org/lppl/>.
+Under the terms of the [LaTeX Project Public
+License](http://www.latex-project.org/lppl.txt "lppl.txt"), version
+1.3, permission is granted to copy, distribute, or modify this
+software. See also <https://www.latex-project.org/lppl/>.
 
 This software is provided as is, without warranty of any kind, either
 expressed or implied, including, but not limited to, the implied
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
index c0fa89c3a0..f04e60e0a9 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
@@ -1,4 +1,4 @@
-% Last modified: Mon 07 Sep 2020 06:40:46 PM CDT
+% Last modified: Tue 29 Sep 2020 06:29:33 PM CDT
 
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{american-windycity.lbx}[2020/09/07 Windy City
+\ProvidesFile{american-windycity.lbx}[2020/09/29 Windy City
   localization module for biblatex]
 \InheritBibliographyExtras{american}
 \InheritBibliographyStrings{american}
@@ -135,6 +135,7 @@
 \NewBibliographyString{special}
 \NewBibliographyString{subverbo,subverbos}
 \NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+}
+\NewBibliographyString{updated}
 
 \DeclareBibliographyStrings{%
   am            = {{a\adddot m\adddot}{a\adddot m\adddot}},
@@ -161,7 +162,7 @@
   edrev+        = {{edit\-ed and revised by}{eds\adddotspace and revs\adddot}},
   edtrans       = {{edit\-ed and translated by}{ed\adddotspace and trans\adddot}},
   edtrans+      = {{edit\-ed and translated by}{eds\adddotspace and trans\adddot}},
-  expanded      = {{exp\adddotspace ed\adddot}{exp\adddotspace ed\adddot}},
+  expanded      = {{expanded edition}{exp\adddotspace ed\adddot}},
   foreword      = {{foreword to}{foreword to}},
   forthcoming   = {{forthcoming}{forthcoming}},
   ibidem        = {{ibid\adddot}{ibid\adddot}},
@@ -204,6 +205,7 @@
   translator+   = {{translated by}{trans\adddot}},
   transrev      = {{translated and revised by}{trans\adddotspace and rev\adddot}},
   transrev+     = {{translated and revised by}{trans\adddotspace and revs\adddot}},
+  updated       = {{updated edition}{up\adddotspace ed\adddot}},
   urlseen       = {{accessed}{accessed}},
   volume        = {{vol\adddot}{vol\adddot}},
   volumes       = {{vols\adddot}{vols\adddot}}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
index a27b370d6d..ebbdc03529 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
@@ -2487,6 +2487,17 @@
   howpublished = {. . .}
 }
 
+% 15.24 Additional material in text citations
+
+@Book{mandolan2017,
+  options = {skipbib},
+  author = {Mandolan, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {2017}
+}
+
 % 15.25 Text citations in relation to surrounding text and punctuation
 
 @Book{fiorina2005,
@@ -2531,6 +2542,113 @@
   year = {2017}
 }
 
+15.30 Multiple text references
+
+@Book{armstrong1989,
+  options = {skipbib},
+  author = {Armstrong, Somebody and Malacinski, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1989}
+}
+@Book{beigl1989,
+  options = {skipbib},
+  author = {Beigl, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1989}
+}
+@Book{pickett1985,
+  options = {skipbib},
+  author = {Pickett, Somebody and White, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1985}
+}
+@Book{whittaker1967,
+  options = {skipbib},
+  author = {Whittaker, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1967}
+}
+@Book{whittaker1975,
+  options = {skipbib},
+  author = {Whittaker, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1975}
+}
+@Book{wiens1989a,
+  options = {skipbib},
+  author = {Wiens, Somebody},
+  title = {First Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1989}
+}
+@Book{wiens1989b,
+  options = {skipbib},
+  author = {Wiens, Somebody},
+  title = {Second Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1989}
+}
+@Book{wong1999,
+  options = {skipbib},
+  author = {Wong, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1999}
+}
+@Book{wong2000,
+  options = {skipbib},
+  author = {Wong, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {2000}
+}
+@Book{garcia1998,
+  options = {skipbib},
+  author = {Garcia, Somebody},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {1989}
+}
+@Book{guest2006,
+  options = {skipbib},
+  author = {Guest, Somebody and Doe1, John and Smith1, Jane and Jones1, Mary},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {2006}
+}
+@Book{stalle2008,
+  options = {skipbib},
+  author = {Stolle, Somebody and Doe2, John and Smith2, Jane and Jones2, Mary},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {2008}
+}
+@Book{rahn2009,
+  options = {skipbib},
+  author = {Rahn, Somebody and Doe3, John and Smith3, Jane and Jones3, Mary},
+  title = {Some Book},
+  address = {Somewhere},
+  publisher = {Some Publisher},
+  year = {2009}
+}
+
 % 15.36 Editor in place of author in text citations
 
 @Book{soltes1999,
@@ -2667,3 +2785,14 @@
   publisher = {Penguin Books},
   year = {2015}
 }
+
+% Bibliography 2.4
+
+@Book{swanson1999,
+  author = {Swanson, Ellen},
+  title = {Mathematics into Type},
+  edition = {updated edition by Arlene O'Sean and Antoinette Schleyer},
+  address = {Providence, RI},
+  publisher = {American Mathematical Society},
+  year = {1999}
+}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
index b7edd45385..fe729f964a 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
index 4fb93bddf9..6bd738fd12 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
@@ -1,4 +1,4 @@
-% Last modified: Mon 07 Sep 2020 06:51:00 PM CDT
+% Last modified: Tue 29 Sep 2020 05:38:35 PM 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{2020-09-07}
+\version{2020-09-29}
 \maketitle
 \begingroup
 \hypersetup{linkcolor=black}
@@ -17,8 +17,8 @@
 
 \section{Introduction}
 
-\nfootnote{Copyright \textcopyright\ 2019 Brian Michael Chase. Under
-the terms of the \LaTeX\ Project Public License, version 1.3,
+\nfootnote{Copyright \textcopyright\ 2014--2020 Brian Michael Chase.
+Under the terms of the \LaTeX\ Project Public License, version 1.3,
 permission is granted to copy, distribute, or modify this software.
 See \url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}
 or \url{https://www.latex-project.org/lppl/}.}
@@ -40,7 +40,7 @@ placement of editors, translators, and the like. 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{CMOS}
-Chapters 14 and 15, respectively, with occasional commentary and
+chapters 14 and 15, respectively, with occasional commentary and
 references to other sections.
 
 Windy City requires \biblatex version 3.13 or later.
@@ -50,7 +50,7 @@ Windy City requires \biblatex version 3.13 or later.
 
 This section covers basic information about Windy City. If you're
 completely new to \biblatex, you should probably glance at its
-documentation. For the impatient, examples in Sections \ref{default},
+documentation. For the impatient, examples in sections \ref{default},
 \ref{short}, \ref{notes}, and \ref{paren} might be of more immediate
 interest.
 
@@ -151,10 +151,10 @@ short form of the work's title.
 
 Windy City supports variations on this format. For information on
 short forms of citations, including the use of \textit{ibid.}, see
-Section \ref{short}. For options to skip parts of citations, change
-the order of editors and translators, and more, see Sections
+section \ref{short}. For options to skip parts of citations, change
+the order of editors and translators, and more, see sections
 \ref{preops} and \ref{entryops}. For parenthetical citations, see
-examples in Section \ref{paren}.
+section \ref{paren}.
 
 The block below shows Windy City's default bibliography for the
 previously cited works:
@@ -199,11 +199,11 @@ reference lists may have problems with sorting. (You'll notice some in
 \ref{ref}, at the end of this document.) For best results, use the
 \opt{reflist} preamble option.
 
-As you proceed through the text, note that all examples of citations
-and bibliographies are outputs of the style from commands that you can
-inspect in the document's source, \file{windycity.tex}, and in its
-style file, \file{windycity.sty}. Almost all citations are from
-\cmd{cite} or \cmd{parencite}. A few are from more specialized
+As you proceed through the this guide, note that all examples of
+citations and bibliographies are outputs of the style from commands
+that you can inspect in the document's source, \file{windycity.tex},
+and in its style file, \file{windycity.sty}. Almost all citations are
+from \cmd{cite} or \cmd{parencite}. A few are from more specialized
 commands, such as \cmd{cite*} or \cmd{cites}. All example
 bibliographies are outputs of the style from \cmd{printbibliography}.
 All bibliographic data resides in \file{windycity.bib}.
@@ -267,13 +267,13 @@ names and titles and omits all other publication information.
 Consecutive citations of a work may omit the title or, as in the
 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.
+option \opt{short}. See section \ref{preops} for more information.
 
 \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
+option \opt{ibid} (again, see section \ref{preops}). Options
 \opt{short} and \opt{ibid} together give the following:
 
 \begin{citeonly}
@@ -303,16 +303,16 @@ option \opt{ibid} (again, see Section \ref{preops}). Options
 \item \cite[33]{morrison2004a}
 \end{citeonly}
 
-There are still other ways to save space: With the default format, you
+Other ways to make citations more concise: In the default format, you
 can use the preamble option \opt{firstshort} to swap long first
-citations for short ones (see Section \ref{preops}). Also with the
-default format, you can shorten the author's name in the first
-citation if the previous citation is of the same author. To do that,
-use the preamble option \opt{idemtracker} (see Section \ref{preops}).
-The entry option \opt{noauth} omits the author's name altogether (see
-Section \ref{entryops}). And the \bibfield{shorthand} field allows you
-to set an abbreviation to stand in place of the author's name, the
-work's title, and other elements of a citation (see \ref{14.59}).
+citations for short ones (see section \ref{preops}). Also in the
+default format, you can use the preamble option \opt{idemtracker} to
+shorten the author's name in the first citation if the previous
+citation is of the same author (see section \ref{preops}). The entry
+option \opt{noauth} omits the author's name altogether (see section
+\ref{entryops}). And the \bibfield{shorthand} field allows you to set
+an abbreviation to stand in place of the author's name, the work's
+title, and other elements of a citation (see \ref{14.59}).
 
 \subsection{Preamble Options}
 \label{preops}
@@ -343,7 +343,7 @@ the previous section the citation of Toni Morrison's \textit{Song of
 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
+appropriate value (see section 3.1.2.3 of \biblatex's user
 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
@@ -356,18 +356,18 @@ name.}
 \noindent This option is for printing annotated bibliographies.
 Annotations will print in block paragraphs below entries. To change
 the spacing between entries and annotations, change the value of
-\cmd{bibitemsep}. Store the text of an annotation in the
-\bibfield{annotation} field of the work's bibliography database entry.
+\cmd{bibitemsep}. Save an annotation in the \bibfield{annotation}
+field of a work's bibliography database entry.
 
 \optitem[false]{collsonly}{\opt{true}, \opt{false}}
 
-\noindent Citing individual works of a collection adds an entry for
-each work to the bibliography. To exclude them and print only an entry
-for the whole collection, use \opt{collsonly}. It has no effect on
-many \bibtype{incollection} entries, such as articles in books, which
-need or ought to have a place in the bibliography, but it does filter
-out chapters of books, books in books, and volumes of collections. For
-discussion of multivolume works, see Section \ref{multivolume}.
+\noindent Citing individual works of a collection adds entries for
+those works to the bibliography. To exclude them and print only an
+entry for the whole collection, use \opt{collsonly}. It has no effect
+on many \bibtype{incollection} entries, such as articles in books, but
+it does filter out chapters of books, books in books, and volumes of
+collections. For discussion of multivolume works, see section
+\ref{multivolume}.
 
 \optitem[false]{firstshort}{\opt{true}, \opt{false}}
 
@@ -384,12 +384,12 @@ which has the same effect on first citations.
 \noindent This option controls whether consecutive citations of a work
 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
+the current page without an \textit{ibid.} The latter isn't a
 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{CMOS}
-discourages the use of \textit{ibid.} (see \ref{14.34}).
+readers from having to look at another page to find 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{CMOS} discourages the use
+of \textit{ibid.} (see \ref{14.34}).
 
 \optitem[false]{isbn}{\opt{true}, \opt{false}}
 
@@ -397,7 +397,8 @@ discourages the use of \textit{ibid.} (see \ref{14.34}).
 ISBN goes in the \bibfield{isbn} field of its bibliography database
 entry. With this option, the style will print ISBNs at the end of
 every entry in the bibliography, before annotations. To print the ISBN
-of a particular work, use the \opt{isbn} entry option.
+of a particular work, use the \opt{isbn} entry option. Neither option
+effects the output of entries without an \bibfield{isbn} field.
 
 \optitem[false]{library}{\opt{true}, \opt{false}}
 
@@ -406,7 +407,8 @@ field of every work in the bibliography. Use it to print information
 about libraries, call numbers, and the like. If you use it with the
 \opt{isbn} and \opt{annotation} options, it will print after the
 former but before the latter. To print this information for selected
-works, use the \opt{library} entry option.
+works, use the \opt{library} entry option. Neither option effects the
+output of entries without a \bibfield{library} field.
 
 \optitem[false]{nolos}{\opt{true}, \opt{false}}
 
@@ -419,16 +421,16 @@ 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{CMOS} calls a reference list. If you choose
-parenthetical citations over notes, consider using \opt{reflist} to
-maintain consistency with \textit{CMOS}. Again, another way to print a
+format, what \textit{CMOS} calls a reference list. If you use
+parenthetical citations, consider using \opt{reflist} to 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
+\cmd{printbibliography}. See section \ref{overview} for more
 information.
 
 \optitem[false]{short}{\opt{true}, \opt{false}}
 
-\noindent As shown in Section \ref{short}, this option prints
+\noindent As shown in section \ref{short}, this option prints
 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
@@ -436,8 +438,8 @@ 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{CMOS}, but
-it prevents readers from having to look at a previous page to
-determine which title a citation refers to.
+it prevents readers from having to look at another page to find the
+title of a citation.
 
 In contexts where \opt{short} would drop a title from a citation, but
 where no name occupies the author's position, it will print the work's
@@ -447,7 +449,7 @@ applicable. In those situations, the short format is no different from
 the default.
 
 As noted earlier, \opt{short} has the same effect on first citations
-as \opt{firstshort}. But recall from Section \ref{short} that you can
+as \opt{firstshort}. But recall from section \ref{short} that you can
 combine \opt{short} and \opt{ibid} for more concise output.
 
 \optitem[false]{swapvol}{\opt{true}, \opt{false}}
@@ -456,7 +458,7 @@ combine \opt{short} and \opt{ibid} for more concise output.
 may place publication information for the volume before that of the
 collection or \textit{vice versa}. Windy City gives priority to the
 volume. To reverse this for all relevant citations, use \opt{swapvol}.
-For more information, see Section \ref{collorder}.
+For more information, see section \ref{collorder}.
 
 \end{optionlist}
 
@@ -465,7 +467,7 @@ For more information, see Section \ref{collorder}.
 
 An entry option is a value for the \bibfield{options} field of a
 work's database entry. It affects the format of that particular work.
-For options that affect the format of every work, see Section
+For options that affect the format of every work, see section
 \ref{preops}.
 
 \begin{optionlist}
@@ -482,8 +484,8 @@ published work in brackets, as in this example from \textit{CMOS}
 
 \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{CMOS} \ref{14.79}:
+\noindent Like \opt{anonauth} but adds a question mark after the
+author's name. From \textit{CMOS} \ref{14.79}:
 
 \begin{citebib}
 \item \cite{hawkes1834}
@@ -492,17 +494,17 @@ author's name, as in this example from \textit{CMOS} \ref{14.79}:
 \optitem[false]{isbn}{\opt{true}, \opt{false}}
 
 \noindent Use this option to print the ISBN of a particular work in a
-bibliography. The ISBN will appear at the end of the work's entry but,
-if applicable, before an annotation. To print ISBNs of every work in
-the bibliography, see the \bibfield{isbn} preamble option.
+bibliography. The ISBN will appear at the end of the work's entry (if
+applicable, before an annotation). To print ISBNs of every work in the
+bibliography, see the \bibfield{isbn} preamble option.
 
 \optitem[false]{library}{\opt{true}, \opt{false}}
 
 \noindent This option prints the \bibfield{library} field of a work's
 bibliography database entry. This information prints at the end of the
-work's entry, though, like an ISBN, before an annotation. To print the
-\bibfield{library} field of every work in the bibliography, use the
-\opt{library} preamble option.
+work's entry (if applicable, after an ISBN and before an annotation).
+To print the \bibfield{library} field of every work in the
+bibliography, use the \opt{library} preamble option.
 
 \optitem[false]{listvols}{\opt{true}, \opt{false}}
 
@@ -514,7 +516,7 @@ citations only if the \bibfield{postnote} field is empty. This does a
 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
+\bibfield{postnote} contains. For more information, see section
 \ref{collorder}.
 
 \optitem[false]{noauth}{\opt{true}, \opt{false}}
@@ -529,33 +531,34 @@ title's position. Below is an example from \textit{CMOS} \ref{14.105}:
 
 \noindent To bypass the author's position in a single note, without
 affecting the bibliography, use starred versions of citation commands,
-such as \cmd{cite*} and \cmd{footcite*}.
+such as \cmd{cite*}, \cmd{footcite*}, and \cmd{parencite*}.
 
 \optitem[false]{skipdate}{\opt{true}, \opt{false}}
 
 \noindent On rare occasions, you may need an entry in a reference list
-to skip the \textit{date} of the author-date format. See Section
-\ref{entrytypes} for examples.
+to skip the \textit{date}. See section \ref{entrytypes} for examples.
 
 \optitem[false]{swapauth}{\opt{true}, \opt{false}}
 
 \noindent To swap the places of a book's author with an editor or
 translator, use \opt{swapauth}. This option works for \bibtype{book},
 \bibtype{bookinbook}, \bibtype{collection}, \bibtype{inbook}, and
-\bibtype{incollection} entry types. For more information, see Section
+\bibtype{incollection} entry types. For more information, see section
 \ref{edtranspos}.
 
 \optitem[false]{swaptrans}{\opt{true}, \opt{false}}
 
 \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
-\bibfield{swaptrans} reverse this order: Their translators print
-first. If a work's translators and editors are the same, using
+which they appear on the work's title page (see \textit{CMOS}
+\ref{14.104}). By default, the style lists editors first. Entries with
+the option \bibfield{swaptrans} reverse this order: Their translators
+print first. If a work's translators and editors are the same,
 \bibfield{swaptrans} reverses the order of their roles, say, from
 \textit{edited and translated by} to \textit{translated and edited
-by}. For more information, see Section \ref{edtranspos}.
+by}. The same goes for compilers and revisers, which the style treats
+as specialized editors. For more information, see section
+\ref{edtranspos}.
 
 \optitem[false]{swapvol}{\opt{true}, \opt{false}}
 
@@ -564,7 +567,7 @@ basis what the \opt{swapvol} preamble option does globally: When set
 to true, it changes the format of a work in a collection so that, in
 bibliographies and long citations, publication information for the
 collection precedes that of the volume. For more information, see
-Section \ref{collorder}.
+section \ref{collorder}.
 
 \end{optionlist}
 
@@ -593,21 +596,21 @@ Windy City supports most of the citation commands familiar from
 citations). Their multicite forms---\cmd{cites}, \cmd{footcites}, and
 \cmd{parencites}---take a comma-separated list of entry keys.
 
-Use \cmd{nocite} to add works to bibliographies without citing them in
-the text. Use it with an asterisk to add every work in every
-\file{bib} file that was loaded with \cmd{addbibresource} or
-\cmd{bibliography}.
+Use \cmd{nocite} to add works to bibliographies even if you haven't
+cited them in the text with citations commands. Use it with an
+asterisk to add every work in every \file{bib} file that your document
+loaded with \cmd{addbibresource} or \cmd{bibliography}.
 
 Windy City sets the \opt{autocite} preamble option to \opt{footnote},
-which makes \cmd{autocite} equivalent to \cmd{smartcite}---which in
-turn behaves like different citation commands in different contexts.
-In Windy City, \cmd{smartcite} is equivalent to \cmd{footcite} in a
-document's body and \cmd{cite} in footnotes and endnotes.\footnote{In
-a \env{minipage} environment, \cmd{smartcite} is equivalent to
-\cmd{cite}. To use \cmd{smartcite} with endnotes, use the
-\sty{endnotes} package.} If you set the \opt{autocite} preamble option
-to \opt{inline}, \cmd{autocite} is equivalent to \cmd{parencite}. If
-you set it to \opt{plain}, \cmd{autocite} is equivalent to \cmd{cite}.
+which makes \cmd{autocite} equivalent to \cmd{smartcite}. The latter
+runs different citation commands in different contexts. In Windy City,
+\cmd{smartcite} is equivalent to \cmd{footcite} in a document's body
+and \cmd{cite} in footnotes and endnotes.\footnote{In a \env{minipage}
+environment, \cmd{smartcite} is equivalent to \cmd{cite}. To use
+\cmd{smartcite} with endnotes, use the \sty{endnotes} package.} If you
+set the \opt{autocite} preamble option to \opt{inline}, \cmd{autocite}
+is equivalent to \cmd{parencite}. If you set it to \opt{plain},
+\cmd{autocite} is equivalent to \cmd{cite}.
 
 Other citation commands:
 
@@ -634,9 +637,9 @@ Like \cmd{footcite} but suppresses the author's position.
 
 \cmditem{parencite*}[prenote][postnote]{key}
 
-Like \cmd{parencite} but suppresses the author's position. This is
-useful in passages where the author receives explicit mention. Here's
-an example from \textit{CMOS} \ref{15.25}:
+Like \cmd{parencite} but suppresses the author's position---useful in
+passages where the author receives explicit mention. Here's an example
+from \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.
@@ -680,13 +683,13 @@ The source for the passage above contains:
 
 Note that \cmd{textcite} doesn't enclose citations in parentheses but
 does drop the final period that standard citations usually end with.
-The parentheses above come from \cmd{mkbibparens}, which also switches
-the note's internal parentheses to brackets.
+The parentheses above come from \cmd{mkbibparens}, which switches the
+note's internal parentheses to brackets.
 
 \cmditem{textcite*}[prenote][postnote]{key}
 
-Like \cmd{textcite} but suppresses the author's position, as in this
-passage from \textit{CMOS} 13.65:
+Like \cmd{textcite} but suppresses the author's position. From
+\textit{CMOS} 13.65:
 
 \begin{quote} In their introduction to \textcite*{tocqueville1999},
 translators Harvey Mansfield and Delba Winthrop write that Tocqueville
@@ -763,8 +766,8 @@ City processes it as a book.
 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{CMOS} \ref{14.232}:
+get the same output using one or the other type alone. Take an example
+from \textit{CMOS} \ref{14.232}:
 
 \begin{citeonly}
 \item \cite{salvation1980}
@@ -788,7 +791,7 @@ the article cross-ref\-er\-enc\-ed to a \bibtype{reference} entry for
 
 \noindent This approach makes sense if you plan to cite more than one
 article from the source.\footnote{Incidentally, reference works don't
-always have titles in italics. As a result, you need to handle it in
+always have titles in italics. As a result, you need to set italics in
 your bibliography database.} But you could also have a single entry of
 either type with the same data:
 
@@ -811,7 +814,7 @@ makes it a fallback for almost anything. The example below is from
 \item \cite{roosevelt1959}
 \end{citebib}
 
-\noindent The database entry for this work contains most of the format
+\noindent This work's database entry contains most of its information
 in \bibfield{usera} (for notes) and \bibfield{userb} (for
 bibliographies). The \bibfield{title} field needs manual formatting,
 since works of this type may have titles in italics or quotation
@@ -858,12 +861,11 @@ from printing \textit{n.d.} (no date) after the name to indicate a
 missing publication date. After adding the \bibtype{misc} entries, use
 \cmd{nocite} with their entry keys to add them to your bibliography,
 and cite the remaining entries as usual. For examples of automatic
-cross-referencing in notes and bibliographies see Section \ref{notes},
-\ref{14.108}; Section \ref{paren}, \ref{15.42}; and Section
+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---see Section \ref{datafields}.
+For more discussion of entry types, see section \ref{datafields}.
 
 \subsection{Data Fields}
 \label{datafields}
@@ -892,10 +894,10 @@ mind that blog posts take the usual \bibfield{title} and
 \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
+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
+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.''
@@ -910,8 +912,8 @@ information like \textit{2nd ser.} and \textit{n.s.} go in the
 
 \item[shortmaintitle] This field is for the short form of a
 \bibfield{maintitle}. This should only be necessary for certain works
-in collections. See, for example, the citation of \textit{The Complete
-Tales of Henry James} in Section \ref{multivolume}.
+in collections. See the citation of \textit{The Complete Tales of
+Henry James} in section \ref{multivolume}.
 
 \end{marglist}
 
@@ -924,11 +926,22 @@ 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 this field to indicate a newspaper's edition,
-such as \textit{Sunday Book Review} (see \textit{CMOS} \ref{14.202}).
+edition's number 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. For expanded
+and updated editions, you may use \textit{expanded} or
+\textit{updated}. Add additional data as necessary. For the following
+example from \textit{CMOS} Bibliography 2.4, \bibfield{edition}
+contains \textit{updated edition by Arlene O'Sean and Antoinette
+Schleyer}:
+
+\begin{bibonly}
+\nocite{swanson1999}
+\end{bibonly}
+
+\noindent 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
@@ -957,9 +970,9 @@ use the \bibfield{issue} field. In other words, for \textit{Fall
 \end{verbatim}
 
 \noindent Remember that when \bibfield{date} contains just a year of
-publication, you may use the classic \bibfield{year} field instead.
+publication, you may use the classic \bibfield{year} field.
 
-\item[series] See the comments for \bibfield{seriesaddon} in Section
+\item[series] See the comments for \bibfield{seriesaddon} in section
 \ref{datafields}.
 
 \item[type] With the \bibtype{thesis} entry type, Windy City uses
@@ -989,8 +1002,8 @@ Beattie in \ref{14.171}.
 
 Windy City offers significant control over the handling of editors,
 translators, and the like. Taking advantage of it, however, may not
-seem intuitive at first. This section covers the options and issues
-that you need to grasp in order to master this aspect of the style.
+seem intuitive at first. This section covers all the relevant features
+and options.
 
 \subsection{Types of Editors and Translators}
 \label{edtransnames}
@@ -1021,15 +1034,15 @@ an example from \textit{CMOS} \ref{14.104}:
 \noindent When the style processes this entry, it identifies the
 editor and translator of the work with the names in the
 \bibfield{editor} and \bibfield{translator} fields. Since the entry
-doesn't use the \opt{swaptrans} entry option (see Section
+doesn't use the \opt{swaptrans} entry option (see section
 \ref{edtranspos}), the resulting output lists the editor and
 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{CMOS} \ref{14.30}, an essay
-is cross-referenced to a collection:
+Cross-referencing introduces a bit more complexity, but 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{CMOS} \ref{14.30}, an essay is
+cross-referenced to a collection:
 
 \begin{verbatim}
    @InCollection{kaiser1964,
@@ -1128,17 +1141,16 @@ examples in \textit{CMOS} \ref{14.103} and \ref{14.142}:
 
 In addition to the four basic roles (editor, translator, compiler, and
 reviser), you may assign names to any pair of them. A work's editor,
-for example, can also be its translator, or compiler, or reviser but
-not also its translator \textit{and} compiler or translator
-\textit{and} reviser, and so on. And just as you can swap the order of
-the editor and translator roles (again, see Section \ref{edtranspos}),
-you can swap the other combinations, say, to identify a work as
-``compiled and edited by'' Jane Doe rather than ``edited and compiled
-by'' her. The output depends on the value of \bibfield{editortype}.
-See Table \ref{table:ed} for a summary.
+for example, can also be its translator, or compiler, or reviser---but
+no more than one of these. And just as you can swap the order of the
+editor and translator roles (again, see section \ref{edtranspos}), you
+can swap all other combinations, say, to identify a work as
+\textit{compiled and edited by} Jane Doe rather than \textit{edited
+and compiled by} her. Simply change the value of
+\bibfield{editortype}. A summary of these values appears in Table
+\ref{table:ed}.
 
 \begin{table}[H]
-\caption{} \label{table:ed}
 \begin{tabular}{@{}r l@{}}
 \bibfield{editortype} & Assignment\\
 \toprule
@@ -1155,10 +1167,11 @@ revtrans & reviser and translator\\
 transcomp & translator and compiler\\
 transrev & translator and reviser\\
 \end{tabular}
+\caption{} \label{table:ed}
 \end{table}
 
-For an example in \textit{CMOS} of a such a dual role, we need turn to
-the bibliography. This will do:
+For an example in \textit{CMOS}, we need turn the bibliography. This
+will do:
 
 \begin{verbatim}
    @Book{fowler1965,
@@ -1260,12 +1273,14 @@ of thumb described above, reserving \bibfield{editor} for
 \label{edtranspos}
 
 Normally, Windy City lists editors first. But if translators are
-listed first on a work's title page (or in some other relevant place),
-you may want to reverse the order. For that, use the entry option
+listed first on a work's title page, you should reverse the order (see
+\textit{CMOS} \ref{14.104}). For that, use the entry option
 \opt{swaptrans}. Compare:
 
 \begin{citebib}
 \item \cite{doe2010a}
+\end{citebib}
+\begin{citebib}
 \item \cite{doe2010b}
 \end{citebib}
 
@@ -1413,14 +1428,11 @@ not the volumes themselves.) In any event, 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 documents with the \opt{swapvol} preamble option,
-which acts globally, affecting all relevant citations. More likely,
+If you want collections to have priority in every case, use the
+\opt{swapvol} preamble option, which acts globally. 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
+some works but not others. In those cases, use the \opt{swapvol} entry
+option. A good candidate for the latter is this example from
 \textit{CMOS} \ref{14.118}:
 
 \begin{citebib}
@@ -1641,7 +1653,7 @@ citation and its entry in the bibliography. This prevents the
 appearance that something has gone wrong when an element in one is
 missing from the other. If the \bibfield{postnote} isn't empty, it
 likely contains information that, as with page references, should also
-include a volume number (see Section \ref{multivolume}). Including a
+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
@@ -1721,9 +1733,9 @@ the appropriate abbreviations (for some examples, see \textit{CMOS}
    \cite[vol. 3, chap. 9]{byrne1981}
 \end{verbatim}
 
-What if you leave the \bibfield{postnote} empty? Windy City assumes
-that you mean to cite the collection as a whole. As such, the first,
-long citation of the work will print the collection's total number of
+What if the \bibfield{postnote} is empty? Windy City assumes that you
+mean to cite the collection as a whole. As such, the first, long
+citation of the work will print the collection's total number of
 volumes. Subsequent entries will indicate the collection in whatever
 short form corresponds to the preamble options. The following shows
 the default output for two such citations of the collection:
@@ -1758,12 +1770,26 @@ in the bibliography database. Here's the entry for the volume cited in
 Since the volume number is part of the entry and needs to print in
 different places depending on the context, don't include it in the
 \bibfield{postnote}. Let Windy City handle it. Below is the source for
-the first citation of \textit{The Complete Tales Henry James}:
+the first and second citations of \textit{The Complete Tales Henry
+James}:
 
 \begin{verbatim}
-   \cite*[32--33]{james1963.5}
+   \item \cite*[32--33]{james1963.5}
+     ...
+   \item \cite*[34]{james1963.5}
 \end{verbatim}
 
+\noindent The first citation prints the volume number after the
+editor's name, long before the \bibfield{postnote}. The second prints
+it just before the \bibfield{postnote}, separated from the page by a
+colon:
+
+\begin{citeonly}
+\item[2.] \cite*[32--33]{james1963.5}
+\item[\ldots]
+\item[4.] \cite*[34]{james1963.5}
+\end{citeonly}
+
 Neither type of collection uses cross-referencing in the bibliography
 database. For \textit{The Lisle Letters}, cross-referencing would
 introduce needless complexity. A single work should have a single
@@ -1828,22 +1854,22 @@ accordingly:
 \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. The
-same error would occur if you put all the data for the citation into,
-say, a \bibfield{collection} entry. Windy City would associate
-\bibfield{volume} with \bibfield{title}, not with
-\bibfield{maintitle}. The upshot is that correctly citing a work like
-this requires cross-referencing an \bibtype{inbook} or
-\bibtype{bookinbook} entry to a \bibtype{collection}, \bibtype{book},
-\bibtype{mvbook}, or \bibtype{mvcollection} entry. (Again, the
-alternatives give the same output.) Only then would Windy City
-associate \bibfield{volume} with the right \bibfield{title}.
+Works of Benedict de Spinoza}. The same error would occur if you put
+all the data for the citation into, say, a \bibfield{collection}
+entry. Windy City would associate \bibfield{volume} with
+\bibfield{title}, not with \bibfield{maintitle}. The upshot is that
+correctly citing a work like this requires cross-referencing an
+\bibtype{inbook} or \bibtype{bookinbook} entry to a
+\bibtype{collection}, \bibtype{book}, \bibtype{mvbook}, or
+\bibtype{mvcollection} entry. (Again, the alternatives give the same
+output.) Only then would Windy City associate \bibfield{volume} with
+the right \bibfield{title}.
 
 \section{Examples from \emph{CMOS} Chap. 14, ``Notes and
 Bibliography''}
 \label{notes}
 
-Examples in this section reproduce those in \textit{CMOS} 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{CMOS}.
 
@@ -1895,7 +1921,7 @@ To help with cross-checking, subsection numbers and headings are from
 % 14.34:
 \label{14.34}
 
-See Section \ref{short} for a discussion of how to enable the short
+See section \ref{short} for a discussion of how to enable the short
 format and the use of \textit{ibid.} First, the short format:
 
 \begin{citeonly}
@@ -2048,7 +2074,7 @@ this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
 % 14.79 No listed author (anonymous works)
 \label{14.79}
 
-See Section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
+See section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
 entry options.
 
 \begin{citebib}
@@ -2072,7 +2098,7 @@ entry options.
 \label{14.81}
 
 For information on how to add entries that cross-references others,
-like several of those below, see Section \ref{entrytypes}. For
+like several of those below, see section \ref{entrytypes}. For
 examples of automatic cross-referencing in a bibliography, see
 \ref{14.108} and \ref{15.42}.
 
@@ -2084,7 +2110,7 @@ examples of automatic cross-referencing in a bibliography, see
 % 14.82 Alternative real names
 \label{14.82}
 
-For information on how to get the last entry below, see Section
+For information on how to get the last entry below, see section
 \ref{entrytypes}.
 
 \begin{bibonly}
@@ -2218,7 +2244,7 @@ database.
 % 14.104 Editor or translator in addition to author
 \label{14.104}
 
-On how to make an author and editor swap places, see Section
+On how to make an author and editor swap places, see section
 \ref{edtranspos}.
 
 \begin{citebib}
@@ -2373,7 +2399,7 @@ elsewhere, such as in \textit{CMOS} \ref{14.163}.
 % 14.118 Citing a particular volume in a note
 \label{14.118}
 
-For a discussion of how to handle these types of works, see Section
+For a discussion of how to handle these types of works, see section
 \ref{multivolume}.
 
 \begin{citebib}
@@ -2450,7 +2476,7 @@ example of the bibliography.
 % 14.122 Authors and editors of multivolume works
 \label{14.122}
 
-For issues surrounding the first example below, see Section
+For issues surrounding the first example below, see section
 \ref{collorder}.
 
 \begin{citebib}
@@ -2867,7 +2893,7 @@ entry. To get the format for the series, you'd need to use the
 \label{14.204}
 
 On the use of the \bibfield{type} field to format this example
-correctly, see Section \ref{fieldscon}.
+correctly, see section \ref{fieldscon}.
 
 \begin{citebib}
 \item \cite{zeitung1828}
@@ -2955,7 +2981,7 @@ correct.
 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
+\bibtype{inreference} entry type. See section \ref{entrytypes} for
 more information. Following the suggestion in \textit{CMOS} 14.232,
 \bibtype{reference} and \bibtype{inreference} works don't appear in
 bibliographies or reference lists.
@@ -2976,7 +3002,7 @@ 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{CMOS}, they,
 too, aren't included in bibliographies and reference lists. See
-Section \ref{entrytypes} for more information.
+section \ref{entrytypes} for more information.
 
 \begin{citeonly}
 \item \cite{toscanini2016}
@@ -3029,7 +3055,7 @@ Section \ref{entrytypes} for more information.
 References''}
 \label{paren}
 
-Examples in this section reproduce those in \textit{CMOS} 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{CMOS}. Since parenthetical citations are relatively simple,
 and since the format of references lists is derivative of the default,
@@ -3097,7 +3123,14 @@ after the year, not before.
 \item \parencite{doershuk2016}
 \end{citeref}
 
-\setcounter{subsubsection}{24}
+\setcounter{subsubsection}{23}
+\subsubsection{Additional material in text citations}
+% 15.24 Additional material in text citations
+
+\begin{citeref}
+\item \parencite[; t-tests are used here]{mandolan2017}
+\end{citeref}
+
 \subsubsection{Text citations in relation to surrounding text and punctuation}
 % 15.25 Text citations in relation to surrounding text and punctuation
 \label{15.25}
@@ -3133,6 +3166,16 @@ midst. \end{citeref}
 \item \parencite{schonen2017b}
 \end{citeref}
 
+\subsubsection{Multiple text references}
+% 15.30 Multiple text references
+
+\begin{citeref}
+\item \parencite{armstrong1989,beigl1989,pickett1985}
+\item \parencites{whittaker1967,whittaker1975,wiens1989a,wiens1989b}
+\item \parencites[328]{wong1999}[475]{wong2000}[67]{garcia1998}
+\item \parencites{guest2006}[see also][]{stalle2008}{rahn2009}
+\end{citeref}
+
 \setcounter{subsection}{2}
 \subsection{Author-Date References: Special Cases}
 \setcounter{subsection}{15}
@@ -3141,7 +3184,7 @@ midst. \end{citeref}
 \subsubsection{Author-date format for anonymous works (no listed author)}
 % 15.34 Author-date format for anonymous works (no listed author)
 
-See Section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
+See section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
 entry options.
 
 \begin{citeref}
@@ -3297,7 +3340,7 @@ from the February 1931 issue of \textit{Poetry} magazine
 with the argument \opt{shorthand}. Running \cmd{printshorthands}
 produces the same output. By default, works in this list also appear
 in bibliographies. To exclude them, use the preamble option
-\opt{nolos}. See Section \ref{preops} for more information.\\}%
+\opt{nolos}. See section \ref{preops} for more information.\\}%
 
 \defbibnote{bib}{This section shows the default output of
 \cmd{printbibliography}. The next section shows the author-date
@@ -3305,7 +3348,7 @@ format.\\}%
 
 \defbibnote{ref}{This section shows the output of
 \cmd{printbibliography} in the author-date format. For information on
-how to produce this output, see Section \ref{preops}. Issues with
+how to produce this output, see section \ref{preops}. Issues with
 sorting in this section are mentioned there. Creating a reference list
 in the preferred way, with the \opt{reflist} preamble option, should
 prevent those issues.\\}%
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
index 0476af4784..29bc593ddd 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Mon 07 Sep 2020 06:40:45 PM CDT
+% Last modified: Tue 29 Sep 2020 06:28:58 PM CDT
 
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{windycity.bbx}[2020/09/07 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2020/09/29 Windy City bibliography style
   for biblatex]
 \@ifpackagelater{biblatex}{2019/08/17}
   {}
@@ -302,6 +302,8 @@
 \DeclareDataInheritance{collection}{collection,inbook}{%
   \inherit{year}{bookyear}
   \inherit{endyear}{endbookyear}}
+\DeclareDataInheritance{reference}{reference}{%
+  \inherit{author}{bookauthor}}
 \DeclareDataInheritance{*}{*}{%
   \noinherit{crossref}
   \noinherit{entryset}
@@ -319,9 +321,9 @@
   \noinherit{sortkey}
   \noinherit{xref}}
 
-%%%%%%%%%%%%%%%%%%%
-%%  Preliminary  %%
-%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%  Other Basic Settings %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \let\cbx@bibstring\empty
 \let\cbx@deflabel\empty
@@ -339,11 +341,13 @@
 
 \providetoggle{authposition}
 \providetoggle{bibliography}
+\providetoggle{ibid:loccit}
 \providetoggle{journalfirst}
 \providetoggle{multicite}
-\providetoggle{cbx@first}
-\providetoggle{cbx@loccit}
-\providetoggle{cbx@short}
+
+\providetoggle{cbx:collection}
+\providetoggle{cbx:first}
+\providetoggle{cbx:short}
 
 \providetoggle{collection}
 \providetoggle{collection:bk}
@@ -363,7 +367,7 @@
 
 \newcommand*{\AtEveryItem}{%
   \global\toggletrue{authposition}%
-  \global\togglefalse{cbx@short}}%
+  \global\togglefalse{cbx:short}}%
 
 \AtBeginBibliography{\AtBeginLists}%
 \AtBeginShorthands{\AtBeginLists}%
@@ -371,6 +375,7 @@
   \global\toggletrue{bibliography}%
   \AtEveryItem}%
 \AtEveryLositem{\AtEveryItem}%
+\DeclareNumChars{.[]?}
 
 \defbibenvironment{reflist}
   {\global\toggletrue{reflist}%
@@ -513,13 +518,13 @@
 \DeclareFieldFormat[thesis,unpublished]{title}{%
   \iftoggle{bibliography}
     {\mkbibquote{#1}}%
-    {\iftoggle{cbx@short}
+    {\iftoggle{cbx:short}
        {\mkbibquote{#1}}%
        {\mkbibquote{#1}\nopunct}}}
 \DeclareFieldFormat[thesis]{labeltitle}{%
   \iftoggle{bibliography}
     {\mkbibquote{#1}}%
-    {\iftoggle{cbx@short}
+    {\iftoggle{cbx:short}
        {\mkbibquote{#1}}%
        {\mkbibquote{#1}\nopunct}}}
 
@@ -556,8 +561,8 @@
 \DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize
 
 % A shorthand should be italicized if the title that it abbreviates is
-% also italicized. See CMOS, 17th ed., 14.60. Set this in the
-% bibliography database with '\emph{}' or '\mkbibemph{}'.
+% also italicized. See CMOS, 17th ed., 14.60. Set italics for it in
+% the bibliography database with '\emph{}' or '\mkbibemph{}'.
 
 \DeclareFieldFormat{shorthand}{#1}
 \DeclareFieldFormat{shorthandintro}{%
@@ -626,6 +631,7 @@
        {\usebibmacro{edtransuthpos}%
         \ifnameundef{\cbx@namelist}
           {\toggletrue{noauth}%
+           \usebibmacro{authpos+deflabel}%
            \usebibmacro{journalfirst}}%
           {\usebibmacro{addplus:authpos}%
            \usebibmacro{namehash+etc}}}%
@@ -661,10 +667,9 @@
     {\renewcommand*{\cbx@namelist}{bookauthor}}%
     {\renewcommand*{\cbx@namelist}{shortbookauthor}}}
 
-% When 'journaltitle' or 'blogtitle' goes in the author's position.
+% When 'journaltitle' goes in the author's position.
 
 \newbibmacro*{journalfirst}{%
-  \usebibmacro{authpos+deflabel}%
   \ifboolexpr{ ( test {\ifentrytype{article}}
                or test {\ifentrytype{review}} )
                and togl {bibliography}}
@@ -675,18 +680,34 @@
      \clearlist{location}%
      \usebibmacro{labeldate+extradate}%
      \newunit}%
-    {\ifboolexpr{ test {\ifentrytype{online}}
-                  and togl {bibliography}}
-       {\toggletrue{journalfirst}%
-        \usebibmacro{bibblogdash}%
-        \setunit{\space}%
-        \usebibmacro{labeldate+extradate}%
-        \newunit}%
-       {}}}
+    {\usebibmacro{blogtitlefirst}}}
+
+% When 'blogtitle' goes in the author's position.
+
+\newbibmacro*{blogtitlefirst}{%
+  \ifboolexpr{ test {\ifentrytype{online}}
+               and togl {bibliography}}
+    {\toggletrue{journalfirst}%
+     \usebibmacro{bibblogdash}%
+     \setunit{\space}%
+     \usebibmacro{labeldate+extradate}%
+     \newunit}%
+    {\usebibmacro{orgfirst}}}
+
+% When 'organization' goes in the author's position.
+
+\newbibmacro*{orgfirst}{%
+  \ifboolexpr{ test {\ifentrytype{reference}}
+               and not test {\iflistundef{organization}}}
+    {\printlist{organization}%
+     \setunit{\space}%
+     \newunit}%
+    {}}
 
 \newbibmacro*{namehash+etc}{%
   \usebibmacro{printnames+etc}%
-  \iftoggle{authposition}% false in 'crossref' macro
+  \ifboolexpr{ togl {authposition}% false in 'crossref' macro
+               or togl {multicite}}
     {\savefield{namehash}{\bbx@lasthash}%
      \usebibmacro{authpos+deflabel}%
      \newunit}%
@@ -872,7 +893,7 @@
                             {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}}
 
 \newbibmacro*{addplus:authpos}{%
-  \iftoggle{cbx@short}
+  \iftoggle{cbx:short}
     {}
     {\usebibmacro{addplus}%
      \renewcommand*{\plugb}{%
@@ -1161,7 +1182,7 @@
   \let\pluga\empty
   \let\plugb\empty}%
 
-% When 'journaltitle' goes in the author's position.
+% When a dash replaces 'journaltitle' in the author's position.
 
 \newbibmacro*{bibjournaldash}{%
   \ifboolexpr{ test {\iffieldequals{journaltitle}{\bbx@lasthash}}
@@ -1175,8 +1196,7 @@
      \usebibmacro{longtitle+titleaddon}%
      \let\xtitle\empty}}%
 
-% When 'blogtitle' goes in the author's position. This should only
-% apply when a blog has changed urls or host organizations.
+% When a dash replaces 'blogtitle' in the author's position.
 
 \newbibmacro*{bibblogdash}{%
   \ifboolexpr{ test {\iffieldequals{blogtitle}{\bbx@lasthash}}
@@ -1379,8 +1399,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%
 
 % The next command should work well enough for most languages but can
-% be overridden by lbx files. This happens when windycity.bbx loads
-% american-windycity.lbx.
+% be overridden by lbx files.
 
 \renewcommand*{\mkdaterangefull}[2]{%
   \begingroup
@@ -1548,10 +1567,9 @@
      \usebibmacro{reflist+origyear}%
      \usebibmacro{labeldate+endyear}%
      \printfield{extradate}%
-     \ifboolexpr{ test {\iffieldundef{year}}
-                  or test {\ifnumeral{\thefield{year}}}}
-       {\newunit}%
-       {\bibsentence\newunit}}% if year enclosed in brackets
+     \iffieldnums{labelyear}
+       {\bibsentence\newunit}%
+       {\newunit}}% for 'n.d.'
     {}}
 
 \newbibmacro*{reflist+origyear}{%
@@ -2108,10 +2126,10 @@
 
 \newbibmacro*{crossref}{%
   \renewcommand*{\cbx@deflabel}{labelname}%
-  \global\toggletrue{cbx@short}%
+  \global\toggletrue{cbx:short}%
   \entrydata{\thefield{crossref}}{%
     \iftoggle{reflist}
-      {\usebibmacro{parencite:long}}%
+      {\usebibmacro{parencite:new}}%
       {\usebibmacro{author+bookauthor+etc}%
        \usebibmacro{shorttitle+crossref}}%
     \usebibmacro{cite:volume}}}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
index d5d0a342b5..3246927365 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Mon 07 Sep 2020 06:40:45 PM CDT
+% Last modified: Tue 29 Sep 2020 06:29:14 PM CDT
 
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{windycity.cbx}[2020/09/07 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2020/09/29 Windy City citation style for
   biblatex]
 \@ifpackagelater{biblatex}{2019/08/17}
   {}
@@ -22,39 +22,32 @@
       This is a fatal error. I'm aborting now.}%
    \endinput}%
 
-% This file contains material only for formatting notes and
-% parenthetical citations. For content that is also used for
-% bibliographies and reference lists, see windycity.bbx.
+%%%%%%%%%%%%%%
+%%  Basics  %%
+%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%
-%%  Preliminary  %%
-%%%%%%%%%%%%%%%%%%%
-
-\InitializeCitationStyle{\let\crossreflist\empty}%
-\DeclareAutoPunctuation{.,;:!?}
-\DeclareCitePunctuationPosition{cite}{r}
 \AtEveryCite{%
   \global\togglefalse{bibliography}%
+  \global\togglefalse{cbx:first}%
+  \global\togglefalse{ibid:loccit}%
   \global\togglefalse{multicite}%
-  \global\togglefalse{cbx@first}%
-  \global\togglefalse{cbx@loccit}%
   \AtEveryItem}%
 \AtEveryMultiCite{\toggletrue{multicite}}%
+\DeclareAutoPunctuation{.,;:!?}
+\DeclareCitePunctuationPosition{cite}{r}
+\InitializeCitationStyle{\let\crossreflist\empty}%
 
 \renewcommand{\bibfootnotewrapper}[1]{%
   \bibsentence#1}%
 \renewcommand{\bibendnotewrapper}[1]{%
   \bibsentence#1}%
 
-\providetoggle{cite:collection}
-\providetoggle{cite:long}
-
-% Protect commas against abbreviation dots and terminal punctuation
-% marks. Note '\addspace'. Using '\space' there causes problems.
+% Protect commas against abbreviation dots and terminal punctuation.
+% Note '\addspace'. Using '\space' there causes problems.
 
 \renewcommand*{\newunitpunct}{\ifterm{,\addspace}{\addcomma\space}}%
 
-% Prevents errant space after a colon.
+% Prevent errant space after a colon.
 
 \renewcommand*{\multicitedelim}{\setunit{\addsemicolon\space}}%
 
@@ -128,7 +121,6 @@
 \DeclareCiteCommand{\textcite}
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-   \usebibmacro{test:multicite}%
    \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
@@ -137,7 +129,6 @@
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \toggletrue{noauth}%
-   \usebibmacro{test:multicite}%
    \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
@@ -149,27 +140,32 @@
 \newbibmacro*{parencite}{%
   \ifboolexpr{ test \ifciteibid
                and not test \iffirstonpage}
-    {\iffieldundef{postnote}
+    {\usebibmacro{test:collection}%
+     \iffieldundef{postnote}
        {\printtext[bibhyperref]{%
           \usebibmacro{parencite:date}%
           \usebibmacro{cite:volume}}}
        {}}
-    {\ifboolexpr{ test {\ifentrytype{book}}
-                  or test {\ifentrytype{collection}}
-                  or test {\ifentrytype{incollection}}
-                  or test {\ifentrytype{inbook}}
-                  or test {\ifentrytype{letter}}}
-       {\usebibmacro{test:crossref}}%
-       {}% needs '%'
-     \printtext[bibhyperref]{%
-       \usebibmacro{parencite:long}%
-       \usebibmacro{cite:volume}}}}
+    {\usebibmacro{test:collection}%
+     \usebibmacro{parencite:crossref}%
+     \usebibmacro{parencite:multicite}}}
 
 \newbibmacro*{parencite:date}{%
   \iffieldundef{labelyear}
     {}
     {\usebibmacro{parencite:origyear}%
-     \ifboolexpr{ test {\iffieldundef{year}}
+     \iffieldnums{labelyear}
+       {}% needs '%'
+       {\addcomma}%
+     \usebibmacro{labeldate+endyear}%
+     \printfield{extradate}}}
+
+\newbibmacro*{parencite:date+old}{%
+  \iffieldundef{labelyear}
+    {}
+    {\usebibmacro{parencite:origyear}%
+     \ifboolexpr{ ( test {\iffieldundef{year}}
+                  and test {\iffieldundef{urlyear}} )
                   or test {\iffieldequalstr{year}{forthcoming}}}
        {\addcomma}%
        {}% needs '%'
@@ -182,7 +178,29 @@
     {\printfield[brackets]{origyear}%
      \space}}%
 
-\newbibmacro*{parencite:long}{%
+\newbibmacro*{parencite:crossref}{%
+  \ifboolexpr{ test {\ifentrytype{book}}
+               or test {\ifentrytype{collection}}
+               or test {\ifentrytype{incollection}}
+               or test {\ifentrytype{inbook}}
+               or test {\ifentrytype{letter}}}
+    {\usebibmacro{test:crossref}}%
+    {}}
+
+\newbibmacro*{parencite:multicite}{%
+  \ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
+               and togl {multicite}}
+   {\iffieldundef{postnote}
+      {\newunit}%
+      {}% needs '%'
+    \printtext[bibhyperref]{%
+      \usebibmacro{parencite:date}%
+      \usebibmacro{cite:volume}}}
+   {\printtext[bibhyperref]{%
+      \usebibmacro{parencite:new}%
+      \usebibmacro{cite:volume}}}}
+
+\newbibmacro*{parencite:new}{%
   \iffieldundef{shorthand}
     {\usebibmacro{parencite:auth+title}}%
     {\printfield{shorthand}}%
@@ -197,7 +215,7 @@
        {\iffieldundef{label}
           {\usebibmacro{parencite:journal}}%
           {\printfield{label}}}
-       {\global\toggletrue{cbx@short}%
+       {\global\toggletrue{cbx:short}%
         \renewcommand*{\cbx@deflabel}{labelname}%
         \clearfield{handle}%
         \clearfield{nameaddon}%
@@ -221,7 +239,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newbibmacro*{cite}{%
-  \usebibmacro{test:multicite}%
   \ifciteseen
     {\usebibmacro{test:collection}%
      \renewcommand*{\cbx@deflabel}{labelname}%
@@ -229,13 +246,6 @@
     {\printtext[bibhyperref]{\usebibmacro{cite:new}}}% needs '%'
   \usebibmacro{savefields}}%
 
-\newbibmacro*{test:multicite}{%
-  \ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
-               and togl {multicite}
-               and togl {short}}
-   {\toggletrue{noauth}}%
-   {}}
-
 \newbibmacro*{cite:seen}{%
   \iffieldundef{shorthand}
     {\ifboolexpr{ test \ifciteibid
@@ -250,9 +260,9 @@
   \iftoggle{ibid}
     {\bibcpstring{ibidem}%
      \ifloccit
-       {\global\toggletrue{cbx@loccit}}%
+       {\global\toggletrue{ibid:loccit}}%
        {\usebibmacro{cite:volume}}}
-    {\global\toggletrue{cbx@short}%
+    {\global\toggletrue{cbx:short}%
      \ifentrytype{review}
        {\usebibmacro{ibid:review}}%
        {\usebibmacro{author+bookauthor+etc}%
@@ -270,13 +280,21 @@
   \usebibmacro{cite:volume}}%
 
 \newbibmacro*{cite:short}{%
-  \global\toggletrue{cbx@short}%
+  \global\toggletrue{cbx:short}%
+  \usebibmacro{short:multicite}%
   \ifentrytype{review}
     {\usebibmacro{short:review}}%
     {\usebibmacro{author+bookauthor+etc}%
      \usebibmacro{title+labelyear}%
      \usebibmacro{cite:volume}}}
 
+\newbibmacro*{short:multicite}{%
+  \ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
+               and togl {multicite}
+               and togl {short}}
+   {\toggletrue{noauth}}%
+   {}}
+
 \newbibmacro*{short:review}{%
   \ifnameundef{author}
     {\bibcpstring{reviewnoauth}}%
@@ -291,7 +309,7 @@
   \usebibmacro{cite:volume}}%
 
 \newbibmacro*{cite:volume}{%
-  \newunit
+  \usebibmacro{cite:punctuation}%
   \iftoggle{swapvol}
     {\ifboolexpr{ togl {collection:bk}
                   or togl {collection:ib}}
@@ -299,6 +317,27 @@
        {}}
     {}}
 
+\newbibmacro*{cite:punctuation}{%
+  \iffieldstart{postnote}{;}
+    {}
+    {\newunit}}%
+
+% Thanks to David Fussner's biblatex-chicago for pointing me to this
+% command by Philipp Lehman. Source:
+% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I
+
+\newrobustcmd*{\iffieldstart}[2]{%
+  \iffieldundef{#1}
+    {\@gobbletwo}%
+    {\begingroup
+     \edef\@tempa{%
+       \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+     \@tempa\@nil{\endgroup\ifblank{##1}}%
+     \savefield*{#1}{\@tempa}%
+     \expandafter\iffieldstart@i\detokenize
+     \expandafter\expandafter\expandafter{%
+       \expandafter\@tempa\detokenize{#2}}\@nil}}%
+
 \newbibmacro*{volume+page}{%
   \iffieldundef{volume}
     {}
@@ -308,8 +347,8 @@
        {\printfield{volume}}}}
 
 \newbibmacro*{cite:new}{%
-  \global\toggletrue{cbx@first}%
-  \usebibmacro{deflabel}%
+  \global\toggletrue{cbx:first}%
+  \usebibmacro{idem+short+multicite}%
   \iftoggle{firstshort}
     {\usebibmacro{cite:short}}%
     {\printtext{%
@@ -322,11 +361,14 @@
 % 'true') the test below will print 'labelname' if it matches that of
 % the previous citation.
 
-\newbibmacro*{deflabel}{%
+\newbibmacro*{idem+short+multicite}{%
   \ifboolexpr{ test {\ifciteidem}
                or togl {firstshort}}
     {\renewcommand*{\cbx@deflabel}{labelname}}%
-    {\renewcommand*{\cbx@deflabel}{default}}}
+    {\ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
+                  and togl {multicite}}
+       {\renewcommand*{\cbx@deflabel}{labelname}}%
+       {\renewcommand*{\cbx@deflabel}{default}}}}
 
 % Checking for 'title' below helps if you cross-reference volumes to a
 % collection with entries containing just 'volume' and 'crossref'
@@ -335,22 +377,15 @@
 \newbibmacro*{test:crossref}{%
   \ifboolexpr{ test {\iffieldundef{crossref}}
                or test {\iffieldundef{title}}}
-    {\toggletrue{cite:long}}%
+    {}
     {\xifinlist{\thefield{crossref}}{\crossreflist}
-       {\toggletrue{cite:collection}%
+       {\toggletrue{cbx:collection}%
         \stepcounter{\thefield{crossref}}}
-       {\toggletrue{cite:long}%
-        \listxadd{\crossreflist}{\thefield{crossref}}%
+       {\listxadd{\crossreflist}{\thefield{crossref}}%
         \ifcsdef{c@\thefield{crossref}}
           {\setcounter{\thefield{crossref}}{0}}%
           {\newcounter{\thefield{crossref}}}}}}
 
-\newbibmacro*{cite:long}{%
-  \printtext{%
-    \usedriver
-      {\DeclareNameAlias{sortname}{default}}%
-      {cite:\thefield{entrytype}}}}
-
 \newbibmacro*{savefields}{%
   \iffieldundef{crossref}
     {\let\cbx@keyhash\empty}%
@@ -371,6 +406,30 @@
           {\newunit}%
           {\setunit{\addcolon\space}}}}}
 
+\newbibmacro*{reference:authpos}{%
+  \iflistundef{organization}
+    {\ifnameundef{bookauthor}
+       {\renewcommand*{\cbx@namelist}{author}}%
+       {\renewcommand*{\cbx@namelist}{bookauthor}}%
+     \usebibmacro{printnames+etc}}%
+    {\printlist{organization}%
+     \clearlist{organization}}}
+
+\newbibmacro*{reference:howpublished+etc}{%
+  \ifboolexpr{ test {\iffieldundef{howpublished}}
+               and test {\iffieldundef{year}}}
+    {}
+    {\setunit{\addspace}%
+     \iffieldundef{howpublished}
+       {\printtext[parens]{\printfield{year}}}
+       {\global\togglefalse{cbx:first}%
+        \printtext[parens]{%
+          \printfield{howpublished}%
+          \newunit
+          \printfield{version}%
+          \newunit
+          \printfield{year}}}}}
+
 %%%%%%%%%%%%%%%%
 %%  Postnote  %%
 %%%%%%%%%%%%%%%%
@@ -379,11 +438,13 @@
   \usebibmacro{postnote+etc}%
   \usebibmacro{postpunct+etc}}%
 
+% In this context, '\ifloccit' is always true. Run it earlier, in
+% 'cite:ibid', and record the state with 'ibid:loccit'.
+
 \newbibmacro*{postnote+etc}{%
-  \ifboolexpr{ togl {cbx@loccit}
-               and togl {ibid}}
+  \iftoggle{ibid:loccit}
     {}
-    {\iftoggle{cbx@first}
+    {\iftoggle{cbx:first}
        {\usebibmacro{postnote:first}%
         \usebibmacro{shorthand+intro}}%
        {\usebibmacro{postnote}}}}
@@ -400,10 +461,10 @@
 % If the postnote is empty, print the page ranges of journal and
 % review articles. 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 don't help. For magazines, CMOS is clear that the range can
-% be left out. To do so, simply omit it from your bibliography
-% database.
+% same, but the example in 14.30 suggests otherwise, while the
+% examples in 14.108 don't help. 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}
@@ -438,21 +499,6 @@
        {}}
     {}}
 
-\newbibmacro*{refworks}{%
-  \ifboolexpr{ test {\iffieldundef{howpublished}}
-               and test {\iffieldundef{year}}}
-    {}
-    {\setunit{\addspace}%
-     \iffieldundef{howpublished}
-       {\printtext[parens]{\printfield{year}}}
-       {\global\togglefalse{cbx@first}%
-        \printtext[parens]{%
-          \printfield{howpublished}%
-          \newunit
-          \printfield{version}%
-          \newunit
-          \printfield{year}}}}}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Bibliography Drivers for Notes  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -464,29 +510,25 @@
 
 \DeclareBibliographyDriver{cite:book}{%
   \usebibmacro{test:crossref}%
-  \iftoggle{cite:long}
+  \iftoggle{cbx:collection}
+    {\usebibmacro{author+incollection+etc}%
+     \usebibmacro{crossref}}%
     {\usebibmacro{author+collection+etc}%
-     \newunit
-     \usebibmacro{volume+page}}%
-    {\iftoggle{cite:collection}
-       {\usebibmacro{author+incollection+etc}%
-        \usebibmacro{crossref}}%
-       {}}}
+     \usebibmacro{cite:punctuation}%
+     \usebibmacro{volume+page}}}
 
 \DeclareBibliographyDriver{cite:incollection}{%
   \ifentrytype{letter}
     {\toggletrue{noauth}}%
     {}% needs '%'
   \usebibmacro{test:crossref}%
-  \iftoggle{cite:long}
+  \iftoggle{cbx:collection}
+    {\usebibmacro{author+incollection+etc}%
+     \usebibmacro{crossref}}%
     {\usebibmacro{author+incollection+etc}%
      \usebibmacro{incollections}%
-     \newunit
-     \usebibmacro{volume+page}}%
-    {\iftoggle{cite:collection}
-       {\usebibmacro{author+incollection+etc}%
-        \usebibmacro{crossref}}%
-       {}}}
+     \usebibmacro{cite:punctuation}%
+     \usebibmacro{volume+page}}}
 
 \DeclareBibliographyDriver{cite:misc}{%
   \usebibmacro{author+bookauthor+etc}%
@@ -509,16 +551,15 @@
   \newunit}%
 
 \DeclareBibliographyDriver{cite:reference}{%
-  \printlist{organization}%
+  \usebibmacro{reference:authpos}%
   \usebibmacro{edition}{}%
-  \usebibmacro{refworks}%
+  \usebibmacro{reference:howpublished+etc}%
   \newunit
   \bibstring{subverbo}\space
   \usebibmacro{longtitle+titleaddon}%
   \newunit
   \renewcommand*{\pluga}{\bibstring{by}\space}%
-  \renewcommand*{\cbx@namelist}{author}%
-  \usebibmacro{printnames+etc}}%
+  \usebibmacro{reference:authpos}}%
 
 \DeclareBibliographyDriver{cite:review}{%
   \usebibmacro{reviews}%
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
index db9f2a22fd..231c4210a5 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
@@ -1,4 +1,4 @@
-\ProvidesFile{windycity.dbx}[2020/09/07 Windy City data model file for
+\ProvidesFile{windycity.dbx}[2020/09/29 Windy City data model file for
   biblatex]
 \DeclareDatamodelFields[type=field,datatype=literal]{%
   blogsubtitle,