windycity (22feb19)

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

9 files changed, 1305 insertions, 831 deletions

diff --git a/Master/texmf-dist/doc/latex/windycity/CHANGES.md b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
index 085f1f90431..6fdfc886de9 100644
--- a/Master/texmf-dist/doc/latex/windycity/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
@@ -1,10 +1,33 @@
 # Release Notes
 
-See [Windy City](https://github.com/brianchase/windycity) for the
-latest changes. The version numbers below are fairly arbitrary
-milestones.
+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").
+
+## 2019-02-21
+
+* fixed reviews with titles
+* in reference lists, fixed 'year' printing with 'season' or 'issue'
+* much improved format of unsigned reviews in bibliographies and
+  reference lists, in part restoring previous work set aside
+* extended 'swapvol' option to work with 'letter', 'incollection',
+  'inbook', and 'bookinbook' entries that are cross-referenced to
+  entries that work with 'swapvol' (in effect, you can use 'swapvol' not
+  only with volumes in collections but with works in those volumes, such
+  as chapters and articles)
+* improved handling of editors and translators, including support for
+  translators of a 'maintitle'
+* added 'library' entry and preamble options to support the 'library'
+  field
+* extended 'swapauth' to work with 'mvbook' and 'mvcollection' entries
+* added support for \iffieldbibstring in processing 'edition' and
+  'type' fields
+* other bug fixes
 
-## 2019.01.31
+## 2019-01-31
 
 * added limited support for citing web pages and social media content
 * added 'listvols' entry option (see documentation)
@@ -20,7 +43,7 @@ milestones.
 * fixed reprints, cross-referencing in reference lists
 * other bug fixes
 
-## 2019.01.18
+## 2019-01-18
 
 * reversed default for collections, printing information for volumes
   first; the option to reverse this is called 'swapvol'
@@ -31,11 +54,11 @@ milestones.
 * 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
-* improved hanlding of name lists and cross-referencing
+* improved handling of name lists and cross-referencing
 * removed no longer maintained citation commands
 * other bug fixes and housekeeping
 
-## 2019.01.07
+## 2019-01-07
 
 * major additions and changes for processing collections
 * fixed \parencite for unsigned articles
@@ -53,7 +76,7 @@ milestones.
   mentioned work gets printed in bibliographies and reference lists
 * many bug fixes
 
-## 2018.12.09
+## 2018-12-09
 
 * simpler processing of author's position
 * added support for common reference works, such as dictionaries and
@@ -63,7 +86,7 @@ milestones.
 * some fixes, though incomplete, for reviews
 * other fixes for spacing and punctuation
 
-## 2018.12.05
+## 2018-12-05
 
 * added much better support for cross-referencing collections in notes
   and bibliographies, including enhanced support for treating multivolume
@@ -79,7 +102,7 @@ milestones.
 * many bug fixes (mainly spacing, punctuation, and toggles)
 * new documentation
 
-## 2018.11.26
+## 2018-11-26
 
 * fixed 'noauth' entry option (it should only affect notes)
 * fixed 'inst+loc+date'
@@ -91,7 +114,7 @@ milestones.
 * limited support for publication times
 * added '\footcite*' command and updated documentation
 
-## 2018.11.23
+## 2018-11-23
 
 * improved and in some cases fixed processing of numbers,
   dates, and issues of periodicals
@@ -99,79 +122,78 @@ milestones.
 * fixed 'type' field format
 * fixed double printing of year for theses and dissertations in
   the author-date system
-* fixed punctation after 'Special issue' in bibliographies
+* fixed punctuation after 'Special issue' in bibliographies
 * fixed obscure punctuation issue with *notewrapper commands
 * added support for shorthandintro and improved handling of shorthands
 * updated field format for DOIs
 * update name formatting for affixes like 'Jr.'
 
-## 2018.11.17
+## 2018-11-17
 
 * replaced \ifthenelse with commands from etoolbox
 * better handling of editors for a series, maintitle, or issuetitle
 * limited support for 'endmonth' field for periodicals
 * fixed extra space from multicitedelim
 
-## 2018.11.14
+## 2018-11-14
 
 * finally got a handle on the author-date format for periodicals,
   rolling back some recent changes (ugh!)
-* put back bibliography options 'useeditor' and 'usetranslator', which
+* put back preamble options 'useeditor' and 'usetranslator', which
   are necessary after all (double ugh!)
 * more readable and arguably simpler date processing for periodicals
-* added bibliography (or preamble) option 'ibid' to prepare for the
-  17th edition of CMS
+* added preamble option 'ibid' to prepare for the 17th edition of CMS
 * 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
 
-## 2018.11.13
+## 2018-11-13
 
-* fixed spacing of date for periodicals (resuling from recent support
+* fixed spacing of date for periodicals (resulting from recent support
   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)
 
-## 2018.11.09
+## 2018-11-09
 
 * for articles etc., limited support for 'season' field
 * limited support for 'endyear' and 'endorigyear' fields
-* removed unused bibliography options and commented code
-* fix inreference bibliography alias
+* removed unused preamble options and commented code
+* fix 'inreference' bibliography alias
 
-## 2018.11.02
+## 2018-11-02
 
 * fixed author-date system printing the year of many articles twice
 * fixed author-date system printing the year between an author's name
   and the field 'nameaddon'
-* fixed bibliography driver for shorhands that caused it to print just
-  titles, rather than full entries
+* fixed bibliography driver for shorthands that caused it to print
+  just titles, rather than full entries
 * added support for 'endday' field
 * 'addendum' field prints only in bibliographies and reference
   lists, not in notes
-* set parentracker bibliography option
-* set minxrefs bibliography option
-* collsonly bibliography option sets 'minxrefs=1'
-* changed pagetracker bibliography option from 'true' to 'page'
+* set 'parentracker' bibliography option
+* set minxrefs preamble option
+* 'collsonly' preamble option sets 'minxrefs=1'
+* changed 'pagetracker' bibliography option from 'true' to 'page'
 * edits and fixes to windycity.sty and windycity.tex
 
-## 2018.10.20
+## 2018-10-20
 
 * fixed broken date formatting in author-date citations
 * changed \DeclareSortingScheme to \DeclareSortingTemplate
-* changed bibliography option labeldate to labeldateparts
+* changed preamble option 'labeldate' to 'labeldateparts'
 * changed special field 'extrayear' to 'extradate'
 * bumped minimum compatible release to biblatex 3.8
 * other minor changes for the version bump
 
-## 2015.12.28
+## 2015-12-28
 
 * added missing \setunit for when bybookauthor prints an author's name
   and the collection has an editor, translator, or compiler
 
-## 2015.07.08
+## 2015-07-08
 
 * removed an unused bibmacro
 * minor edits and fixes to windycity.sty and windycity.tex
@@ -179,7 +201,7 @@ milestones.
 * removed an empty line from windycity.bib
 * changed the version number format to match the release date
 
-## 2014.03.21
+## 2014-03-21
 
 * improved and fixed cross-referencing of collections to other collections
 * fixed missing publication year in notes under option 'reflist'
@@ -187,7 +209,7 @@ milestones.
 * minor fixes
 * updated documentation
 
-## 2014.03.02
+## 2014-03-02
 
 * greatly simplified the handling of editors and translators
 * changes and fixes to 'incollections', 'ed+vol+part+etc', and
@@ -200,7 +222,7 @@ milestones.
 * other minor changes and fixes
 * updated windycity.tex and windycity.bib
 
-## 2014.02.26
+## 2014-02-26
 
 * initial release
 
diff --git a/Master/texmf-dist/doc/latex/windycity/README.md b/Master/texmf-dist/doc/latex/windycity/README.md
index b2146951bf3..8a0ceb4869e 100644
--- a/Master/texmf-dist/doc/latex/windycity/README.md
+++ b/Master/texmf-dist/doc/latex/windycity/README.md
@@ -2,37 +2,41 @@
 
 ## About
 
-Windy City is a style for [biblatex](http://www.ctan.org/pkg/biblatex)
-that formats notes, bibliographies, parenthetical citations, and
-reference lists according to the 17th edition of [The Chicago Manual
-of Style](http://www.chicagomanualofstyle.org/). It accurately handles
-a wide range of citations 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.
+Windy City is a style for [biblatex](http://www.ctan.org/pkg/biblatex
+"biblatex") that formats notes, bibliographies, parenthetical
+citations, and reference lists according to the 17th edition of [The
+Chicago Manual of Style](http://www.chicagomanualofstyle.org/ "Chicago
+Manual of Style"). It accurately handles a wide range of citations 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.
 
-For more information, please see Windy City's
-[documentation](https://s3.amazonaws.com/brianchase/windycity.pdf
-"windycity.pdf") (PDF) or [click
-here](https://s3.amazonaws.com/brianchase/windycity.zip
-"windycity.zip") (ZIP) to download the complete package.
+Windy City's latest release is available on
+[CTAN](https://www.ctan.org/pkg/windycity "CTAN: pkg/windycity"), the
+[Comprehensive TeX Archive Network](https://www.ctan.org "CTAN"). It
+includes a PDF of the [user
+guide](http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
+"windycity.pdf"). More recent changes are available at Windy City's
+[repository on GitHub](https://github.com/brianchase/windycity
+"GitHub: brianchase/windycity").
 
 ## Getting Started
 
 If you already know how to use
-[biblatex](http://www.ctan.org/pkg/biblatex), getting started with
-Windy City is easy. Locate
-[biblatex](http://www.ctan.org/pkg/biblatex) on your system, and copy
-Windy City's files into their respective directories:
+[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:
 
-* .../biblatex/[windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx)
-* .../biblatex/bbx/[windycity.bbx](https://github.com/brianchase/windycity/blob/master/bbx/windycity.bbx)
-* .../biblatex/cbx/[windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx)
-* .../biblatex/lbx/[american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx)
+* .../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) to load Windy
-City with the load-time option `style`:
+Next, tell [biblatex](http://www.ctan.org/pkg/biblatex "biblatex") to
+load Windy City with the load-time option `style`:
 
 ```
 \usepackage[style=windycity]{biblatex}
@@ -41,19 +45,20 @@ City with the load-time option `style`:
 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)
-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),
-should serve as a guide for how to manage your input for nearly every
-circumstance that the style is meant to handle.
+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),
-version 1.3, permission is granted to copy, distribute, or modify this
-software.
+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/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx b/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx
index 5064b082254..1af95c29e6a 100644
--- a/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx
+++ b/Master/texmf-dist/doc/latex/windycity/bbx/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Thu 31 Jan 2019 08:28:54 PM CST
+% Last modified: Thu 21 Feb 2019 09:27:06 AM CST
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -14,16 +14,14 @@
 % purpose.
 
 \ProvidesFile{windycity.bbx}[Windy City style for biblatex]
-
 \@ifpackagelater{biblatex}{2017/11/04}
    {}
    {\PackageError{biblatex}
       {Outdated 'biblatex' package}
-      {Windy City 2019.01.31 is for biblatex v3.8 and above.\MessageBreak
+      {Windy City 2019-02-21 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}%
-\RequireBiber
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Bibliography and Entry Options  %%
@@ -44,10 +42,8 @@
     {}}
 
 \providetoggle{annotate}
-\DeclareBibliographyOption{annotate}[true]{%
-  \ifstrequal{#1}{true}
-    {\global\toggletrue{annotate}}%
-    {\global\togglefalse{annotate}}}
+\DeclareBibliographyOption[boolean]{annotate}[true]{%
+  \global\settoggle{annotate}{#1}}%
 
 \DeclareBibliographyOption{collsonly}[true]{%
   \ifstrequal{#1}{true}
@@ -57,10 +53,8 @@
     {}}
 
 \providetoggle{firstshort}
-\DeclareBibliographyOption{firstshort}[true]{%
-  \ifstrequal{#1}{true}
-    {\global\toggletrue{firstshort}}%
-    {\global\togglefalse{firstshort}}}
+\DeclareBibliographyOption[boolean]{firstshort}[true]{%
+  \global\settoggle{firstshort}{#1}}%
 
 \providetoggle{ibid}
 \DeclareBibliographyOption{ibid}[true]{%
@@ -70,26 +64,24 @@
     {\global\togglefalse{ibid}}}
 
 \providetoggle{isbn}
-\DeclareBibliographyOption{isbn}[true]{%
-  \ifstrequal{#1}{true}
-    {\global\toggletrue{isbn}}%
-    {\global\togglefalse{isbn}}}
-\DeclareEntryOption{isbn}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{isbn}}%
-    {\togglefalse{isbn}}}
+\DeclareBibliographyOption[boolean]{isbn}[true]{%
+  \global\settoggle{isbn}{#1}}%
+\DeclareEntryOption[boolean]{isbn}[true]{%
+  \settoggle{isbn}{#1}}%
+
+\providetoggle{library}
+\DeclareBibliographyOption[boolean]{library}[true]{%
+  \global\settoggle{library}{#1}}%
+\DeclareEntryOption[boolean]{library}[true]{%
+  \settoggle{library}{#1}}%
 
 \providetoggle{listvols}
-\DeclareEntryOption{listvols}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{listvols}}%
-    {\togglefalse{listvols}}}
+\DeclareEntryOption[boolean]{listvols}[true]{%
+  \settoggle{listvols}{#1}}%
 
 \providetoggle{noauth}
-\DeclareEntryOption{noauth}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{noauth}}%
-    {\togglefalse{noauth}}}
+\DeclareEntryOption[boolean]{noauth}[true]{%
+  \settoggle{noauth}{#1}}%
 
 \DeclareBibliographyOption{nolos}[true]{%
   \ifstrequal{#1}{true}
@@ -122,32 +114,22 @@
     {\global\togglefalse{short}}}
 
 \providetoggle{skipdate}
-\DeclareEntryOption{skipdate}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{skipdate}}%
-    {\togglefalse{skipdate}}}
+\DeclareEntryOption[boolean]{skipdate}[true]{%
+  \settoggle{skipdate}{#1}}%
 
 \providetoggle{swapauth}
-\DeclareEntryOption{swapauth}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{swapauth}}%
-    {\togglefalse{swapauth}}}
+\DeclareEntryOption[boolean]{swapauth}[true]{%
+  \settoggle{swapauth}{#1}}%
 
 \providetoggle{swaptrans}
-\DeclareEntryOption{swaptrans}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{swaptrans}}%
-    {\togglefalse{swaptrans}}}
+\DeclareEntryOption[boolean]{swaptrans}[true]{%
+  \settoggle{swaptrans}{#1}}%
 
 \providetoggle{swapvol}
-\DeclareBibliographyOption{swapvol}[true]{%
-  \ifstrequal{#1}{true}
-    {\global\toggletrue{swapvol}}%
-    {\global\togglefalse{swapvol}}}
-\DeclareEntryOption{swapvol}[true]{%
-  \ifstrequal{#1}{true}
-    {\toggletrue{swapvol}}%
-    {\togglefalse{swapvol}}}
+\DeclareBibliographyOption[boolean]{swapvol}[true]{%
+  \global\settoggle{swapvol}{#1}}%
+\DeclareEntryOption[boolean]{swapvol}[true]{%
+  \settoggle{swapvol}{#1}}%
 
 % For setting 'minbibnames' and such, see CMS, 17th ed., 14.76 and
 % 15.29.
@@ -297,6 +279,7 @@
 %%  Data Inheritance  %%
 %%%%%%%%%%%%%%%%%%%%%%%%
 
+\ResetDataInheritance
 \DefaultInheritance[\except{*}{review}{all=false}]{all=true,override=false}
 \DeclareDataInheritance{*}{%
   incollection,inbook,bookinbook,inproceedings,letter,suppbook,review}{%
@@ -309,13 +292,17 @@
   \inherit{editoratype}{editorbtype}
   \inherit{editorbtype}{editorctype}
   \inherit{translator}{translatora}
+  \inherit{translatora}{translatorb}
+  \inherit{translatortype}{translatoratype}
   \inherit{title}{booktitle}
   \inherit{subtitle}{booksubtitle}
   \inherit{titleaddon}{booktitleaddon}
   \inherit{shorttitle}{shortbooktitle}
   \inherit{booktitle}{bookbooktitle}
+  \inherit{volume}{bookvolume}
+  \inherit{bookvolume}{bookbookvolume}
   \inherit{options}{options}}
-\DeclareDataInheritance{collection}{collection,inbook,bookinbook}{%
+\DeclareDataInheritance{collection}{bookinbook,collection,inbook}{%
   \inherit{year}{bookyear}
   \inherit{endyear}{endbookyear}}
 
@@ -335,18 +322,22 @@
 \let\xeditor\empty
 \let\yeditor\empty
 \let\xtitle\empty
+\let\xvolume\empty
 
 \providetoggle{authposition}
 \providetoggle{bibliography}
-\providetoggle{collection}
-\providetoggle{collection:book}
-\providetoggle{collection:inbook}
 \providetoggle{journalfirst}
 \providetoggle{multicite}
 \providetoggle{cbx@first}
 \providetoggle{cbx@loccit}
 \providetoggle{cbx@short}
 
+\providetoggle{collection}
+\providetoggle{collection:bk}
+\providetoggle{collection:ib}
+\providetoggle{collection:icbk}
+\providetoggle{collection:icib}
+
 \providetoggle{edshift}
 \providetoggle{noed}
 \providetoggle{notrans}
@@ -359,9 +350,6 @@
 
 \newcommand*{\AtEveryItem}{%
   \global\toggletrue{authposition}%
-  \global\togglefalse{collection}%
-  \global\togglefalse{collection:book}%
-  \global\togglefalse{collection:inbook}%
   \global\togglefalse{cbx@short}}%
 
 \AtBeginBibliography{\AtBeginLists}%
@@ -388,7 +376,6 @@
   \ifbibindex
     {\indexnames{labelname}}%
     {}}
-
 \renewbibmacro*{citeindex}{%
   \ifciteindex
     {\indexnames{labelname}}%
@@ -540,8 +527,8 @@
 \DeclareFieldFormat{issue}{\MakeCapital{#1}}% always capitalize
 \DeclareFieldFormat{journum}{%
   \ifnumeral{#1}
-   {no\adddotspace\printfield{number}}%
-   {nos\adddotspace\printfield{number}}}
+    {no\adddotspace\printfield{number}}%
+    {nos\adddotspace\printfield{number}}}
 \DeclareFieldFormat{labelyear}{%
   \ifboolexpr{ test {\iffieldundef{year}}
                and test {\iffieldundef{bookyear}}}
@@ -578,12 +565,16 @@
 \DeclareBibliographyAlias{booklet}{book}
 \DeclareBibliographyAlias{collection}{book}
 \DeclareBibliographyAlias{manual}{book}
+\DeclareBibliographyAlias{mvbook}{book}
+\DeclareBibliographyAlias{mvcollection}{book}
 \DeclareBibliographyAlias{proceedings}{book}
 \DeclareBibliographyAlias{report}{book}
 \DeclareBibliographyAlias{techreport}{book}
 \DeclareBibliographyAlias{cite:booklet}{cite:book}
 \DeclareBibliographyAlias{cite:collection}{cite:book}
 \DeclareBibliographyAlias{cite:manual}{cite:book}
+\DeclareBibliographyAlias{cite:mvbook}{cite:book}
+\DeclareBibliographyAlias{cite:mvcollection}{cite:book}
 \DeclareBibliographyAlias{cite:proceedings}{cite:book}
 \DeclareBibliographyAlias{cite:report}{cite:book}
 \DeclareBibliographyAlias{cite:techreport}{cite:book}
@@ -592,14 +583,14 @@
 \DeclareBibliographyAlias{conference}{incollection}
 \DeclareBibliographyAlias{inbook}{incollection}
 \DeclareBibliographyAlias{inproceedings}{incollection}
-\DeclareBibliographyAlias{inreference}{reference}
 \DeclareBibliographyAlias{letter}{incollection}
 \DeclareBibliographyAlias{suppbook}{incollection}
 \DeclareBibliographyAlias{suppcollection}{incollection}
 \DeclareBibliographyAlias{cite:bookinbook}{cite:incollection}
+\DeclareBibliographyAlias{cite:conference}{cite:incollection}
 \DeclareBibliographyAlias{cite:inbook}{cite:incollection}
 \DeclareBibliographyAlias{cite:inproceedings}{cite:incollection}
-\DeclareBibliographyAlias{cite:inreference}{cite:reference}
+\DeclareBibliographyAlias{cite:letter}{cite:incollection}
 \DeclareBibliographyAlias{cite:suppbook}{cite:incollection}
 \DeclareBibliographyAlias{cite:suppcollection}{cite:incollection}
 
@@ -610,6 +601,9 @@
 \DeclareBibliographyAlias{cite:phdthesis}{cite:thesis}
 \DeclareBibliographyAlias{cite:unpublished}{cite:thesis}
 
+\DeclareBibliographyAlias{inreference}{reference}
+\DeclareBibliographyAlias{cite:inreference}{cite:reference}
+
 \DeclareBibliographyAlias{*}{book}
 \DeclareBibliographyAlias{cite:*}{cite:book}
 
@@ -623,15 +617,15 @@
     {}}
 
 \newbibmacro*{author+bookauthor+etc}{%
-  \iftoggle{noauth}% true by entry option or citation command
+  \iftoggle{noauth}
     {\usebibmacro{authpos+deflabel}}%
     {\usebibmacro{author+bookauthor}%
      \ifnameundef{\cbx@namelist}
-       {\usebibmacro{a:authpos+edtrans}%
+       {\usebibmacro{edtrans:authpos}%
         \ifnameundef{\cbx@namelist}
           {\toggletrue{noauth}%
            \usebibmacro{journalfirst}}%
-          {\usebibmacro{b:authpos+edtrans}%
+          {\usebibmacro{edscomps:authpos}%
            \usebibmacro{namehash+etc}}}%
        {\usebibmacro{namehash+etc}}}}
 
@@ -645,9 +639,11 @@
                or test {\ifentrytype{bookinbook}}
                or test {\ifentrytype{collection}}
                or test {\ifentrytype{inbook}}
-               or test {\ifentrytype{incollection}} )}
+               or test {\ifentrytype{incollection}}
+               or test {\ifentrytype{mvbook}}
+               or test {\ifentrytype{mvcollection}} )}
     {}
-    {\ifboolexpr{ togl {collection:inbook}
+    {\ifboolexpr{ togl {collection:ib}
                   and togl {swapvol}}
       {\usebibmacro{bookauthor+namelist}}%
       {\ifnameundef{author}
@@ -670,7 +666,8 @@
 
 \newbibmacro*{journalfirst}{%
   \usebibmacro{authpos+deflabel}%
-  \ifboolexpr{ test {\ifentrytype{article}}
+  \ifboolexpr{ ( test {\ifentrytype{article}}
+               or test {\ifentrytype{review}} )
                and togl {bibliography}}
     {\toggletrue{journalfirst}%
      \usebibmacro{bibjournaldash}%
@@ -715,143 +712,106 @@
 %%  Editors and Translators  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\newbibmacro*{a:authpos+edtrans}{%
-  \usebibmacro{test:edtrans}%
-  \iftoggle{noed}
-    {\usebibmacro{transcombos}}%
-    {\iftoggle{swaptrans}
-       {\usebibmacro{transcombos}}%
-       {\usebibmacro{edcombos}}}}
-
-\newbibmacro*{test:edtrans}{%
-  \global\togglefalse{noed}%
-  \global\togglefalse{notrans}%
-  \usebibmacro{test:trans}%
-  \usebibmacro{test:notrans}%
-  \usebibmacro{test:ed}}%
-
-\newbibmacro*{test:trans}{%
-  \usebibmacro{test:transdupes}%
-  \iftoggle{edshift}
-    {\ifnameundef{translator}
-       {\renewcommand*{\yeditor}{translatora}}%
-       {\renewcommand*{\yeditor}{translator}}}
-    {\renewcommand*{\yeditor}{translator}}}
-
-\newbibmacro*{test:transdupes}{%
-  \ifnamesequal{translator}{translatora}
-    {\clearname{translatora}}%
-    {}}
-
-\newbibmacro*{test:notrans}{%
-  \ifnameundef{\yeditor}
-    {\global\toggletrue{notrans}}%
-    {\ifboolexpr{ test {\ifdefstring{\yeditor}{translator}}
-                  and togl {collection}
-                  and togl {swapvol}
-                  and ( test {\ifdefstring{\xtitle}{book}}
-                  or test {\ifdefstring{\xtitle}{main}} )}
-       {\global\toggletrue{notrans}}%
-       {}}}
+% For editors and translators in the author's position.
 
-\newbibmacro*{test:ed}{%
-  \usebibmacro{test:eddupes}%
-  \iftoggle{edshift}
-    {\usebibmacro{eda+edb+edc}}%
+\newbibmacro*{edtrans:authpos}{%
+  \togglefalse{noed}%
+  \togglefalse{notrans}%
+  \usebibmacro{test:ed:authpos}%
+  \usebibmacro{test:trans:authpos}%
+  \ifboolexpr{ togl {noed}
+               and togl {notrans}}
+    {}
+    {\iftoggle{noed}
+       {\usebibmacro{transcombos}}%
+       {\iftoggle{notrans}
+          {\usebibmacro{edcombos}}%
+          {\iftoggle{swaptrans}
+             {\usebibmacro{transcombos}}%
+             {\usebibmacro{edcombos}}}}}}
+
+\newbibmacro*{test:ed:authpos}{%
+  \ifboolexpr{ test {\ifnameundef{editor}}
+               and test {\ifnameundef{editora}}}
+    {\toggletrue{noed}}%
     {\ifnameundef{editor}
-       {\usebibmacro{editora+noed}}%
-       {\usebibmacro{editor+noed}%
-        \iftoggle{noed}
-          {\global\togglefalse{noed}%
-           \usebibmacro{editora+noed}}%
+       {\renewcommand*{\xeditor}{editora}}%
+       {\renewcommand*{\xeditor}{editor}}%
+     \usebibmacro{test:xeditor:a}{ap}%
+     \iftoggle{noed}
+       {}
+       {\ifdefstring{\xeditor}{editor}
+          {\usebibmacro{test:editor:authpos}}%
+          {\usebibmacro{test:editora:authpos}}}}}
+
+\newbibmacro*{test:xeditor:a}[1]{%
+  \ifboolexpr{ test {\ifnameundef{\xeditor}}
+               or test {\iffieldequalstr{\xeditor type}{issuetitle}}
+               or test {\iffieldequalstr{\xeditor type}{series}}}
+    {\toggletrue{noed}}%
+    {\ifstrequal{#1}{ap}% not 'authposition' toggle
+       {\usebibmacro{test:xeditor:b:authpos}}%
+       {\usebibmacro{test:xeditor:b}}}}
+
+\newbibmacro*{test:xeditor:b:authpos}{%
+  \iffieldequalstr{\xeditor type}{maintitle}
+    {\iftoggle{collection:bk}
+       {\iftoggle{swapvol}
+          {}
+          {\toggletrue{noed}}}
+       {\toggletrue{noed}}}
+    {\ifboolexpr{ togl {collection:bk}
+                  and togl {swapvol}}
+       {\toggletrue{noed}}%
+       {\ifboolexpr{ togl {collection:icbk}
+                     or togl {collection:icib}}
+          {\ifnameundef{translator}
+             {}
+             {\toggletrue{noed}}}
           {}}}}
 
-\newbibmacro*{test:eddupes}{%
-  \ifnamesequal{editor}{editora}
-    {\ifboolexpr{ test {\iffieldundef{editoratype}}
-                  or test {\iffieldsequal{editortype}{editoratype}}}
-       {\clearname{editora}}%
-       {}}
-    {}}
-
-\newbibmacro*{eda+edb+edc}{%
-  \ifnameundef{editor}
-    {\ifnameundef{editora}
-       {\ifnameundef{editorb}
-          {\renewcommand*{\xeditor}{editorc}}%
-          {\renewcommand*{\xeditor}{editorb}}%
-        \iffieldequalstr{\xeditor type}{maintitle}
-          {\global\toggletrue{noed}}%
-          {\usebibmacro{test:noed:a}}}%
-       {\usebibmacro{editora+noed}}}
-    {\usebibmacro{editor+noed}%
-     \iftoggle{noed}
-       {\global\togglefalse{noed}%
-        \usebibmacro{editora+noed}}%
+\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}}%
        {}}}
 
-\newbibmacro*{editora+noed}{%
-  \renewcommand*{\xeditor}{editora}%
-  \usebibmacro{test:noed:a}%
-  \iftoggle{noed}
-    {}
-    {\usebibmacro{test:noed:b}%
-     \ifboolexpr{ test {\ifdefempty{\xtitle}}
-                  and not togl {authposition}
-                  and ( togl {collection:inbook}
-                  or test {\ifentrytype{incollection}}
-                  or test {\ifentrytype{letter}} )}
-       {\global\toggletrue{noed}}%
-       {}}}
-
-\newbibmacro*{editor+noed}{%
-  \renewcommand*{\xeditor}{editor}%
-  \usebibmacro{test:noed:a}%
-  \iftoggle{noed}
-    {}
-    {\usebibmacro{test:noed:b}%
-     \iftoggle{authposition}
-       {\ifboolexpr{ togl {collection:inbook}
-                     and togl {swapvol}
-                     and not test {\ifnameundef{editora}}}
-          {\global\toggletrue{noed}}%
-          {}}
-       {\ifdefstring{\xtitle}{book}
-          {\global\toggletrue{noed}}%
-          {}}}}
-
-\newbibmacro*{test:noed:a}{%
-  \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{issuetitle}}
-               or test {\iffieldequalstr{\xeditor type}{series}}
-               or test {\ifnameundef{\xeditor}}}
-    {\global\toggletrue{noed}}%
+\newbibmacro*{test:editora:authpos}{%
+  \ifboolexpr{ togl {collection:ib}
+               and not togl {swapvol}
+               and test {\ifnameundef{editor}}}
+    {\toggletrue{noed}}%
     {}}
 
-\newbibmacro*{test:noed:b}{%
-  \iftoggle{authposition}
-    {\iffieldequalstr{\xeditor type}{maintitle}
-       {\iftoggle{collection:book}
-          {\iftoggle{swapvol}
-             {}
-             {\global\toggletrue{noed}}}
-          {\global\toggletrue{noed}}}
-       {\ifboolexpr{ togl {collection:book}
+\newbibmacro*{test:trans:authpos}{%
+  \usebibmacro{trans+transa+transb}%
+  \ifnameundef{\yeditor}
+    {\toggletrue{notrans}}%
+    {\iffieldequalstr{translatortype}{maintitle}
+       {\ifboolexpr{ togl {collection:bk}
                      and togl {swapvol}}
-          {\global\toggletrue{noed}}%
-          {}}}
-    {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{maintitle}}
-                  and not test {\ifdefstring{\xtitle}{main}}}
-      {\global\toggletrue{noed}}%
-      {\ifboolexpr{ not test {\iffieldequalstr{\xeditor type}{maintitle}}
-                    and test {\ifdefstring{\xtitle}{main}}}
-         {\global\toggletrue{noed}}%
-         {\ifdefempty{\xtitle}
-            {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
-                          or test {\iffieldequalstr{\xeditor type}{title}}
-                          or test {\iffieldundef{\xeditor type}}}
-               {}
-               {\global\toggletrue{noed}}}
-            {}}}}}
+          {}
+          {\toggletrue{notrans}}}
+       {\iffieldequalstr{translatoratype}{maintitle}
+          {\ifboolexpr{ togl {collection:icbk}
+                        and togl {swapvol}}
+             {}
+             {\toggletrue{notrans}}}
+          {}}}}
+
+\newbibmacro*{trans+transa+transb}{%
+  \ifnameundef{translator}
+    {\ifnameundef{translatora}
+       {\renewcommand*{\yeditor}{translatorb}}%
+       {\renewcommand*{\yeditor}{translatora}}}
+    {\renewcommand*{\yeditor}{translator}}}
 
 \newbibmacro*{transcombos}{%
   \renewcommand*{\cbx@namelist}{\yeditor}%
@@ -873,14 +833,14 @@
        {\renewcommand*{\cbx@bibstring}{compiler}}%
        {\renewcommand*{\cbx@bibstring}{editor}}}}
 
-\newbibmacro*{b:authpos+edtrans}{%
+\newbibmacro*{edscomps:authpos}{%
   \iftoggle{cbx@short}
     {}
-    {\usebibmacro{eds+comps}%
+    {\usebibmacro{edscomps}%
      \renewcommand*{\plugb}{%
        \addcomma\space\bibsstring{\cbx@bibstring}}}}
 
-\newbibmacro*{eds+comps}{%
+\newbibmacro*{edscomps}{%
   \iftoggle{swaptrans}
     {}
     {\ifnameundef{editor}
@@ -891,7 +851,9 @@
           {\edef\cbx@bibstring{\cbx@bibstring +}}%
           {}}}}
 
-\newbibmacro*{a:edtrans}{%
+% For editors and translators not in the author's position.
+
+\newbibmacro*{edtrans:a}{%
   \iftoggle{swaptrans}
     {\usebibmacro{transcombos+etc}%
      \usebibmacro{edcombos+etc}}%
@@ -899,31 +861,36 @@
      \usebibmacro{transcombos+etc}}}
 
 \newbibmacro*{transcombos+etc}{%
-  \usebibmacro{test:edtrans}%
+  \togglefalse{noed}%
+  \togglefalse{notrans}%
+  \usebibmacro{test:ed}%
+  \usebibmacro{test:trans}%
   \iftoggle{notrans}
     {}
     {\usebibmacro{transcombos}%
      \usebibmacro{pluga+etc}}}
 
 \newbibmacro*{edcombos+etc}{%
-  \usebibmacro{test:edtrans}%
+  \togglefalse{noed}%
+  \togglefalse{notrans}%
+  \usebibmacro{test:ed}%
+  \usebibmacro{test:trans}%
   \iftoggle{noed}
     {}
     {\usebibmacro{edcombos}%
      \usebibmacro{pluga+etc}}}
 
-\newbibmacro*{b:edtrans}{%
-  \global\toggletrue{edshift}%
-  \usebibmacro{a:edtrans}%
-  \global\togglefalse{edshift}%
+\newbibmacro*{edtrans:b}{%
+  \toggletrue{edshift}%
+  \usebibmacro{edtrans:a}%
   \usebibmacro{editoraddon}}%
 
 \newbibmacro*{pluga+etc}{%
-  \usebibmacro{a:edtranspunct}%
+  \usebibmacro{edtranspunct:a}%
   \usebibmacro{pluga+printnames}%
-  \usebibmacro{b:edtranspunct}}%
+  \usebibmacro{edtranspunct:b}}%
 
-\newbibmacro*{a:edtranspunct}{%
+\newbibmacro*{edtranspunct:a}{%
   \ifboolexpr{ togl {authposition}
                or togl {edshift}}
     {}
@@ -934,26 +901,130 @@
     \bibstring{\cbx@bibstring}\space}%
   \usebibmacro{printnames+etc}}%
 
-\newbibmacro*{b:edtranspunct}{%
-  \ifboolexpr{ test {\ifdefstring{\xtitle}{book}}
-               and not test {\iffieldundef{title}}}
+\newbibmacro*{edtranspunct:b}{%
+  \iftoggle{edshift}
     {\setunit{\addcomma\space}}%
     {\newunit}}%
 
-% For editors and translators whose names belong after 'issuetitle',
-% 'maintitle', or 'series'.
+% Tests for 'edtrans:a' and 'edtrans:b' macros.
+
+\newbibmacro*{test:ed}{%
+  \iftoggle{edshift}
+    {\usebibmacro{eda+edb+edc}}%
+    {\ifnameundef{editor}
+       {\usebibmacro{test:editora}}%
+       {\usebibmacro{test:editor}%
+        \iftoggle{noed}
+          {\global\togglefalse{noed}%
+           \usebibmacro{test:editora}}%
+          {}}}}
 
-\newbibmacro*{xeditor+yeditor}[1]{%
+\newbibmacro*{eda+edb+edc}{%
+  \ifnameundef{editor}
+    {\ifnameundef{editora}
+       {\ifnameundef{editorb}
+          {\renewcommand*{\xeditor}{editorc}}%
+          {\renewcommand*{\xeditor}{editorb}}%
+        \usebibmacro{test:editorb}}%
+       {\usebibmacro{test:editora}%
+        \iftoggle{noed}
+          {\global\togglefalse{noed}%
+           \renewcommand*{\xeditor}{editorb}%
+           \usebibmacro{test:editorb}}%
+          {}}}
+    {\usebibmacro{test:editor}%
+     \iftoggle{noed}
+       {\global\togglefalse{noed}%
+        \usebibmacro{test:editora}}%
+       {}}}
+
+\newbibmacro*{test:editor}{%
+  \renewcommand*{\xeditor}{editor}%
+  \usebibmacro{test:xeditor:a}{}%
+  \iftoggle{noed}
+    {}
+    {\ifdefstring{\xtitle}{book}
+       {\toggletrue{noed}}%
+       {}}}
+
+\newbibmacro*{test:editora}{%
+  \renewcommand*{\xeditor}{editora}%
+  \usebibmacro{test:xeditor:a}{}%
+  \iftoggle{noed}
+    {}
+    {\ifboolexpr{ test {\ifdefempty{\xtitle}}
+                  and ( togl {collection:ib}
+                  or togl {collection:icbk}
+                  or togl {collection:icib}
+                  or not togl {collection} )}
+       {\toggletrue{noed}}%
+       {\ifboolexpr{ test {\ifdefstring{\xtitle}{bookbook}}
+                     and togl {swapvol}
+                     and ( togl {collection:icib}
+                     or togl {collection:icbk} )}
+          {\toggletrue{noed}}%
+          {}}}}
+
+\newbibmacro*{test:editorb}{%
+  \usebibmacro{test:xeditor:a}{}%
+  \iftoggle{collection:icib}
+    {\ifdefstring{\xtitle}{book}
+       {\toggletrue{noed}}%
+       {}}
+    {}}
+
+\newbibmacro*{test:xeditor:b}{%
+ \iffieldequalstr{\xeditor type}{maintitle}
+   {\toggletrue{noed}}%
+   {\ifdefempty{\xtitle}
+      {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
+                    or test {\iffieldequalstr{\xeditor type}{title}}
+                    or test {\iffieldundef{\xeditor type}}}
+         {}
+         {\toggletrue{noed}}}
+      {}}}
+
+\newbibmacro*{test:trans}{%
+  \usebibmacro{trans+transa+transb}%
+  \ifnameundef{\yeditor}
+    {\toggletrue{notrans}}%
+    {\iffieldequalstr{\yeditor type}{maintitle}
+       {\toggletrue{notrans}}%
+       {\ifdefstring{\yeditor}{translatorb}
+          {\ifboolexpr{ test {\ifdefempty{\xtitle}}
+                        or test {\ifdefstring{\xtitle}{book}}}
+             {\toggletrue{notrans}}%
+             {}}
+          {\ifdefstring{\yeditor}{translatora}
+             {\ifboolexpr{ test {\ifdefempty{\xtitle}}
+                           or test {\ifdefstring{\xtitle}{bookbook}}}
+                {\toggletrue{notrans}}%
+                {}}
+             {\ifboolexpr{ togl {collection}
+                           and togl {swapvol}
+                           and test {\ifdefstring{\xtitle}{book}}}
+                {\toggletrue{notrans}}%
+                {}}}}}}
+
+% For editors of an 'issuetitle', 'maintitle', or 'series'.
+
+\newbibmacro*{editortypes}[1]{%
   \ifboolexpr{ test {\iffieldequalstr{editortype}{#1}}
                or test {\iffieldequalstr{editoratype}{#1}}
                or test {\iffieldequalstr{editorbtype}{#1}}
                or test {\iffieldequalstr{editorctype}{#1}}}
-    {\setunit{\addcomma\space}%
+    {\usebibmacro{edtranspunct:c}%
      \renewcommand*{\cbx@bibstring}{editor}%
      \usebibmacro{editorlists}{#1}%
      \usebibmacro{pluga+printnames}}%
     {}}
 
+\newbibmacro*{edtranspunct:c}{%
+  \ifboolexpr{ togl {collection:bk}
+               and togl {swapvol}}
+    {\newunit}%
+    {\setunit{\unspace,\addspace}}}
+
 \newbibmacro*{editorlists}[1]{%
   \iffieldequalstr{editortype}{#1}
     {\renewcommand*{\cbx@namelist}{editor}}%
@@ -963,6 +1034,19 @@
           {\renewcommand*{\cbx@namelist}{editorb}}%
           {\renewcommand*{\cbx@namelist}{editorc}}}}}
 
+% For translators of a 'maintitle'.
+
+\newbibmacro*{translatortypes}{%
+  \ifboolexpr{ test {\iffieldequalstr{translatortype}{maintitle}}
+               or test {\iffieldequalstr{translatoratype}{maintitle}}}
+    {\usebibmacro{edtranspunct:c}%
+     \renewcommand*{\cbx@bibstring}{translator}%
+     \iffieldequalstr{translatortype}{maintitle}
+       {\renewcommand*{\cbx@namelist}{translator}}%
+       {\renewcommand*{\cbx@namelist}{translatora}}%
+     \usebibmacro{pluga+printnames}}%
+    {}}
+
 % A catchall for additional editorial information about a 'title'.
 
 \newbibmacro*{editoraddon}{%
@@ -1092,50 +1176,69 @@
   \iftoggle{bibliography}
     {\usebibmacro{longtitle+titleaddon}%
      \usebibmacro{b:labeldate+extradate}}%
-    {\ifboolexpr{ test {\ifciteseen}
+    {\ifboolexpr{ test \ifciteseen
                   or togl {firstshort}}
        {\usebibmacro{shorttitle}}%
        {\usebibmacro{longtitle+titleaddon}}}}
 
 \newbibmacro*{shorttitle}{%
-  \ifboolexpr{ togl {collection}
+  \ifboolexpr{ togl {collection:bk}
                and togl {swapvol}}
-    {\iftoggle{collection:book}
-       {\iffieldundef{shortmaintitle}
-         {\printfield[title]{maintitle}}%
-         {\printfield[title]{shortmaintitle}}}
+    {\iffieldundef{shortmaintitle}
+       {\printfield[title]{maintitle}}%
+       {\printfield[title]{shortmaintitle}}}
+    {\ifboolexpr{ togl {collection:ib}
+                  and togl {swapvol}}
        {\iffieldundef{shortbooktitle}
          {\printfield[title]{booktitle}}%
-         {\printfield[title]{shortbooktitle}}}}
-    {\printfield[\thefield{entrytype}]{labeltitle}}}
-
-\newbibmacro*{test:title+booktitle}{%
-  \ifboolexpr{ test {\iffieldundef{title}}
-               and test {\iffieldundef{booktitle}}}
-    {\renewcommand*{\xtitle}{bookbook}}%
-    {\iffieldundef{title}
-       {\renewcommand*{\xtitle}{book}}%
-       {\ifboolexpr{ togl {collection}
-                     and togl {swapvol}}
-          {\iftoggle{collection:book}
-             {\renewcommand*{\xtitle}{main}}%
-             {\renewcommand*{\xtitle}{book}}}
-          {}}}}
+         {\printfield[title]{shortbooktitle}}}
+       {\printfield[\thefield{entrytype}]{labeltitle}}}}
+
+\newbibmacro*{shorttitle+crossref}{%
+  \ifboolexpr{ togl {collection:icbk}
+               and togl {swapvol}}
+    {\iffieldundef{shortmaintitle}
+       {\printfield[title]{maintitle}}%
+       {\printfield[title]{shortmaintitle}}}
+    {\ifboolexpr{ togl {collection:icib}
+                  and togl {swapvol}}
+       {\iffieldundef{shortbooktitle}
+         {\printfield[title]{booktitle}}%
+         {\printfield[title]{shortbooktitle}}}
+       {\printfield[\thefield{entrytype}]{labeltitle}}}}
+
+\newbibmacro*{booktitle+editor}[1]{%
+  \iffieldundef{booktitle}
+    {}
+    {\renewcommand*{\xtitle}{book}%
+     \usebibmacro{longtitle+titleaddon}%
+     \setunit{\unspace,\addspace}%
+     \usebibmacro{bybookauthor+pages}%
+     \ifstrequal{#1}{a}
+       {\usebibmacro{edtrans:a}}%
+       {\usebibmacro{edtrans:b}}}}
 
-\newbibmacro*{bookbooktitle}{%
+\newbibmacro*{bookbooktitle+editor}[1]{%
   \iffieldundef{bookbooktitle}
     {}
-    {\bibstring{in}\space
+    {\ifstrequal{#1}{in}
+       {\newunit\bibstring{in}\space}%
+       {}% needs '%'
      \renewcommand*{\xtitle}{bookbook}%
      \usebibmacro{longtitle+titleaddon}%
-     \midsentence\setunit{\addcomma\space}}}
+     \setunit{\unspace,\addspace}%
+     \usebibmacro{edtrans:b}}}
 
 \newbibmacro*{maintitle+editor}{%
   \iffieldundef{maintitle}
     {}
     {\renewcommand*{\xtitle}{main}%
      \usebibmacro{longtitle+titleaddon}%
-     \usebibmacro{xeditor+yeditor}{maintitle}}}
+     \iftoggle{swaptrans}
+       {\usebibmacro{translatortypes}%
+        \usebibmacro{editortypes}{maintitle}}%
+       {\usebibmacro{editortypes}{maintitle}%
+        \usebibmacro{translatortypes}}}}
 
 \newbibmacro*{issuetitle}{%
   \iffieldundef{issuetitle}
@@ -1145,7 +1248,7 @@
        {\bibstring{in}\space
         \renewcommand*{\xtitle}{issue}%
         \usebibmacro{longtitle+titleaddon}%
-        \usebibmacro{xeditor+yeditor}{issuetitle}}%
+        \usebibmacro{editortypes}{issuetitle}}%
      \newunit\bibstring{special}%
      \setunit{\addcomma\space}}}
 
@@ -1165,6 +1268,73 @@
          {}
          {\usebibmacro{origyear+origendyear}}}}}
 
+%%%%%%%%%%%%%%%%%%%
+%%  Collections  %%
+%%%%%%%%%%%%%%%%%%%
+
+\newbibmacro*{test:collection}{%
+  \ifboolexpr{ test {\ifentrytype{book}}
+               or test {\ifentrytype{collection}}
+               or test {\ifentrytype{mvbook}}
+               or test {\ifentrytype{mvcollection}}}
+    {\usebibmacro{test:collection:bk}}%
+    {\ifboolexpr{ test {\ifentrytype{bookinbook}}
+                  or test {\ifentrytype{inbook}}
+                  or test {\ifentrytype{incollection}}
+                  or test {\ifentrytype{letter}}}
+       {\usebibmacro{test:collection:icbk+etc}}%
+       {}}}
+
+\newbibmacro*{test:collection:bk}{%
+  \ifboolexpr{ test {\iffieldundef{booktitle}}
+               and test {\iffieldundef{bookbooktitle}}
+               and test {\iffieldundef{bookvolume}}
+               and test {\iffieldundef{bookbookvolume}}
+               and not test {\iffieldundef{title}}
+               and not test {\iffieldundef{maintitle}}
+               and not test {\iffieldundef{volume}}}
+    {\toggletrue{collection}%
+     \toggletrue{collection:bk}}%
+    {}}
+
+\newbibmacro*{test:collection:icbk+etc}{%
+  \ifboolexpr{ test {\iffieldundef{bookbooktitle}}
+               and test {\iffieldundef{volume}}
+               and test {\iffieldundef{bookbookvolume}}
+               and not test {\iffieldundef{title}}
+               and not test {\iffieldundef{booktitle}}
+               and not test {\iffieldundef{maintitle}}
+               and not test {\iffieldundef{bookvolume}}}
+    {\toggletrue{collection}%
+     \toggletrue{collection:icbk}}%
+    {\ifboolexpr{ test {\ifentrytype{bookinbook}}
+                  or test {\ifentrytype{inbook}}}
+       {\usebibmacro{test:collection:ib}}%
+       {\usebibmacro{test:collection:icib}}}}
+
+\newbibmacro*{test:collection:ib}{%
+  \ifboolexpr{ test {\iffieldundef{maintitle}}
+               and test {\iffieldundef{bookbooktitle}}
+               and test {\iffieldundef{bookvolume}}
+               and test {\iffieldundef{bookbookvolume}}
+               and not test {\iffieldundef{title}}
+               and not test {\iffieldundef{booktitle}}
+               and not test {\iffieldundef{volume}}}
+    {\toggletrue{collection}%
+     \toggletrue{collection:ib}}%
+    {}}
+
+\newbibmacro*{test:collection:icib}{%
+  \ifboolexpr{ test {\iffieldundef{maintitle}}
+               and test {\iffieldundef{volume}}
+               and test {\iffieldundef{bookbookvolume}}
+               and not test {\iffieldundef{booktitle}}
+               and not test {\iffieldundef{bookbooktitle}}
+               and not test {\iffieldundef{bookvolume}}}
+    {\toggletrue{collection}%
+     \toggletrue{collection:icib}}%
+    {}}
+
 %%%%%%%%%%%%%%%%%%%%%%%
 %%  Dates and Times  %%
 %%%%%%%%%%%%%%%%%%%%%%%
@@ -1185,7 +1355,7 @@
           {\usebibmacro{month+day+year}}}
        {\setunit{\space}%
         \iffieldundef{month}
-          {\usebibmacro{reflist+issue+season+year}}%
+          {\usebibmacro{reflist+issue+season}}%
           {\printtext[parens]{%
              \usebibmacro{month+day+year}}}}}}
 
@@ -1234,17 +1404,21 @@
     {\addcomma\space
      \printtime}}%
 
-\newbibmacro*{reflist+issue+season+year}{%
-  \ifboolexpr{ togl {bibliography}
-               and togl {reflist}
-               and test {\iffieldundef{issue}}
-               and test {\iffieldundef{season}}}
-      {}
-      {\setunit{\space}%
-       \printtext[parens]{\usebibmacro{issue+season+year}}}}
-
 % Treat 'season' as an alternative for 'issue'.
 
+\newbibmacro*{reflist+issue+season}{%
+  \ifboolexpr{ togl {bibliography}
+               and togl {reflist}}
+    {\ifboolexpr{ test {\iffieldundef{issue}}
+                  and test {\iffieldundef{season}}}
+       {}
+       {\setunit{\space}%
+        \iffieldundef{issue}
+           {\printtext[parens]{\printfield{season}}}
+           {\printtext[parens]{\printfield{issue}}}}}
+    {\setunit{\space}%
+     \printtext[parens]{\usebibmacro{issue+season+year}}}}
+
 \newbibmacro*{issue+season+year}{%
   \ifboolexpr{ test {\iffieldundef{issue}}
                and test {\iffieldundef{season}}}
@@ -1325,7 +1499,7 @@
   \ifboolexpr{ togl {reflist}
                and not togl {skipdate}}
     {\newunit
-     \usebibmacro{reflist:origyear}%
+     \usebibmacro{reflist+origyear}%
      \usebibmacro{labeldate+endyear}%
      \printfield{extradate}%
      \ifboolexpr{ test {\iffieldundef{year}}
@@ -1334,7 +1508,7 @@
        {\bibsentence\newunit}}% if year enclosed in brackets
     {}}
 
-\newbibmacro*{reflist:origyear}{%
+\newbibmacro*{reflist+origyear}{%
   \iffieldundef{origyear}
     {}
     {\printtext[parens]{\usebibmacro{origyear+origendyear}}%
@@ -1420,7 +1594,6 @@
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
-  \usebibmacro{test:collection}%
   \usebibmacro{author+title+etc}%
   \usebibmacro{crossref+incollections}%
   \usebibmacro{doi+finentry+etc}}%
@@ -1477,9 +1650,8 @@
 
 \newbibmacro*{author+title+ed+note}{%
   \usebibmacro{author+bookauthor+etc}%
-  \usebibmacro{test:title+booktitle}%
   \usebibmacro{title+labelyear}%
-  \usebibmacro{a:edtrans}%
+  \usebibmacro{edtrans:a}%
   \usebibmacro{note}}%
 
 \newbibmacro*{articles}{%
@@ -1519,78 +1691,61 @@
 \newbibmacro*{doi+finentry+etc}{%
   \usebibmacro{doi+url+etc}%
   \usebibmacro{isbn}%
+  \usebibmacro{library}%
   \usebibmacro{pageref+finentry}}%
 
 \newbibmacro*{author+collection+etc}{%
   \usebibmacro{test:collection}%
   \usebibmacro{author+bookauthor+etc}%
-  \usebibmacro{test:title+booktitle}%
-  \usebibmacro{title+labelyear}%
-  \ifdefstring{\xtitle}{main}
-    {\usebibmacro{a:edtrans}%
-     \usebibmacro{pages+volume+etc}%
+  \ifboolexpr{ togl {collection:bk}
+               and togl {swapvol}}
+    {\usebibmacro{maintitle+editor}%
+     \usebibmacro{note}%
+     \usebibmacro{edition}%
+     \usebibmacro{volume+number+etc}%
      \let\xtitle\empty
      \usebibmacro{longtitle+titleaddon}%
-     \midsentence\setunit{\addcomma\space}%
+     \setunit{\unspace,\addspace}%
      \usebibmacro{byauthor}{}%
-     \usebibmacro{b:edtrans}%
-     \usebibmacro{note}%
-     \usebibmacro{edition}%
-     \usebibmacro{volumes+series+etc}%
-     \usebibmacro{date+loc+etc}%
-     \usebibmacro{origtitle}}%
-    {\usebibmacro{byauthor}{newunit}%
-     \usebibmacro{a:edtrans}%
+     \usebibmacro{edtrans:b}%
+     \usebibmacro{volumes}%
+     \usebibmacro{bookseries}%
+     \usebibmacro{volume+number+etc}%
+     \usebibmacro{book:number}%
+     \usebibmacro{part}}%
+    {\usebibmacro{title+labelyear}%
+     \usebibmacro{byauthor}{newunit}%
+     \usebibmacro{edtrans:a}%
      \usebibmacro{editoraddon}%
-     \usebibmacro{note}%
-     \usebibmacro{edition}%
-     \usebibmacro{volumes+series+etc}%
-     \usebibmacro{maintitle+editor}%
-     \usebibmacro{date+loc+etc}%
-     \usebibmacro{origtitle}}}
-
-% Check for entrytypes due to its use in 'cite' and 'parencite'.
-
-\newbibmacro*{test:collection}{%
-  \ifboolexpr{ test {\ifentrytype{book}}
-               or test {\ifentrytype{bookinbook}}
-               or test {\ifentrytype{collection}}
-               or test {\ifentrytype{inbook}}}
-    {\iffieldundef{volume}
-       {}
-       {\ifboolexpr{ ( test {\ifentrytype{book}}
-                     or test {\ifentrytype{collection}} )
-                     and not test {\iffieldundef{maintitle}}}
-          {\global\toggletrue{collection}%
-           \global\toggletrue{collection:book}}%
-          {\ifboolexpr{ ( test {\ifentrytype{bookinbook}}
-                        or test {\ifentrytype{inbook}} )
-                        and test {\iffieldundef{maintitle}}
-                        and not test {\iffieldundef{title}}
-                        and not test {\iffieldundef{booktitle}}}
-             {\global\toggletrue{collection}%
-              \global\toggletrue{collection:inbook}}%
-             {}}}}
-    {}}
+     \iffieldundef{maintitle}
+       {\usebibmacro{note+edition+etc}}%
+       {\usebibmacro{volumes}%
+        \usebibmacro{bookseries}%
+        \usebibmacro{volume+number+etc}%
+        \usebibmacro{book:number}%
+        \usebibmacro{part}%
+        \usebibmacro{maintitle+editor}%
+        \usebibmacro{note}%
+        \usebibmacro{edition}}}
+  \usebibmacro{date+loc+etc}%
+  \usebibmacro{origtitle}}%
 
 \newbibmacro*{author+title+etc}{%
+  \usebibmacro{test:collection}%
   \usebibmacro{test:bookauthor}%
-  \iftoggle{reprinted}
-    {}
-    {\ifboolexpr{ test {\ifnameundef{afterword}}
-                  and test {\ifnameundef{foreword}}
-                  and test {\ifnameundef{introduction}}}
-       {\usebibmacro{author+bookauthor+etc}%
-        \usebibmacro{test:title+booktitle}%
-        \usebibmacro{title+labelyear}%
-        \ifdefstring{\xtitle}{book}
-          {\usebibmacro{bybookauthor+pages}{newunit}%
-           \usebibmacro{a:edtrans}}%
-          {\ifboolexpr{ test {\ifentrytype{bookinbook}}
-                        or test {\ifentrytype{inbook}}}
-             {\usebibmacro{byauthor+ed+in}}%
-             {\usebibmacro{ed+chapter+in}}}}
-       {\usebibmacro{aft+fore+intro}}}}
+  \ifboolexpr{ test {\ifnameundef{afterword}}
+               and test {\ifnameundef{foreword}}
+               and test {\ifnameundef{introduction}}}
+    {\usebibmacro{author+bookauthor+etc}%
+     \iffieldundef{title}
+       {\usebibmacro{booktitle+editor}{a}}%
+       {\ifboolexpr{ togl {collection:ib}
+                     and togl {swapvol}
+                     and not togl {collection:icib}}
+          {\usebibmacro{booktitle+editor}{a}}%
+          {\usebibmacro{title+labelyear}%
+           \usebibmacro{byauthor+ed+chapter}}}}
+    {\usebibmacro{aft+fore+intro}}}
 
 \newbibmacro*{crossref+incollections}{%
   \iffieldundef{crossref}
@@ -1621,24 +1776,25 @@
      \setunit{\addcomma\space}}}
 
 \newbibmacro*{reviews}{%
-% Unsigned reviews have no plausible place for the publication year
-% except where the default format would put it. Perhaps best to use
-% the default format from here.
-  \ifnameundef{author}
-    {\toggletrue{noauth}%
-     \togglefalse{reflist}}%
-    {}%
+  \ifboolexpr{ test {\ifnameundef{author}}
+               and not test {\ifnameundef{bookauthor}}}
+    {\savename{bookauthor}{\reviewee}%
+     \clearname{bookauthor}}%
+    {\let\reviewee\empty}%
   \usebibmacro{author+bookauthor+etc}%
-  \usebibmacro{title+labelyear}%
+  \iffieldundef{title}
+    {}
+    {\usebibmacro{title+labelyear}%
+     \newunit}%
   \usebibmacro{note}%
   \usebibmacro{review+title}%
   \setunit{\addcomma\space}%
   \iftoggle{firstshort}
     {}
-    {\usebibmacro{b:edtrans}}}
+    {\usebibmacro{edtrans:b}}}
 
 \newbibmacro*{inst+loc+date}{%
-  \printfield{type}%
+  \usebibmacro{type}%
   \setunit{\addcomma\space}%
   \iflistundef{institution}
     {\printfield{venue}}%
@@ -1683,7 +1839,7 @@
         \printfield{series}}%
      \isdot\addcomma
      \usebibmacro{seriesaddon}%
-     \usebibmacro{xeditor+yeditor}{series}%
+     \usebibmacro{editortypes}{series}%
      \newunit}}%
 
 \newbibmacro*{journallocation}{%
@@ -1757,15 +1913,39 @@
           {}}
        {}}}
 
-\newbibmacro*{volumes+series+etc}{%
-  \usebibmacro{volumes}%
-  \usebibmacro{bookseries}%
-  \usebibmacro{pages+volume+etc}%
-  \usebibmacro{pages}%
-  \usebibmacro{book:number}%
-  \usebibmacro{part}}%
+\newbibmacro*{library}{%
+  \iffieldundef{library}
+    {}
+    {\iftoggle{bibliography}
+       {\iftoggle{library}
+          {\newunit
+           \printfield{library}}%
+          {}}
+       {}}}
+
+\newbibmacro*{volume+number+etc}{%
+  \iffieldundef{\xvolume volume}
+    {}
+    {\usebibmacro{swapvol+pages}%
+     \iffieldundef{series}
+       {\newunit}%
+       {\setunit{\addcomma\space}}%
+     \iffieldnum{\xvolume volume}
+       {\printfield[volume]{\xvolume volume}%
+        \usebibmacro{volume:number}}%
+       {\bibstring{volumes}\space
+        \printfield[noformat]{\xvolume volume}}%
+     \clearfield{\xvolume volume}%
+     \usebibmacro{part}%
+     \iftoggle{collection}
+       {\iftoggle{swapvol}
+          {\addcomma\space}%
+          {\space\bibstring{of}\space}}%
+       {\iffieldundef{maintitle}
+          {}
+          {\space\bibstring{of}\space}}}}
 
-\newbibmacro*{byauthor}[1]{%
+\renewbibmacro*{byauthor}[1]{%
   \ifboolexpr{ test {\ifnameundef{author}}
                or togl {noauth}}
     {}
@@ -1779,7 +1959,9 @@
   \iffieldundef{edition}
     {}
     {\newunit
-     \printfield{edition}}}
+     \iffieldbibstring{edition}
+       {\bibstring{\thefield{edition}}}
+       {\printfield{edition}}}}
 
 \newbibmacro*{date+loc+etc}{%
   \ifboolexpr{ test {\iflistundef{location}}
@@ -1805,63 +1987,40 @@
        {\clearname{bookauthor}}%
        {}}}
 
-\newbibmacro*{bybookauthor+pages}[1]{%
+\newbibmacro*{bybookauthor+pages}{%
   \ifnameundef{bookauthor}
     {}
-    {\ifstrequal{#1}{newunit}
-       {\renewcommand*{\pluga}{\newunit\bibstring{by}\space}}%
-       {\renewcommand*{\pluga}{\bibstring{by}\space}}%
+    {\renewcommand*{\pluga}{\bibstring{by}\space}%
      \renewcommand*{\cbx@namelist}{bookauthor}%
      \usebibmacro{printnames+etc}%
      \usebibmacro{pages}%
-      \ifdefstring{\xtitle}{book}
-        {\newunit}%
-        {}}}
+     \newunit}}%
 
-\newbibmacro*{byauthor+ed+in}{%
+\newbibmacro*{byauthor+ed+chapter}{%
   \usebibmacro{byauthor}{newunit}%
-  \usebibmacro{a:edtrans}%
-  \iftoggle{collection:inbook}
+  \usebibmacro{edtrans:a}%
+  \iftoggle{collection:ib}
     {}
     {\newunit
-     \bibstring{in}\space}}%
-
-\newbibmacro*{ed+chapter+in}{%
-  \usebibmacro{a:edtrans}%
-  \newunit
-  \iffieldundef{chapter}
-    {\bibstring{in}\space}%
-    {\printfield{chapter}\space
-     \bibstring{in}\space}}%
+     \iffieldundef{chapter}
+       {\bibstring{in}\space}%
+       {\printfield{chapter}\space
+        \bibstring{in}\space}}}
 
 \newbibmacro*{incollections}{%
-  \ifdefstring{\xtitle}{book}
-    {\usebibmacro{pages+volume+etc}%
-     \let\xtitle\empty
-     \usebibmacro{longtitle+titleaddon}%
-     \midsentence\setunit{\addcomma\space}%
-     \usebibmacro{byauthor}{}%
-     \usebibmacro{b:edtrans}%
-     \usebibmacro{note}%
-     \usebibmacro{edition}}%
-    {\iftoggle{collection:inbook}
-       {\usebibmacro{note}%
-        \usebibmacro{edition}%
-        \usebibmacro{volumes}%
-        \usebibmacro{pages+volume+etc}}%
-       {}% needs '%'
-     \renewcommand*{\xtitle}{book}%
-     \usebibmacro{longtitle+titleaddon}%
-     \midsentence\setunit{\addcomma\space}%
-     \usebibmacro{bybookauthor+pages}{}%
-     \usebibmacro{bookbooktitle}%
-     \usebibmacro{b:edtrans}%
-     \iftoggle{collection:inbook}
-       {}% needs '%'
-       {\usebibmacro{note}%
-        \usebibmacro{edition}}}% needs '%'
-  \usebibmacro{volumes+series+etc}%
-  \usebibmacro{maintitle+editor}%
+  \iftoggle{collection:ib}
+    {\usebibmacro{incollections:ib}}%
+    {\ifboolexpr{ togl {collection:icbk}
+                  or togl {collection:icib}}
+      {\usebibmacro{incollections:ic}}%
+      {\usebibmacro{booktitle+editor}{}%
+       \usebibmacro{bookbooktitle+editor}{in}%
+       \iffieldundef{volume}
+         {\iffieldundef{bookvolume}%
+            {\renewcommand*{\xvolume}{bookbook}}%
+            {\renewcommand*{\xvolume}{book}}%
+          \usebibmacro{note+edition+etc}}%
+         {\usebibmacro{note+edition+etc}}}}
   \usebibmacro{date+loc+etc}%
   \usebibmacro{origtitle}}%
 
@@ -1872,7 +2031,7 @@
     \iftoggle{reflist}
       {\usebibmacro{parencite:long}}%
       {\usebibmacro{author+bookauthor+etc}%
-       \usebibmacro{shorttitle}}%
+       \usebibmacro{shorttitle+crossref}}%
     \usebibmacro{cite:volume}}}
 
 \newbibmacro*{pages}{%
@@ -1889,16 +2048,25 @@
     {\bibcpstring{reviewnoauth}}%
     {\bibstring{review}}%
   \space
-  \usebibmacro{test:title+booktitle}%
+  \renewcommand*{\xtitle}{book}%
   \usebibmacro{title+labelyear}%
   \iftoggle{firstshort}
-    {\clearfield{booktitle}}
+    {\clearfield{booktitle}}%
     {\setunit{\addcomma\space}%
-     \togglefalse{noauth}%
+     \ifdefempty{\reviewee}
+       {}
+       {\restorename{bookauthor}{\reviewee}}%
      \renewcommand*{\pluga}{\bibstring{by}\space}%
      \renewcommand*{\cbx@namelist}{bookauthor}%
      \usebibmacro{printnames+etc}}}
 
+\newbibmacro*{type}{%
+  \iffieldundef{type}
+    {}
+    {\iffieldbibstring{type}
+       {\bibstring{\thefield{type}}}
+       {\printfield{type}}}}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Fourth and Higher Tier Macros  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1914,9 +2082,10 @@
 \newbibmacro*{volumes}{%
   \iffieldundef{volumes}
     {}
-    {\ifboolexpr{ not togl {bibliography}
-                  and not test {\iffieldundef{postnote}}
-                  and not togl {listvols}}
+    {\ifboolexpr{ togl {collection}
+                  or ( not togl {bibliography}
+                  and not togl {listvols}
+                  and not test {\iffieldundef{postnote}} )}
        {}
        {\newunit
         \printfield{volumes}%
@@ -1929,7 +2098,7 @@
      \newunit
      \printfield{series}%
      \usebibmacro{seriesaddon}%
-     \usebibmacro{xeditor+yeditor}{series}%
+     \usebibmacro{editortypes}{series}%
      \setunit{\addcomma\space}}}
 
 \newbibmacro*{seriesaddon}{%
@@ -1939,34 +2108,11 @@
      \printfield{seriesaddon}%
      \isdot\addcomma}}%
 
-\newbibmacro*{pages+volume+etc}{%
-  \iffieldundef{volume}
+\newbibmacro*{swapvol+pages}{%
+  \ifboolexpr{ togl {collection}
+               and togl {swapvol}}
     {}
-    {\iftoggle{bibliography}
-       {\setunit{\addcomma\space}%
-        \printfield{pages}%
-        \clearfield{pages}%
-        \usebibmacro{volume+number+etc}}%
-       {\usebibmacro{volume+number+etc}}}}
-
-\newbibmacro*{volume+number+etc}{%
-  \iffieldundef{series}
-    {\newunit}%
-    {\setunit{\addcomma\space}}%
-  \iffieldnum{volume}
-    {\printfield{volume}%
-     \usebibmacro{volume:number}}%
-    {\bibstring{volumes}\space
-     \printfield[noformat]{volume}}%
-  \clearfield{volume}%
-  \usebibmacro{part}%
-  \iftoggle{collection}
-    {\iftoggle{swapvol}
-       {\addcomma\space}%
-       {\space\bibstring{of}\space}}%
-    {\iffieldundef{maintitle}
-       {}
-       {\space\bibstring{of}\space}}}
+    {\usebibmacro{pages}}}
 
 \newbibmacro*{volume:number}{%
   \iffieldundef{number}
@@ -2023,4 +2169,50 @@
      \bibstring{reprint}%
      \addcomma\space}}%
 
+\newbibmacro*{incollections:ib}{%
+  \iftoggle{swapvol}
+    {\usebibmacro{note+edition+etc}%
+     \let\xtitle\empty
+     \usebibmacro{longtitle+titleaddon}%
+     \setunit{\unspace,\addspace}%
+     \usebibmacro{byauthor}{}%
+     \usebibmacro{edtrans:b}}%
+    {\usebibmacro{volume+number+etc}%
+     \usebibmacro{booktitle+editor}{}%
+     \usebibmacro{note+edition+etc}}}
+
+\newbibmacro*{note+edition+etc}{%
+  \usebibmacro{note}%
+  \usebibmacro{edition}%
+  \usebibmacro{volumes}%
+  \usebibmacro{bookseries}%
+  \usebibmacro{pages}%
+  \usebibmacro{volume+number+etc}%
+  \usebibmacro{book:number}%
+  \usebibmacro{part}}%
+
+\newbibmacro*{incollections:ic}{%
+  \iftoggle{swapvol}
+    {\iftoggle{collection:icbk}
+       {\usebibmacro{maintitle+editor}}%
+       {\usebibmacro{bookbooktitle+editor}{}}%
+     \renewcommand*{\xvolume}{book}%
+     \usebibmacro{note+edition+etc}%
+     \usebibmacro{booktitle+editor}{}%
+     \usebibmacro{pages}}%
+    {\usebibmacro{booktitle+editor}{}%
+     \renewcommand*{\xvolume}{book}%
+     \usebibmacro{volume+number+etc}%
+     \iftoggle{collection:icbk}
+       {\usebibmacro{maintitle+editor}}%
+       {\usebibmacro{bookbooktitle+editor}{}}%
+     \renewcommand*{\xvolume}{book}%
+     \usebibmacro{note+edition+etc}}}
+
+\newbibmacro*{volume}{%
+  \iffieldundef{\xvolume volume}
+    {}
+    {\newunit
+     \printfield[volume]{\xvolume volume}}}
+
 \endinput
diff --git a/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx b/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx
index d5a7cb6679f..cd2beed0f40 100644
--- a/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx
+++ b/Master/texmf-dist/doc/latex/windycity/cbx/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Thu 31 Jan 2019 08:30:49 PM CST
+% Last modified: Thu 21 Feb 2019 09:35:25 AM CST
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -14,16 +14,14 @@
 % purpose.
 
 \ProvidesFile{windycity.cbx}[Windy City style for biblatex]
-
 \@ifpackagelater{biblatex}{2017/11/04}
    {}
    {\PackageError{biblatex}
       {Outdated 'biblatex' package}
-      {Windy City 2019.01.31 is for biblatex v3.8 and above.\MessageBreak
+      {Windy City 2019-02-21 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}%
-\RequireBiber
 
 % This file contains material only for formatting notes and
 % parenthetical citations. For content that is also used for
@@ -48,8 +46,8 @@
 % '\addperiod' (see cite:postnote). This makes '\footcite{something}'
 % and '\footnote{\cite{something}}' functionally equivalent. To
 % prevent an extra period from printing in very rare cases, as when
-% the text of '\footcite{something}' ends with a capital letter,
-% remove '\addperiod' from the commands below:
+% '\footcite{something}' ends with a capital letter, remove
+% '\addperiod' from the commands below:
 
 \renewcommand{\bibfootnotewrapper}[1]{%
   \bibsentence#1}%
@@ -61,7 +59,7 @@
 
 \renewcommand*{\newunitpunct}{\ifterm{,\addspace}{\addcomma\space}}%
 
-% Prevents errant space after colon.
+% Prevents errant space after a colon.
 
 \renewcommand*{\multicitedelim}{\setunit{\addsemicolon\space}}%
 
@@ -114,18 +112,6 @@
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
 
-\providetoggle{reprinted}
-\DeclareCiteCommand{\reprint}
-  {}
-  {\usebibmacro{citeindex}%
-   \toggletrue{noauth}%
-   \toggletrue{reprinted}%
-   \bibstring{reprinted}\space
-   \usebibmacro{cite}%
-   \togglefalse{reprinted}}%
-  {\multicitedelim}%
-  {\usebibmacro{cite:postnote}}%
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Parenthetical Citations  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -209,9 +195,9 @@
 
 \newbibmacro*{cite}{%
   \usebibmacro{test:multicite}%
-  \usebibmacro{test:collection}%
   \ifciteseen
-    {\renewcommand*{\cbx@deflabel}{labelname}%
+    {\usebibmacro{test:collection}%
+     \renewcommand*{\cbx@deflabel}{labelname}%
      \printtext[bibhyperref]{\usebibmacro{cite:seen}}}
     {\printtext[bibhyperref]{\usebibmacro{cite:new}}}% needs '%'
   \usebibmacro{savefields}}%
@@ -270,19 +256,15 @@
     {\usebibmacro{author+bookauthor+etc}%
      \bibstring{review}}%
   \space
-  \usebibmacro{test:title+booktitle}%
+  \renewcommand*{\xtitle}{book}%
   \usebibmacro{title+labelyear}%
   \usebibmacro{cite:volume}}%
 
 \newbibmacro*{cite:volume}{%
   \newunit
-  \ifboolexpr{ test {\ifentrytype{book}}
-               or test {\ifentrytype{bookinbook}}
-               or test {\ifentrytype{collection}}
-               or test {\ifentrytype{inbook}}
-               or test {\ifentrytype{incollection}}}
-    {\ifboolexpr{ togl {collection}
-                  and togl {swapvol}}
+  \iftoggle{swapvol}
+    {\ifboolexpr{ togl {collection:bk}
+                  or togl {collection:ib}}
        {\usebibmacro{volume+page}}%
        {}}
     {}}
@@ -406,9 +388,6 @@
     {}
     {\printtext[bibhyperref]{\printfield{postnote}}}}
 
-% Use 'shorthandintro' to introduce a shorthand in whatever format you
-% want. See the example in windycity.bib.
-
 \newbibmacro*{shorthand+intro}{%
   \iffieldundef{shorthand}
     {}
@@ -457,13 +436,9 @@
   \usebibmacro{volume+page}}%
 
 \DeclareBibliographyDriver{cite:incollection}{%
-  \usebibmacro{author+title+etc}%
-  \usebibmacro{incollections}%
-  \newunit
-  \usebibmacro{volume+page}}%
-
-\DeclareBibliographyDriver{cite:letter}{%
-  \toggletrue{noauth}%
+  \ifentrytype{letter}
+    {\toggletrue{noauth}}%
+    {}% needs '%'
   \usebibmacro{author+title+etc}%
   \usebibmacro{incollections}%
   \newunit
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib b/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
index 6c6f5616647..976badc97f3 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.bib
@@ -1,4 +1,4 @@
-@STRING{ucp = "University of Chi\-ca\-go Press"}
+@STRING{ucp = "University of Chicago Press"}
 
 @Book{chicago2017,
   author = {{University of Chicago Press}},
@@ -13,28 +13,6 @@
 
 % Examples not in CMS
 
-@Article{frankfurt1969,
-  author = {Frankfurt, Harry G.},
-  title = {Alternate Possibilities and Moral Responsibility},
-  volume = {66},
-  number = {23},
-  pages = {829–39},
-  date = {1969-12-04},
-  journal = {The Journal of Philosophy}
-}
-@InCollection{frankfurt1988.1,
-  title = {Alternate Possibilities and Moral Responsibility},
-  pages = {1–10},
-  crossref = {frankfurt1988}
-}
-@Collection{frankfurt1988,
-  author = {Frankfurt, Harry G.},
-  subtitle = {Philosophical Essays},
-  title = {The Importance of What We Care About},
-  location = {Cambridge},
-  publisher = {Cambridge University Press},
-  year = {1988}
-}
 @Book{doe2010a,
   options = {skipbib},
   author = {Doe, Jane},
@@ -101,6 +79,49 @@
   publisher = ucp,
   year = {1948}
 }
+@InBook{spinoza1900.1.1,
+  title = {A Theological-Political Treatise},
+  crossref = {spinoza1900.1}
+}
+@Collection{spinoza1900.1,
+  author = {Spinoza, Benedict de},
+  title = {The Chief Works of Benedict de Spinoza},
+%  edition = {rev. ed.},% alternative to below:
+  edition = {revised},
+  translator = {Elwes, R. H. M.},
+  volume = {1},
+  address = {London},
+  publisher = {George Bell {and} Sons},
+  year = {1900}
+}
+@InCollection{doe2018,
+  author = {Doe, Jane},
+  title = {A Poem},
+  translator = {Smith, John},
+  pages = {56–57},
+  crossref = {jones2018}
+}
+@InCollection{edwards2018,
+  author = {Adams, Mary},
+  title = {Another Poem},
+  pages = {128–32},
+  crossref = {jones2018}
+}
+@InBook{jones2018,
+  editor = {Jones, David},
+  title = {A Volume of Poems},
+  volume = {2},
+  year = {2018},
+  crossref = {blow2016}
+}
+@Collection{blow2016,
+  editor = {White, Amy},
+  title = {A Collection of Poems},
+  volumes = {4},
+  address = {Chicago},
+  publisher = ucp,
+  year = {2016–18}
+}
 
 % 14.23 Notes and bibliography—examples and variations
 % 15.9 Author-date references—examples and variations
@@ -185,7 +206,7 @@
 @Article{schwartz1992,
   author = {Schwartz, Regina M.},
   title = {Nationals and Nationalism},
-  subtitle = {Adultery in the House of Da\-vid},
+  subtitle = {Adultery in the House of David},
   journal = {Critical Inquiry},
   volume = {19},
   number = {1},
@@ -225,12 +246,32 @@
   year = {2007}
 }
 
+% 14.54 Source notes for previously published material
+
+@Book{shapin1996,
+  author = {Shapin, Steven},
+  title = {The Scientific Revolution},
+  address = {Chicago},
+  publisher = ucp,
+  year = {1996}
+}
+@Article{manet1992,
+  author = {Fried, Michael},
+  title = {Manet in His Generation},
+  subtitle = {The Face of Painting in the 1860s},
+  journal = {Critical Inquiry},
+  volume = {19},
+  number = {1},
+  year = {1992},
+  pages = {22–69}
+}
+
 % 14.59 Abbreviations for frequently cited works
 
 @Collection{shurtleff1853,
   options = {listvols},
   editor = {Shurtleff, Nathaniel B.},
-  title = {Records of the Governor and Company of the Mas\-sa\-chu\-setts Bay in New England (1628–86)},
+  title = {Records of the Governor and Company of the Massachusetts Bay in New England (1628–86)},
   shorthand = {\emph{Mass. Records}},
   volumes = {5},
   address = {Boston},
@@ -371,7 +412,7 @@
   author = {Franklin, Benjamin},
   title = {Autobiography of Benjamin Franklin},
   editor = {Big\-e\-low, John},
-  address = {Phil\-a\-del\-phi\-a},
+  address = {Philadelphia},
   publisher = {J. B. Lippincott},
   year = {1868}
 }
@@ -459,6 +500,7 @@
 @Book{creasey1976,
   author = {Creasey, John},
   nameaddon = {Gordon Ashe, pseud.},
+  sortname = {Creasey, Ashe},
   title = {A Blast of Trumpets},
   address = {New York},
   publisher = {Rinehart {and} Winston},
@@ -467,6 +509,7 @@
 @Book{creasey1978,
   author = {Creasey, John},
   nameaddon = {Anthony Morton, pseud.},
+  sortname = {Creasey, Morton},
   title = {Hide the Baron},
   address = {New York},
   publisher = {Walker},
@@ -475,6 +518,7 @@
 @Book{creasey1966,
   author = {Creasey, John},
   nameaddon = {Jeremy York, pseud.},
+  sortname = {Creasey, York},
   title = {Death to My Killer},
   address = {New York},
   publisher = {Macmillan},
@@ -590,7 +634,7 @@
 
 @Book{vanwagenen1973,
   author = {Van Wagenen, Gertrude and Simpson, Miriam E.},
-  title = {Postnatal Development of the O\-var\-y in \emph{Homo sapiens} and \emph{Macaca mulatta} and Induction of Ovulation in the Ma\-caque},
+  title = {Postnatal Development of the Ovary in \emph{Homo sapiens} and \emph{Macaca mulatta} and Induction of Ovulation in the Ma\-caque},
   address = {New Haven, CT},
   publisher = {Yale University Press},
   year = {1973}
@@ -610,7 +654,7 @@
 @Book{oram2007,
   author = {Oram, Alison},
   title = {Her Husband Was a Woman!},
-  subtitle = {Women's Gender-Crossing and Bri\-tish Popular Culture},
+  subtitle = {Women's Gender-Crossing and British Popular Culture},
   address = {London},
   publisher = {Routledge},
   year = {2007}
@@ -649,7 +693,7 @@
   author = {Kern, W.},
   title = {Waar verzamelde Pigafetta zijn Maleise woorden?},
   titleaddon = {Where did Pigafetta collect his Malaysian words?},
-  journal = {Tijdschrift voor Indische taal-, land- en volkenkunde},
+  journal = {Tijdschrift voor Indische taal-, land- en vol\-ken\-kun\-de},
   volume = {78},
   year = {1938},
   pages = {271–73}
@@ -731,7 +775,7 @@
 @Collection{bonnefoy1995,
   author = {Bonnefoy, Yves},
   title = {New and Selected Poems},
-  editor = {Naughton, John and Rudolf, Anthony},
+  editor = {Naughton, John and Ru\-dolf, Anthony},
   address = {Chicago},
   publisher = ucp,
   year = {1995}
@@ -970,7 +1014,6 @@
 
 @Letter{adams1867,
   title = {Adams to Charles Milnes Gaskell, Baden, September 22, 1867},
-  pages = {133–34},
   crossref = {adams1930}
 }
 @Collection{adams1930,
@@ -1010,7 +1053,8 @@
   editor = {Boudett, Kathryn Parker and City, Elizabeth A. and Murnane, Richard J.},
   title = {Data Wise},
   subtitle = {A Step-by-Step Guide to Using Assessment Results to Improve Teaching and Learning},
-  edition = {\bibstring{revised}},
+%  edition = {rev. ed.},% alternative to below:
+  edition = {revised},
   address = {Cambridge, MA},
   publisher = {Harvard Education Press},
   year = {2013}
@@ -1030,7 +1074,8 @@
   author = {Barzun, Jacques},
   title = {Simple and Direct},
   subtitle = {A Rhetoric for Writers},
-  edition = {\bibstring{revised}},
+%  edition = {rev. ed.},% alternative to below:
+  edition = {revised},
   address = {Chicago},
   publisher = ucp,
   origdate = {1985},
@@ -1069,9 +1114,9 @@
 
 @Book{farwell1997,
   author = {Farwell, Beatrice},
-  title = {Li\-tho\-gra\-phy in Art and Commerce},
+  title = {Lithography in Art and Commerce},
   volume = {12},
-  maintitle = {French Popular Li\-tho\-gra\-phic Imagery, 1815–1870},
+  maintitle = {French Popular Lithographic Imagery, 1815–1870},
   address = {Chicago},
   publisher = ucp,
   year = {1997},
@@ -1080,7 +1125,7 @@
 @Thesis{tauber1958,
   author = {Tauber, Abraham},
   title = {Spelling Reform in the United States},
-  type = {\bibstring{phdthesis}},
+  type = {phdthesis},
   institution = {Columbia University},
   year = {1958},
   howpublished = {microfilm}
@@ -1112,11 +1157,13 @@
   author = {James, Henry},
   title = {The Complete Tales of Henry James},
   shorttitle = {Complete Tales of Henry James},
+  sorttitle = {Complete Tales of Henry James},
   editor = {Edel, Leon},
   volumes = {12},
   address = {London},
   publisher = {Rupert Hart-Davis},
-  year = {1962–64}
+  year = {1962–64},
+  sortyear = {1962}
 }
 
 % 14.118 Citing a particular volume in a note
@@ -1128,8 +1175,10 @@
   volume = {5},
   maintitle = {The Complete Tales of Henry James},
   shortmaintitle = {Complete Tales of Henry James},
+  sorttitle = {Complete Tales of Henry James},
   editor = {Edel, Leon},
   editortype = {maintitle},
+  volumes = {12},
   address = {London},
   publisher = {Rupert Hart-Davis},
   year = {1963}
@@ -1144,6 +1193,7 @@
   maintitle = {The Papers of Martin Luther King, Jr.},
   editora = {Carson, Clayborne},
   editoratype = {maintitle},
+  volumes = {14},
   address = {Berkeley},
   publisher = {University of California Press},
   year = {2014}
@@ -1159,6 +1209,7 @@
 @Collection{carson1992,
   editor = {Carson, Clayborne},
   title = {The Papers of Martin Luther King, Jr.},
+  volumes = {14},
   address = {Berkeley},
   publisher = {University of California Press},
   year = {1992–}
@@ -1181,6 +1232,13 @@
   publisher = {Cambridge University Press},
   year = {2010}
 }
+@Letter{king2014,
+  author = {King, Jr., Martin Luther},
+  title = {Unpublished letter to the editor of the \emph{Afro-American} (Washington, DC)},
+  shorttitle = {Letter to the \emph{Afro-American}},
+%  crossref = {carson2014}
+  crossref = {armstrong2014}
+}
 
 % 14.121 One volume in two or more books
 
@@ -1262,7 +1320,7 @@
 }
 @Book{wauchope1950,
   author = {Wauchope, Robert},
-  title = {A Tentative Sequence of Pre-Classic Ceramics in Middle A\-mer\-i\-ca},
+  title = {A Tentative Sequence of Pre-Classic Ceramics in Middle America},
   series = {Middle American Research Records},
   volume = {1},
   number = {14},
@@ -1526,16 +1584,19 @@
 @Book{james2008,
   author = {James, Henry},
   title = {The Ambassadors},
+  sorttitle = {Ambassadors},
   publisher = {Project Gutenberg},
   year = {2008},
   origlocation = {New York},
   origyear = {1909},
+  sortyear = {1910},
   url = {http://www.gutenberg.org/ebooks/432}
 }
 @Book{james1909,
   options = {listvols},
   author = {James, Henry},
   title = {The Ambassadors},
+  sorttitle = {Ambassadors},
   volumes = {2},
   address = {New York},
   publisher = {Charles Scribner's Sons},
@@ -1607,7 +1668,7 @@
   shorttitle = {The Pattern of Crime},
   journal = {Past and Present},
   number = {62},
-  year = {1974},
+  date = {1974-02},
   pages = {47–95},
   url = {http://www.jstor.org/stable/650463}
 }
@@ -1697,7 +1758,6 @@
   volume = {21},
   number = {2},
   date = {2013-21},
-  page = {351–81},
   url = {https://doi.org/10.1215/10679847-2018283}
 }
 
@@ -1706,7 +1766,7 @@
 @Article{brown1978,
   editor = {Brown, George C.},
   title = {A Swedish Traveler in Early Wisconsin},
-  subtitle = {The Observations of Fred\-ri\-ka Bremer},
+  subtitle = {The Observations of Fredrika Bremer},
   part = {1},
   journal = {Wisconsin Magazine of History},
   volume = {61},
@@ -1896,6 +1956,14 @@
   date = {2015-03-06},
   url = {http://www.nytimes.com/2015/03/08/style/finding-equilibrium-in-seesawing-libidos.html}
 }
+@Article{editorial2015,
+  title = {Junk Science at the F.B.I.},
+  journal = {New York Times},
+  sortname = {{New York Times}},
+  note = {editorial},
+  date = {2015-04-27},
+  url = {http://www.nytimes.com/2015/04/27/opinion/junk-science-at-the-fbi.html}
+}
 
 % 14.197 Weekend supplements, magazines, and the like
 
@@ -1947,6 +2015,23 @@
   publisher = {University of North Carolina Press},
   year = {1999}
 }
+@Review{kamp2006,
+  author = {Kamp, David},
+  title = {Deconstructing Dinner},
+  journal = {New York Times},
+  date = {2006-04-23},
+%  section = {Sunday Book Review},% FIX: no such field
+  url = {http://www.nytimes.com/2006/04/23/books/review/23kamp.html},
+  crossref = {pollan2006}
+}
+@Book{pollan2006,
+  title = {The Omnivore's Dilemma},
+  subtitle = {A Natural History of Four Meals},
+  author = {Pollan, Michael},
+  address = {New York},
+  publisher = {Penguin Press},
+  year = {2006}
+}
 @Review{brehm2015,
   author = {Brehm, William C},
   journal = {Comparative Education Review},
@@ -1969,7 +2054,7 @@
 % 14.204 Unsigned reviews
 
 @Review{zeitung1828,
-  sortname = {Unsigned},
+  sortname = {Ergänzungsblätter},
   journal = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
   date = {1828-02},
   number = {23–24},
@@ -1977,7 +2062,7 @@
 }
 @Book{ranke,
   author = {Ranke, Le\-o\-pold von},
-  title = {Geschichten der romanischen und germanischen Völker},
+  title = {Ge\-schich\-ten der romanischen und germanischen Völker},
   shorttitle = {Geschichten}
 }
 
@@ -1989,7 +2074,7 @@
   title = {Futurist Shock},
   blogtitle = {Lingua Franca},
   blogtitleaddon = {blog},
-  journal = {Chronicle of High\-er Education},
+  journal = {Chronicle of Higher Education},
   date = {2017-02-15},
   url = {http://www.chronicle.com/blogs/linguafranca/2017/02/15/futurist-shock/}
 }
@@ -2064,7 +2149,7 @@
 @Thesis{vedrashko2006,
   author = {Vedrashko, Ilya},
   title = {Advertising in Computer Games},
-  type = {\bibstring{mathesis}},
+  type = {mathesis},
   institution = {MIT},
   year = {2006},
   url = {http://hdl.handle.net/1721.1/39144}
@@ -2072,7 +2157,7 @@
 @Thesis{choi2008,
   author = {Choi, Mihwa},
   title = {Contesting \emph{Imaginaires} in Death Rituals during the Northern Song Dynasty},
-  type = {\bibstring{phdthesis}},
+  type = {phdthesis},
   institution = {University of Chicago},
   year = {2008},
   howpublished = {ProQuest (AAT 3300426)}
@@ -2117,7 +2202,7 @@
   url = {http://www.aboutmcdonalds.com/mcd/investors/annual_reports.html}
 }
 @Report{standardtax1996,
-  author = {{Standard Federal Tax Reporter}},
+  title = {Standard Federal Tax Reporter},
   edition = {\thefield{year} ed.},
   volume = {4},
   address = {Chicago},
@@ -2247,7 +2332,7 @@
 @Patent{iizuka1986,
   author = {Iizuka, Masanori and Tanaka, Hideki},
   title = {Cement admixture},
-  number = {US Patent 4,586,960, filed June 26, 1984, and issued May 6, 1986},
+  number = {US Patent 4,586,\hspace{0pt plus 1pt}960, filed June 26, 1984, and issued May 6, 1986},
   year = {1986}
 }
 
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf b/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
index 998fd172291..d3d0e7db81c 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 c4684d98d30..d645c574b7d 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: Fri 01 Feb 2019 10:24:12 AM CST
+% Last modified: Wed 20 Feb 2019 05:58:18 PM CST
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{windycity}
 \RequirePackage{ifxetex}
@@ -222,7 +222,8 @@
 % From Oren Patashnik's documentation for bibtex:
 \newcommand{\BibTeX}{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
   T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}%
-\hyphenation{bib-er bib-la-tex Chi-ca-go}
+\emergencystretch=1em
+\hyphenation{bib-la-tex Chi-ca-go}
 \usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, \op, etc.
 \renewenvironment*{optionlist}
   {\list{}{%
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex b/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
index 7c60f1957fa..d7082e7e337 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: Sat 02 Feb 2019 11:47:15 AM CST
+% Last modified: Thu 21 Feb 2019 03:04:32 PM CST
 \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.01.31}
+\version{2019-02-21}
 \maketitle
 \begingroup
 \hypersetup{linkcolor=black}
@@ -20,7 +20,8 @@
 \nfootnote{Copyright \textcopyright\ 2019 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}.}
+See \url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}
+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
@@ -40,7 +41,7 @@ placement of editors, translators, and compilers. Section
 options for formatting citations of individual volumes. Sections
 \ref{notes} and \ref{paren} reproduce examples from \textit{CMS}
 Chapters 14 and 15, respectively, with occasional commentary and
-references to earlier sections.
+references to other sections.
 
 Windy City requires \biblatex version 3.8 or later.
 
@@ -148,6 +149,11 @@ environment is called \opt{reflist}, which you may use as follows:
    \printbibliography[env=reflist]
 \end{verbatim}
 
+\noindent Unfortunately, while the \opt{env} option allows you to have
+differently formatted bibliographies within the same document, the
+reference lists may have problems with sorting. 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
@@ -263,12 +269,6 @@ 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}).
 
-In total, Windy City allows a fair amount of control over the format
-of notes and bibliographies, consistent with \textit{CMS}. The
-remainder of this section, and the next few sections thereafter,
-describe these and other features of the style in a more systematic
-way.
-
 \subsection{Preamble Options}
 \label{preops}
 
@@ -298,11 +298,11 @@ 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 the user guide for
-\biblatex).\footnote{\textit{CMS} 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 citations give the
-author's full name.}
+appropriate value (see Section 3.1.2.3 of \biblatex's user
+guide).\footnote{\textit{CMS} 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.}
 
 \begin{optionlist}
 
@@ -320,21 +320,19 @@ the spacing between entries and annotations, change the value of
 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}.
+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}.
 
 \optitem[false]{firstshort}{\opt{true}, \opt{false}}
 
 \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.
+\opt{ibid}. However, it adds nothing to \opt{short}, which has the
+same effect on first citations.
 
 \optitem[false]{ibid}{\opt{true}, \opt{false}}
 
@@ -351,30 +349,37 @@ discourages the use of \textit{ibid.} (see \ref{14.34}).
 \optitem[false]{isbn}{\opt{true}, \opt{false}}
 
 \noindent Use this option to print ISBNs in bibliographies. A work's
-ISBN belongs in the \bibfield{isbn} field of its database entry. With
-this option, the style will print ISBNs at the end of every entry in
-the bibliography, though before annotations. To print the ISBN of a
-particular work, see the \bibfield{isbn} entry option in Section
-\ref{entryops}.
+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.
+
+\optitem[false]{library}{\opt{true}, \opt{false}}
+
+\noindent Like \opt{isbn}, this option prints the \bibfield{library}
+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.
 
 \optitem[false]{nolos}{\opt{true}, \opt{false}}
 
 \noindent By default, every work with a \bibfield{shorthand} receives
 an entry in the bibliography. If you wish to exclude them, say, to
-avoid duplication with the output of \cmd{printshorthands} and the
-like, use \opt{nolos}. Since \opt{collsonly} also excludes certain
-works from the bibliography, their results may overlap.
+avoid duplication with the output of \cmd{printshorthands}, use
+\opt{nolos}. Since \opt{collsonly} also excludes works from the
+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{CMS} 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 reference list is to pass
-\opt{env=reflist} to \cmd{printbibliography}. See Section
-\ref{overview} for more information.
+maintain consistency with \textit{CMS}. Again, another way to print a
+reference list is to pass \opt{env=reflist} to
+\cmd{printbibliography}. See Section \ref{overview} for more
+information.
 
 \optitem[false]{short}{\opt{true}, \opt{false}}
 
@@ -402,11 +407,11 @@ combine \opt{short} and \opt{ibid} for more concise output.
 
 \optitem[false]{swapvol}{\opt{true}, \opt{false}}
 
-In bibliographies and long citations, works in collections 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}.
+\noindent In bibliographies and long citations, works in collections
+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}.
 
 \end{optionlist}
 
@@ -442,21 +447,30 @@ author's name, as in this example from \textit{CMS} \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
-before an annotation. To print ISBNs of every work, see the
-\bibfield{isbn} preamble option in Section \ref{preops}.
+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.
+
+\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.
 
 \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}
 \ref{14.118}). Windy City replicates this in a roundabout way: By
-default, it prints the \bibfield{volumes} field in long citations only
-if the \bibfield{postnote} field is empty. This does better job of
-matching examples in \textit{CMS} than a simpler policy would. For the
-rest, use \opt{listvols}. It prints the \bibfield{volumes} field in
-long citations no matter what the \bibfield{postnote} contains. For
-more information, see Section \ref{collorder}.
+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
+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
+\ref{collorder}.
 
 \optitem[false]{noauth}{\opt{true}, \opt{false}}
 
@@ -468,9 +482,8 @@ title's position. Below is an example from \textit{CMS} \ref{14.105}:
 \item \cite{chaucer1966}
 \end{citebib}
 
-\noindent To bypass the author's position in a single note, and
-without affecting the bibliography, use \cmd{cite*} or
-\cmd{footcite*}.
+\noindent To bypass the author's position in a single note, without
+affecting the bibliography, use \cmd{cite*} or \cmd{footcite*}.
 
 \optitem[false]{skipdate}{\opt{true}, \opt{false}}
 
@@ -488,8 +501,8 @@ 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 both an editor and
-a translator, their names should appear in citations in the order in
+\noindent According to \textit{CMS}, 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
@@ -525,19 +538,18 @@ The most important citation commands are already familiar from
 
 \noindent Insert notes with \cmd{cite} and \cmd{footcite}. Insert
 parenthetical citations with \cmd{parencite}. Use \cmd{nocite} to add
-works to bibliographies without citing them in the text. Use
-\cmd{nocite} with a comma-separated list of entry keys to add
-particular works. Use it with an asterisk to add every work in every
-\file{bib} file listed in \cmd{bibliography}.
+works to bibliographies without citing them in the text. Use it with a
+comma-separated list of entry keys to add particular works. Use it
+with an asterisk to add every work in every \file{bib} file that
+you've loaded with \biblatex.
 
 \begin{ltxsyntax}
 
 \cmditem{cite*}[prenote][postnote]{key}
 
 Use this command to cite a work without printing anything in the
-author's position. It comes in handy when the context of a citation
-makes the author's name clear, such as when the name appears in the
-work's title. From \textit{CMS} \ref{14.78}:
+author's position. It comes in handy when the context makes the
+author's name clear. From \textit{CMS} \ref{14.78}:
 
 \begin{citebib}
 \item \cite*[233]{franklin1868}
@@ -552,9 +564,9 @@ note but otherwise functions like \cmd{footcite}.
 \cmditem{parencite*}[prenote][postnote]{key}
 
 Use this command to print a parenthetical citation without the
-author's position. The most likely context for this is a sentence in
+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} 15.25:
+\textit{CMS} \ref{15.25}:
 
 \begin{quote} Fiorina et al. \parencite*{fiorina2005} and Fischer and
 Hout \parencite*{fischer2006} reach more or less the same conclusions.
@@ -570,22 +582,6 @@ The source for the passage above contains:
    \parencite*{abramowitz2005}... \end{quote}
 \end{verbatim}
 
-\cmditem{reprint}[postnote]{key}
-
-This command precedes a citation with ``reprinted in'' and then skips
-the author's position and the work's title. This is useful for citing
-a reprint of a work after citing the original:
-
-\begin{citebib}
-\item \cite{frankfurt1969}; \reprint[1--10]{frankfurt1988.1}
-\end{citebib}
-
-\noindent The output above derives from:
-
-\begin{verbatim}
-   \cite{frankfurt1969}; \reprint[1--10]{frankfurt1988.1}
-\end{verbatim}
-
 \end{ltxsyntax}
 
 \subsection{Additional Data Fields}
@@ -605,8 +601,8 @@ citations in this document wouldn't match their counterparts in
 \item[blogtitle/blogsubtitle]
 
 The name of a blog goes in \bibfield{blogtitle} and
-\bibfield{blogsubtitle}. It would have been preferable to use already
-exiting fields for this information. But since blog posts take the
+\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.
 
@@ -629,12 +625,6 @@ 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[shortbooktitle] This field is for the short form of a
-\bibfield{booktitle}, just as \bibfield{shorttitle} is for
-\bibfield{title}. Nevertheless, its use is internal. You never need to
-use it in a bibliography database. Instead, always use
-\bibfield{shorttitle}.
-
 \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
@@ -663,7 +653,8 @@ Aliases: \bibtype{periodical}
 \typeitem{book}
 
 Aliases: \bibtype{booklet}, \bibtype{collection}, \bibtype{manual},
-\bibtype{proceedings}, \bibtype{report}, \bibtype{techreport}
+\bibtype{mvbook}, \bibtype{mvcollection}, \bibtype{proceedings},
+\bibtype{report}, \bibtype{techreport}
 
 \typeitem{incollection}
 
@@ -690,15 +681,10 @@ Aliases: \bibtype{mastersthesis}, \bibtype{phdthesis},
 \end{typelist}
 
 \noindent For the most part, you may assign every work to the basic
-entry types listed above. A PhD thesis, for example, may have the
-entry type \bibtype{thesis} or \bibtype{phdthesis}; the output is the
-same. An exception applies to books in collections: Every book in a
-one-volume or multivolume collection needs the \bibtype{inbook} or
-\bibtype{bookinbook} entry type.\footnote{Using \bibtype{inbook} for
-books in collections may depart somewhat from common usage but seems
-harmless enough.} You may use either \bibtype{inbook} or
-\bibtype{bookinbook}. If an entry belongs to a type other than the
-ones listed above, the style processes it as a book.
+entry types listed above. A PhD thesis, for example, may have a
+\bibtype{thesis} or \bibtype{phdthesis} entry type. The output is the
+same. If an entry has a type other than the ones listed above, Windy
+City processes it as a book.
 
 One comment about \bibtype{reference} and \bibtype{inreference}
 entries: You may cross-reference \bibtype{inreference} entries to
@@ -741,8 +727,8 @@ either type with the same data, like this:
    }
 \end{verbatim}
 
-For unusually complicated ci\-ta\-tions---or those just not supported
-by the style---consider using the \bibtype{misc} entry type. The style
+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:
@@ -775,15 +761,14 @@ quotation marks.
 
 You may also use the \bibtype{misc} entry type to cross-reference
 entries in a bibliography, as in \textit{CMS} \ref{14.81} and
-\ref{14.82}. Below are examples from the former:
+\ref{14.82}.
 
 \begin{bibonly}
 \nocite{ashe,creasey1976,creasey1978,creasey1966,morton,york}
 \end{bibonly}
 
-For every cross-reference of this type that you want in your
-bibliography, add a \bibtype{misc} entry to your bibliography
-database. Here's one from the previous list:
+\noindent Here's the \bibtype{misc} entry for one of the
+cross-references above:
 
 \begin{verbatim}
    @Misc{ashe,
@@ -796,12 +781,12 @@ database. Here's one from the previous list:
 \noindent The option \opt{skipdate} is necessary only if you plan to
 format your bibliography as a reference list. It prevents Windy City
 from printing \textit{n.d.} (no date) after the name to indicate a
-missing publication date.
-
-With the \bibtype{misc} entries in place, use \cmd{nocite} to add them
-to your bibliography. Cite the remaining entries in the usual way. For
-examples of automatic cross-referencing in a bibliography see Section
-\ref{notes}, \ref{14.108}, and Section \ref{paren}, \ref{15.42}.
+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 in the usual way. 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 \ref{collections}.
 
 \section{Editors, Translators, and Compilers}
 \label{edtrans}
@@ -841,7 +826,7 @@ for an example in \textit{CMS} \ref{14.104}:
 editor and translator of the work with the names, respectively, in the
 \bibfield{editor} and \bibfield{translator} fields. Since the entry
 doesn't use the \opt{swaptrans} entry option (see Section
-\ref{edtranspos}), the resulting output list the editor and
+\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
@@ -873,12 +858,11 @@ is cross-referenced to a collection:
 
 \noindent Since \bibfield{editor} appears within the
 \bibtype{collection} entry, Windy City associates the editor's name
-with the title of that entry, \textit{Harlem}. If you moved
-\bibfield{editor} from \bibtype{collection} to \bibtype{incollection},
-the association would change to the \bibfield{title} of that entry,
-\textit{The Literature of Harlem}.
+with \textit{Harlem}. If you moved \bibfield{editor} from
+\bibtype{collection} to \bibtype{incollection}, the association would
+change to \textit{The Literature of Harlem}.
 
-Consider another example, this one of an essay in a collection:
+Consider another example, this one an essay in a collection:
 
 \begin{citebib}
 \item \cite{petrarca1948}
@@ -908,9 +892,8 @@ scope of the \bibtype{incollection} entry:
 \end{verbatim}
 
 \noindent By the same token, since \bibfield{editor} falls within the
-scope of \bibtype{collection}, the style associates it with the
-\bibfield{title} of that entry, \textit{The Renaissance Philosophy of
-Man}.
+scope of \bibtype{collection}, the style associates it with
+\textit{The Renaissance Philosophy of Man}.
 
 Sometimes, you need to designate the role of an editor with the field
 \bibfield{editortype}. The values of \bibfield{editortype} are
@@ -962,8 +945,24 @@ Follow the same pattern for editors of a \bibfield{maintitle},
 
 \noindent If there were no \bibfield{editortype} assigning the editor
 to the series, Windy City would assume that she's the book's editor.
-In short, for any title at a higher level than \bibfield{title}, you
-need to use \bibfield{editortype} to assign an editor to it.
+In short, for a title's compilers and for any title at a higher level
+than the \bibfield{title} field, you need to use
+\bibfield{editortype}. Combined with Windy City's support for citing
+articles, chapters, books, and other works within books, this scheme
+allows for several sets of editors per work, although it does limit
+you to just one set of compilers.
+
+Windy City's support for translators falls between its support for
+editors and compilers. Unless a work's bibliography database entry has
+a \bibfield{translatortype} field with the value \textit{maintitle},
+Windy City associates the names in \bibfield{translator} with the
+entry's lowest level title. (Recall ``The Ascent of Mont Ventoux''
+above.) You should rarely, and perhaps never, need more than one set
+of translators per work. But if you do, Windy City lets you assign as
+many as three, if you cross-reference a work with one set of
+translators to another with two. Does any such work exist? Probably
+not. Anyway, support for it is something of an accident, stemming in
+large part from how the style handles cross-referencing with editors.
 
 One complication remains: There are other name lists for editors than
 \bibfield{editor}. There's \bibfield{editora}, \bibfield{editorb}, and
@@ -993,10 +992,10 @@ of thumb described above, reserving \bibfield{editor} for
 \subsection{Switching Places and Roles}
 \label{edtranspos}
 
-Normally, Windy City prints editors' names 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 and print the translators'
-names first. For that, use the entry option \opt{swaptrans}. Compare:
+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
+\opt{swaptrans}. Compare:
 
 \begin{citebib}
 \item \cite{doe2010a}
@@ -1004,9 +1003,9 @@ names first. For that, use the entry option \opt{swaptrans}. Compare:
 \end{citebib}
 
 If a work has no author, but has an editor, the style will print the
-name of the editor 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}:
+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}:
 
 \begin{citebib}
 \item \cite[100]{egan2014}
@@ -1014,8 +1013,8 @@ from \textit{CMS} \ref{14.103}:
 \end{citebib}
 
 What if a work has no author but has editors and translators? Since
-Windy City gives priority to editors, it defaults to printing the
-editors' names in the author's position:
+Windy City gives priority to editors, it defaults to listing editors
+in the author's position:
 
 \begin{citebib}
 \item \cite{smith2002a}
@@ -1028,37 +1027,37 @@ editors' names in the author's position:
 \end{citebib}
 
 Similarly, if a work's editors and translators are identical, the
-style will print the editors' role first, as in, ``Edited and
-translated by\ldots'' Using \opt{swaptrans} reverses them. Here's an
-example from \textit{CMS} \ref{14.104}:
+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}:
 
 \begin{citebib}
 \item \cite{menchu1999}
 \end{citebib}
 
-Since the style treats a compiler as a kind of editor, the comments
+Since Windy City treats a compiler as a kind of editor, the comments
 above apply to compilers: If a work has compilers and translators,
-Windy City will print compilers' names first, unless you use
-\opt{swaptrans}.
+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} gives this example in \ref{14.104}:
+editor or translator. \textit{CMS} \ref{14.104} gives an example:
 
 \begin{citebib}
 \item \cite{pound1953}
 \end{citebib}
 
-\noindent You can accomplish this effect with the entry option
+\noindent You can get this effect with the entry option
 \opt{swapauth}, which works for \bibtype{book}, \bibtype{bookinbook},
-\bibtype{collection}, \bibtype{inbook}, and \bibtype{incollection}
-entry types. But beware: Windy City doesn't look ahead to see if there
-really is an editor or translator to take the author's place. If it
-doesn't find one, it will still print the author's name after the
-title, leaving the author's position empty. Also, if it finds both an
-editor and a translator, and they're not the same person, it will
-print the editor's name in the author's position---again, giving
-priority to editors. If you want the translator's name in the author's
-position, use \opt{swapauth} with \opt{swaptrans}.
+\bibtype{collection}, \bibtype{inbook}, \bibtype{incollection},
+\bibtype{mvbook}, and \bibtype{mvcollection} entry types. But beware:
+Windy City doesn't look ahead to see if there's really an editor or
+translator to take the author's place. If it doesn't find one, it will
+still print the author's name after the title, leaving the author's
+position empty. Also, if it finds both an editor and a translator, and
+they're not the same person, it will print the editor's name in the
+author's position---again, giving priority to editors. If you want the
+translator's name in the author's position, use \opt{swapauth} with
+\opt{swaptrans}.
 
 Another caveat: For correct sorting in a bibliography, a work that
 uses \opt{swapauth} needs a field like \bibfield{sortname} to sort it
@@ -1066,7 +1065,7 @@ by the name of the editor or translator whose name will occupy the
 author's position. It would be nice if Windy City could do this for
 you, but at present no feature of \biblatex seems to allow the kind of
 on-the-fly changes to sorting that \opt{swapauth} requires. Below is
-the entry for the example above:
+the entry for the previous example:
 
 \begin{verbatim}
    @Book{pound1953,
@@ -1105,12 +1104,12 @@ priority, the collection's or the volume's. Consider an example from
 \item \cite{armstrong2014}
 \end{citebib}
 
-\noindent The editor and title of the volume precedes that 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 \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}.
+\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
+\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}.
 
 \begin{citebib}
 \AtNextCitekey{\toggletrue{swapvol}}
@@ -1166,8 +1165,8 @@ collection, somewhat like the volume of an encyclopedia with the title
 \textit{D–F}. There's nothing wrong with putting it first. But putting
 it second seems more intuitive.
 
-By contrast, here's an example of a case when using \opt{swapvol}
-might not seem desirable:
+For other works, \opt{swapvol} may seem like a poor choice, even if
+the output is formally correct:
 
 \begin{citebib}
 \AtNextCitekey{\toggletrue{swapvol}}
@@ -1177,11 +1176,11 @@ might not seem desirable:
 
 \noindent Having the editor's name first and the author's name after
 the volume's title looks odd. But it's not wrong. The volume's author
-apparently didn't write every volume of the collection. As such, if
-you choose to give priority to the collection, the first position
-should go to the collection's editor, not to the volume's author. The
-default format, on the other hand, looks more familiar and so is
-perhaps less likely to raise questions:
+didn't write every volume of the collection. In giving priority to the
+collection, then, the first position, where an author's name normally
+goes, should go to the collection's editor, not to the volume's
+author. By contrast, the default format looks more familiar and so is
+perhaps less likely to raise eyebrows:
 
 \begin{citebib}
 \item \cite{barrows1959}
@@ -1194,8 +1193,63 @@ an author but the collection as a whole doesn't---and possibly others.
 You can fix them by adding a \bibfield{sortname} field to their
 bibliography database entries.
 
+This drawback shouldn't affect \bibfield{bookinbook},
+\bibfield{inbook}, \bibfield{incollection}, or \bibfield{letter}
+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}:
+
+\begin{citebib}
+\item \cite[169--71]{king2014}
+\item \cite[170]{king2014}
+\end{citebib}
+
+\noindent Here's the output with the preamble or entry option
+\opt{swapvol}:
+
+\begin{citebib}
+\AtNextCitekey{\toggletrue{swapvol}}
+\item \cite[169--71]{king2014}
+\AtNextCitekey{\toggletrue{swapvol}}
+\item \cite[170]{king2014}
+\AtNextBibliography{\toggletrue{swapvol}}
+\end{citebib}
+
+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}
+\ref{14.108} and \ref{15.42}, Windy City cross-references previously
+cited volumes.
+
+% Due to 'mincrossrefs=2', smith2018 would be added automatically to
+% the bibliography at the end of the document because it's referenced
+% twice below. However, it wouldn't appear in the refsegment without
+% using \nocite.
+
+\begin{citebib}
+\item \cite[56]{doe2018}
+\item \cite[128]{edwards2018}
+\nocite{smith2018}
+\end{citebib}
+
+\noindent Now with \opt{swapvol}:
+
+\begin{citebib}
+\AtNextCitekey{\toggletrue{swapvol}}
+\item \cite[56]{doe2018}
+\AtNextCitekey{\toggletrue{swapvol}}
+\item \cite[128]{edwards2018}
+\AtNextBibliography{\toggletrue{swapvol}}
+\nocite{smith2018}
+\end{citebib}
+
 How does Windy City determine which entries in a bibliography database
-are affected by \opt{swapvol}? Below are the entries for an earlier
+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
 example:
 
 \begin{verbatim}
@@ -1211,19 +1265,30 @@ example:
    @Collection{carson1992,
      editor = {Carson, Clayborne},
      title = {The Papers of Martin Luther King, Jr.},
+     volumes = {14},
      address = {Berkeley},
      publisher = {University of California Press},
      year = {1992–}
    }
 \end{verbatim}
 
-A \bibtype{bookinbook} or \bibtype{inbook} entry, which should always
-be cross-referenced to a \bibtype{collection} entry, is subject to
-\opt{swapvol} if it has a \bibfield{volume} field and lacks certain
-fields that a volume of a collection of this sort shouldn't have. You
-can find the exact details in \file{windycity.bbx}. With one
-exception, you can get the same output with a \bibtype{book} or
-\bibtype{collection} entry:
+A \bibtype{bookinbook} or \bibtype{inbook} entry for a volume works
+with \opt{swapvol} if it has a \bibfield{title}, a \bibfield{volume},
+and another \bibfield{title} inherited from a cross-referenced entry,
+and if it lacks certain fields that it shouldn't have, such as a
+\bibfield{maintitle} field or a \bibfield{volume} field inherited from
+the cross-referenced entry. You can find the exact details in
+\file{windycity.bbx}. Just remember that entries like these should
+always be cross-referenced to a \bibtype{collection} or one of its
+aliases. Since Windy City treats them the same, it makes no difference
+whether you designate entries for volumes as \bibtype{bookinbook} or
+\bibtype{inbook}.
+
+With one exception, you can get the same output with a \bibtype{book},
+\bibtype{collection}, \bibtype{mvbook}, or \bibtype{mvcollection}
+entry. As before, the choice of entry type is arbitrary. All four are
+equivalent. Here's a counterpart to the previous example using
+\bibtype{collection}:
 
 \begin{verbatim}
    @Collection{carson2014,
@@ -1234,65 +1299,95 @@ exception, you can get the same output with a \bibtype{book} or
      maintitle = {The Papers of Martin Luther King, Jr.},
      editora = {Carson, Clayborne},
      editoratype = {maintitle},
+     volumes = {14},
      address = {Berkeley},
      publisher = {University of California Press},
      year = {2014}
    }
 \end{verbatim}
 
-A \bibtype{book} or \bibtype{collection} entry is subject to
-\opt{swapvol} if it has \bibfield{volume} and \bibfield{maintitle}
-fields. You may prefer these entry types if you only intend to cite
-one volume of the collection and have no need to cite the collection
-as a whole. But you risk trouble if the volumes of the collection have
-different publication dates, as they do for \textit{The Papers of
-Martin Luther King, Jr}. If the publication information for this
-volume goes last, the bibliography and long citation should list the
-publication date as \textit{2014}. If the publication information for
-the collection goes last, that date is \textit{1992–}. A
-\bibtype{book} or \bibtype{collection} entry, however, has just one
-field for a publication date, so using \opt{swapvol} on
-\bibfield{carson2014} would print \textit{2014}, not \textit{1992–}.
-Otherwise, the entry types are interchangeable. You can find examples
-of both approaches in \file{windycity.bib}.
+These entries work with \opt{swapvol} if they have \bibfield{volume}
+and \bibfield{maintitle} fields, among other conditions. You may
+prefer them over \bibfield{bookinbook} or \bibfield{inbook} entries if
+you only intend to cite one volume of the collection and have no need
+to cite the collection as a whole. You risk trouble, though, if the
+volumes of the collection have different publication dates, as they do
+for \textit{The Papers of Martin Luther King, Jr}. If the publication
+information for this volume goes last, the bibliography and long
+citation should list the publication date as \textit{2014}. If the
+publication information for the collection goes last, that date is
+\textit{1992–}. A \bibtype{book} or \bibtype{collection} entry,
+however, has just one field for a publication date, so using
+\opt{swapvol} on \bibfield{carson2014} would print \textit{2014}, not
+\textit{1992–}. Otherwise, the entry types are interchangeable. You
+can find examples of both approaches in \file{windycity.bib}.
+
+Certain entries cross-referenced to entries that work with
+\opt{swapvol} also work with it. Those enty types are limited to
+\bibtype{bookinbook}, \bibtype{inbook}, \bibtype{incollection}, or
+\bibtype{letter}. For the letter cited above:
+
+\begin{verbatim}
+   @Letter{king2014,
+     author = {King, Jr., Martin Luther},
+     title = {Unpublished letter to the editor of the
+              \emph{Afro-American} (Washington, DC)},
+%     crossref = {carson2014}
+     crossref = {armstrong2014}
+   }
+\end{verbatim}
+
+\noindent You may cross-reference this entry to
+\bibfield{armstrong2014} or \bibfield{carson2014}. The only difference
+is that, with \opt{swapvol}, cross-referencing to
+\bibfield{carson2014} once more gives the wrong publication date for
+the collection. With many other collections, this wouldn't be an
+issue. Convenience, then, is perhaps the only consideration in
+choosing how you do it. If you plan to cite more than one volume of a
+collection, and different works in those volumes or the collection as
+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
-priority to the volume, not the collection. Nevertheless, Windy City
-doesn't prevent you from using \opt{swapvol} with \opt{reflist}.
+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
 different publication dates, a reference list entry prints both dates,
 which in turn requires you to use the \bibtype{bookinbook} or
-\bibtype{inbook} approach described above.
+\bibtype{inbook} approach.
 
 \begin{refonly}
 \nocite{armstrong2014}
 \end{refonly}
 
 A final issue concerns whether you want long citations to give a
-work's total number of volumes by printing the \bibfield{volumes}
-field. Whereas entries in a bibliography always give the total, doing
-so in notes is optional (see \textit{CMS} \ref{14.118}).
-
-Windy City 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 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 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}). The point then is to cite a specific
-volume, not the whole collection, so the total seems less important
-and omitting it cuts down on clutter. 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.
-
-If you want to print a work's total number of volumes without regard
-to the \bibfield{postnote}, use the entry option \opt{listvols}. Some
-examples in \textit{CMS} need it for Windy City to match them. Here's
-one from \textit{CMS} \ref{14.59}:
+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}
+\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
+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
+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
+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.
+
+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}:
 
 \begin{citeonly}
 \item \cite[1:126]{shurtleff1853}
@@ -1364,11 +1459,10 @@ the appropriate abbreviations (for some examples, see \textit{CMS}
 
 What if you leave the \bibfield{postnote} empty? In that case, 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 total number of
-volumes in the collection. 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:
+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:
 
 \begin{citeonly}
 \item \cite{byrne1981}
@@ -1377,19 +1471,20 @@ 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 your bibliography database. Here's the entry for the volume cited
-in \textit{CMS} \ref{14.118}:
+in the bibliography database. Here's the entry for the volume cited in
+\textit{CMS} \ref{14.118}:
 
 \begin{verbatim}
    @Collection{james1963.5,
      options = {swapvol},
      author = {James, Henry},
+     title = {1883–1884},
+     volume = {5},
      maintitle = {The Complete Tales of Henry James},
      shortmaintitle = {Complete Tales of Henry James},
      editor = {Edel, Leon},
      editortype = {maintitle},
-     volume = {5},
-     title = {1883–1884},
+     volumes = {12},
      address = {London},
      publisher = {Rupert Hart-Davis},
      year = {1963}
@@ -1398,7 +1493,7 @@ in \textit{CMS} \ref{14.118}:
 
 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. Here's the source for
+\bibfield{postnote}. Let Windy City handle it. Below is the source for
 the first citation of \textit{The Complete Tales Henry James}:
 
 \begin{verbatim}
@@ -1409,11 +1504,11 @@ 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
 entry, not multiple, cross-referenced entries. For \textit{The
-Complete Tales Henry James}, cross-referencing would result in errors.
-That's because, with different titles and publication dates, not all
-data for the collection is true of particular volumes. To cite the
-collection as a whole, as in \textit{CMS} \ref{14.117}, add a separate
-entry:
+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
+separate entry:
 
 \begin{verbatim}
    @Collection{james1962,
@@ -1428,6 +1523,59 @@ entry:
    }
 \end{verbatim}
 
+\subsection{Works \textit{in} Volumes or \textit{as} Volumes}
+
+Many examples so far show the use of the \bibfield{volume} field. What
+they don't quite show is that, as with editors and translators, Windy
+City associates \bibfield{volume} with an entry's lowest level title.
+Usually, this doesn't require any thought when preparing a
+bibliography database. The \bibfield{volume} field goes where you'd
+expect it to. But if you're not careful, you could end up with errors,
+especially when citing books in collections.
+
+\begin{verbatim}
+   @InBook{spinoza1900.1.1,
+     title = {A Theological-Political Treatise},
+     crossref = {spinoza1900.1}
+   }
+   @Collection{spinoza1900.1,
+     author = {Spinoza, Benedict de},
+     title = {The Chief Works of Benedict de Spinoza},
+     edition = {revised},
+     translator = {Elwes, R. H. M.},
+     volume = {1},
+     address = {London},
+     publisher = {George Bell {and} Sons},
+     year = {1900}
+   }
+\end{verbatim}
+
+In the entries above, Windy City associates \bibfield{volume} with
+\textit{The Chief Works of Benedict de Spinoza}, not with \textit{A
+Theological-Political Treatise}. The latter, it assumes, isn't volume
+one of the collection but a work contained \textit{in} volume one,
+presumably with other works. Windy City formats the citation
+accordingly:
+
+\begin{citebib}
+\item \cite{spinoza1900.1.1}
+\end{citebib}
+
+\noindent If instead \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,
+like other works in this section. 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{CMS} Chap. 14, ``Notes and
 Bibliography''}
 \label{notes}
@@ -1542,6 +1690,16 @@ format and the use of \textit{ibid.} First, the short format:
 \item \cite[33]{morrison2004a}
 \end{citeonly}
 
+\setcounter{subsubsection}{53}
+\subsubsection{Source notes for previously published material}
+% 14.54 Source notes for previously published material
+
+\begin{citebib}
+\item \cite[Reprinted with permission from][15–64]{shapin1996}
+\item \cite*[Originally published as][22–69, © 1992 by The University of
+Chicago. All rights reserved. Reprinted by permission]{manet1992}
+\end{citebib}
+
 \setcounter{subsubsection}{58}
 \subsubsection{Abbreviations for frequently cited works}
 % 14.59 Abbreviations for frequently cited works
@@ -1840,10 +1998,10 @@ On how to make an author and editor swap places, see Section
 % 14.108 Several contributions to the same multiauthor book
 \label{14.108}
 
-% Due to 'mincrossrefs=2', angle1968 and zukowsky1987 would be
-% automatically added to the bibliography at the end of the document
-% because each is referenced twice below. However, they wouldn't
-% appear in the refsegment below without using \nocite.
+% Due to 'mincrossrefs=2', angle1968 and zukowsky1987 would be added
+% automatically to the bibliography at the end of the document because
+% each is referenced twice below. However, they wouldn't appear in the
+% refsegment without using \nocite.
 
 % Unlike article entries, incollection entries don't automatically
 % print page ranges. That seems right, though CMS isn't entirely clear
@@ -1859,6 +2017,7 @@ On how to make an author and editor swap places, see Section
 
 \subsubsection{Book-length work within a book}
 % 14.109 Book-length work within a book
+\label{14.109}
 
 \begin{citebib}
 \item \cite{bernard1990a}
@@ -1981,9 +2140,9 @@ For a discussion of how to handle these types of works, see Section
 % 14.120 Chapters and other parts of individual volumes
 \label{14.120}
 
-There are some peculiarities with this example. In the book, but not
-online, \textit{CMS} errs in printing `.ed' rather than `editeb by' in
-the bibliography and neglects to invert the author's name. More
+There are some peculiarities with the first example. In the book, but
+not online, \textit{CMS} 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
@@ -1993,6 +2152,16 @@ example of the bibliography.
 
 \begin{citebib}
 \item \cite[180]{chen2010.3}
+\item \cite[169--71]{king2014}
+\end{citebib}
+
+\noindent Citing King with the preamble or entry option
+\opt{swapvol}:
+
+\begin{citebib}
+\AtNextCitekey{\toggletrue{swapvol}}
+\item \cite[169--71]{king2014}
+\AtNextBibliography{\toggletrue{swapvol}}
 \end{citebib}
 
 \subsubsection{One volume in two or more books}
@@ -2228,13 +2397,17 @@ Gutenberg as a reprint.
 \setcounter{subsubsection}{170}
 \subsubsection{Journal volume, issue, and date}
 % 14.171 Journal volume, issue, and date
+\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 in the bibliography, \textit{CMS}
-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} has it.
+omits it. As for Lock's entry, \textit{CMS} 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}
+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
+give \textit{Autumn 2013}.
 
 \begin{citebib}
 \item \cite[155]{lock2015}
@@ -2288,6 +2461,10 @@ article, Windy City prints \textit{nos.} before \textit{1/2}, not
 \subsubsection{Articles published in installments}
 % 14.180 Articles published in installments
 
+By default, Windy City will print each installment as a separate
+entry. To get the format for the series, you'd need to use the
+\bibtype{misc} entry type.
+
 \begin{citebib}
 \item \cite[312]{brown1978}
 \end{citebib}
@@ -2375,6 +2552,7 @@ article, Windy City prints \textit{nos.} before \textit{1/2}, not
 
 \begin{citebib}
 \item \cite{jaffe2015}
+\item \cite{editorial2015}
 \end{citebib}
 
 \setcounter{subsubsection}{196}
@@ -2404,8 +2582,14 @@ article, Windy City prints \textit{nos.} before \textit{1/2}, not
 \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.
+
 \begin{citebib}
 \item \cite[B13--B14]{ratliff1999}
+\item \cite{kamp2006}
 \item \cite{brehm2015}
 \end{citebib}
 
@@ -2413,20 +2597,10 @@ article, Windy City prints \textit{nos.} before \textit{1/2}, not
 \subsubsection{Unsigned reviews}
 % 14.204 Unsigned reviews
 
-This example fails to match \textit{CMS}. The date should appear
-immediately after the newspaper's title and not in parentheses.
-Presumably, \textit{CMS} puts the date first because the date is a
-more important part of a magazine's or newspaper's citation.
-Nevertheless, the format below is consistent with many other types of
-articles.
-
-For reference lists, unsigned reviews have no plausible place for the
-publication year except where the default format would put it. The
-easiest solution is to give unsigned reviews the same format in
-reference lists as in bibliographies.
-
-Finally, an unsigned review won't sort correctly in a bibliography or
-reference list without adding, say, a \bibfield{sortname} field.
+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}.
 
 \begin{citebib}
 \item \cite{zeitung1828}
@@ -2441,6 +2615,11 @@ reference list without adding, say, a \bibfield{sortname} field.
 % 14.208 Citing blog posts and blogs
 \label{14.208}
 
+In \textit{CMS}, 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.
+
 \begin{citebib}
 \item \cite{amlen2015}
 \item \cite{germano2017}
@@ -2651,6 +2830,17 @@ after the year, not before.
 \item \parencite{doershuk2016}
 \end{citeref}
 
+\setcounter{subsubsection}{24}
+\subsubsection{Text citations in relation to surrounding text and punctuation}
+% 15.25 Text citations in relation to surrounding text and punctuation
+\label{15.25}
+
+\begin{quote} Fiorina et al. \parencite*{fiorina2005} and Fischer and
+Hout \parencite*{fischer2006} reach more or less the same conclusions.
+In contrast, Abramowitz and Saunders \parencite*{abramowitz2005}
+suggest that the mass public is deeply divided between red states and
+blue states and between churchgoers and secular voters. \end{quote}
+
 \setcounter{subsubsection}{26}
 \subsubsection{Several references to the same source}
 % 15.27 Several references to the same source
@@ -2798,6 +2988,7 @@ between a volume number and a page reference.
 \setcounter{subsubsection}{50}
 \subsubsection{Citing blogs in author-date format}
 % 15.51 Citing blogs in author-date format
+\label{15.51}
 
 \textit{CMS} seems mistaken in printing a period after
 \textit{Chronicle of Higher Education} instead of a comma. Compare
@@ -2846,7 +3037,10 @@ author-date 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}.\\}%
+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.\\}%
 
 \printbiblist[prenote=sh]{shorthand}
 \refstepcounter{sh}\label{sh}
diff --git a/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx b/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx
index 79b74d45edd..284fa58298d 100644
--- a/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx
+++ b/Master/texmf-dist/doc/latex/windycity/lbx/american-windycity.lbx
@@ -1,4 +1,4 @@
-% Last modified: Thu 31 Jan 2019 02:50:51 PM CST
+% Last modified: Mon 11 Feb 2019 05:36:39 PM CST
 
 % Copyright (c) 2018 Brian Michael Chase.
 %
@@ -81,10 +81,10 @@
   comptrans     = {{compiled and translated by}{comp\adddotspace and trans\adddot}},
   comptrans+    = {{compiled and translated by}{comps\adddotspace and trans\adddot}},
   edition       = {{ed\adddot}{ed\adddot}},
-  editor        = {{edited by}{ed\adddot}},
-  editor+       = {{edited by}{eds\adddot}},
-  edtrans       = {{edited and translated by}{ed\adddotspace and trans\adddot}},
-  edtrans+      = {{edited and translated by}{eds\adddotspace and trans\adddot}},
+  editor        = {{edit\-ed by}{ed\adddot}},
+  editor+       = {{edit\-ed by}{eds\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}},
   foreword      = {{foreword to}{foreword to}},
   forthcoming   = {{forthcoming}{forthcoming}},