csl-styles 2.0.2 → 2.1.0

data/vendor/styles/chicago-in-text-shortened-author-no-url.csl

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " page-range-format="chicago-16" version="1.0">
   <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
     <title>Chicago Manual of Style 18th edition (in-text shortened author-only citations, without URLs)</title>
-    <title-short>CMOS with Bluebook (parenthetical author-only [12.77], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (parenthetical author-only [12.77], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-in-text-shortened-author-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-in-text-shortened-author-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
     <link href="https://www.chicagomanualofstyle.org/" rel="documentation"/>
+    <link href="https://zotero.org/groups/2205533/collections/5V67EPX3" rel="documentation"/>
     <author>
       <name>Andrew Dunning</name>
       <uri>https://orcid.org/0000-0003-0464-5036</uri>
@@ -29,7 +30,7 @@
     <category field="sociology"/>
     <category field="theology"/>
     <summary>Chicago-style source citations (with Bluebook for legal citations), shortened author-only in-text citations (CMOS18 12.77), without URLs (CMOS18 13.6)</summary>
-    <updated>2025-08-07T00:00:00+00:00</updated>
+    <updated>2025-02-09T00:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -70,7 +71,7 @@
   </locale>
   <locale xml:lang="en-GB">
     <terms>
-      <!-- ensure consistency with other `en-GB` contractions -->
+      <!-- the Bibliography of Additional Resources recommends the New Oxford Style Manual as a British English guide, which the `en-GB` locale follows -->
       <term form="short" name="collection-number">
         <single>vol.</single>
         <multiple>vols</multiple>
@@ -83,10 +84,11 @@
         <single>ed. and trans.</single>
         <multiple>eds and trans.</multiple>
       </term>
+      <term form="verb-short" name="illustrator">illus.</term>
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -107,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -188,24 +190,21 @@
           <label form="short" variable="edition"/>
         </if>
         <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- full label for serial edition (CMOS18 14.89) -->
+          <!-- serial types: full label (CMOS18 14.89) -->
           <text variable="edition"/>
           <label variable="edition"/>
         </else-if>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text variable="edition"/>
+        </else-if>
         <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor compiler editor editorial-director">
-              <!-- monographic usage -->
-              <text variable="edition"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text variable="edition"/>
-              <label variable="edition"/>
-            </else>
-          </choose>
+          <!-- serial types -->
+          <text variable="edition"/>
+          <label variable="edition"/>
         </else-if>
         <else>
+          <!-- monographic types -->
           <text variable="edition"/>
         </else>
       </choose>
@@ -219,24 +218,21 @@
           <label form="short" variable="edition"/>
         </if>
         <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- full label for serial edition (CMOS18 14.89) -->
+          <!-- serial types: full label (CMOS18 14.89) -->
           <text text-case="title" variable="edition"/>
           <label text-case="capitalize-first" variable="edition"/>
         </else-if>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text text-case="capitalize-first" variable="edition"/>
+        </else-if>
         <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor compiler editor editorial-director">
-              <!-- monographic usage -->
-              <text text-case="capitalize-first" variable="edition"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text text-case="title" variable="edition"/>
-              <label text-case="capitalize-first" variable="edition"/>
-            </else>
-          </choose>
+          <!-- serial types -->
+          <text text-case="title" variable="edition"/>
+          <label text-case="capitalize-first" variable="edition"/>
         </else-if>
         <else>
+          <!-- monographic types -->
           <text text-case="capitalize-first" variable="edition"/>
         </else>
       </choose>
@@ -263,15 +259,11 @@
             </else>
           </choose>
         </else-if>
+        <else-if is-numeric="locator" locator="line">
+          <label variable="locator"/>
+        </else-if>
         <else-if is-numeric="locator">
-          <choose>
-            <if locator="line">
-              <label variable="locator"/>
-            </if>
-            <else>
-              <label form="short" variable="locator"/>
-            </else>
-          </choose>
+          <label form="short" variable="locator"/>
         </else-if>
         <else-if locator="chapter line verse" match="any"/>
         <!-- a non-numeric canonical reference is identified by its formatting and does not need a label (CMOS18 14.143-54) -->
@@ -282,6 +274,12 @@
       <text variable="locator"/>
     </group>
   </macro>
+  <macro name="label-locator-all">
+    <group delimiter=" ">
+      <label form="short" variable="locator"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
   <macro name="label-number-capitalized">
     <group delimiter=" ">
       <choose>
@@ -303,6 +301,12 @@
       </choose>
     </group>
   </macro>
+  <macro name="label-page">
+    <group delimiter=" ">
+      <label form="short" variable="page"/>
+      <text variable="page"/>
+    </group>
+  </macro>
   <macro name="label-part-number">
     <group delimiter=" ">
       <choose>
@@ -345,10 +349,14 @@
     <group delimiter=" ">
       <choose>
         <!-- TODO: Replace with `supplement-number` label when CSL provides one -->
-        <if is-numeric="supplement-number" variable="volume-title">
+        <if variable="issue supplement-number">
+          <!-- if there is both an issue and supplement number, do not label both as 'no.' -->
+          <text form="short" term="supplement"/>
+        </if>
+        <else-if is-numeric="supplement-number" variable="volume-title">
           <!-- if there is a volume title, it is already described as a supplement -->
           <text form="short" term="issue"/>
-        </if>
+        </else-if>
         <else-if is-numeric="supplement-number" type="periodical" variable="title">
           <text form="short" term="issue"/>
         </else-if>
@@ -410,7 +418,7 @@
   <!-- 1. Author (CMOS18 13.74-86) -->
   <macro name="author-bib">
     <names variable="composer">
-      <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+      <name and="text" delimiter-precedes-last="always" initialize="false" name-as-sort-order="first"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="author"/>
@@ -436,6 +444,13 @@
           </else-if>
         </choose>
         <names variable="illustrator"/>
+        <choose>
+          <!-- list an edited multivolume work under the name of the series editor; remove this condition for author-date or notes and bibliography leading with volume title (CMOS18 14.21) -->
+          <if variable="container-title"/>
+          <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+            <names variable="collection-editor"/>
+          </else-if>
+        </choose>
         <choose>
           <if match="none" type="standard">
             <names variable="editor-translator"/>
@@ -469,8 +484,8 @@
         </choose>
         <names variable="curator"/>
         <choose>
-          <if type="software">
-            <!-- `software` listed under the name of the publisher or developer (CMOS18 14.169) -->
+          <if match="any" type="software webpage">
+            <!-- `software` listed under the name of the publisher or developer (CMOS18 14.169); `webpage` listed under a site owner or sponsor (CMOS18 14.104) -->
             <text variable="publisher"/>
           </if>
           <else-if type="standard">
@@ -481,13 +496,10 @@
         <text macro="author-title-substitute-container"/>
         <text macro="author-title-substitute-bib"/>
         <choose>
-          <if type="manuscript">
-            <choose>
-              <if match="none" variable="container-title event-date event-place event-title genre title publisher publisher-place">
-                <text macro="source-archive-bib"/>
-              </if>
-            </choose>
-          </if>
+          <if match="any" variable="container-title event-date event-place event-title genre title publisher publisher-place"/>
+          <else-if type="manuscript">
+            <text macro="source-archive-bib"/>
+          </else-if>
         </choose>
       </substitute>
     </names>
@@ -502,7 +514,7 @@
       </else-if>
       <else>
         <names variable="composer">
-          <name and="text" form="short"/>
+          <name and="text" form="short" initialize="true"/>
           <substitute>
             <names variable="author"/>
             <names variable="guest"/>
@@ -519,32 +531,33 @@
               </if>
               <else-if type="broadcast" variable="container-title number title">
                 <!-- note contributors fall after the title of `broadcast` (CMOS18 14.165) -->
-                <text macro="author-title-substitute-container"/>
+                <text macro="author-title-substitute-container-short"/>
               </else-if>
               <else-if match="any" type="broadcast motion_picture song">
                 <!-- note contributors fall after the title of `broadcast`, `motion_picture` (CMOS18 14.165), `song` (CMOS18 14.163)  -->
                 <text macro="author-title-substitute-short"/>
               </else-if>
+              <!-- unsigned reference articles consulted in physical formats list `title` in the manner of a `sub-verbo` locator (CMOS18 14.130) -->
+              <else-if match="any" variable="DOI URL"/>
               <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-                <!-- unsigned reference articles consulted in physical formats list `title` in the manner of a `sub-verbo` locator (CMOS18 14.130) -->
-                <choose>
-                  <if match="none" variable="DOI URL">
-                    <text macro="author-title-substitute-container"/>
-                  </if>
-                </choose>
+                <text macro="author-title-substitute-container-short"/>
               </else-if>
             </choose>
             <names variable="illustrator"/>
             <choose>
-              <!-- In multivolume works, notes list editors after the title of the part for which they are responsible (CMOS18 14.20-24); it appears also that editors should not be substituted for authors with chapters (cf. CMOS18 14.22) -->
-              <if match="any" type="chapter standard" variable="part-title volume-title"/>
-              <else-if type="book" variable="container-title"/>
-              <else>
+              <!-- list an edited multivolume work under the name of the series editor; remove this condition for notes and bibliography leading with volume title (CMOS18 14.21) -->
+              <if variable="container-title"/>
+              <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+                <names variable="collection-editor"/>
+              </else-if>
+            </choose>
+            <choose>
+              <if match="none" type="standard">
                 <names variable="editor-translator"/>
                 <names variable="editor"/>
                 <names variable="translator"/>
                 <names variable="collection-editor"/>
-              </else>
+              </if>
             </choose>
             <choose>
               <if type="broadcast" variable="container-title number title"/>
@@ -569,16 +582,24 @@
               </if>
             </choose>
             <names variable="curator"/>
+            <choose>
+              <!-- no Chicago definition for these shortened references; this follows the bibliography -->
+              <if match="any" type="software webpage">
+                <!-- `software` listed under the name of the publisher or developer (CMOS18 14.169); `webpage` listed under a site owner or sponsor (CMOS18 14.104) -->
+                <text form="short" variable="publisher"/>
+              </if>
+              <else-if type="standard">
+                <!-- `standard` listed in bibliography under organization (CMOS18 14.159) -->
+                <text form="short" variable="authority"/>
+              </else-if>
+            </choose>
             <text macro="author-title-substitute-container-short"/>
             <text macro="author-title-substitute-short"/>
             <choose>
-              <if type="manuscript">
-                <choose>
-                  <if match="none" variable="container-title event-date event-place event-title genre title publisher publisher-place">
-                    <text macro="source-archive-note"/>
-                  </if>
-                </choose>
-              </if>
+              <if match="any" variable="container-title event-date event-place event-title genre title publisher publisher-place"/>
+              <else-if type="manuscript">
+                <text macro="source-archive-note"/>
+              </else-if>
             </choose>
           </substitute>
         </names>
@@ -599,42 +620,63 @@
   <macro name="author-short-and-recipient">
     <group delimiter=" ">
       <choose>
-        <!-- Inaccessible personal commmunication is cited in-text (CMOS18 14.111) -->
+        <!-- inaccessible `interview` or `personal_commmunication`: in-text citation (CMOS18 14.111) -->
         <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-          <!-- These variables indicate whether the letter is retrievable by the reader -->
-          <group delimiter=", ">
-            <names variable="author">
-              <substitute>
-                <text macro="title-and-descriptions-short"/>
-              </substitute>
-            </names>
-          </group>
           <choose>
-            <if match="none" variable="genre">
+            <if position="first">
+              <!-- at the first citation in shortened forms, give the full name -->
+              <names variable="author">
+                <name and="text" initialize="false"/>
+                <!-- never initialize -->
+                <substitute>
+                  <text macro="title-and-descriptions-short"/>
+                </substitute>
+              </names>
+            </if>
+            <else>
+              <names variable="author">
+                <name and="text" form="short" initialize="true"/>
+                <substitute>
+                  <text macro="title-and-descriptions-short"/>
+                </substitute>
+              </names>
+            </else>
+          </choose>
+          <choose>
+            <if variable="genre"/>
+            <!-- recipient appears in the description if there is a `genre`; otherwise after `author` -->
+            <else-if position="first">
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
+                <!-- never initialize -->
               </names>
-            </if>
+            </else-if>
+            <else>
+              <names variable="recipient">
+                <label form="verb" suffix=" "/>
+                <name and="text" form="short" initialize="true"/>
+              </names>
+            </else>
           </choose>
         </if>
+        <!-- accessible `interview` or `personal_communication`: standard citation -->
         <else-if variable="author recipient">
           <names variable="author">
-            <label/>
-            <name and="text" form="short"/>
+            <name and="text" form="short" initialize="true"/>
           </names>
           <choose>
             <if match="none" variable="genre">
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name and="text" form="short"/>
+                <name and="text" form="short" initialize="true"/>
               </names>
             </if>
           </choose>
         </else-if>
         <else>
           <names variable="author">
-            <name and="text" form="short"/>
+            <name and="text" form="short" initialize="true"/>
             <substitute>
               <text macro="title-and-descriptions-short"/>
             </substitute>
@@ -695,7 +737,8 @@
   </macro>
   <macro name="author-title-substitute-container">
     <choose>
-      <if match="none" variable="container-title"/>
+      <!-- no Chicago model for citing an anonymous article with an issue title in `volume-title` -->
+      <if variable="volume-title"/>
       <else-if match="any" type="article-magazine article-newspaper">
         <!-- Anonymous magazine and newspaper articles substitute name of publication (CMOS18 14.87, 14.97) -->
         <text macro="source-serial-name"/>
@@ -713,33 +756,34 @@
         <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if type="webpage">
-        <!-- Website title substituted in bibliography only (CMOS18 14.104) -->
+        <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
   <macro name="author-title-substitute-container-short">
     <choose>
-      <if match="none" variable="container-title"/>
-      <else-if match="any" type="article-magazine article-newspaper">
+      <if match="any" type="article-magazine article-newspaper">
         <!-- Anonymous magazine/newspaper articles substitute name of publication (CMOS18 14.87, 14.97) -->
         <text font-style="italic" text-case="title" variable="container-title"/>
-      </else-if>
+      </if>
       <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
         <!-- Publication name also substituted for unsigned reviews (CMOS18 14.102) -->
         <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <!-- Anonymous entries in reference works (CMOS18 14.130) -->
-        <text font-style="italic" text-case="title" variable="container-title"/>
+        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
       </else-if>
       <else-if type="broadcast">
         <!-- TV broadcasts and podcasts (CMOS18 14.165, 14.168) -->
-        <text font-style="italic" text-case="title" variable="container-title"/>
+        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
       </else-if>
       <else-if type="webpage">
-        <!-- Website title substituted in bibliography only (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
+        <text form="short" text-case="title" variable="container-title"/>
       </else-if>
     </choose>
   </macro>
@@ -760,10 +804,10 @@
     <choose>
       <if is-uncertain-date="issued">
         <!-- guessed-at date (CMOS18 14.44) -->
-        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="event-date"/>
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="event-date"/>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="event-date"/>
+        <date date-parts="year" form="numeric" variable="event-date"/>
       </else>
     </choose>
   </macro>
@@ -782,10 +826,10 @@
     <choose>
       <if is-uncertain-date="issued">
         <!-- guessed-at date (CMOS18 14.44) -->
-        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="issued"/>
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="issued"/>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <date date-parts="year" form="numeric" variable="issued"/>
       </else>
     </choose>
   </macro>
@@ -813,10 +857,10 @@
   <macro name="date-original-year">
     <choose>
       <if is-uncertain-date="original-date">
-        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="original-date"/>
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="original-date"/>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="original-date"/>
+        <date date-parts="year" form="numeric" variable="original-date"/>
       </else>
     </choose>
   </macro>
@@ -872,13 +916,16 @@
       <choose>
         <if type="broadcast" variable="container-title number title">
           <!-- Bespoke `broadcast` format (CMOS18 14.165, 14.168) -->
-          <text macro="source-monographic-title-bib"/>
+          <text font-style="italic" text-case="title" variable="container-title"/>
+          <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+          <!-- <text macro="source-monographic-title-specific-title-first"/> -->
           <group delimiter=", ">
             <text macro="identifier-number-bib"/>
             <text macro="title-bib"/>
             <text macro="description-bib"/>
             <text macro="source-monographic-identifier-contributors-bib"/>
           </group>
+          <text macro="source-monographic-identifier-contributors-bib-container-author"/>
           <text macro="source-series-bib"/>
           <choose>
             <!-- show event information here only if not collapsed with `issued` (CMOS18 14.167) -->
@@ -888,7 +935,14 @@
           </choose>
         </if>
         <else-if type="chapter" variable="container-title genre">
-          <!-- 'Introduction to' etc. (CMOS18 14.12, 14.14) -->
+          <!-- 'introduction to', 'online appendix to' (CMOS18 14.12, 14.14) -->
+          <group delimiter=" ">
+            <text macro="title-and-descriptions-bib"/>
+            <text macro="source-bib"/>
+          </group>
+        </else-if>
+        <else-if type="article-journal" variable="container-title genre volume-title">
+          <!-- introduction to a special issue or supplement -->
           <group delimiter=" ">
             <text macro="title-and-descriptions-bib"/>
             <text macro="source-bib"/>
@@ -903,17 +957,16 @@
         <choose>
           <!-- show event information here only if collapsed with `issued` (CMOS18 14.167) -->
           <if match="any" variable="event-date original-date original-publisher original-publisher-place publisher status"/>
-          <!-- monographic usage only -->
+          <!-- omit serial types -->
           <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
-          <else-if match="any" type="interview paper-conference">
-            <choose>
-              <if match="any" variable="collection-editor container-author editor editorial-director">
-                <!-- monographic usage -->
-                <text macro="source-event-bib"/>
-              </if>
-            </choose>
+          <else-if match="any" variable="collection-editor compiler editor editorial-director">
+            <!-- monographic types -->
+            <text macro="source-event-bib"/>
           </else-if>
+          <!-- omit serial types -->
+          <else-if match="any" type="interview paper-conference"/>
           <else>
+            <!-- monographic types -->
             <text macro="source-event-bib"/>
           </else>
         </choose>
@@ -928,26 +981,27 @@
   <macro name="title-bib">
     <choose>
       <if match="any" type="post webpage">
-        <!-- Handle `container-title` on `post` or `webpage` in manner of `publisher` -->
+        <!-- part number/title always at the analytic level -->
         <text macro="title-and-part-filter-review-bib"/>
       </if>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
         <text macro="title-and-part-filter-review-bib"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="title-primary"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="title-monographic-bib-specific-title-first"/> -->
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="title-monographic-bib"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="title-and-part-filter-review-bib"/>
-          </else>
-        </choose>
+        <!-- serial types -->
+        <text macro="title-and-part-filter-review-bib"/>
       </else-if>
       <else>
-        <text macro="title-monographic-bib"/>
+        <text macro="title-primary"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="title-monographic-bib-specific-title-first"/> -->
       </else>
     </choose>
   </macro>
@@ -999,25 +1053,6 @@
       </group>
     </group>
   </macro>
-  <macro name="title-monographic-bib">
-    <!-- For monographic items, assume `part-number` and `part-title` refer to the book/volume. -->
-    <!-- There is no `title-monographic-note` as notes always open with the primary title. -->
-    <choose>
-      <if variable="container-title">
-        <text macro="title-primary"/>
-      </if>
-      <!-- For monographic items without `container-title`, bibliography entries list `part-title` or `volume-title` first if available -->
-      <else-if variable="part-title">
-        <text macro="title-part"/>
-      </else-if>
-      <else-if variable="volume-title">
-        <text font-style="italic" text-case="title" variable="volume-title"/>
-      </else-if>
-      <else>
-        <text macro="title-primary"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="title-part">
     <choose>
       <if type="patent">
@@ -1052,11 +1087,35 @@
         <!-- Quotes, sentence case -->
         <text quotes="true" variable="part-title"/>
       </else-if>
-      <!-- Other types are formatted based on presence of `container-title` -->
-      <else-if variable="container-title">
+      <else-if type="webpage">
         <!-- Quotes, title case -->
         <text quotes="true" text-case="title" variable="part-title"/>
       </else-if>
+      <!-- Other types are formatted based on presence of `container-title` -->
+      <else-if variable="container-title">
+        <choose>
+          <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+            <!-- serial types -->
+            <!-- Quotes, title case -->
+            <text quotes="true" text-case="title" variable="part-title"/>
+          </if>
+          <else-if match="any" variable="collection-editor compiler editor editorial-director">
+            <!-- monographic types -->
+            <!-- Italics, title case -->
+            <text font-style="italic" text-case="title" variable="part-title"/>
+          </else-if>
+          <else-if match="any" type="interview paper-conference">
+            <!-- serial types -->
+            <!-- Quotes, title case -->
+            <text quotes="true" text-case="title" variable="part-title"/>
+          </else-if>
+          <else>
+            <!-- monographic types -->
+            <!-- Italics, title case -->
+            <text font-style="italic" text-case="title" variable="part-title"/>
+          </else>
+        </choose>
+      </else-if>
       <else-if match="any" type="article dataset document interview manuscript paper-conference personal_communication speech thesis webpage">
         <!-- Container-like but not necessarily with `container-title` -->
         <!-- Quotes, title case -->
@@ -1168,6 +1227,34 @@
       </else>
     </choose>
   </macro>
+  <macro name="title-volume">
+    <choose>
+      <if type="manuscript">
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="volume-title"/>
+      </if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="volume-title"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <!-- Italics, title case -->
+        <text font-style="italic" text-case="title" variable="volume-title"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="volume-title"/>
+      </else-if>
+      <else>
+        <!-- monographic types -->
+        <!-- Italics, title case -->
+        <text font-style="italic" text-case="title" variable="volume-title"/>
+      </else>
+    </choose>
+  </macro>
   <!-- 3.2. Description -->
   <macro name="description-bib">
     <choose>
@@ -1180,30 +1267,54 @@
       <else-if type="personal_communication">
         <text macro="description-letter-bib"/>
       </else-if>
+      <else-if type="song" variable="composer">
+        <text macro="description-song-bib"/>
+      </else-if>
+      <!-- thesis type appears with university name (CMOS18 14.113) -->
+      <else-if type="thesis"/>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
         <text macro="description-serial-bib"/>
       </else-if>
       <else-if type="paper-conference">
         <text macro="description-paper-conference-bib"/>
       </else-if>
-      <else-if type="song" variable="composer">
-        <text macro="description-song-bib"/>
-      </else-if>
-      <!-- thesis type appears with university name (CMOS18 14.113) -->
-      <else-if type="thesis"/>
       <else-if match="none" variable="container-title">
-        <!-- Other description -->
         <text macro="description-format-bib"/>
       </else-if>
+      <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software, place description within the source element -->
+      <else-if match="any" type="document report software standard"/>
+      <else-if match="any" type="event paper-conference performance speech">
+        <choose>
+          <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+            <text macro="description-format-bib"/>
+          </if>
+        </choose>
+      </else-if>
       <else>
-        <text macro="description-generic-bib"/>
+        <text macro="description-format-bib"/>
       </else>
     </choose>
   </macro>
   <macro name="description-short">
     <choose>
       <if match="any" type="interview" variable="interviewer">
-        <text macro="description-interview-short"/>
+        <choose>
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+            <text macro="description-interview-short"/>
+          </if>
+          <else>
+            <!-- for an inaccessible `interview`, give a full in-text description at the first citation -->
+            <choose>
+              <if position="first">
+                <text macro="description-interview-note"/>
+              </if>
+              <else>
+                <text macro="description-interview-short"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
       </if>
       <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
         <text macro="description-review-short"/>
@@ -1212,21 +1323,19 @@
         <text macro="description-letter-short"/>
       </else-if>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
         <text macro="description-serial-short"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="description-format-short"/>
+      </else-if>
       <else-if type="paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor container-author editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="description-format-short"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="description-serial-short"/>
-          </else>
-        </choose>
+        <!-- serial `paper-conference` -->
+        <text macro="description-serial-short"/>
       </else-if>
       <else>
+        <!-- monographic types -->
         <text macro="description-format-short"/>
       </else>
     </choose>
@@ -1238,68 +1347,85 @@
       <else-if variable="genre">
         <text text-case="capitalize-first" variable="genre"/>
       </else-if>
+      <!-- generic labels if unpublished -->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
       <else-if type="manuscript">
         <!-- 'unpublished manuscript' if no `genre` (CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript" text-case="capitalize-first"/>
-          </if>
-        </choose>
+        <text term="manuscript" text-case="capitalize-first"/>
       </else-if>
       <else-if type="personal_communication">
         <!-- 'personal communication' if no `genre` (CMOS18 14.111) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="personal-communication" text-case="capitalize-first"/>
-          </if>
-        </choose>
+        <text term="personal-communication" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="description-format-short">
+  <macro name="description-format-note">
     <choose>
-      <if variable="genre">
+      <if variable="genre number"/>
+      <else-if variable="genre">
         <text variable="genre"/>
-      </if>
-      <else-if variable="medium">
-        <text variable="medium"/>
       </else-if>
+      <!-- generic labels if unpublished -->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
       <else-if type="manuscript">
         <!-- 'unpublished manuscript' if no `genre` (CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+        <text term="manuscript"/>
       </else-if>
       <else-if type="personal_communication">
-        <!-- 'pers. comm.' if no `genre` (CMOS18 14.111) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text form="short" term="personal-communication"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if variable="chapter-number">
-        <text macro="label-chapter-number"/>
+        <!-- 'personal communication' if no `genre` (CMOS18 14.111) -->
+        <text term="personal-communication"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="description-generic-bib">
-    <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software, place description within the source element -->
-    <choose>
-      <if match="any" type="event paper-conference performance speech">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="description-format-bib"/>
-          </if>
-        </choose>
-      </if>
-      <else-if match="none" type="document report software standard">
-        <text macro="description-format-bib"/>
-      </else-if>
-    </choose>
+  <macro name="description-format-short">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter" variable="container-title genre">
+          <!-- untitled introductions: cf. review model, which includes a title (CMOS18 14.101) -->
+          <text form="short" variable="genre"/>
+          <choose>
+            <if match="none" position="ibid ibid-with-locator">
+              <!-- CMOS team suggests leaving out title in repeated references -->
+              <text macro="source-monographic-preposition-note"/>
+              <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="article-journal" variable="container-title genre volume-title">
+          <!-- untitled introduction to a special issue or supplement -->
+          <text form="short" variable="genre"/>
+          <choose>
+            <if match="none" position="ibid ibid-with-locator">
+              <text macro="source-monographic-preposition-note"/>
+              <text form="short" quotes="true" text-case="title" variable="volume-title"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if variable="genre">
+          <text form="short" variable="genre"/>
+        </else-if>
+        <else-if variable="medium">
+          <text form="short" variable="medium"/>
+        </else-if>
+        <else-if variable="chapter-number container-title">
+          <text macro="source-monographic-preposition-note"/>
+          <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+        </else-if>
+        <else-if variable="chapter-number">
+          <text macro="label-chapter-number"/>
+        </else-if>
+        <!-- generic labels if unpublished -->
+        <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
+        <else-if type="manuscript">
+          <!-- 'unpublished manuscript' if no `genre` (CMOS18 14.114) -->
+          <text term="manuscript"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- 'pers. comm.' if no `genre` (CMOS18 14.111) -->
+          <text form="short" term="personal-communication"/>
+        </else-if>
+      </choose>
+    </group>
   </macro>
   <macro name="description-interview-bib">
     <group delimiter=", ">
@@ -1308,7 +1434,7 @@
           <!-- `genre` printed with `number` -->
           <names variable="interviewer">
             <label form="verb" suffix=" " text-case="capitalize-first"/>
-            <name and="text"/>
+            <name and="text" initialize="false"/>
           </names>
         </if>
         <else-if variable="genre">
@@ -1316,14 +1442,16 @@
             <text text-case="capitalize-first" variable="genre"/>
             <group delimiter=" ">
               <text form="verb" term="container-author"/>
-              <names variable="interviewer"/>
+              <names variable="interviewer">
+                <name and="text" initialize="false"/>
+              </names>
             </group>
           </group>
         </else-if>
         <else-if variable="interviewer">
           <names variable="interviewer">
             <label form="verb" suffix=" " text-case="capitalize-first"/>
-            <name and="text"/>
+            <name and="text" initialize="false"/>
           </names>
         </else-if>
         <else>
@@ -1333,25 +1461,59 @@
       <text macro="source-event-place-first"/>
     </group>
   </macro>
-  <macro name="description-interview-short">
-    <choose>
-      <if disambiguate="true">
-        <names variable="interviewer">
-          <label form="verb" suffix=" "/>
-          <name and="text"/>
-          <substitute>
-            <text macro="description-format-short"/>
-          </substitute>
-        </names>
-      </if>
-      <else-if match="any" variable="genre medium">
-        <choose>
-          <if match="none" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-            <!-- capitalize if no author or title -->
-            <text macro="description-format-bib"/>
+  <macro name="description-interview-note">
+    <group delimiter=", ">
+      <choose>
+        <if variable="genre number">
+          <!-- `genre` printed with `number` -->
+          <names variable="interviewer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+        </if>
+        <else-if variable="genre">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <text form="verb" term="container-author"/>
+              <names variable="interviewer">
+                <name and="text" initialize="false"/>
+              </names>
+            </group>
+          </group>
+        </else-if>
+        <else-if variable="interviewer">
+          <names variable="interviewer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+        </else-if>
+        <else>
+          <text macro="description-format-note"/>
+        </else>
+      </choose>
+      <text macro="source-event-place-first"/>
+    </group>
+  </macro>
+  <macro name="description-interview-short">
+    <choose>
+      <if disambiguate="true">
+        <names variable="interviewer">
+          <label form="verb" suffix=" "/>
+          <name and="text" form="short" initialize="true"/>
+          <substitute>
+            <text macro="description-format-short"/>
+          </substitute>
+        </names>
+      </if>
+      <else-if match="any" variable="genre medium">
+        <choose>
+          <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
+            <text macro="description-format-short"/>
           </if>
           <else>
-            <text macro="description-format-short"/>
+            <!-- capitalize if no author or title -->
+            <text macro="description-format-bib"/>
           </else>
         </choose>
       </else-if>
@@ -1370,7 +1532,7 @@
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
                 <label form="verb" suffix=" " text-case="capitalize-first"/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
               </names>
             </if>
             <else-if variable="genre">
@@ -1378,14 +1540,14 @@
                 <text macro="description-format-bib"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name and="text"/>
+                  <name and="text" initialize="false"/>
                 </names>
               </group>
             </else-if>
             <else>
               <names variable="recipient">
                 <label form="verb" suffix=" " text-case="capitalize-first"/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
               </names>
             </else>
           </choose>
@@ -1407,7 +1569,7 @@
             <text macro="description-format-short"/>
             <names variable="recipient">
               <label form="verb" suffix=" "/>
-              <name and="text"/>
+              <name and="text" form="short" initialize="true"/>
             </names>
           </group>
         </if>
@@ -1416,17 +1578,24 @@
         </else>
       </choose>
       <text variable="event-place"/>
-      <text macro="date-event-full"/>
+      <choose>
+        <if variable="event-date">
+          <text macro="date-event-full"/>
+        </if>
+        <else>
+          <text macro="date-issued-full"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="description-paper-conference-bib">
     <choose>
-      <if match="any" variable="collection-editor container-author editor editorial-director">
-        <!-- monographic usage -->
-        <text macro="description-generic-bib"/>
+      <if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="description-format-bib"/>
       </if>
       <else>
-        <!-- serial usage -->
+        <!-- serial types -->
         <group delimiter=". ">
           <text macro="description-serial-bib"/>
           <text macro="source-event-bib"/>
@@ -1446,14 +1615,14 @@
           <if variable="reviewed-genre reviewed-title title">
             <names variable="reviewed-author">
               <label form="verb" suffix=" "/>
-              <name and="text"/>
+              <name and="text" initialize="false"/>
             </names>
           </if>
           <else-if variable="reviewed-genre"/>
           <else>
             <names variable="reviewed-author">
               <label form="verb" suffix=" "/>
-              <name and="text"/>
+              <name and="text" initialize="false"/>
             </names>
           </else>
         </choose>
@@ -1472,7 +1641,7 @@
             <if match="none" variable="reviewed-title">
               <names variable="reviewed-author">
                 <label form="verb" suffix=" "/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
               </names>
             </if>
           </choose>
@@ -1491,10 +1660,17 @@
     </choose>
   </macro>
   <macro name="description-review-short">
-    <group delimiter=" ">
-      <text term="review-of"/>
-      <text macro="description-review-title-short"/>
-    </group>
+    <choose>
+      <if match="any" position="ibid ibid-with-locator">
+        <text term="review"/>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="review-of"/>
+          <text macro="description-review-title-short"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="description-review-term-unsigned-bib">
     <!-- Anonymous reviews appear as 'unsigned' (CMOS18 14.102) -->
@@ -1550,7 +1726,7 @@
         <text macro="description-format-short"/>
       </else-if>
       <else>
-        <text variable="section"/>
+        <text form="short" text-case="title" variable="section"/>
       </else>
     </choose>
   </macro>
@@ -1570,6 +1746,7 @@
         </else>
       </choose>
       <names variable="author">
+        <name and="text" initialize="false"/>
         <substitute>
           <names variable="performer"/>
         </substitute>
@@ -1587,12 +1764,11 @@
           <text macro="identifier-report-bib"/>
         </else-if>
         <else-if match="any" type="post webpage">
-          <!-- Handle `container-title` on `post` or `webpage` as `publisher` -->
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text macro="identifier-number-bib"/>
           <text macro="label-version-capitalized"/>
           <text macro="identifier-edition-bib"/>
           <text macro="identifier-contributors-bib"/>
-          <text macro="identifier-volume-monographic-bib"/>
         </else-if>
         <else-if variable="container-title">
           <choose>
@@ -1611,40 +1787,7 @@
           </choose>
           <text macro="label-version-capitalized"/>
           <text macro="identifier-edition-bib"/>
-          <choose>
-            <if match="any" variable="part-title volume-title">
-              <text macro="identifier-contributors-bib"/>
-            </if>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <!-- `collection-editor` belongs with `collection-title` if item is not multivolume -->
-              <choose>
-                <if variable="collection-editor">
-                  <names variable="collection-editor">
-                    <label form="verb" suffix=" " text-case="capitalize-first"/>
-                    <name and="text"/>
-                  </names>
-                </if>
-                <else>
-                  <text macro="identifier-contributors-bib"/>
-                </else>
-              </choose>
-            </else-if>
-            <else>
-              <text macro="identifier-contributors-bib"/>
-            </else>
-          </choose>
-          <text macro="identifier-volume-monographic-bib"/>
-          <choose>
-            <!-- `collection-editor` supplied in `identifier-volume-monographic-bib` if there is a `part-title` or `volume-title` -->
-            <if match="any" variable="part-title volume-title"/>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <choose>
-                <if variable="collection-editor">
-                  <text macro="identifier-contributors-bib"/>
-                </if>
-              </choose>
-            </else-if>
-          </choose>
+          <text macro="identifier-contributors-and-volume-bib"/>
         </else>
       </choose>
     </group>
@@ -1655,17 +1798,11 @@
       <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="identifier-contributors-serial-bib"/>
       </if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="identifier-contributors-monographic-bib"/>
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="identifier-contributors-monographic-bib"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="identifier-contributors-serial-bib"/>
-          </else>
-        </choose>
+        <text macro="identifier-contributors-serial-bib"/>
       </else-if>
       <else>
         <text macro="identifier-contributors-monographic-bib"/>
@@ -1676,219 +1813,372 @@
     <group delimiter=". ">
       <choose>
         <if match="any" type="post webpage">
-          <group delimiter=". ">
-            <names variable="container-author">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="editor-translator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names delimiter=". " variable="editor translator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="editorial-director">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="guest">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="host">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="illustrator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="narrator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names delimiter=". " variable="compiler chair organizer curator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names delimiter=". " variable="series-creator executive-producer">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="producer">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="director">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <choose>
-              <if match="any" type="broadcast performance">
-                <names variable="script-writer">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="performer">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <choose>
-              <if match="none" type="thesis">
-                <names variable="contributor">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-              </if>
-            </choose>
-          </group>
+          <names variable="container-author">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editor-translator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="editor translator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editorial-director">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="guest">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="illustrator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="compiler chair organizer curator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="series-creator executive-producer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="director">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="performer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" type="thesis">
+              <names variable="contributor">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
         </if>
         <else>
-          <!-- Handle `container-title` on `post` or `webpage` as `publisher` -->
-          <group delimiter=". ">
-            <choose>
-              <if match="none" variable="container-title">
-                <names variable="container-author">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="editor-translator">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names delimiter=". " variable="editor translator">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="editorial-director">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="guest">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="host">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-              </if>
-            </choose>
-            <names variable="illustrator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <names variable="narrator">
-              <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name and="text"/>
-            </names>
-            <choose>
-              <if match="none" variable="container-title">
-                <names delimiter=". " variable="compiler chair organizer curator">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names delimiter=". " variable="series-creator executive-producer">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="producer">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <names variable="director">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <choose>
-                  <if match="any" type="broadcast performance">
-                    <names variable="script-writer">
-                      <label form="verb" suffix=" " text-case="capitalize-first"/>
-                      <name and="text"/>
-                    </names>
-                  </if>
-                </choose>
-                <names variable="performer">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-                <choose>
-                  <if match="none" type="song thesis">
-                    <names variable="contributor">
-                      <label form="verb" suffix=" " text-case="capitalize-first"/>
-                      <name and="text"/>
-                    </names>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-            <choose>
-              <if type="song">
-                <!-- Song contributors attached to album (CMOS18 14.163) -->
-                <names variable="contributor">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="text"/>
-                </names>
-              </if>
-            </choose>
-          </group>
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="container-author">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="editor-translator">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names delimiter=". " variable="editor translator">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="editorial-director">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="guest">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="host">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="illustrator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" variable="container-title">
+              <names delimiter=". " variable="compiler chair organizer curator">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names delimiter=". " variable="series-creator executive-producer">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="producer">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <names variable="director">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <choose>
+                <if match="any" type="broadcast performance">
+                  <names variable="script-writer">
+                    <label form="verb" suffix=" " text-case="capitalize-first"/>
+                    <name and="text" initialize="false"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="performer">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+              <choose>
+                <if match="none" type="song thesis">
+                  <names variable="contributor">
+                    <label form="verb" suffix=" " text-case="capitalize-first"/>
+                    <name and="text" initialize="false"/>
+                  </names>
+                </if>
+              </choose>
+            </if>
+          </choose>
+          <choose>
+            <if type="song">
+              <!-- Song contributors attached to album (CMOS18 14.163) -->
+              <names variable="contributor">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
         </else>
       </choose>
     </group>
   </macro>
+  <macro name="identifier-contributors-monographic-bib-multivolume">
+    <!-- lowercase for attachment to volume; otherwise identical to `identifier-contributors-monographic-bib` -->
+    <group delimiter=", ">
+      <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
+      <choose>
+        <if match="none" variable="container-title">
+          <names variable="container-author">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editor-translator">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=", " variable="editor translator">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editorial-director">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="guest">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="illustrator">
+        <label form="verb" suffix=" "/>
+        <name and="text" initialize="false"/>
+      </names>
+      <names variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name and="text" initialize="false"/>
+      </names>
+      <choose>
+        <if match="none" variable="container-title">
+          <names delimiter=", " variable="compiler chair organizer curator">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=", " variable="series-creator executive-producer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="director">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
+                <label form="verb" suffix=" "/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="performer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" type="song thesis">
+              <names variable="contributor">
+                <label form="verb" suffix=" "/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
+        </if>
+      </choose>
+      <choose>
+        <if type="song">
+          <!-- Song contributors attached to album (CMOS18 14.163) -->
+          <names variable="contributor">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+        </if>
+      </choose>
+    </group>
+  </macro>
   <macro name="identifier-contributors-serial-bib">
     <group delimiter=". ">
       <names delimiter=". " variable="translator narrator">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
-      <names delimiter=", " variable="compiler chair organizer curator">
+      <names delimiter=". " variable="compiler chair organizer curator">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
-      <names delimiter=", " variable="series-creator executive-producer">
+      <names delimiter=". " variable="series-creator executive-producer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
       <names variable="producer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
       <names variable="director">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
       <names variable="script-writer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
       <names variable="performer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
+        <name and="text" initialize="false"/>
       </names>
     </group>
   </macro>
+  <macro name="identifier-contributors-and-volume-bib">
+    <choose>
+      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="identifier-contributors-serial-bib"/>
+      </if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="identifier-contributors-and-volume-monographic-bib"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="identifier-contributors-and-volume-monographic-bib-specific-title-first"/> -->
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="identifier-contributors-serial-bib"/>
+      </else-if>
+      <else>
+        <!-- monographic types -->
+        <text macro="identifier-contributors-and-volume-monographic-bib"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="identifier-contributors-and-volume-monographic-bib-specific-title-first"/> -->
+      </else>
+    </choose>
+  </macro>
+  <macro name="identifier-contributors-and-volume-monographic-bib">
+    <group delimiter=". ">
+      <choose>
+        <if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+          <!-- cite multivolume `collection-editor`; otherwise it belongs with `collection-title` -->
+          <names variable="collection-editor">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+        </if>
+      </choose>
+      <group delimiter=", ">
+        <text macro="identifier-volume-bib"/>
+        <choose>
+          <if match="any" variable="part-number part-title volume volume-title">
+            <text macro="identifier-contributors-monographic-bib-multivolume"/>
+          </if>
+        </choose>
+      </group>
+      <choose>
+        <if match="none" variable="part-number part-title volume volume-title">
+          <text macro="identifier-contributors-monographic-bib"/>
+          <text macro="label-number-of-volumes"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
   <macro name="identifier-edition-bib">
     <choose>
-      <if match="none" variable="original-date">
+      <!-- ensure `source-publication-history-bib` does not duplicate edition -->
+      <if variable="original-title">
         <text macro="label-edition-capitalized"/>
       </if>
-      <else-if variable="original-title">
+      <else-if variable="issued original-date"/>
+      <else>
         <text macro="label-edition-capitalized"/>
-      </else-if>
+      </else>
+    </choose>
+  </macro>
+  <macro name="identifier-edition-note">
+    <choose>
+      <!-- ensure `source-publication-history-note` does not duplicate edition -->
+      <if variable="original-title">
+        <text macro="label-edition"/>
+      </if>
+      <else-if variable="issued original-date"/>
+      <else>
+        <text macro="label-edition"/>
+      </else>
     </choose>
   </macro>
   <macro name="identifier-number-bib">
     <group delimiter=" ">
       <choose>
-        <if is-numeric="number" type="broadcast" variable="genre">
+        <if type="thesis"/>
+        <else-if is-numeric="number" type="broadcast" variable="genre">
           <text text-case="capitalize-first" variable="genre"/>
           <text variable="number"/>
-        </if>
+        </else-if>
         <else-if is-numeric="number" type="broadcast">
           <text text-case="capitalize-first" value="episode"/>
           <text variable="number"/>
@@ -1943,122 +2233,90 @@
           <text macro="identifier-number-bib"/>
           <text macro="label-version-capitalized"/>
           <text macro="identifier-edition-bib"/>
-          <text macro="identifier-contributors-bib"/>
-          <text macro="identifier-volume-monographic-bib"/>
+          <text macro="identifier-contributors-and-volume-bib"/>
         </else-if>
         <else>
           <!-- If there is no `title`, then `genre` and `number` are already printed as the title. -->
           <text macro="label-version-capitalized"/>
           <text macro="identifier-edition-bib"/>
-          <text macro="identifier-contributors-bib"/>
-          <text macro="identifier-volume-monographic-bib"/>
+          <text macro="identifier-contributors-and-volume-bib"/>
         </else>
       </choose>
     </group>
   </macro>
   <macro name="identifier-volume-bib">
-    <!-- In notes styles, bibliography entries may be listed either under an individual volume title or its series, but the former approach is required for author-date, which is the form that this macro implements (CMOS18 14.21) -->
+    <!-- In notes styles, bibliography entries may be listed beginning with either the general title of the multivolume set or that of the individual volume; the former approach is listed first, but the latter is required in author-date (CMOS18 14.21) -->
     <group delimiter=", ">
       <choose>
-        <if variable="part-number part-title volume volume-title">
-          <!-- part and title with individual titles -->
-          <group delimiter=" ">
-            <text macro="label-part-number-capitalized"/>
-            <text value="of"/>
-            <text font-style="italic" text-case="title" variable="volume-title"/>
-          </group>
-          <group delimiter=" ">
-            <text macro="label-volume"/>
-            <text value="of"/>
-            <group delimiter=", ">
-              <text macro="title-primary"/>
-              <names variable="collection-editor">
-                <label form="verb" suffix=" "/>
-                <name and="text"/>
-              </names>
-            </group>
-          </group>
+        <if match="any" variable="volume volume-title">
+          <!-- if there is a volume or volume title, the part number is not capitalized -->
+          <text macro="label-volume-capitalized"/>
+          <text macro="title-volume"/>
+          <text macro="label-part-number"/>
+          <text macro="title-part"/>
         </if>
-        <else-if match="any" variable="part-title volume-title">
-          <group delimiter=" ">
-            <choose>
-              <if variable="part-number volume">
-                <group delimiter=", ">
-                  <text macro="label-volume-capitalized"/>
-                  <text macro="label-part-number"/>
-                  <text value="of"/>
-                </group>
-              </if>
-              <else-if variable="part-number">
-                <text macro="label-part-number-capitalized"/>
-                <text value="of"/>
-              </else-if>
-              <else-if variable="volume">
-                <text macro="label-volume-capitalized"/>
-                <text value="of"/>
-              </else-if>
-            </choose>
-            <group delimiter=", ">
-              <text macro="title-primary"/>
-              <names variable="collection-editor">
-                <label form="verb" suffix=" "/>
-                <name and="text"/>
-              </names>
-            </group>
-          </group>
+        <else-if match="any" variable="part-number part-title">
+          <text macro="label-part-number-capitalized"/>
+          <text macro="title-part"/>
         </else-if>
-        <else-if variable="part-number volume">
-          <text macro="label-volume-capitalized"/>
+      </choose>
+    </group>
+  </macro>
+  <macro name="identifier-volume-note">
+    <!-- List the general title first in the notes (CMOS18 14.20) -->
+    <group delimiter=", ">
+      <choose>
+        <if match="any" variable="part-number part-title volume-title">
+          <text macro="label-volume"/>
+          <text macro="title-volume"/>
           <text macro="label-part-number"/>
+          <text macro="title-part"/>
+        </if>
+        <else-if is-numeric="volume" locator="page">
+          <!-- provide lone `volume` only if it does not appear in `source-monographic-locator-note` (CMOS18 14.20) -->
+          <choose>
+            <!-- check for variables that might come between the volume and page number -->
+            <if match="any" variable="part-number part-title volume-title">
+              <text macro="label-volume"/>
+            </if>
+            <else-if match="any" variable="container-author editor editor-translator translator">
+              <text macro="label-volume"/>
+            </else-if>
+          </choose>
         </else-if>
-        <else-if variable="part-number">
-          <text macro="label-part-number-capitalized"/>
+        <else-if is-numeric="volume" variable="page">
+          <choose>
+            <if match="any" variable="part-number part-title volume-title">
+              <text macro="label-volume"/>
+            </if>
+            <else-if match="any" variable="container-author editor editor-translator translator">
+              <text macro="label-volume"/>
+            </else-if>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
+          </choose>
         </else-if>
         <else-if variable="volume">
-          <text macro="label-volume-capitalized"/>
+          <text macro="label-volume"/>
         </else-if>
-        <else>
-          <text macro="label-number-of-volumes"/>
-        </else>
       </choose>
     </group>
   </macro>
-  <macro name="identifier-volume-monographic-bib">
-    <choose>
-      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="identifier-volume-bib"/>
-          </if>
-        </choose>
-      </else-if>
-      <else>
-        <text macro="identifier-volume-bib"/>
-      </else>
-    </choose>
-  </macro>
   <!-- 4. Source -->
   <macro name="source-bib">
     <choose>
-      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <!-- serial usage -->
+      <if match="any" type="patent post webpage"/>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="source-serial-bib"/>
-      </if>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="source-monographic-bib"/>
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor container-author editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="source-monographic-bib"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-serial-bib"/>
-          </else>
-        </choose>
+        <text macro="source-serial-bib"/>
       </else-if>
-      <else-if match="any" type="patent post webpage"/>
       <else>
         <text macro="source-monographic-bib"/>
       </else>
@@ -2132,7 +2390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2146,7 +2405,7 @@
         <group delimiter=", ">
           <group delimiter=" ">
             <text macro="source-monographic-preposition-bib"/>
-            <text quotes="true" text-case="title" variable="volume-title"/>
+            <text macro="title-volume"/>
           </group>
           <text macro="source-monographic-identifier-contributors-bib"/>
         </group>
@@ -2155,9 +2414,9 @@
   </macro>
   <!-- Serial source identifier -->
   <macro name="source-serial-identifier-bib">
-    <choose>
-      <if match="any" type="article-magazine article-newspaper">
-        <group delimiter=", ">
+    <group delimiter=", ">
+      <choose>
+        <if match="any" type="article-magazine article-newspaper">
           <group delimiter=". ">
             <text macro="source-serial-identifier-volume-bib"/>
             <!-- for author-date: -->
@@ -2166,26 +2425,24 @@
             <text macro="label-edition-capitalized"/>
           </group>
           <text macro="source-serial-locator"/>
-        </group>
-      </if>
-      <else-if match="any" variable="issue supplement-number volume">
-        <group delimiter=": ">
-          <text macro="source-serial-identifier-volume-bib"/>
-          <!-- for author-date: -->
-          <!-- <text macro="source-serial-identifier-volume-author-date"/> -->
-          <text macro="source-serial-locator"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=", ">
+        </if>
+        <else-if match="any" variable="issue supplement-number volume">
+          <group delimiter=": ">
+            <text macro="source-serial-identifier-volume-bib"/>
+            <!-- for author-date: -->
+            <!-- <text macro="source-serial-identifier-volume-author-date"/> -->
+            <text macro="source-serial-locator"/>
+          </group>
+        </else-if>
+        <else>
           <text macro="source-serial-identifier-volume-bib"/>
           <!-- for author-date: -->
           <!-- <text macro="source-serial-identifier-volume-author-date"/> -->
           <text macro="source-serial-locator"/>
-        </group>
-      </else>
-      <!-- TODO: If CSL adds `date-part` detection, add two further conditions to address CMOS18 14.74: delimiting with ":" if there is a `volume` and no month or `issue` or `supplement number`; delimiting with ", " or there is an `issue` or `supplement number` and no month -->
-    </choose>
+        </else>
+        <!-- TODO: If CSL adds `date-part` detection, add two further conditions to address CMOS18 14.74: delimiting with ":" if there is a `volume` and no month or `issue` or `supplement number`; delimiting with ", " or there is an `issue` or `supplement number` and no month -->
+      </choose>
+    </group>
   </macro>
   <macro name="source-serial-identifier-volume-bib">
     <group delimiter=", ">
@@ -2197,16 +2454,11 @@
         </if>
         <else-if match="any" variable="issue supplement-number volume">
           <choose>
-            <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+            <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"/>
+            <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
               <!-- date appears first if the review `container-title` has been substituted for a missing author (CMOS18 14.87, 14.102) -->
-              <choose>
-                <if match="none" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-                  <text macro="source-date-bib"/>
-                  <!-- for CMOS17 author-date: -->
-                  <!-- <text macro="source-date-issued-month-day"/> -->
-                </if>
-              </choose>
-            </if>
+              <text macro="source-date-issued-or-status"/>
+            </else-if>
           </choose>
           <!-- `collection-title` is for any serial with multiple series (e.g. 'second series') -->
           <text variable="collection-title"/>
@@ -2239,20 +2491,24 @@
                 <!-- date for unsigned reviews only appears here if it did not earlier (CMOS18 14.102) -->
                 <choose>
                   <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-                    <text macro="source-date-bib" prefix="(" suffix=")"/>
+                    <text macro="source-date-issued-or-status" prefix="(" suffix=")"/>
                   </if>
                 </choose>
               </if>
               <else>
-                <text macro="source-date-bib" prefix="(" suffix=")"/>
+                <text macro="source-date-issued-or-status" prefix="(" suffix=")"/>
               </else>
             </choose>
           </group>
         </else-if>
         <else>
           <text variable="collection-title"/>
-          <!-- publisher possible with `interview` (CMOS18 14.110) -->
-          <text variable="publisher"/>
+          <choose>
+            <if match="any" type="interview post-weblog">
+              <!-- publisher possible with broadcast `interview` (CMOS18 14.110) or `post-weblog` (CMOS18 14.105) -->
+              <text variable="publisher"/>
+            </if>
+          </choose>
           <text macro="source-serial-volume-status-bib"/>
         </else>
       </choose>
@@ -2261,20 +2517,22 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
-        <text macro="source-date-bib"/>
-        <!-- for CMOS17 author-date: -->
-        <!-- <text macro="source-date-issued-full-serial"/> -->
+        <text macro="source-date-issued-or-status"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="source-date-specific-title-first"/> -->
       </group>
     </group>
   </macro>
@@ -2285,7 +2543,16 @@
         <group delimiter=", ">
           <text macro="label-locator"/>
           <!-- an article ID appears alongside locators in notes (CMOS18 14.71) -->
-          <text variable="number"/>
+          <choose>
+            <!-- if there is an `archive` with no other reference, `number` appears in `source-archive-database-number` -->
+            <if match="any" variable="archive_collection archive_location archive-place">
+              <text variable="number"/>
+            </if>
+            <else-if variable="archive"/>
+            <else>
+              <text variable="number"/>
+            </else>
+          </choose>
         </group>
       </if>
       <!-- do not give pages for magazines or newspapers (CMOS18 14.87, 14.89) -->
@@ -2303,19 +2570,18 @@
         <if variable="container-title">
           <group delimiter=", ">
             <group delimiter=" ">
-              <choose>
-                <if match="none" type="broadcast motion_picture">
-                  <text macro="source-monographic-preposition-bib"/>
-                </if>
-              </choose>
-              <text macro="source-monographic-title-bib"/>
+              <text macro="source-monographic-preposition-bib"/>
+              <text font-style="italic" text-case="title" variable="container-title"/>
+              <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+              <!-- <text macro="source-monographic-title-specific-title-first"/> -->
             </group>
-            <text macro="source-monographic-description-bib"/>
+            <text macro="source-monographic-description"/>
             <text macro="source-monographic-identifier-bib"/>
             <text macro="source-monographic-locator"/>
           </group>
         </if>
       </choose>
+      <text macro="source-monographic-identifier-contributors-bib-container-author"/>
       <text macro="source-series-bib"/>
       <choose>
         <!-- show event information here only if not collapsed with `issued` (CMOS18 14.167) -->
@@ -2328,9 +2594,13 @@
   <!-- Monographic source title -->
   <macro name="source-monographic-preposition-bib">
     <choose>
-      <if type="chapter" variable="container-title genre">
+      <if match="any" type="broadcast motion_picture"/>
+      <else-if type="chapter" variable="container-title genre">
         <text value="to"/>
-      </if>
+      </else-if>
+      <else-if type="article-journal" variable="container-title genre volume-title">
+        <text value="to"/>
+      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="author composer">
@@ -2360,38 +2630,55 @@
       </else>
     </choose>
   </macro>
-  <macro name="source-monographic-title-bib">
+  <macro name="source-monographic-preposition-note">
     <choose>
-      <if variable="part-title">
-        <text macro="title-part"/>
-      </if>
-      <else-if variable="volume-title">
-        <text font-style="italic" text-case="title" variable="volume-title"/>
+      <if match="any" type="broadcast motion_picture"/>
+      <else-if type="chapter" variable="container-title genre">
+        <text value="to"/>
+      </else-if>
+      <else-if type="article-journal" variable="container-title genre volume-title">
+        <text value="to"/>
+      </else-if>
+      <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
+        <choose>
+          <if match="any" variable="author composer">
+            <!-- Give preposition only for signed entries; otherwise, title is substituted -->
+            <text term="in"/>
+          </if>
+        </choose>
+      </else-if>
+      <!-- if printing chapter page numbers (CMOS17/classic):
+      <else-if variable="chapter-number page title"><text term="in"/></else-if>
+      -->
+      <else-if variable="chapter-number">
+        <group delimiter=" ">
+          <text macro="label-chapter-number"/>
+          <choose>
+            <if type="song">
+              <text term="on"/>
+            </if>
+            <else>
+              <text term="in"/>
+            </else>
+          </choose>
+        </group>
       </else-if>
       <else>
-        <text font-style="italic" text-case="title" variable="container-title"/>
+        <text term="in"/>
       </else>
     </choose>
   </macro>
   <!-- Monographic source description -->
-  <macro name="source-monographic-description-bib">
+  <macro name="source-monographic-description">
     <choose>
-      <if match="any" type="event paper-conference performance speech">
-        <!-- Conference presentations should describe the session unless published in a proceedings -->
-        <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director">
-            <!-- serial usage -->
-            <text macro="description-format-bib"/>
-          </if>
-        </choose>
+      <if match="any" type="document report software standard">
+        <!-- place description after `container-title` -->
+        <text macro="description-format-note"/>
       </if>
-      <else-if type="software">
-        <!-- For entries in mobile app reference works, place description after `container-title` -->
-        <text macro="description-format-bib"/>
-      </else-if>
-      <else-if match="any" type="document report standard">
-        <!-- For chapters in report, standards, and generic documents, place description after `container-title` -->
-        <text macro="description-format-bib"/>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume"/>
+      <else-if match="any" type="event paper-conference performance speech">
+        <!-- unpublished conference presentations should describe the session -->
+        <text macro="description-format-note"/>
       </else-if>
     </choose>
   </macro>
@@ -2408,188 +2695,180 @@
             </if>
           </choose>
           <text macro="label-version"/>
-          <text macro="label-edition"/>
-          <choose>
-            <if match="any" variable="part-title volume-title">
-              <text macro="source-monographic-identifier-contributors-bib"/>
-            </if>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <!-- `collection-editor` belongs with `collection-title` if item is not multivolume -->
-              <choose>
-                <if variable="collection-editor">
-                  <names variable="collection-editor">
-                    <label form="verb" suffix=" "/>
-                    <name and="text"/>
-                  </names>
-                </if>
-                <else>
-                  <text macro="source-monographic-identifier-contributors-bib"/>
-                </else>
-              </choose>
-            </else-if>
-            <else>
-              <text macro="source-monographic-identifier-contributors-bib"/>
-            </else>
-          </choose>
-          <text macro="source-monographic-identifier-volume-bib"/>
-          <choose>
-            <!-- `collection-editor` supplied in `source-monographic-identifier-volume-bib` if there is a `part-title` or `volume-title` -->
-            <if match="any" variable="part-title volume-title"/>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <choose>
-                <if variable="collection-editor">
-                  <text macro="source-monographic-identifier-contributors-bib"/>
-                </if>
-              </choose>
-            </else-if>
-          </choose>
+          <!-- use note form as `edition` is not capitalized here -->
+          <text macro="identifier-edition-note"/>
+          <text macro="source-monographic-identifier-contributors-and-volume-bib"/>
+          <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+          <!-- <text macro="source-monographic-identifier-contributors-and-volume-bib-specific-title-first"/> -->
         </group>
       </if>
     </choose>
   </macro>
   <macro name="source-monographic-identifier-contributors-bib">
-    <group delimiter=", ">
-      <names variable="container-author">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="editor-translator">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names delimiter=", " variable="editor translator">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="guest">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="host">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names delimiter=", " variable="chair organizer">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names delimiter=", " variable="illustrator narrator compiler curator">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names delimiter=", " variable="series-creator executive-producer">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="producer">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="editorial-director">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <choose>
-        <if match="any" type="broadcast performance">
-          <names variable="script-writer">
+    <choose>
+      <if variable="container-author container-title">
+        <!-- set off `container-author` from other contributors in the bibliography (CMOS18 14.12; for page location, CMOS17 14.110) -->
+        <names variable="container-author">
+          <label form="verb" suffix=" "/>
+          <name and="text" initialize="false"/>
+        </names>
+        <!-- other contributors shift to `source-monographic-identifier-contributors-bib-container-author` -->
+      </if>
+      <else>
+        <group delimiter=", ">
+          <names variable="editor-translator">
             <label form="verb" suffix=" "/>
-            <name and="text"/>
+            <name and="text" initialize="false"/>
           </names>
-        </if>
-      </choose>
-      <names variable="director">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <names variable="performer">
-        <label form="verb" suffix=" "/>
-        <name and="text"/>
-      </names>
-      <choose>
-        <if match="none" type="song thesis">
-          <!-- Song contributors attached to album (CMOS18 14.163) -->
-          <names variable="contributor">
+          <names delimiter=", " variable="editor translator">
             <label form="verb" suffix=" "/>
-            <name and="text"/>
+            <name and="text" initialize="false"/>
           </names>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="source-monographic-identifier-volume-bib">
-    <!-- Mostly identical to `identifier-volume-bib` but without capitalization; giving `container-title` rather than `title-primary`; and ensuring volume number -->
-    <group delimiter=", ">
-      <choose>
-        <if variable="part-number part-title volume volume-title">
-          <!-- part and title with individual titles -->
-          <group delimiter=" ">
-            <text macro="label-part-number"/>
-            <text value="of"/>
-            <text font-style="italic" text-case="title" variable="volume-title"/>
-          </group>
-          <group delimiter=" ">
-            <text macro="label-volume"/>
-            <text value="of"/>
-            <group delimiter=", ">
-              <text font-style="italic" text-case="title" variable="container-title"/>
-              <names variable="collection-editor">
+          <names variable="guest">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=", " variable="chair organizer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=", " variable="illustrator narrator compiler curator">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=", " variable="series-creator executive-producer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editorial-director">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
                 <label form="verb" suffix=" "/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
               </names>
-            </group>
-          </group>
-        </if>
-        <else-if match="any" variable="part-title volume-title">
-          <group delimiter=" ">
-            <choose>
-              <if variable="part-number volume">
-                <group delimiter=", ">
-                  <text macro="label-volume"/>
-                  <text macro="label-part-number"/>
-                  <text value="of"/>
-                </group>
-              </if>
-              <else-if variable="part-number">
-                <text macro="label-part-number"/>
-                <text value="of"/>
-              </else-if>
-              <else-if variable="volume">
-                <text macro="label-volume"/>
-                <text value="of"/>
-              </else-if>
-            </choose>
-            <group delimiter=", ">
-              <text font-style="italic" text-case="title" variable="container-title"/>
-              <names variable="collection-editor">
+            </if>
+          </choose>
+          <names variable="director">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="performer">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" type="song thesis">
+              <!-- Song contributors attached to album (CMOS18 14.163) -->
+              <names variable="contributor">
                 <label form="verb" suffix=" "/>
-                <name and="text"/>
+                <name and="text" initialize="false"/>
               </names>
-            </group>
-          </group>
-        </else-if>
-        <else-if match="any" variable="part-number volume">
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="source-monographic-identifier-contributors-bib-container-author">
+    <!-- set off `container-author` from other contributors in the bibliography (CMOS18 14.12; for page location, CMOS17 14.110) -->
+    <choose>
+      <if variable="container-author container-title">
+        <group delimiter=". ">
+          <names variable="editor-translator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="editor translator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="guest">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="chair organizer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="illustrator narrator compiler curator">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names delimiter=". " variable="series-creator executive-producer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="editorial-director">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
           <choose>
-            <if is-numeric="volume" match="none">
-              <text macro="label-volume"/>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
             </if>
-            <else-if variable="container-title">
-              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
-              <text macro="label-volume"/>
-            </else-if>
-            <else-if is-numeric="volume" variable="page">
-              <choose>
-                <!-- check for variables that might come between the volume and page number -->
-                <if match="any" variable="collection-editor part-number part-title volume-title">
-                  <text macro="label-volume"/>
-                </if>
-              </choose>
-            </else-if>
-            <else>
-              <text macro="label-volume"/>
-            </else>
           </choose>
-          <text macro="label-part-number"/>
-        </else-if>
+          <names variable="director">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <names variable="performer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" type="song thesis">
+              <!-- Song contributors attached to album (CMOS18 14.163) -->
+              <names variable="contributor">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name and="text" initialize="false"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="source-monographic-identifier-contributors-and-volume-bib">
+    <!-- based on `identifier-contributors-and-volume-monographic-bib` -->
+    <group delimiter=", ">
+      <choose>
+        <if match="any" variable="number-of-volumes part-number part-number volume volume-title">
+          <!-- cite multivolume `collection-editor`; otherwise it belongs with `collection-title` -->
+          <names variable="collection-editor">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+        </if>
+      </choose>
+      <!-- use the note form for an item with `container-title` -->
+      <text macro="identifier-volume-note"/>
+      <text macro="source-monographic-identifier-contributors-bib"/>
+      <choose>
+        <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -2599,33 +2878,48 @@
   <!-- Monographic source locator -->
   <macro name="source-monographic-locator">
     <choose>
-      <if is-numeric="volume" locator="page">
+      <!-- archival locators appear after the shelfmark (CMOS18 14.127) -->
+      <if locator="column" variable="archive archive_location"/>
+      <else-if locator="folio" variable="archive archive_location"/>
+      <else-if locator="page" variable="archive archive_location"/>
+      <else-if is-numeric="volume" locator="page">
+        <!-- separate a volume and page number with a colon (CMOS18 14.18) -->
         <group delimiter=":">
           <choose>
-            <if match="none" variable="collection-editor part-number part-title volume-title">
+            <if match="any" variable="part-number part-title volume-title"/>
+            <else-if match="any" variable="container-author editor editor-translator translator"/>
+            <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21), check for name variables falling after the general title: -->
+            <!-- <else-if variable="collection-editor"/> -->
+            <else>
               <text variable="volume"/>
-            </if>
+            </else>
           </choose>
           <text variable="locator"/>
         </group>
-      </if>
+      </else-if>
       <else-if variable="locator">
         <text macro="label-locator"/>
       </else-if>
       <!-- remove `container-title` condition in styles that print chapter page numbers (CMOS17/classic) -->
       <else-if variable="container-title"/>
       <else-if is-numeric="volume" variable="page">
-        <!-- collapse the volume and page number if adjacent -->
+        <!-- collapse the volume and page number if adjacent (CMOS18 14.18) -->
         <group delimiter=":">
           <choose>
             <!-- check for variables that might come between the volume and page number -->
-            <if match="none" variable="collection-editor part-number part-title volume-title">
+            <if match="any" variable="part-number part-title volume-title"/>
+            <else-if match="any" variable="container-author editor editor-translator translator"/>
+            <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21), check for name variables falling after the general title: -->
+            <!-- <else-if variable="collection-editor"/> -->
+            <else>
               <text variable="volume"/>
-            </if>
+            </else>
           </choose>
           <text variable="page"/>
         </group>
       </else-if>
+      <!-- archival locators appear after the shelfmark (CMOS18 14.127) -->
+      <else-if variable="archive archive_location page"/>
       <else>
         <text variable="page"/>
       </else>
@@ -2635,22 +2929,19 @@
   <macro name="source-series-bib">
     <group delimiter=", ">
       <choose>
-        <if variable="collection-editor collection-title">
-          <choose>
-            <if match="any" variable="number-of-volumes part-number part-title volume volume-title">
-              <text macro="source-series-title"/>
-            </if>
-            <else>
-              <text text-case="title" variable="collection-title"/>
-              <names variable="collection-editor">
-                <label form="verb" suffix=" "/>
-                <name and="text"/>
-              </names>
-              <text macro="label-collection-number"/>
-              <text macro="label-issue"/>
-            </else>
-          </choose>
+        <if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+          <text macro="source-series-title"/>
         </if>
+        <else-if variable="collection-editor collection-title">
+          <!-- `collection-editor` belongs with `collection-title` if the item is not multivolume -->
+          <text text-case="title" variable="collection-title"/>
+          <names variable="collection-editor">
+            <label form="verb" suffix=" "/>
+            <name and="text" initialize="false"/>
+          </names>
+          <text macro="label-collection-number"/>
+          <text macro="label-issue"/>
+        </else-if>
         <else>
           <text macro="source-series-title"/>
         </else>
@@ -2752,9 +3043,10 @@
           </choose>
         </else-if>
         <else-if variable="event-date issued"/>
-        <else-if match="none" variable="issued">
+        <else-if variable="issued"/>
+        <else>
           <text text-case="capitalize-first" variable="status"/>
-        </else-if>
+        </else>
       </choose>
     </group>
   </macro>
@@ -2800,23 +3092,22 @@
       <text variable="event-place"/>
     </group>
   </macro>
-  <!-- 4.5. Facts of publication -->
-  <macro name="source-monographic-publication-bib">
-    <group delimiter=". ">
-      <choose>
-        <!-- Provide only for monographic types -->
-        <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
-        <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor container-author editor editorial-director">
-              <!-- monographic usage -->
-              <text macro="source-publication-and-date-bib"/>
-            </if>
-          </choose>
-        </else-if>
+  <!-- 4.5. Facts of publication -->
+  <macro name="source-monographic-publication-bib">
+    <group delimiter=". ">
+      <choose>
         <!-- `patent` date in identification (CMOS18 14.158) -->
-        <else-if type="patent"/>
+        <if type="patent"/>
+        <!-- omit serial types -->
+        <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text macro="source-publication-and-date-bib"/>
+        </else-if>
+        <!-- omit serial types -->
+        <else-if match="any" type="interview paper-conference"/>
         <else>
+          <!-- monographic types -->
           <text macro="source-publication-and-date-bib"/>
         </else>
       </choose>
@@ -2827,8 +3118,10 @@
     <group delimiter=", ">
       <choose>
         <if match="any" type="post webpage">
-          <!-- `container-title` functions like a publisher with social media and website sources (CMOS18 14.104-106) -->
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
@@ -2847,7 +3140,9 @@
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
-        <text macro="source-date-bib"/>
+        <text macro="source-date-issued-or-status"/>
+        <!-- for author-date or notes and bibliography leading with volume title (CMOS18 14.21): -->
+        <!-- <text macro="source-date-specific-title-first"/> -->
       </group>
       <choose>
         <if type="broadcast" variable="URL"/>
@@ -2870,7 +3165,7 @@
       </else-if>
       <else-if type="thesis">
         <!-- thesis type appears with university name (CMOS18 14.113) -->
-        <text macro="description-format-bib"/>
+        <text text-case="capitalize-first" variable="genre"/>
       </else-if>
       <else-if match="any" variable="original-publisher original-publisher-place">
         <choose>
@@ -2932,7 +3227,9 @@
         <group delimiter=" ">
           <text term="original-work-published" text-case="capitalize-first"/>
           <group delimiter=", ">
-            <names variable="original-author"/>
+            <names variable="original-author">
+              <name and="text" initialize="false"/>
+            </names>
             <text font-style="italic" text-case="title" variable="original-title"/>
           </group>
           <group delimiter=", " prefix="(" suffix=")">
@@ -2983,24 +3280,6 @@
     </choose>
   </macro>
   <!-- 4.6. Date -->
-  <macro name="source-date-bib">
-    <!-- the date represents the last-mentioned title (CMOS18 14.21) -->
-    <!-- there is no `source-date-note` as the date of a multivolume work is not used in note form -->
-    <choose>
-      <if variable="available-date volume-title">
-        <!-- TODO: Is there a better CSL variable for a date of a multivolume work (CMOS18 14.21)? -->
-        <date date-parts="year" form="text" variable="available-date"/>
-      </if>
-      <else-if variable="available-date part-title">
-        <date date-parts="year" form="text" variable="available-date"/>
-      </else-if>
-      <else>
-        <text macro="source-date-issued-or-status"/>
-        <!-- for author-date: -->
-        <!-- <text macro="source-date-issued-month-day"/> -->
-      </else>
-    </choose>
-  </macro>
   <!-- Date elements -->
   <macro name="source-date-issued-full">
     <!-- Give full date for more ephemeral types -->
@@ -3010,21 +3289,6 @@
         <!-- Provide issue date for letters listed under event-date -->
         <text macro="date-issued-year"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="source-date-issued-full-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="date-issued-year"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-date-issued-full-serial"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -3036,19 +3300,31 @@
           </else>
         </choose>
       </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software song speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software song speech standard webpage">
         <text macro="date-issued-full"/>
       </else-if>
-      <else-if variable="issued">
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="source-date-issued-full-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
         <text macro="date-issued-year"/>
       </else-if>
-      <else-if variable="available-date">
-        <!-- possible recourse for multivolume series (e.g. CMOS18 14.26) -->
-        <date date-parts="year" form="text" variable="available-date"/>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-issued-full-serial"/>
+      </else-if>
+      <!-- monographic types -->
+      <else-if variable="issued">
+        <text macro="date-issued-year"/>
       </else-if>
       <else-if variable="event-date">
         <text macro="date-event-year"/>
       </else-if>
+      <else-if variable="available-date">
+        <date date-parts="year" form="numeric" variable="available-date"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="source-date-issued-full-serial">
@@ -3130,21 +3406,6 @@
         <!-- Provide original date for letters listed under event-date -->
         <text macro="date-original-year"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="source-date-original-full-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="date-original-year"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-date-original-full-serial"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -3156,10 +3417,23 @@
           </else>
         </choose>
       </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software song speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software song speech standard webpage">
         <text macro="date-original-full"/>
       </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="source-date-original-full-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="date-original-year"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-original-full-serial"/>
+      </else-if>
       <else>
+        <!-- monographic types -->
         <text macro="date-original-year"/>
       </else>
     </choose>
@@ -3191,9 +3465,22 @@
       <else-if variable="issued status">
         <!-- `status` specifies date type, e.g. 'effective', 'last modified', 'approved' (CMOS18 14.104 for `webpage`; CMOS18 14.159 for `standard`) -->
         <choose>
-          <if match="any" variable="original-date original-publisher original-publisher-place original-title publisher">
+          <if type="webpage" variable="container-title">
             <text variable="status"/>
           </if>
+          <else-if type="webpage" variable="author publisher">
+            <text variable="status"/>
+          </else-if>
+          <else-if type="webpage" variable="translator publisher">
+            <text variable="status"/>
+          </else-if>
+          <else-if type="webpage">
+            <!-- capitalize `status` if there is nothing else after the `title` (either no website title or substituted publisher) -->
+            <text text-case="capitalize-first" variable="status"/>
+          </else-if>
+          <else-if match="any" variable="original-date original-publisher original-publisher-place original-title publisher">
+            <text variable="status"/>
+          </else-if>
           <else>
             <text text-case="capitalize-first" variable="status"/>
           </else>
@@ -3232,17 +3519,13 @@
       <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="source-locator-subsequent-serial"/>
       </if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="source-locator-subsequent-monographic"/>
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="source-locator-subsequent-monographic"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-locator-subsequent-serial"/>
-          </else>
-        </choose>
+        <!-- serial types -->
+        <text macro="source-locator-subsequent-serial"/>
       </else-if>
       <else>
         <text macro="source-locator-subsequent-monographic"/>
@@ -3256,12 +3539,14 @@
           <!-- Do not provide `volume` or `part-number` for defined section -->
           <text macro="label-locator"/>
         </if>
-        <else-if is-numeric="volume" locator="page" variable="part-number">
+        <else-if variable="part-number">
+          <!-- label page numbers to balance a part number (CMOS18 14.50) -->
           <text macro="label-volume"/>
           <text macro="label-part-number"/>
-          <text macro="label-locator"/>
+          <text macro="label-locator-all"/>
         </else-if>
         <else-if is-numeric="volume" locator="page">
+          <!-- separate a volume and page number with a colon (CMOS18 14.18) -->
           <group delimiter=":">
             <text variable="volume"/>
             <text variable="locator"/>
@@ -3269,7 +3554,6 @@
         </else-if>
         <else>
           <text macro="label-volume"/>
-          <text macro="label-part-number"/>
           <text macro="label-locator"/>
         </else>
       </choose>
@@ -3277,8 +3561,16 @@
   </macro>
   <macro name="source-locator-subsequent-serial">
     <group delimiter=", ">
-      <text macro="label-part-number"/>
-      <text macro="label-locator"/>
+      <choose>
+        <if variable="part-number">
+          <!-- label page numbers when using multiple locators (CMOS18 14.50) -->
+          <text macro="label-part-number"/>
+          <text macro="label-locator-all"/>
+        </if>
+        <else>
+          <text macro="label-locator"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <!-- 4.8. Medium -->
@@ -3291,88 +3583,105 @@
   </macro>
   <!-- 4.9. Archival location -->
   <macro name="source-archive-bib">
-    <choose>
-      <!-- With `archive_collection` or `archive-place`: physical archives -->
-      <if type="graphic">
-        <text macro="source-archive-name-first"/>
-      </if>
-      <else-if match="any" type="collection document manuscript personal_communication" variable="archive_collection archive-place">
-        <text macro="source-archive-location-first-bib"/>
-      </else-if>
-      <!-- Without `archive_collection` or `archive-place`: digital archives (database and identifier) -->
-      <else>
-        <text macro="source-archive-identifier"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <choose>
+        <if type="graphic">
+          <text macro="source-archive-reference-institution-first"/>
+        </if>
+        <else>
+          <text macro="source-archive-reference-location-first-bib"/>
+        </else>
+      </choose>
+      <text macro="source-archive-database-number" prefix="(" suffix=")"/>
+    </group>
   </macro>
   <macro name="source-archive-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="graphic">
+          <text macro="source-archive-reference-institution-first"/>
+        </if>
+        <else>
+          <text macro="source-archive-reference-location-first-note"/>
+        </else>
+      </choose>
+      <text macro="source-archive-database-number" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- Archival elements -->
+  <macro name="source-archive-database-number">
+    <!-- database identifier, if not included elsewhere (CMOS18 14.113) -->
     <choose>
-      <!-- With `archive_collection` or `archive-place`: physical archives -->
-      <if type="graphic">
-        <text macro="source-archive-name-first"/>
-      </if>
-      <else-if match="any" type="collection document manuscript personal_communication" variable="archive_collection archive-place">
-        <text macro="source-archive-location-first-note"/>
+      <if match="any" variable="archive_collection archive_location archive-place"/>
+      <!-- `number` never shown elsewhere with a thesis -->
+      <else-if type="thesis">
+        <text variable="number"/>
+      </else-if>
+      <!-- `number` shown with `genre` -->
+      <else-if match="any" type="dataset entry song" variable="genre"/>
+      <else-if variable="archive">
+        <text variable="number"/>
       </else-if>
-      <!-- Without `archive_collection` or `archive-place`: digital archives (database and identifier) -->
-      <else>
-        <text macro="source-archive-identifier"/>
-      </else>
     </choose>
   </macro>
-  <!-- Archival elements -->
-  <macro name="source-archive-identifier">
+  <macro name="source-archive-locator">
     <choose>
-      <if variable="archive archive_location">
-        <!-- database identifier: the only example is `thesis`, but presumably this is for all types (CMOS18 14.113) -->
-        <group delimiter=" ">
-          <text variable="archive"/>
-          <text prefix="(" suffix=")" variable="archive_location"/>
-        </group>
+      <!-- physical locators with archival references appear after the shelfmark (CMOS18 14.127) -->
+      <if locator="column" variable="archive archive_location">
+        <!-- archival locators must always be labelled to avoid confusion with `archive_location` (CMOS18 14.123) -->
+        <text macro="label-locator-all"/>
       </if>
-      <else>
-        <group delimiter=", ">
-          <text variable="archive"/>
-          <text variable="archive_location"/>
-        </group>
-      </else>
+      <else-if locator="folio" variable="archive archive_location">
+        <text macro="label-locator-all"/>
+      </else-if>
+      <else-if locator="page" variable="archive archive_location">
+        <text macro="label-locator-all"/>
+      </else-if>
+      <else-if variable="archive archive_location page">
+        <choose>
+          <if is-numeric="page">
+            <!-- TODO: remove this conditional when `page` parsing is fixed for different locator types -->
+            <text macro="label-page"/>
+          </if>
+          <else>
+            <text variable="page"/>
+          </else>
+        </choose>
+      </else-if>
     </choose>
   </macro>
-  <macro name="source-archive-location-first-bib">
-    <!-- Order of elements begins with the most specific (CMOS18 14.119, 14.127) -->
-    <!-- In note styles, the bibliography generally provide entries for a `collection` rather than individual items (CMOS18 14.120, 14.128) -->
-    <group delimiter=". ">
-      <group delimiter=", ">
-        <text text-case="capitalize-first" variable="archive_location"/>
-        <text variable="archive_collection"/>
-      </group>
-      <group delimiter=", ">
-        <text variable="archive"/>
-        <text variable="archive-place"/>
-      </group>
+  <macro name="source-archive-reference-institution-first">
+    <!-- Archive (gallery) name first for art (CMOS18 14.133) -->
+    <group delimiter=", ">
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+      <text variable="archive_collection"/>
+      <text variable="archive_location"/>
+      <text macro="source-archive-locator"/>
     </group>
   </macro>
-  <macro name="source-archive-location-first-note">
-    <!-- Order of elements begins with the most specific (CMOS18 14.119, 14.127) -->
-    <!-- In note styles, the bibliography generally provide entries for a `collection` rather than individual items (CMOS18 14.120, 14.128) -->
-    <group delimiter=", ">
+  <macro name="source-archive-reference-location-first-bib">
+    <!-- Order of elements begins with the most specific (CMOS18 14.128) -->
+    <group delimiter=". ">
       <group delimiter=", ">
-        <text variable="archive_location"/>
-        <text variable="archive_collection"/>
+        <text text-case="capitalize-first" variable="archive_location"/>
+        <text macro="source-archive-locator"/>
       </group>
+      <text variable="archive_collection"/>
       <group delimiter=", ">
         <text variable="archive"/>
         <text variable="archive-place"/>
       </group>
     </group>
   </macro>
-  <macro name="source-archive-name-first">
-    <!-- Archive (gallery) name first for art (CMOS18 14.133) -->
+  <macro name="source-archive-reference-location-first-note">
+    <!-- Order of elements begins with the most specific (CMOS18 14.127) -->
     <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text macro="source-archive-locator"/>
+      <text variable="archive_collection"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
-      <text variable="archive_collection"/>
-      <text variable="archive_location"/>
     </group>
   </macro>
   <!-- 4.10. URL or persistent identifier -->
@@ -3422,7 +3731,7 @@
           <text macro="legal-title"/>
           <names variable="author">
             <!-- Treaty parties should be included at least for bilateral treaties (Bluebook 21.4.2) -->
-            <name delimiter="-" et-al-min="100" et-al-use-first="99" form="short"/>
+            <name delimiter="-" et-al-min="100" et-al-use-first="99" form="short" initialize="false"/>
           </names>
           <text macro="legal-date"/>
           <!-- treaty source/report in addition to URL (Bluebook 21.4.5) -->
@@ -3506,14 +3815,12 @@
           <group delimiter=" ">
             <text term="hearing" text-case="capitalize-first"/>
             <group delimiter=" ">
-              <group delimiter=" ">
-                <text term="on"/>
-                <text variable="number"/>
-              </group>
-              <group delimiter=" ">
-                <text value="before the"/>
-                <text variable="section"/>
-              </group>
+              <text term="on"/>
+              <text variable="number"/>
+            </group>
+            <group delimiter=" ">
+              <text value="before the"/>
+              <text variable="section"/>
             </group>
           </group>
         </group>
@@ -3522,21 +3829,21 @@
   </macro>
   <!-- 6.2.2. Legal identifier -->
   <macro name="legal-identifier">
-    <choose>
-      <if type="hearing">
-        <group delimiter=" " prefix="(" suffix=")">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if type="hearing">
           <!-- Use the 'verb' form of the hearing term to hold 'testimony of' -->
           <text form="verb" term="hearing"/>
           <names variable="author">
             <name and="symbol" initialize="false"/>
           </names>
-        </group>
-      </if>
-      <else-if match="any" type="bill legislation regulation">
-        <!-- For uncodified regulations, assume future code section is in `status`. -->
-        <text prefix="(" suffix=")" variable="status"/>
-      </else-if>
-    </choose>
+        </if>
+        <else-if match="any" type="bill legislation regulation">
+          <!-- For uncodified regulations, assume future code section is in `status`. -->
+          <text variable="status"/>
+        </else-if>
+      </choose>
+    </group>
   </macro>
   <macro name="legal-identifier-bill-report">
     <group delimiter=" ">
@@ -3596,19 +3903,17 @@
     <group delimiter=" ">
       <choose>
         <if variable="container-title">
-          <group delimiter=" ">
-            <text variable="volume"/>
-            <text variable="container-title"/>
-            <text macro="label-section-symbol"/>
-            <choose>
-              <if match="any" variable="page page-first">
-                <text variable="page-first"/>
-              </if>
-              <else>
-                <text value="___"/>
-              </else>
-            </choose>
-          </group>
+          <text variable="volume"/>
+          <text variable="container-title"/>
+          <text macro="label-section-symbol"/>
+          <choose>
+            <if match="any" variable="page page-first">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <text value="___"/>
+            </else>
+          </choose>
         </if>
         <else>
           <text macro="label-number-capitalized"/>
@@ -3699,71 +4004,67 @@
   <!-- Citation -->
   <citation disambiguate-add-givenname="true" disambiguate-add-names="true" et-al-min="3" et-al-use-first="1">
     <layout delimiter="; " prefix="(" suffix=")">
-      <choose>
-        <if type="classic">
+      <group delimiter=", ">
+        <choose>
+          <if match="none" type="classic">
+            <text macro="author-short"/>
+            <choose>
+              <if match="any" type="bill hearing legal_case legislation regulation treaty" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"/>
+              <else-if disambiguate="true">
+                <text macro="title-and-descriptions-short"/>
+              </else-if>
+              <else>
+                <text macro="title-and-descriptions-short"/>
+              </else>
+            </choose>
+            <text macro="source-locator-subsequent"/>
+          </if>
           <!-- with `classic`, a non-numeric canonical reference or identifying number is separated by a space rather than a comma (CMOS18 14.145) -->
-          <choose>
-            <if is-numeric="locator">
-              <group delimiter=", ">
-                <text macro="author-short"/>
-                <choose>
-                  <if match="none" type="bill hearing legal_case legislation regulation treaty" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-                    <text macro="title-and-descriptions-short"/>
-                  </if>
-                  <else-if disambiguate="true">
-                    <text macro="title-and-descriptions-short"/>
-                  </else-if>
-                </choose>
-                <text macro="source-locator-subsequent"/>
-              </group>
-            </if>
-            <else-if locator="chapter line verse" match="any">
-              <group delimiter=" ">
-                <group delimiter=", ">
-                  <text macro="author-short"/>
-                  <choose>
-                    <if match="none" type="bill hearing legal_case legislation regulation treaty" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-                      <text macro="title-and-descriptions-short"/>
-                    </if>
-                    <else-if disambiguate="true">
-                      <text macro="title-and-descriptions-short"/>
-                    </else-if>
-                  </choose>
-                </group>
-                <text macro="source-locator-subsequent"/>
-              </group>
-            </else-if>
-            <else>
+          <else-if is-numeric="locator">
+            <text macro="author-short"/>
+            <choose>
+              <if disambiguate="true">
+                <text macro="title-and-descriptions-short"/>
+              </if>
+              <else-if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"/>
+              <else>
+                <text macro="title-and-descriptions-short"/>
+              </else>
+            </choose>
+            <text macro="source-locator-subsequent"/>
+          </else-if>
+          <else-if locator="chapter line verse" match="any">
+            <group delimiter=" ">
               <group delimiter=", ">
                 <text macro="author-short"/>
                 <choose>
-                  <if match="none" type="bill hearing legal_case legislation regulation treaty" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
+                  <if disambiguate="true">
                     <text macro="title-and-descriptions-short"/>
                   </if>
-                  <else-if disambiguate="true">
+                  <else-if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"/>
+                  <else>
                     <text macro="title-and-descriptions-short"/>
-                  </else-if>
+                  </else>
                 </choose>
-                <text macro="source-locator-subsequent"/>
               </group>
-            </else>
-          </choose>
-        </if>
-        <else>
-          <group delimiter=", ">
+              <text macro="source-locator-subsequent"/>
+            </group>
+          </else-if>
+          <else>
             <text macro="author-short"/>
             <choose>
-              <if match="none" type="bill hearing legal_case legislation regulation treaty" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
+              <if disambiguate="true">
                 <text macro="title-and-descriptions-short"/>
               </if>
-              <else-if disambiguate="true">
+              <else-if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator"/>
+              <else>
                 <text macro="title-and-descriptions-short"/>
-              </else-if>
+              </else>
             </choose>
             <text macro="source-locator-subsequent"/>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
     </layout>
   </citation>
   <!-- Bibliography -->
@@ -3817,14 +4118,11 @@
             </else-if>
           </choose>
         </else-if>
-        <else-if match="any" type="interview personal_communication">
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <!-- Personal communications only appear in the bibliography if the reader can retrieve them (CMOS18 14.13, 14.111) -->
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
+        <!-- Personal communications only appear in the bibliography if the reader can retrieve them (CMOS18 14.13, 14.111) -->
+        <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+          <text macro="bibliography-notes"/>
         </else-if>
+        <else-if match="any" type="interview personal_communication"/>
         <else>
           <text macro="bibliography-notes"/>
         </else>