csl-styles 2.0.2 → 2.1.0

data/vendor/styles/new-harts-rules-author-date.csl

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="in-text" 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="in-text" 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 (author-date)</title>
-    <title-short>NHR (author-date/Harvard [17.3])</title-short>
+    <title>New Hart's Rules: The Oxford Style Guide 2nd edition (author-date, bracketed date with comma)</title>
+    <title-short>NHR (author-date/Harvard [17.3], date with comma)</title-short>
     <id>http://www.zotero.org/styles/new-harts-rules-author-date</id>
     <link href="http://www.zotero.org/styles/new-harts-rules-author-date" 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>
@@ -29,7 +30,7 @@
     <category field="sociology"/>
     <category field="theology"/>
     <summary>Oxford source citations, author-date system</summary>
-    <updated>2025-11-05T00:00:00+00:00</updated>
+    <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>
@@ -399,11 +415,11 @@
       </if>
       <else>
         <names variable="composer">
-          <name form="short" initialize-with=". "/>
+          <name form="short" initialize="true"/>
           <substitute>
             <names variable="author"/>
-            <names variable="host"/>
             <names variable="guest"/>
+            <names variable="host"/>
             <choose>
               <if type="song">
                 <names variable="performer"/>
@@ -438,25 +454,28 @@
             </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>
-            <text macro="author-title-substitute-short"/>
             <choose>
-              <if type="manuscript">
-                <choose>
-                  <if match="none" variable="container-title event-date event-place event-title genre title publisher publisher-place">
-                    <text macro="source-archive-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>
+            <text macro="author-title-substitute-short"/>
+            <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>
@@ -466,42 +485,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>
@@ -530,8 +570,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>
@@ -555,14 +598,17 @@
         <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">
-    <group prefix="(" suffix=")">
+    <group delimiter="-" prefix="(" suffix=")">
       <choose>
         <if variable="issued">
           <group delimiter=" ">
@@ -575,93 +621,89 @@
           </group>
         </if>
         <else-if variable="available-date">
-          <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"/>
         </else-if>
         <else-if variable="status">
-          <group>
-            <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
-            <text text-case="capitalize-first" variable="status"/>
-            <text prefix="-" variable="year-suffix"/>
-          </group>
+          <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
+          <text text-case="capitalize-first" variable="status"/>
+          <text variable="year-suffix"/>
         </else-if>
         <else-if type="collection">
           <!-- do not give n.d. for archival collections (cf. CMOS18 14.128) -->
-          <text prefix="-" variable="year-suffix"/>
+          <text variable="year-suffix"/>
         </else-if>
         <else-if type="manuscript">
           <!-- do not give n.d. with a bare shelfmark -->
           <choose>
             <if match="any" variable="container-title event-date event-place event-title genre title publisher publisher-place">
               <text form="short" term="no date"/>
-              <text prefix="-" variable="year-suffix"/>
+              <text variable="year-suffix"/>
             </if>
           </choose>
         </else-if>
         <else>
           <text form="short" term="no date"/>
-          <text prefix="-" variable="year-suffix"/>
+          <text variable="year-suffix"/>
         </else>
       </choose>
     </group>
   </macro>
   <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>
   <macro name="date-sort-group">
     <!-- Sort items with and without dates (cf. CMOS18 14.44):
@@ -685,10 +727,10 @@
   <macro name="date-sort-year">
     <choose>
       <if type="personal_communication" variable="event-date issued">
-        <date date-parts="year" form="text" variable="event-date"/>
+        <date date-parts="year" form="numeric" variable="event-date"/>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <date date-parts="year" form="numeric" variable="issued"/>
       </else>
     </choose>
   </macro>
@@ -697,7 +739,7 @@
     <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>
@@ -716,18 +758,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>
@@ -767,16 +809,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>
@@ -797,20 +839,20 @@
         <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>
-  <!-- 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>
@@ -832,10 +874,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>
@@ -863,6 +905,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"/>
@@ -874,19 +923,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>
@@ -902,25 +954,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>
@@ -983,7 +1033,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>
@@ -1018,11 +1068,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 -->
@@ -1127,15 +1201,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"/>
@@ -1143,17 +1230,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>
@@ -1171,30 +1259,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"/>
@@ -1203,19 +1356,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"/>
@@ -1229,90 +1379,95 @@
       <else-if variable="genre">
         <text variable="genre"/>
       </else-if>
+      <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) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+        <text term="manuscript"/>
       </else-if>
       <else-if type="personal_communication">
         <!-- '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>
@@ -1320,7 +1475,7 @@
           <!-- `genre` printed with `number` -->
           <names variable="interviewer">
             <label form="verb" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </if>
         <else-if variable="genre">
@@ -1328,14 +1483,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>
@@ -1345,12 +1502,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>
@@ -1358,12 +1549,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>
@@ -1382,7 +1573,7 @@
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name initialize="false"/>
               </names>
             </if>
             <else>
@@ -1390,7 +1581,7 @@
                 <text macro="description-format"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name/>
+                  <name initialize="false"/>
                 </names>
               </group>
             </else>
@@ -1404,6 +1595,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=", ">
@@ -1413,7 +1635,7 @@
             <text macro="description-format-short"/>
             <names variable="recipient">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name form="short" initialize="true"/>
             </names>
           </group>
         </if>
@@ -1422,17 +1644,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 usage -->
+        <!-- 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 types -->
         <group delimiter=", ">
           <text macro="description-serial"/>
           <text macro="source-event"/>
@@ -1453,18 +1697,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=")"/>
@@ -1472,22 +1708,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"/>
@@ -1495,6 +1778,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"/>
@@ -1502,7 +1792,7 @@
         <text macro="description-format-short"/>
       </else-if>
       <else>
-        <text variable="section"/>
+        <text form="short" text-case="title" variable="section"/>
       </else>
     </choose>
   </macro>
@@ -1518,7 +1808,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>
@@ -1536,7 +1845,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"/>
@@ -1572,17 +1881,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"/>
@@ -1593,149 +1896,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>
-        </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>
+          <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>
+          <!-- 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>
@@ -1746,34 +2090,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 variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
-      <names delimiter=", " variable="compiler chair organizer curator">
+      <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>
@@ -1784,7 +2136,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>
@@ -1861,37 +2213,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">
@@ -1902,36 +2252,25 @@
         <if type="article-newspaper">
           <group delimiter=" ">
             <text macro="source-serial-title"/>
-            <text macro="source-serial-identifier"/>
+            <text macro="source-serial-identifier-author-date"/>
           </group>
         </if>
         <else-if match="any" variable="collection-title issue supplement-number volume">
           <text macro="source-serial-title"/>
-          <text macro="source-serial-identifier"/>
+          <text macro="source-serial-identifier-author-date"/>
         </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-author-date"/>
           </group>
         </else-if>
         <else>
           <group delimiter=" ">
             <text macro="source-serial-title"/>
-            <text macro="source-serial-identifier"/>
+            <text macro="source-serial-identifier-author-date"/>
           </group>
         </else>
       </choose>
@@ -1939,16 +2278,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">
@@ -1993,7 +2330,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>
@@ -2001,14 +2338,27 @@
     </choose>
   </macro>
   <!-- Serial source identifier -->
-  <macro name="source-serial-identifier">
+  <macro name="source-serial-identifier-author-date">
+    <!-- different punctuation in author-date system (NHR 17.3) -->
     <group delimiter=", ">
-      <text macro="source-serial-identifier-volume"/>
-      <!-- periodical edition always capitalized (cf. CMOS18 14.89) -->
-      <text macro="label-edition-capitalized"/>
-      <text macro="source-serial-locator"/>
-      <!-- for OGS: -->
-      <!-- <text macro="source-serial-locator-range"/> -->
+      <choose>
+        <if match="any" type="article-magazine article-newspaper">
+          <text macro="source-serial-identifier-volume"/>
+          <!-- newspaper edition always capitalized (CMOS18 14.89) -->
+          <text macro="label-edition-capitalized"/>
+          <text macro="source-serial-locator"/>
+        </if>
+        <else-if match="any" variable="issue supplement-number volume">
+          <group delimiter=": ">
+            <text macro="source-serial-identifier-volume"/>
+            <text macro="source-serial-locator"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="source-serial-identifier-volume"/>
+          <text macro="source-serial-locator"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="source-serial-identifier-volume">
@@ -2034,6 +2384,8 @@
                 </if>
                 <else>
                   <text variable="volume"/>
+                  <!-- for serial Roman volume numbers: -->
+                  <!-- <text macro="label-volume"/> -->
                   <text macro="label-issue"/>
                 </else>
               </choose>
@@ -2079,7 +2431,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>
@@ -2132,8 +2493,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"/>
@@ -2182,29 +2545,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 -->
@@ -2231,54 +2590,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 delimiter=", " variable="illustrator narrator compiler 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 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>
@@ -2286,27 +2675,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"/>
@@ -2319,6 +2725,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>
@@ -2396,9 +2804,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>
@@ -2424,21 +2833,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"/>
@@ -2450,7 +2858,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">
@@ -2466,7 +2874,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>
@@ -2477,13 +2885,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>
@@ -2496,12 +2904,6 @@
   </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"/>
@@ -2540,7 +2942,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>
@@ -2558,7 +2961,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>
@@ -2584,7 +2988,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="]">
@@ -2607,9 +3013,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>
@@ -2620,7 +3027,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>
@@ -2653,17 +3060,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-day-month-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director">
-            <!-- serial usage -->
-            <text macro="source-date-issued-day-month-serial"/>
-          </if>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -2672,9 +3068,19 @@
           </if>
         </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-day-month"/>
       </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-day-month-serial"/>
+      </else-if>
+      <!-- omit monographic types -->
+      <else-if match="any" variable="collection-editor compiler editor editorial-director"/>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-issued-day-month-serial"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="source-date-issued-day-month-serial">
@@ -2702,17 +3108,6 @@
         <!-- Provide original date for letters listed under event-date -->
         <text macro="date-original-year"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="source-date-original-day-month-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director">
-            <!-- serial usage -->
-            <text macro="source-date-original-day-month-serial"/>
-          </if>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -2721,9 +3116,19 @@
           </if>
         </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-day-month"/>
       </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="source-date-original-day-month-serial"/>
+      </else-if>
+      <!-- omit monographic types -->
+      <else-if match="any" variable="collection-editor compiler editor editorial-director"/>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-original-day-month-serial"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="source-date-original-day-month-serial">
@@ -2749,7 +3154,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>
@@ -2758,7 +3163,7 @@
   <!-- 4.7. Locator (including page references) -->
   <!-- 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"/>
@@ -2822,16 +3227,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"/>
@@ -2839,7 +3244,6 @@
           </group>
         </else-if>
       </choose>
-      <text macro="source-DOI-URL"/>
     </group>
   </macro>
   <macro name="source-DOI-URL">
@@ -2853,7 +3257,7 @@
     </choose>
   </macro>
   <!-- Citation -->
-  <citation after-collapse-delimiter="; " collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true">
+  <citation collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name">
     <layout delimiter="; " prefix="(" suffix=")">
       <!-- more detail in Oxford Guide to Style, sect. 15.19 -->
       <group delimiter=": ">
@@ -2867,45 +3271,48 @@
                 </if>
               </choose>
             </if>
-            <else-if match="any" variable="event-date issued">
+            <else-if match="any" type="interview personal_communication">
               <choose>
-                <if match="any" type="interview personal_communication">
+                <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+                  <!-- accessible `interview` or `personal_communication` uses standard format -->
                   <choose>
-                    <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+                    <if match="any" variable="event-date issued">
                       <group delimiter=" ">
                         <text macro="author-inline"/>
                         <text macro="date-short"/>
                       </group>
                     </if>
                     <else>
-                      <!-- unpublished `interview` or `personal_communication` use inline format (NHR 17.3.2) -->
                       <text macro="author-inline"/>
-                      <text macro="title-and-descriptions-short"/>
                       <text macro="date-short"/>
                     </else>
                   </choose>
                 </if>
                 <else>
-                  <group delimiter=" ">
-                    <text macro="author-inline"/>
-                    <text macro="date-short"/>
-                  </group>
+                  <!-- inaccessible `interview` or `personal_communication` uses in-text format (NHR 17.3.2, cf. CMOS18 14.111) -->
+                  <text macro="author-inline"/>
+                  <text macro="title-and-descriptions-short"/>
+                  <choose>
+                    <if position="first" type="interview">
+                      <text macro="date-short"/>
+                      <text macro="source-medium"/>
+                    </if>
+                    <else-if position="first" type="personal_communication">
+                      <text macro="source-medium"/>
+                    </else-if>
+                  </choose>
                 </else>
               </choose>
             </else-if>
+            <else-if match="any" variable="event-date issued">
+              <group delimiter=" ">
+                <text macro="author-inline"/>
+                <text macro="date-short"/>
+              </group>
+            </else-if>
             <else>
-              <!--- Comma with forthcoming or n.d. -->
+              <!--- comma with forthcoming or n.d. -->
               <text macro="author-inline"/>
-              <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="title-and-descriptions-short"/>
-                    </if>
-                  </choose>
-                </if>
-              </choose>
               <text macro="date-short"/>
             </else>
           </choose>
@@ -2939,7 +3346,6 @@
       <key macro="source-archive"/>
     </sort>
     <layout suffix=".">
-      <!-- MHRA4 does not provide specific guidance on excluding citations from the bibliography (cf. MHRA4 8.3), but this seems to be the intent, as some of its examples are only usable in a note; this macro follows guidance in NHR and CMOS. -->
       <choose>
         <if type="classic">
           <choose>
@@ -2960,14 +3366,11 @@
             </else-if>
           </choose>
         </else-if>
-        <else-if match="any" type="interview personal_communication">
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <!-- Personal communications only appear in the bibliography if the reader can retrieve them (NHR 17.3.2; cf. CMOS18 14.13, 14.111) -->
-              <text macro="bibliography-author-date"/>
-            </if>
-          </choose>
+        <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+          <!-- Personal communications only appear in the bibliography if the reader can retrieve them (NHR 17.3.2; cf. CMOS18 14.13, 14.111) -->
+          <text macro="bibliography-author-date"/>
         </else-if>
+        <else-if match="any" type="interview personal_communication"/>
         <else>
           <text macro="bibliography-author-date"/>
         </else>