csl-styles 2.0.2 → 2.1.0

data/vendor/styles/new-harts-rules-notes-publisher.csl

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" demote-non-dropping-particle="display-and-sort" et-al-min="4" et-al-use-first="1" page-range-format="minimal" version="1.0" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" demote-non-dropping-particle="display-and-sort" et-al-min="4" et-al-use-first="1" initialize-with=". " page-range-format="minimal" version="1.0" default-locale="en-GB">
   <!-- 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>New Hart's Rules: The Oxford Style Guide 2nd edition (notes, publisher)</title>
-    <title-short>NHR (notes, publisher [18.2.10])</title-short>
+    <title-short>NHR (notes [17.2], publisher [18.2.10])</title-short>
     <id>http://www.zotero.org/styles/new-harts-rules-notes-publisher</id>
     <link href="http://www.zotero.org/styles/new-harts-rules-notes-publisher" rel="self"/>
     <link href="http://www.zotero.org/styles/new-harts-rules-notes" rel="template"/>
     <link href="https://en.wikipedia.org/wiki/Hart's_Rules" rel="documentation"/>
+    <link href="http://zotero.org/groups/2205533/collections/499SCKUW" rel="documentation"/>
     <author>
       <name>Andrew Dunning</name>
       <uri>https://orcid.org/0000-0003-0464-5036</uri>
@@ -28,8 +29,8 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Oxford source citations, notes system, including publisher (NHR 18.2.10)</summary>
-    <updated>2025-11-05T00:00:00+00:00</updated>
+    <summary>Oxford source citations, notes system, publisher name (NHR 18.2.10)</summary>
+    <updated>2026-02-05T00: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">
@@ -63,7 +64,7 @@
   <!-- This file's main source is the New Oxford Style Manual (2016), with reference also to the Oxford Style Manual (2003) <https://archive.org/details/oxfordstylemanua0000unse>, which provides more detailed guidance on many points. -->
   <!-- Contents:
     
-       This file interprets New Hart's Rules using APA's four basic reference elements:
+       This file interprets Oxford style using APA's four basic reference elements:
 
         1. Author
         2. Date (author-date system only)
@@ -139,6 +140,19 @@
       <text variable="chapter-number"/>
     </group>
   </macro>
+  <macro name="label-chapter-number-long-capitalized">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="chapter-number" type="song">
+          <text text-case="capitalize-first" value="track"/>
+        </if>
+        <else-if is-numeric="chapter-number">
+          <label text-case="capitalize-first" variable="chapter-number"/>
+        </else-if>
+      </choose>
+      <text variable="chapter-number"/>
+    </group>
+  </macro>
   <macro name="label-edition">
     <group delimiter=" ">
       <choose>
@@ -147,22 +161,18 @@
           <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 (cf. CMOS18 14.89) -->
+          <!-- serial types: full label (cf. 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>
           <text variable="edition"/>
@@ -178,24 +188,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 (cf. CMOS18 14.89) -->
+          <!-- serial types: full label (cf. 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>
@@ -291,10 +298,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>
@@ -312,29 +323,31 @@
     </group>
   </macro>
   <macro name="label-volume">
-    <!-- label a volume by rendering it in Roman numerals (NHR 18.2.7) -->
-    <choose>
-      <if is-numeric="volume">
-        <number form="roman" variable="volume"/>
-      </if>
-      <else>
-        <text variable="volume"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="volume">
+          <label form="short" variable="volume"/>
+        </if>
+      </choose>
+      <text variable="volume"/>
+    </group>
+    <!-- in OGS and other styles, label a volume by rendering it in Roman numerals (NHR 18.2.7): -->
+    <!-- <choose><if is-numeric="volume"><number form="roman" variable="volume"/></if><else><text variable="volume"/></else></choose>-->
   </macro>
   <!-- 1. Author -->
   <macro name="author-bib">
     <group delimiter=", ">
       <names variable="composer">
-        <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" name-as-sort-order="first"/>
+        <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" initialize="false" name-as-sort-order="first"/>
         <!-- for OGS: -->
-        <!-- <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" font-variant="small-caps" name-as-sort-order="first"/> -->
-        <!-- <et-al font-variant="normal"/> -->
+        <!-- <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" font-variant="small-caps" initialize="false" name-as-sort-order="first"/><et-al font-variant="normal"/>-->
         <label form="short" prefix=", "/>
+        <!-- for OGS or variants with bracketed roles: -->
+        <!-- <label form="short" prefix=" (" suffix=")"/> -->
         <substitute>
           <names variable="author"/>
-          <names variable="host"/>
           <names variable="guest"/>
+          <names variable="host"/>
           <choose>
             <if type="song">
               <names variable="performer"/>
@@ -369,8 +382,8 @@
           </choose>
           <names variable="curator"/>
           <choose>
-            <if type="software">
-              <!-- `software` listed under the name of the publisher or developer (NHR 18.8.5) -->
+            <if match="any" type="software webpage">
+              <!-- list under a publisher, developer, or owner/sponsor name (NHR 18.8.1-5) -->
               <text variable="publisher"/>
             </if>
             <else-if type="standard">
@@ -378,16 +391,19 @@
               <text variable="authority"/>
             </else-if>
           </choose>
-          <text macro="author-title-substitute"/>
           <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"/>
-                </if>
-              </choose>
+            <if type="webpage">
+              <!-- website title substituted if no `publisher` (NHR 18.8.1-5) -->
+              <text text-case="title" variable="container-title"/>
             </if>
           </choose>
+          <text macro="author-title-substitute"/>
+          <choose>
+            <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"/>
+            </else-if>
+          </choose>
         </substitute>
       </names>
     </group>
@@ -395,8 +411,10 @@
   <macro name="author-note">
     <group delimiter=", ">
       <names variable="composer">
-        <name delimiter-precedes-last="contextual"/>
+        <name initialize="false"/>
         <label form="short" prefix=", "/>
+        <!-- for OGS or variants with bracketed roles: -->
+        <!-- <label form="short" prefix=" (" suffix=")"/> -->
         <substitute>
           <names variable="author"/>
           <names variable="guest"/>
@@ -414,15 +432,12 @@
           </choose>
           <names variable="illustrator"/>
           <choose>
-            <!-- In multivolume works, notes list editors after the title of the part for which they are responsible (cf. 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>
+            <if match="none" type="standard">
               <names variable="editor-translator"/>
               <names variable="editor"/>
               <names variable="translator"/>
               <names variable="collection-editor"/>
-            </else>
+            </if>
           </choose>
           <names variable="director"/>
           <choose>
@@ -449,8 +464,8 @@
           </choose>
           <names variable="curator"/>
           <choose>
-            <if type="software">
-              <!-- `software` listed under the name of the publisher or developer (NHR 18.8.5) -->
+            <if match="any" type="software webpage">
+              <!-- list under a publisher, developer, or owner/sponsor name (NHR 18.8.1-5) -->
               <text variable="publisher"/>
             </if>
             <else-if type="standard">
@@ -459,14 +474,18 @@
             </else-if>
           </choose>
           <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"/>
-                </if>
-              </choose>
+            <if type="webpage">
+              <!-- website title substituted if no `publisher` (NHR 18.8.1-5) -->
+              <text text-case="title" variable="container-title"/>
             </if>
           </choose>
+          <text macro="author-title-substitute"/>
+          <choose>
+            <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"/>
+            </else-if>
+          </choose>
         </substitute>
       </names>
     </group>
@@ -478,7 +497,7 @@
       </if>
       <else>
         <names variable="composer">
-          <name form="short"/>
+          <name form="short" initialize="true"/>
           <substitute>
             <names variable="author"/>
             <names variable="guest"/>
@@ -496,15 +515,12 @@
             </choose>
             <names variable="illustrator"/>
             <choose>
-              <!-- In multivolume works, notes list editors after the title of the part for which they are responsible (cf. 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>
+              <if match="none" type="standard">
                 <names variable="editor-translator"/>
                 <names variable="editor"/>
                 <names variable="translator"/>
                 <names variable="collection-editor"/>
-              </else>
+              </if>
             </choose>
             <names variable="director"/>
             <choose>
@@ -531,24 +547,27 @@
             </choose>
             <names variable="curator"/>
             <choose>
-              <if type="software">
-                <!-- `software` listed under the name of the publisher or developer (NHR 18.8.5) -->
-                <text variable="publisher"/>
+              <if match="any" type="software webpage">
+                <!-- list under a publisher, developer, or owner/sponsor name (NHR 18.8.1-5) -->
+                <text form="short" variable="publisher"/>
               </if>
               <else-if type="standard">
                 <!-- `standard` listed in bibliography under organization, but note omits this (cf. CMOS18 14.159) -->
-                <text variable="authority"/>
+                <text form="short" variable="authority"/>
               </else-if>
             </choose>
             <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-short"/>
-                  </if>
-                </choose>
+              <if type="webpage">
+                <!-- website title substituted if no `publisher` (NHR 18.8.1-5) -->
+                <text form="short" text-case="title" variable="container-title"/>
               </if>
             </choose>
+            <choose>
+              <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-short"/>
+              </else-if>
+            </choose>
           </substitute>
         </names>
       </else>
@@ -558,42 +577,63 @@
   <macro name="author-short-and-recipient">
     <group delimiter=" ">
       <choose>
-        <!-- Inaccessible personal commmunication is cited in-text (cf. CMOS18 14.111) -->
+        <!-- inaccessible `interview` or `personal_commmunication`: in-text citation (NHR 17.3.2, cf. 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">
-              <names variable="recipient">
-                <label form="verb-short" suffix=" "/>
-                <name/>
+            <if position="first">
+              <!-- at the first citation in shortened forms, give the full name -->
+              <names variable="author">
+                <name initialize="false"/>
+                <!-- never initialize -->
+                <substitute>
+                  <text macro="title-and-descriptions-short"/>
+                </substitute>
               </names>
             </if>
+            <else>
+              <names variable="author">
+                <name 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 initialize="false"/>
+                <!-- never initialize -->
+              </names>
+            </else-if>
+            <else>
+              <names variable="recipient">
+                <label form="verb" suffix=" "/>
+                <name 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 form="short"/>
+            <name form="short" initialize="true"/>
           </names>
           <choose>
             <if match="none" variable="genre">
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name form="short"/>
+                <name form="short" initialize="true"/>
               </names>
             </if>
           </choose>
         </else-if>
         <else>
           <names variable="author">
-            <name form="short"/>
+            <name form="short" initialize="true"/>
             <substitute>
               <text macro="title-and-descriptions-short"/>
             </substitute>
@@ -622,8 +662,11 @@
         <text macro="title"/>
       </else-if>
       <else>
-        <!-- If an item has no `title`, substitute with descriptions. -->
-        <text macro="title-and-descriptions"/>
+        <!-- if an item has no `title`, substitute with descriptions and capitalize -->
+        <group delimiter=", ">
+          <text macro="description-capitalized"/>
+          <text macro="identifier"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -647,74 +690,75 @@
         <text macro="title-short"/>
       </else-if>
       <else>
-        <!-- If an item has no `title`, substitute with descriptions and capitalize -->
-        <text macro="title-and-descriptions"/>
+        <!-- if an item has no `title`, substitute with descriptions and capitalize -->
+        <group delimiter=", ">
+          <text macro="description-capitalized"/>
+          <text macro="identifier"/>
+        </group>
       </else>
     </choose>
   </macro>
   <!-- 2. Date -->
   <macro name="date-short">
-    <choose>
-      <if variable="issued">
-        <group delimiter=" ">
-          <text macro="date-original-year" prefix="[" suffix="]"/>
-          <group>
-            <choose>
-              <if match="any" type="interview personal_communication">
-                <choose>
-                  <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-                    <!-- These variables indicate that the communication is retrievable by the reader. If not, then use the in-text-only personal communication format -->
-                    <text macro="date-issued-full"/>
-                  </if>
-                  <else>
-                    <text macro="date-issued-year"/>
-                  </else>
-                </choose>
-              </if>
-              <else>
-                <text macro="date-issued-year"/>
-              </else>
-            </choose>
-            <text variable="year-suffix"/>
+    <group delimiter="-">
+      <choose>
+        <if variable="issued">
+          <group delimiter=" ">
+            <text macro="date-original-year" prefix="[" suffix="]"/>
+            <group>
+              <choose>
+                <if match="none" type="interview personal_communication">
+                  <text macro="date-issued-year"/>
+                </if>
+                <!-- accessible `interview` or `personal_communication` items appear in the bibliography; inaccessible items are in-text only -->
+                <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+                  <text macro="date-issued-year"/>
+                </else-if>
+                <else>
+                  <text macro="date-issued-full"/>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
           </group>
-        </group>
-      </if>
-      <else-if variable="available-date">
-        <date date-parts="year" form="text" variable="available-date"/>
-      </else-if>
-      <else-if variable="event-date">
-        <text macro="date-event-year"/>
-      </else-if>
-      <else-if variable="status">
-        <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
-        <text text-case="lowercase" variable="status"/>
-        <text prefix="-" variable="year-suffix"/>
-      </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">
-            <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
-            <text form="short" term="no date"/>
-          </if>
-        </choose>
-        <text prefix="-" variable="year-suffix"/>
-      </else-if>
-      <else-if match="any" type="classic collection entry entry-dictionary entry-encyclopedia manuscript">
-        <!-- do not give n.d. for archival collections (cf. CMOS18 14.128), `classic` (cf. 14.143), manuscripts (NHR 18.6.2), or reference entries (cf. 14.131) -->
-        <text prefix="-" variable="year-suffix"/>
-      </else-if>
-      <else>
-        <text form="short" term="no date"/>
-        <text prefix="-" variable="year-suffix"/>
-      </else>
-    </choose>
+        </if>
+        <else-if variable="available-date">
+          <date date-parts="year" form="numeric" variable="available-date"/>
+        </else-if>
+        <else-if variable="event-date">
+          <text macro="date-event-year"/>
+        </else-if>
+        <else-if variable="status">
+          <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
+          <text text-case="lowercase" variable="status"/>
+          <text variable="year-suffix"/>
+        </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">
+              <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
+              <text form="short" term="no date"/>
+              <text variable="year-suffix"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if match="any" type="classic collection entry entry-dictionary entry-encyclopedia manuscript">
+          <!-- do not give n.d. for archival collections (cf. CMOS18 14.128), `classic` (cf. 14.143), manuscripts (NHR 18.6.2), or reference entries (cf. 14.131) -->
+          <text variable="year-suffix"/>
+        </else-if>
+        <else>
+          <text form="short" term="no date"/>
+          <text variable="year-suffix"/>
+        </else>
+      </choose>
+    </group>
   </macro>
   <!-- Date elements -->
   <macro name="date-event-full">
     <choose>
       <if is-uncertain-date="issued">
         <choose>
-          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard">
+          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
             <group prefix="[" suffix="]">
               <date form="text" suffix="?" variable="event-date"/>
             </group>
@@ -733,18 +777,18 @@
     <choose>
       <if is-uncertain-date="issued">
         <choose>
-          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard">
+          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
             <group prefix="[" suffix="]">
-              <date date-parts="year" form="text" suffix="?" variable="event-date"/>
+              <date date-parts="year" form="numeric" suffix="?" variable="event-date"/>
             </group>
           </if>
           <else>
-            <date date-parts="year" form="text" suffix="?" variable="event-date"/>
+            <date date-parts="year" form="numeric" suffix="?" variable="event-date"/>
           </else>
         </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="event-date"/>
+        <date date-parts="year" form="numeric" variable="event-date"/>
       </else>
     </choose>
   </macro>
@@ -773,16 +817,16 @@
         <choose>
           <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
             <group prefix="[" suffix="]">
-              <date date-parts="year" form="text" suffix="?" variable="issued"/>
+              <date date-parts="year" form="numeric" suffix="?" variable="issued"/>
             </group>
           </if>
           <else>
-            <date date-parts="year" form="text" suffix="?" variable="issued"/>
+            <date date-parts="year" form="numeric" suffix="?" variable="issued"/>
           </else>
         </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <date date-parts="year" form="numeric" variable="issued"/>
       </else>
     </choose>
   </macro>
@@ -830,16 +874,16 @@
         <choose>
           <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
             <group prefix="[" suffix="]">
-              <date date-parts="year" form="text" suffix="?" variable="original-date"/>
+              <date date-parts="year" form="numeric" suffix="?" variable="original-date"/>
             </group>
           </if>
           <else>
-            <date date-parts="year" form="text" suffix="?" variable="original-date"/>
+            <date date-parts="year" form="numeric" suffix="?" variable="original-date"/>
           </else>
         </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="original-date"/>
+        <date date-parts="year" form="numeric" variable="original-date"/>
       </else>
     </choose>
   </macro>
@@ -862,7 +906,7 @@
       </else>
     </choose>
   </macro>
-  <!-- 3. Title and descriptions (cf. CMOS18 13.87–101) -->
+  <!-- 3. Title and descriptions (cf. CMOS18 13.87-101) -->
   <macro name="title-and-descriptions">
     <group delimiter=", ">
       <choose>
@@ -884,10 +928,10 @@
         <group delimiter=", ">
           <text macro="title-short"/>
           <choose>
-            <if match="none" type="entry entry-dictionary entry-encyclopedia"/>
-            <else-if match="none" variable="author">
+            <if variable="author"/>
+            <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
               <!-- give container title to distinguish an unsigned reference entry -->
-              <text font-style="italic" variable="container-title"/>
+              <text font-style="italic" form="short" variable="container-title"/>
             </else-if>
           </choose>
         </group>
@@ -915,6 +959,13 @@
                     <text macro="source"/>
                   </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"/>
+                    <text macro="source"/>
+                  </group>
+                </else-if>
                 <else>
                   <text macro="title-and-descriptions"/>
                   <text macro="source"/>
@@ -926,19 +977,22 @@
           </group>
           <choose>
             <!-- Locator for monographic types only; serial locator handled in `source-serial-locator` -->
+            <!-- omit serial 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-monographic-locator"/>
-                  <!-- for OGS: -->
-                  <!-- <text macro="source-monographic-locator-range"/> -->
-                </if>
-              </choose>
+            <else-if match="any" variable="collection-editor compiler editor editorial-director">
+              <!-- monographic types -->
+              <text macro="source-monographic-locator"/>
+              <!-- for styles using Roman volume numbers: -->
+              <!-- <text macro="source-monographic-locator-roman-volume"/> -->
+              <!-- for OGS: -->
+              <!-- <text macro="source-monographic-locator-range"/> -->
             </else-if>
+            <!-- omit serial types -->
+            <else-if match="any" type="interview paper-conference"/>
             <else>
               <text macro="source-monographic-locator"/>
+              <!-- for styles using Roman volume numbers: -->
+              <!-- <text macro="source-monographic-locator-roman-volume"/> -->
               <!-- for OGS: -->
               <!-- <text macro="source-monographic-locator-range"/> -->
             </else>
@@ -954,25 +1008,23 @@
   <macro name="title">
     <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"/>
       </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"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="title-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="title-monographic"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="title-and-part-filter-review"/>
-          </else>
-        </choose>
+        <!-- serial types -->
+        <text macro="title-and-part-filter-review"/>
       </else-if>
       <else>
+        <!-- monographic types -->
         <text macro="title-monographic"/>
       </else>
     </choose>
@@ -1035,7 +1087,7 @@
         <!-- For monographic items without `container-title` and with `volume-title`, append `volume-title` to `title` (APA example 30) -->
         <group delimiter=", ">
           <text macro="title-primary"/>
-          <text macro="title-volume"/>
+          <text macro="title-volume-and-part"/>
         </group>
       </else>
     </choose>
@@ -1070,11 +1122,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 -->
@@ -1179,15 +1255,28 @@
     </choose>
   </macro>
   <macro name="title-volume">
+    <choose>
+      <if type="manuscript">
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="volume-title"/>
+      </if>
+      <else>
+        <!-- Italics, title case -->
+        <text font-style="italic" text-case="title" variable="volume-title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-volume-and-part">
     <group delimiter=", ">
       <group delimiter=": ">
         <choose>
           <!-- negotiate with `source-monographic-locator` -->
-          <if match="any" variable="part-title volume-title">
+          <if match="any" variable="part-number part-title volume-title">
             <text macro="label-volume"/>
           </if>
           <else-if locator="column page" match="any"/>
           <else-if variable="locator">
+            <!-- remove variable="locator" condition for OGS, which prints ranges -->
             <text macro="label-volume"/>
           </else-if>
           <else-if variable="page"/>
@@ -1195,17 +1284,18 @@
             <text macro="label-volume"/>
           </else>
         </choose>
-        <text font-style="italic" text-case="title" variable="volume-title"/>
+        <text macro="title-volume"/>
       </group>
       <!-- `part-number` and `part-title` of monographic items refer to the source book/volume -->
       <group delimiter=": ">
         <choose>
-          <if match="any" variable="part-title volume-title">
+          <if match="any" variable="part-number part-title volume-title">
             <text macro="label-part-number"/>
           </if>
-          <else-if match="none" variable="locator page">
+          <else-if match="any" variable="locator page"/>
+          <else>
             <text macro="label-part-number"/>
-          </else-if>
+          </else>
         </choose>
         <text macro="title-part"/>
       </group>
@@ -1223,30 +1313,95 @@
       <else-if type="personal_communication">
         <text macro="description-letter"/>
       </else-if>
+      <else-if type="song" variable="composer">
+        <text macro="description-song"/>
+      </else-if>
+      <!-- thesis type appears with university name (cf. 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"/>
       </else-if>
       <else-if type="paper-conference">
         <text macro="description-paper-conference"/>
       </else-if>
+      <else-if match="none" variable="container-title">
+        <text macro="description-format"/>
+      </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"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="description-format"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-capitalized">
+    <!-- identical to `description` -->
+    <choose>
+      <if match="any" type="interview" variable="interviewer">
+        <text macro="description-interview-capitalized"/>
+      </if>
+      <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+        <text macro="description-review-capitalized"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="description-letter-capitalized"/>
+      </else-if>
       <else-if type="song" variable="composer">
-        <text macro="description-song"/>
+        <text macro="description-song-capitalized"/>
       </else-if>
       <!-- thesis type appears with university name (cf. 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-capitalized"/>
+      </else-if>
+      <else-if type="paper-conference">
+        <text macro="description-paper-conference-capitalized"/>
+      </else-if>
       <else-if match="none" variable="container-title">
-        <!-- Other description -->
-        <text macro="description-format"/>
+        <text macro="description-format-capitalized"/>
+      </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-capitalized"/>
+          </if>
+        </choose>
       </else-if>
       <else>
-        <text macro="description-generic"/>
+        <text macro="description-format-capitalized"/>
       </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"/>
+              </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"/>
@@ -1255,19 +1410,16 @@
         <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>
         <text macro="description-format-short"/>
@@ -1281,90 +1433,95 @@
       <else-if variable="genre">
         <text variable="genre"/>
       </else-if>
-      <else-if type="manuscript">
-        <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+      <else-if variable="chapter-number title"/>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number-long"/>
+      </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` (cf. CMOS18 14.114) -->
+        <text term="manuscript"/>
       </else-if>
       <else-if type="personal_communication">
         <!-- 'personal communication' if no `genre` (cf. 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-capitalized">
+    <choose>
+      <if variable="genre number"/>
+      <else-if variable="genre">
+        <text text-case="capitalize-first" variable="genre"/>
       </else-if>
       <else-if variable="chapter-number title"/>
       <else-if variable="chapter-number">
-        <text macro="label-chapter-number-long"/>
+        <text macro="label-chapter-number-long-capitalized"/>
+      </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` (cf. CMOS18 14.114) -->
+        <text term="manuscript" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <!-- 'personal communication' if no `genre` (cf. CMOS18 14.111) -->
+        <text term="personal-communication" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="description-format-short">
     <group delimiter=" ">
       <choose>
-        <if variable="container-title genre">
-          <text variable="genre"/>
+        <if type="chapter" variable="container-title genre">
+          <!-- untitled introductions, based on review model (cf. CMOS18 14.101, MHRA4 7.12) -->
+          <text form="short" variable="genre"/>
           <choose>
-            <if disambiguate="true">
-              <!-- disambiguate items with an identical `genre` (e.g. 'introduction') -->
-              <text term="in"/>
-              <text font-style="italic" text-case="title" variable="container-title"/>
+            <if match="none" position="ibid ibid-with-locator">
+              <!-- leave out title in repeated references -->
+              <text macro="source-monographic-preposition"/>
+              <text font-style="italic" form="short" text-case="title" variable="container-title"/>
             </if>
           </choose>
         </if>
-        <else-if variable="genre">
-          <text variable="genre"/>
-        </else-if>
-        <else-if variable="medium">
-          <text variable="medium"/>
-        </else-if>
-        <else-if type="manuscript">
-          <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
+        <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" variable="archive archive-place container-title DOI number publisher references URL">
-              <text term="manuscript"/>
+            <if match="none" position="ibid ibid-with-locator">
+              <text macro="source-monographic-preposition"/>
+              <text font-style="italic" form="short" text-case="title" variable="volume-title"/>
             </if>
           </choose>
         </else-if>
-        <else-if type="personal_communication">
-          <!-- 'pers. comm.' if no `genre` (cf. 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 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="label-chapter-number"/>
           <text term="in"/>
-          <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 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` (cf. CMOS18 14.114) -->
+          <text term="manuscript"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- 'pers. comm.' if no `genre` (cf. CMOS18 14.111) -->
+          <text form="short" term="personal-communication"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="description-generic">
-    <!-- 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"/>
-          </if>
-        </choose>
-      </if>
-      <else-if match="none" type="document report software standard">
-        <text macro="description-format"/>
-      </else-if>
-    </choose>
-  </macro>
   <macro name="description-interview">
     <group delimiter=", ">
       <choose>
@@ -1372,7 +1529,7 @@
           <!-- `genre` printed with `number` -->
           <names variable="interviewer">
             <label form="verb" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </if>
         <else-if variable="genre">
@@ -1380,14 +1537,16 @@
             <text variable="genre"/>
             <group delimiter=" ">
               <text form="verb" term="container-author"/>
-              <names variable="interviewer"/>
+              <names variable="interviewer">
+                <name initialize="false"/>
+              </names>
             </group>
           </group>
         </else-if>
         <else-if variable="interviewer">
           <names variable="interviewer">
             <label form="verb" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </else-if>
         <else>
@@ -1397,12 +1556,46 @@
       <text macro="source-event-place-first"/>
     </group>
   </macro>
+  <macro name="description-interview-capitalized">
+    <group delimiter=", ">
+      <choose>
+        <if variable="genre number">
+          <!-- `genre` printed with `number` -->
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name initialize="false"/>
+          </names>
+        </if>
+        <else-if variable="genre">
+          <group delimiter=" ">
+            <text text-case="capitalize-first" variable="genre"/>
+            <group delimiter=" ">
+              <text form="verb" term="container-author"/>
+              <names variable="interviewer">
+                <name initialize="false"/>
+              </names>
+            </group>
+          </group>
+        </else-if>
+        <else-if variable="interviewer">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name initialize="false"/>
+          </names>
+        </else-if>
+        <else>
+          <text macro="description-format-capitalized"/>
+        </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/>
+          <name form="short" initialize="true"/>
           <substitute>
             <text macro="description-format-short"/>
           </substitute>
@@ -1410,12 +1603,12 @@
       </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"/>
+          <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"/>
           </else>
         </choose>
       </else-if>
@@ -1434,7 +1627,7 @@
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name initialize="false"/>
               </names>
             </if>
             <else>
@@ -1442,7 +1635,7 @@
                 <text macro="description-format"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name/>
+                  <name initialize="false"/>
                 </names>
               </group>
             </else>
@@ -1456,6 +1649,37 @@
       </else>
     </choose>
   </macro>
+  <macro name="description-letter-capitalized">
+    <choose>
+      <if variable="recipient">
+        <group delimiter=", ">
+          <choose>
+            <if variable="genre number">
+              <!-- `genre` appears with `number` -->
+              <names variable="recipient">
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name initialize="false"/>
+              </names>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text macro="description-format-capitalized"/>
+                <names variable="recipient">
+                  <label form="verb" suffix=" "/>
+                  <name initialize="false"/>
+                </names>
+              </group>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+          <text macro="date-event-full"/>
+        </group>
+      </if>
+      <else>
+        <text macro="description-format-capitalized"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="description-letter-short">
     <!-- shortened notes ideally give author, recipient, place, and date (cf. CMOS18 14.13) -->
     <group delimiter=", ">
@@ -1465,7 +1689,7 @@
             <text macro="description-format-short"/>
             <names variable="recipient">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name form="short" initialize="true"/>
             </names>
           </group>
         </if>
@@ -1474,17 +1698,39 @@
         </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">
     <choose>
-      <if match="any" variable="collection-editor container-author editor editorial-director">
-        <!-- monographic usage -->
-        <text macro="description-generic"/>
+      <if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="description-format"/>
+      </if>
+      <else>
+        <!-- serial types -->
+        <group delimiter=", ">
+          <text macro="description-serial"/>
+          <text macro="source-event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-paper-conference-capitalized">
+    <choose>
+      <if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="description-format"/>
       </if>
       <else>
-        <!-- serial usage -->
+        <!-- serial types -->
         <group delimiter=", ">
           <text macro="description-serial"/>
           <text macro="source-event"/>
@@ -1505,18 +1751,10 @@
           </else>
         </choose>
         <group delimiter=", ">
-          <names variable="reviewed-author"/>
-          <choose>
-            <if match="any" variable="reviewed-genre reviewed-title">
-              <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title -->
-              <!-- Adapt for `reviewed-container-title` or similar if it becomes available -->
-              <text font-style="italic" text-case="title" variable="reviewed-title"/>
-            </if>
-            <else>
-              <!-- Assume title is title of reviewed work -->
-              <text font-style="italic" text-case="title" variable="title"/>
-            </else>
-          </choose>
+          <names variable="reviewed-author">
+            <name initialize="false"/>
+          </names>
+          <text macro="description-review-title"/>
           <text variable="reviewed-genre"/>
         </group>
         <text macro="source-event-place-first" prefix="(" suffix=")"/>
@@ -1524,22 +1762,69 @@
       <text macro="label-section"/>
     </group>
   </macro>
-  <macro name="description-review-short">
-    <group delimiter=" ">
-      <text term="review-of"/>
-      <choose>
-        <if match="any" variable="reviewed-genre reviewed-title">
-          <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title -->
-          <!-- Adapt for `reviewed-container-title` or similar if it becomes available -->
-          <text font-style="italic" form="short" text-case="title" variable="reviewed-title"/>
-        </if>
-        <else>
-          <!-- Assume title is title of reviewed work -->
-          <text font-style="italic" form="short" text-case="title" variable="title"/>
-        </else>
-      </choose>
+  <macro name="description-review-capitalized">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="genre">
+            <!-- assume that `genre` is entered as 'Review of the book' or similar -->
+            <text text-case="capitalize-first" variable="genre"/>
+          </if>
+          <else>
+            <text term="review-of" text-case="capitalize-first"/>
+          </else>
+        </choose>
+        <group delimiter=", ">
+          <names variable="reviewed-author">
+            <name initialize="false"/>
+          </names>
+          <text macro="description-review-title"/>
+          <text variable="reviewed-genre"/>
+        </group>
+        <text macro="source-event-place-first" prefix="(" suffix=")"/>
+      </group>
+      <text macro="label-section"/>
     </group>
   </macro>
+  <macro name="description-review-short">
+    <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-title">
+    <choose>
+      <if match="any" variable="reviewed-genre reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title -->
+        <!-- Adapt for `reviewed-container-title` or similar if it becomes available -->
+        <text font-style="italic" text-case="title" variable="reviewed-title"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text font-style="italic" text-case="title" variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-review-title-short">
+    <choose>
+      <if match="any" variable="reviewed-genre reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title -->
+        <!-- Adapt for `reviewed-container-title` or similar if it becomes available -->
+        <text font-style="italic" form="short" text-case="title" variable="reviewed-title"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="description-serial">
     <group delimiter=", ">
       <text macro="description-format"/>
@@ -1547,6 +1832,13 @@
       <text macro="label-section"/>
     </group>
   </macro>
+  <macro name="description-serial-capitalized">
+    <group delimiter=", ">
+      <text macro="description-format-capitalized"/>
+      <!-- `section` provides magazine departments (cf. CMOS18 14.88) and newspaper column names (cf. CMOS18 14.93) -->
+      <text macro="label-section"/>
+    </group>
+  </macro>
   <macro name="description-serial-short">
     <choose>
       <if variable="title"/>
@@ -1554,7 +1846,7 @@
         <text macro="description-format-short"/>
       </else-if>
       <else>
-        <text variable="section"/>
+        <text form="short" text-case="title" variable="section"/>
       </else>
     </choose>
   </macro>
@@ -1570,7 +1862,26 @@
         </if>
       </choose>
       <names variable="author">
-        <name delimiter-precedes-last="always"/>
+        <name delimiter-precedes-last="always" initialize="false"/>
+        <substitute>
+          <names variable="performer"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="description-song-capitalized">
+    <!-- Performer of classical music works -->
+    <!-- TODO: remove when Zotero fixes mapping of performer to `author` -->
+    <group delimiter=" ">
+      <!-- Based on `description-format` macro -->
+      <choose>
+        <if variable="genre">
+          <text text-case="capitalize-first" variable="genre"/>
+          <text form="verb" term="performer"/>
+        </if>
+      </choose>
+      <names variable="author">
+        <name delimiter-precedes-last="always" initialize="false"/>
         <substitute>
           <names variable="performer"/>
         </substitute>
@@ -1588,7 +1899,7 @@
           <text macro="identifier-report"/>
         </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` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
           <text macro="identifier-number"/>
           <text macro="label-version"/>
           <text macro="identifier-edition"/>
@@ -1624,17 +1935,11 @@
       <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="identifier-contributors-serial"/>
       </if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="identifier-contributors-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="identifier-contributors-monographic"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="identifier-contributors-serial"/>
-          </else>
-        </choose>
+        <text macro="identifier-contributors-serial"/>
       </else-if>
       <else>
         <text macro="identifier-contributors-monographic"/>
@@ -1645,149 +1950,190 @@
     <group delimiter=", ">
       <choose>
         <if match="any" type="post webpage">
-          <group delimiter=", ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="editor-translator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="editor translator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="editorial-director">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="guest">
-              <label form="verb" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="host">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="illustrator narrator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="compiler chair organizer curator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="series-creator executive-producer">
-              <label form="verb" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="producer">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="director">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="performer">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <choose>
-              <if type="thesis"/>
-              <else>
-                <names variable="contributor">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-              </else>
-            </choose>
-          </group>
+          <names variable="container-author">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="editor-translator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="editor translator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if variable="collection-editor editor"/>
+            <else-if variable="collection-editor editor-translator"/>
+            <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+              <names variable="collection-editor">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </else-if>
+          </choose>
+          <names variable="editorial-director">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="guest">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="illustrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="compiler">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="chair organizer curator">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="series-creator executive-producer">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="director">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="performer">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" type="thesis">
+              <names variable="contributor">
+                <label form="verb" suffix=" "/>
+                <name 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-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editor-translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names delimiter=", " variable="editor translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editorial-director">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="guest">
-                  <label form="verb" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="host">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-              </if>
-            </choose>
-            <names delimiter=", " variable="illustrator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="narrator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <choose>
-              <if match="none" variable="container-title">
-                <names delimiter=", " variable="compiler chair organizer curator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names delimiter=", " variable="series-creator executive-producer">
-                  <label form="verb" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="producer">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="director">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="performer">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <choose>
-                  <if type="song"/>
-                  <else-if type="thesis"/>
-                  <else>
-                    <names variable="contributor">
-                      <label form="verb-short" suffix=" "/>
-                      <name/>
-                    </names>
-                  </else>
-                </choose>
-              </if>
-            </choose>
-            <choose>
-              <if type="song">
-                <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
-                <names variable="contributor">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-              </if>
-            </choose>
-          </group>
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="container-author">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="editor-translator">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names delimiter=", " variable="editor translator">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <choose>
+                <if variable="collection-editor editor"/>
+                <else-if variable="collection-editor editor-translator"/>
+                <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+                  <names variable="collection-editor">
+                    <label form="verb-short" suffix=" "/>
+                    <name initialize="false"/>
+                  </names>
+                </else-if>
+              </choose>
+              <names variable="editorial-director">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="guest">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="host">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="illustrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="compiler">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names delimiter=", " variable="chair organizer curator">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names delimiter=", " variable="series-creator executive-producer">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="producer">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="director">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <choose>
+                <if match="any" type="broadcast performance">
+                  <names variable="script-writer">
+                    <label form="verb" suffix=" "/>
+                    <name initialize="false"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="performer">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <choose>
+                <if match="none" type="song thesis">
+                  <names variable="contributor">
+                    <label form="verb" suffix=" "/>
+                    <name initialize="false"/>
+                  </names>
+                </if>
+              </choose>
+            </if>
+          </choose>
+          <choose>
+            <if type="song">
+              <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
+              <names variable="contributor">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </if>
+          </choose>
         </else>
       </choose>
     </group>
@@ -1798,34 +2144,42 @@
         <if type="periodical">
           <names variable="editor">
             <label form="verb-short" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </if>
       </choose>
-      <names delimiter=", " variable="translator narrator">
+      <names variable="translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
-      <names delimiter=", " variable="compiler chair organizer curator">
+      <names variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
+      </names>
+      <names variable="compiler">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
+      </names>
+      <names delimiter=", " variable="chair organizer curator">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="producer">
         <!-- not abbreviated (cf. CMOS18 14.168) -->
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="director">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
     </group>
   </macro>
@@ -1836,7 +2190,7 @@
       </if>
       <!-- critical editions or original date require placement in brackets -->
       <else-if match="any" type="classic" variable="original-date"/>
-      <else-if variable="editor">
+      <else-if match="any" variable="collection-editor editor editorial-director">
         <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
         <text macro="label-edition"/>
       </else-if>
@@ -1913,37 +2267,35 @@
   </macro>
   <macro name="identifier-volume">
     <choose>
-      <if match="none" variable="part-number part-title volume volume-title">
+      <!-- notes show the number of volumes only when not referring to a specific volume -->
+      <if match="any" variable="part-number part-title volume volume-title"/>
+      <!-- unlike Chicago, display the number of volumes with a locator (NHR 18.2.7) -->
+      <else>
         <text macro="label-number-of-volumes"/>
-      </if>
+      </else>
     </choose>
   </macro>
   <!-- 4. Source -->
   <macro name="source">
-    <group delimiter=", ">
-      <choose>
-        <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- Serial items -->
-          <text macro="source-serial"/>
-        </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"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text macro="source-serial"/>
-            </else>
-          </choose>
-        </else-if>
-        <else-if match="any" type="patent post webpage"/>
-        <else>
-          <text macro="source-monographic"/>
-        </else>
-      </choose>
-    </group>
+    <choose>
+      <if type="patent"/>
+      <else-if match="any" type="post webpage">
+        <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
+        <text text-case="title" variable="container-title"/>
+      </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <text macro="source-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="source-monographic"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <text macro="source-serial"/>
+      </else-if>
+      <else>
+        <text macro="source-monographic"/>
+      </else>
+    </choose>
   </macro>
   <!-- 4.1. Serial sources -->
   <macro name="source-serial">
@@ -1963,27 +2315,20 @@
         </else-if>
         <else-if type="interview" variable="publisher">
           <!-- publisher possible with `interview` (NHR 18.7.3) -->
-          <group delimiter=", ">
-            <text macro="source-serial-title"/>
-            <group delimiter=" ">
-              <text variable="publisher"/>
-              <text macro="source-serial-identifier"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if variable="interviewer publisher">
-          <group delimiter=", ">
-            <text macro="source-serial-title"/>
-            <group delimiter=" ">
-              <text variable="publisher"/>
-              <text macro="source-serial-identifier"/>
-            </group>
+          <text macro="source-serial-title"/>
+          <group delimiter=" ">
+            <text variable="publisher"/>
+            <text macro="source-serial-identifier"/>
+            <!-- for author-date: -->
+            <!-- <text macro="source-serial-identifier-author-date"/> -->
           </group>
         </else-if>
         <else>
           <group delimiter=" ">
             <text macro="source-serial-title"/>
             <text macro="source-serial-identifier"/>
+            <!-- for author-date: -->
+            <!-- <text macro="source-serial-identifier-author-date"/> -->
           </group>
         </else>
       </choose>
@@ -1991,16 +2336,14 @@
   </macro>
   <!-- Serial source title -->
   <macro name="source-serial-name">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <text font-style="italic" text-case="title" variable="container-title"/>
-        <choose>
-          <!-- TODO: remove conditional when Zotero stops double-mapping `event-place` and `publisher-place` -->
-          <if match="none" variable="event-date event-title">
-            <text prefix="(" suffix=")" variable="publisher-place"/>
-          </if>
-        </choose>
-      </group>
+    <group delimiter=" ">
+      <text font-style="italic" text-case="title" variable="container-title"/>
+      <choose>
+        <!-- TODO: remove conditional when Zotero stops double-mapping `event-place` and `publisher-place` -->
+        <if match="none" variable="event-date event-title">
+          <text prefix="(" suffix=")" variable="publisher-place"/>
+        </if>
+      </choose>
     </group>
   </macro>
   <macro name="source-serial-title">
@@ -2045,7 +2388,7 @@
             <text term="in"/>
             <group delimiter=", ">
               <text macro="source-monographic-author"/>
-              <text font-style="italic" text-case="title" variable="volume-title"/>
+              <text macro="title-volume"/>
             </group>
           </group>
         </group>
@@ -2086,6 +2429,8 @@
                 </if>
                 <else>
                   <text variable="volume"/>
+                  <!-- for serial Roman volume numbers: -->
+                  <!-- <text macro="label-volume"/> -->
                   <text macro="label-issue"/>
                 </else>
               </choose>
@@ -2131,7 +2476,16 @@
         <group delimiter=", ">
           <text macro="label-locator"/>
           <!-- `number` is an article ID (cf. CMOS18 14.71) -->
-          <text macro="label-number-article"/>
+          <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 macro="label-number-article"/>
+            </if>
+            <else-if variable="archive"/>
+            <else>
+              <text macro="label-number-article"/>
+            </else>
+          </choose>
         </group>
       </if>
       <else>
@@ -2184,8 +2538,10 @@
   <macro name="source-monographic-author">
     <!-- based on `author-note` -->
     <names variable="container-author">
-      <name delimiter-precedes-last="contextual"/>
+      <name initialize="false"/>
       <label form="short" prefix=", "/>
+      <!-- for OGS or variants with bracketed roles: -->
+      <!-- <label form="short" prefix=" (" suffix=")"/> -->
       <substitute>
         <names variable="author"/>
         <names variable="guest"/>
@@ -2234,29 +2590,25 @@
   <macro name="source-monographic-title">
     <group delimiter=", ">
       <text font-style="italic" text-case="title" variable="container-title"/>
-      <text macro="title-volume"/>
+      <text macro="title-volume-and-part"/>
     </group>
   </macro>
   <!-- Monographic source description -->
   <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"/>
-          </if>
-        </choose>
-      </if>
-      <else-if type="software">
+      <if type="software">
         <!-- For entries in mobile app reference works, place description after `container-title` -->
         <text macro="description-format"/>
-      </else-if>
+      </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"/>
       </else-if>
+      <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"/>
+      </else-if>
     </choose>
   </macro>
   <!-- Monographic source identifier -->
@@ -2283,54 +2635,84 @@
     <group delimiter=", ">
       <names variable="editor-translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="editor translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
+      <choose>
+        <if variable="collection-editor editor"/>
+        <else-if variable="collection-editor editor-translator"/>
+        <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+          <names variable="collection-editor">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+        </else-if>
+      </choose>
       <names variable="guest">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="host">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="chair organizer">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
+      </names>
+      <names variable="illustrator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
+      </names>
+      <names variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
-      <names delimiter=", " variable="illustrator narrator compiler curator">
+      <names variable="compiler">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
+      </names>
+      <names variable="curator">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="producer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names variable="editorial-director">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
+      <choose>
+        <if match="any" type="broadcast performance">
+          <names variable="script-writer">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+        </if>
+      </choose>
       <names variable="director">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <choose>
         <if match="none" type="song thesis">
           <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
           <names variable="contributor">
-            <label form="verb-short" suffix=" "/>
-            <name/>
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
           </names>
         </if>
       </choose>
@@ -2338,27 +2720,44 @@
   </macro>
   <!-- Monographic source locator -->
   <macro name="source-monographic-locator">
-    <group delimiter=", ">
-      <choose>
-        <if match="any" variable="part-title volume-title"/>
-        <else-if locator="column page" match="any">
-          <text macro="label-volume"/>
-          <text macro="label-part-number"/>
-        </else-if>
-        <else-if variable="locator"/>
-        <else-if variable="page">
-          <text macro="label-volume"/>
-          <text macro="label-part-number"/>
-        </else-if>
-      </choose>
+    <group delimiter=".">
       <choose>
-        <!-- archival locators appear after the shelfmark (cf. CMOS18 14.127, MHRA 7.7) -->
+        <!-- archival locators appear after the shelfmark (cf. 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="column">
+          <!-- separate a volume and column number with a point (NHR 17.2.5) -->
+          <choose>
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </else-if>
+        <else-if is-numeric="volume" locator="page">
+          <!-- separate a volume and page number with a point (NHR 17.2.5) -->
+          <choose>
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </else-if>
         <else-if variable="locator">
           <text macro="label-locator"/>
         </else-if>
+        <else-if is-numeric="volume" variable="page">
+          <!-- collapse the volume and page number if adjacent (NHR 17.2.5) -->
+          <choose>
+            <!-- check for variables that might come between the volume and page number -->
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="page"/>
+        </else-if>
+        <!-- archival locators appear after the shelfmark (cf. CMOS18 14.127) -->
         <else-if variable="archive archive_location page"/>
         <else>
           <text variable="page"/>
@@ -2371,6 +2770,8 @@
     <group delimiter=", ">
       <text text-case="title" variable="collection-title"/>
       <text variable="collection-number"/>
+      <!-- for Roman collection numbers (old Hart's Rules): -->
+      <!-- <number form="roman" variable="collection-number"/> -->
       <text macro="label-issue"/>
     </group>
   </macro>
@@ -2448,9 +2849,10 @@
           </choose>
         </else-if>
         <else-if variable="event-date issued"/>
-        <else-if match="none" variable="issued">
+        <else-if variable="issued"/>
+        <else>
           <text variable="status"/>
-        </else-if>
+        </else>
       </choose>
     </group>
   </macro>
@@ -2476,21 +2878,20 @@
   <macro name="source-monographic-publication">
     <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 -->
-              <!-- add for OGS: -->
-              <!-- <text macro="source-series"/> -->
-              <text macro="source-publication-and-date"/>
-            </if>
-          </choose>
-        </else-if>
         <!-- `patent` date in identification (cf. 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 -->
+          <!-- add for OGS: -->
+          <!-- <text macro="source-series"/> -->
+          <text macro="source-publication-and-date"/>
+        </else-if>
+        <!-- omit serial types -->
+        <else-if match="any" type="interview paper-conference"/>
         <else>
+          <!-- monographic types -->
           <!-- add for OGS: -->
           <!-- <text macro="source-series"/> -->
           <text macro="source-publication-and-date"/>
@@ -2502,7 +2903,7 @@
   <macro name="source-monographic-publication-bracketed">
     <!-- Facts of publication with brackets for print monographic formats -->
     <choose>
-      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard">
+      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
         <text macro="source-monographic-publication" prefix="(" suffix=")"/>
       </if>
       <else-if type="article" variable="genre publisher">
@@ -2518,7 +2919,7 @@
       </else-if>
       <else-if type="personal_communication">
         <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director publisher">
+          <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
             <!-- in an edited collection -->
             <text macro="source-monographic-publication" prefix="(" suffix=")"/>
           </if>
@@ -2529,13 +2930,13 @@
   <macro name="source-monographic-publication-unbracketed">
     <!-- Facts of publication without brackets -->
     <choose>
-      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard"/>
+      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage"/>
       <else-if type="article" variable="genre publisher"/>
       <else-if type="entry-dictionary" variable="publisher"/>
       <else-if type="entry-encyclopedia" variable="publisher"/>
       <else-if type="personal_communication">
         <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director publisher">
+          <if match="none" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
             <!-- not in an edited collection -->
             <text macro="source-monographic-publication"/>
           </if>
@@ -2548,81 +2949,69 @@
   </macro>
   <macro name="source-monographic-publication-short-bracketed">
     <!-- mirrors `source-monographic-publication-bracketed` -->
-    <choose>
-      <if disambiguate="true">
-        <group delimiter=", " prefix="(" suffix=")">
+    <group delimiter=", " prefix="(" suffix=")">
+      <choose>
+        <if disambiguate="true" match="none"/>
+        <!-- Facts of publication with brackets for print monographic formats -->
+        <else-if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
           <choose>
-            <!-- Facts of publication with brackets for print monographic formats -->
-            <if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
-              <text macro="source-date"/>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
             </if>
-            <else-if type="article" variable="genre publisher">
-              <!-- without brackets for a preprint in a repository (cf. CMOS18 14.76), with brackets for a working paper (cf. CMOS18 14.116) -->
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
-              <text macro="source-date"/>
-            </else-if>
-            <else-if type="motion_picture" variable="publisher">
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="article" variable="genre publisher">
+          <!-- without brackets for a preprint in a repository (cf. CMOS18 14.76), with brackets for a working paper (cf. CMOS18 14.116) -->
+          <choose>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
+            </if>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="motion_picture" variable="publisher">
+          <choose>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
+            </if>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+              <!-- in an edited collection -->
               <text macro="source-date"/>
-            </else-if>
-            <else-if type="personal_communication">
-              <choose>
-                <if match="any" variable="collection-editor compiler editor editorial-director publisher">
-                  <!-- in an edited collection -->
-                  <text macro="source-date"/>
-                </if>
-              </choose>
-            </else-if>
+            </if>
           </choose>
-        </group>
-      </if>
-    </choose>
+        </else-if>
+      </choose>
+    </group>
   </macro>
   <macro name="source-monographic-publication-short-unbracketed">
     <!-- mirrors `source-monographic-publication-unbracketed` -->
     <choose>
-      <if disambiguate="true">
+      <if disambiguate="true" match="none"/>
+      <!-- Facts of publication without brackets -->
+      <else-if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis"/>
+      <else-if type="article" variable="genre publisher"/>
+      <else-if type="motion_picture" variable="publisher"/>
+      <else-if type="personal_communication">
         <choose>
-          <!-- Facts of publication without brackets -->
-          <if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis"/>
-          <else-if type="article" variable="genre publisher"/>
-          <else-if type="motion_picture" variable="publisher"/>
-          <else-if type="personal_communication">
-            <choose>
-              <if match="none" variable="collection-editor compiler editor editorial-director publisher">
-                <!-- not in an edited collection -->
-                <text macro="source-date"/>
-              </if>
-            </choose>
-          </else-if>
-          <else>
+          <if match="none" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+            <!-- not in an edited collection -->
             <text macro="source-date"/>
-          </else>
+          </if>
         </choose>
-      </if>
+      </else-if>
+      <else>
+        <text macro="source-date"/>
+      </else>
     </choose>
   </macro>
   <macro name="source-publication-and-date">
     <group delimiter=", ">
-      <choose>
-        <if match="any" type="post webpage">
-          <!-- `container-title` functions like a publisher with social media and website sources (cf. CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
-        </if>
-      </choose>
       <text macro="source-publication-history"/>
       <group delimiter=" ">
         <text macro="source-date-status"/>
@@ -2661,7 +3050,8 @@
         <group delimiter=", ">
           <text macro="source-publication-description"/>
           <choose>
-            <if match="none" variable="editor">
+            <if match="none" variable="collection-editor editor editorial-director">
+              <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
               <text macro="label-edition"/>
             </if>
           </choose>
@@ -2679,7 +3069,8 @@
               <if match="any" type="classic" variable="original-date">
                 <text macro="label-edition"/>
               </if>
-              <else-if variable="editor"/>
+              <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
+              <else-if match="any" variable="collection-editor editor editorial-director"/>
               <else>
                 <text macro="label-edition"/>
               </else>
@@ -2705,7 +3096,9 @@
             </if>
           </choose>
           <group delimiter=", ">
-            <names variable="original-author"/>
+            <names variable="original-author">
+              <name initialize="false"/>
+            </names>
             <text font-style="italic" text-case="title" variable="original-title"/>
           </group>
           <group delimiter=", " prefix="[" suffix="]">
@@ -2728,9 +3121,10 @@
               <else-if type="report">
                 <text variable="publisher"/>
               </else-if>
-              <else-if match="none" type="classic entry entry-dictionary entry-encyclopedia interview manuscript personal_communication" variable="original-publisher-place">
+              <else-if match="any" type="classic entry entry-dictionary entry-encyclopedia interview manuscript personal_communication" variable="original-publisher-place"/>
+              <else>
                 <text form="short" term="no-place"/>
-              </else-if>
+              </else>
             </choose>
             <text variable="publisher"/>
           </group>
@@ -2741,7 +3135,7 @@
       </choose>
       <choose>
         <if type="song">
-          <!-- Album catalogue number follows label name (NHR 18.7.2; cf. CMOS18 14.163–164) -->
+          <!-- Album catalogue number follows label name (NHR 18.7.2; cf. CMOS18 14.163-164) -->
           <text variable="number"/>
         </if>
       </choose>
@@ -2775,21 +3169,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">
@@ -2801,15 +3180,27 @@
           </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 speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software speech standard webpage">
         <text macro="date-issued-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-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 match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-issued-full-serial"/>
+      </else-if>
       <else-if variable="issued">
         <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"/>
+        <date date-parts="year" form="numeric" variable="available-date"/>
       </else-if>
       <else-if variable="event-date">
         <text macro="date-event-year"/>
@@ -2840,16 +3231,13 @@
       <else-if variable="status">
         <text text-case="lowercase" variable="status"/>
       </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">
-            <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
-            <text form="short" term="no date"/>
-          </if>
-        </choose>
-      </else-if>
-      <!-- no n.d. for `classic` (cf. MHRA4 7.3c) or manuscripts (NHR 18.6.2) -->
+      <!-- no n.d. for `classic` (cf. MHRA4 7.3c) or `manuscript` (NHR 18.6.2) -->
       <else-if match="any" type="classic manuscript"/>
+      <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+        <text form="short" term="no date"/>
+      </else-if>
+      <else-if match="any" type="interview personal_communication"/>
       <else>
         <text form="short" term="no date"/>
       </else>
@@ -2871,18 +3259,6 @@
       <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">
@@ -2894,9 +3270,17 @@
           </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 speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software speech standard webpage">
         <text macro="date-original-full"/>
       </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>
         <text macro="date-original-year"/>
       </else>
@@ -2927,7 +3311,7 @@
         <text variable="status"/>
       </else-if>
       <!-- 'published online' for a work available ahead of print (cf. MHRA4 7.4) -->
-      <else-if match="any" variable="available-date collection-title issue number page status supplement-number volume"/>
+      <else-if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
       <else-if type="article-journal" variable="DOI issued">
         <text term="advance-online-publication"/>
       </else-if>
@@ -2939,20 +3323,18 @@
       <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">
+        <text macro="source-locator-subsequent-monographic"/>
+        <!-- for OGS and other styles using Roman volume numbers: -->
+        <!-- <text macro="source-locator-subsequent-monographic-roman-volume"/> -->
+      </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>
+        <text macro="source-locator-subsequent-serial"/>
       </else-if>
       <else>
         <text macro="source-locator-subsequent-monographic"/>
+        <!-- for OGS and other styles using Roman volume numbers: -->
+        <!-- <text macro="source-locator-subsequent-monographic-roman-volume"/> -->
       </else>
     </choose>
   </macro>
@@ -2963,6 +3345,26 @@
           <!-- Do not provide `volume` or `part-number` for defined section -->
           <text macro="label-locator"/>
         </if>
+        <else-if variable="part-number">
+          <!-- label column and page numbers when using multiple locators (cf. CMOS18 14.50) -->
+          <text macro="label-volume"/>
+          <text macro="label-part-number"/>
+          <text macro="label-locator-all"/>
+        </else-if>
+        <else-if is-numeric="volume" locator="column">
+          <!-- separate a volume and column number with a point (NHR 17.2.5) -->
+          <group delimiter=".">
+            <text variable="volume"/>
+            <text variable="locator"/>
+          </group>
+        </else-if>
+        <else-if is-numeric="volume" locator="page">
+          <!-- separate a volume and page number with a point (NHR 17.2.5) -->
+          <group delimiter=".">
+            <text variable="volume"/>
+            <text variable="locator"/>
+          </group>
+        </else-if>
         <else>
           <text macro="label-volume"/>
           <text macro="label-part-number"/>
@@ -2973,13 +3375,21 @@
   </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 (cf. 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 -->
   <macro name="source-medium">
-    <!-- the medium appears at both the title and container levels, and both with and without brackets (NHR 18.7.2–3, 18.8.5) -->
+    <!-- the medium appears at both the title and container levels, and both with and without brackets (NHR 18.7.2-3, 18.8.5) -->
     <group delimiter=", ">
       <text variable="medium"/>
       <text variable="scale"/>
@@ -3043,16 +3453,16 @@
           <text form="short" variable="archive"/>
         </if>
       </choose>
-      <text variable="archive_collection"/>
-      <text variable="archive_location"/>
+      <text form="short" variable="archive_collection"/>
+      <text form="short" variable="archive_location"/>
     </group>
   </macro>
   <!-- 4.10. DOI or URL -->
   <macro name="source-date-accessed-DOI-URL">
     <group delimiter=", ">
+      <text macro="source-DOI-URL"/>
       <choose>
         <if variable="DOI"/>
-        <else-if match="any" variable="available-date event-date issued status"/>
         <else-if variable="URL">
           <group delimiter=" ">
             <text term="accessed"/>
@@ -3060,7 +3470,6 @@
           </group>
         </else-if>
       </choose>
-      <text macro="source-DOI-URL"/>
     </group>
   </macro>
   <macro name="source-DOI-URL">
@@ -3081,14 +3490,15 @@
         <text macro="title-and-descriptions-short"/>
         <text macro="citation-notes-shortened-author-title-disambiguate"/>
         <choose>
-          <if match="any" type="interview personal_communication">
-            <choose>
-              <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-                <!-- unpublished `interview` or `personal_communication` use inline format (NHR 17.3.2) -->
-                <text macro="date-short"/>
-              </if>
-            </choose>
-          </if>
+          <!-- inaccessible `interview` or `personal_communication` uses in-text format (cf. NHR 17.3.2, CMOS18 14.111): give the date at the first citation in shortened notes -->
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
+          <else-if position="first" type="interview">
+            <text macro="date-short"/>
+            <text macro="source-medium"/>
+          </else-if>
+          <else-if position="first" type="personal_communication">
+            <text macro="source-medium"/>
+          </else-if>
         </choose>
         <text macro="source-monographic-publication-short-unbracketed"/>
       </group>
@@ -3102,7 +3512,7 @@
         <if disambiguate="true">
           <names variable="editor-translator">
             <label form="verb-short" suffix=" "/>
-            <name form="short"/>
+            <name form="short" initialize="true"/>
             <substitute>
               <names variable="editor"/>
               <names variable="translator"/>
@@ -3120,20 +3530,18 @@
   </macro>
   <citation disambiguate-add-givenname="true" disambiguate-add-names="true">
     <layout delimiter="; " suffix=".">
-      <choose>
-        <if position="subsequent">
-          <group delimiter=", ">
+      <group delimiter=", ">
+        <choose>
+          <if position="subsequent">
             <text macro="citation-notes-shortened-author-title-item"/>
             <text macro="source-locator-subsequent"/>
-          </group>
-        </if>
-        <else>
-          <group delimiter=", ">
+          </if>
+          <else>
             <text macro="author-note"/>
             <text macro="title-and-source"/>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
     </layout>
   </citation>
   <!-- Bibliography -->
@@ -3175,24 +3583,15 @@
             </if>
           </choose>
         </else-if>
-        <else-if match="any" type="interview personal_communication">
-          <!-- Personal communications only appear in the bibliography if the reader can retrieve them (NHR 17.3.2; cf. CMOS18 14.13, 14.111) -->
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
-        </else-if>
-        <else-if match="any" type="document manuscript paper-conference speech">
-          <!-- In note styles, the bibliography also omits inaccessible manuscripts (NHR 18.3.1; cf. CMOS18 14.114), conference papers (cf. CMOS18 14.115), and private documents (cf. CMOS18 14.118) -->
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
-        </else-if>
         <!-- social media content usually omitted from the bibliography (cf. CMOS18 14.106) -->
         <else-if type="post"/>
+        <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+          <text macro="bibliography-notes"/>
+        </else-if>
+        <!-- Personal communications only appear in the bibliography if the reader can retrieve them (NHR 17.3.2; cf. CMOS18 14.13, 14.111) -->
+        <else-if match="any" type="interview personal_communication"/>
+        <!-- In note styles, the bibliography also omits inaccessible manuscripts (NHR 18.3.1; cf. CMOS18 14.114), conference papers (cf. CMOS18 14.115), and private documents (cf. CMOS18 14.118) -->
+        <else-if match="any" type="document manuscript paper-conference speech"/>
         <else>
           <text macro="bibliography-notes"/>
         </else>