csl-styles 2.0.2 → 2.1.0

data/vendor/styles/{modern-humanities-research-association-notes.csl → mhra-notes.csl}

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" demote-non-dropping-particle="display-and-sort" et-al-min="4" et-al-use-first="1" page-range-format="minimal-two" version="1.0" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" demote-non-dropping-particle="display-and-sort" et-al-min="4" et-al-use-first="1" initialize-with=". " page-range-format="minimal-two" 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>Modern Humanities Research Association 4th edition (notes)</title>
-    <title-short>MHRA Style Guide (notes)</title-short>
-    <id>http://www.zotero.org/styles/modern-humanities-research-association-notes</id>
-    <link href="http://www.zotero.org/styles/modern-humanities-research-association-notes" rel="self"/>
+    <title>MHRA Style Guide 4th edition (notes)</title>
+    <title-short>Modern Humanities Research Association (notes)</title-short>
+    <id>http://www.zotero.org/styles/mhra-notes</id>
+    <link href="http://www.zotero.org/styles/mhra-notes" rel="self"/>
     <link href="https://www.mhra.org.uk/style/" rel="documentation"/>
+    <link href="https://zotero.org/groups/2205533/collections/D9MVMAFF" rel="documentation"/>
     <author>
       <name>Andrew Dunning</name>
       <uri>https://orcid.org/0000-0003-0464-5036</uri>
@@ -20,7 +21,7 @@
     <category field="philosophy"/>
     <category field="theology"/>
     <summary>MHRA source citations, notes system</summary>
-    <updated>2025-08-07T00:00:00+00:00</updated>
+    <updated>2025-02-04T00: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">
@@ -113,6 +114,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 text-case="capitalize-first" variable="chapter-number"/>
+    </group>
+  </macro>
   <macro name="label-edition">
     <group delimiter=" ">
       <choose>
@@ -121,24 +135,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 variable="edition"/>
           <label variable="edition"/>
         </else-if>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text variable="edition"/>
+        </else-if>
         <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor compiler editor editorial-director">
-              <!-- monographic usage -->
-              <text variable="edition"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text variable="edition"/>
-              <label variable="edition"/>
-            </else>
-          </choose>
+          <!-- serial types -->
+          <text variable="edition"/>
+          <label variable="edition"/>
         </else-if>
         <else>
+          <!-- monographic types -->
           <text variable="edition"/>
         </else>
       </choose>
@@ -152,24 +163,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>
@@ -258,10 +266,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>
@@ -293,17 +305,13 @@
   <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"/>
         <label form="short" prefix=" (" suffix=")"/>
         <substitute>
           <choose>
-            <if variable="author interviewer">
-              <choose>
-                <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                  <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
-                  <names variable="interviewer"/>
-                </if>
-              </choose>
+            <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+              <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
+              <names variable="interviewer"/>
             </if>
           </choose>
           <names variable="author"/>
@@ -321,6 +329,13 @@
             </if>
           </choose>
           <names variable="illustrator"/>
+          <choose>
+            <!-- list an edited multivolume work under the name of the series editor -->
+            <if variable="container-title"/>
+            <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+              <names variable="collection-editor"/>
+            </else-if>
+          </choose>
           <choose>
             <if match="none" type="standard">
               <names variable="editor-translator"/>
@@ -343,8 +358,8 @@
           </choose>
           <names variable="curator"/>
           <choose>
-            <if type="software">
-              <!-- `software` listed under the name of the publisher or developer (MHRA 7.8) -->
+            <if match="any" type="software webpage">
+              <!-- `software` listed under the name of the publisher or developer (MHRA 7.8); an anonymous `webpage` also usually treats this as equivalent to a group author (cf. CMOS18 14.104) -->
               <text variable="publisher"/>
             </if>
             <else-if type="standard">
@@ -355,13 +370,10 @@
           <text macro="author-review-unsigned"/>
           <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>
+            <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>
@@ -371,17 +383,13 @@
   <macro name="author-note">
     <group delimiter=", ">
       <names variable="composer">
-        <name delimiter-precedes-last="contextual"/>
+        <name initialize="false"/>
         <label form="short" prefix=" (" suffix=")"/>
         <substitute>
           <choose>
-            <if variable="author interviewer">
-              <choose>
-                <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                  <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
-                  <names variable="interviewer"/>
-                </if>
-              </choose>
+            <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+              <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
+              <names variable="interviewer"/>
             </if>
           </choose>
           <names variable="author"/>
@@ -393,8 +401,8 @@
           </choose>
           <!-- do not list editors or translators as authors (MHRA 7.3) -->
           <choose>
-            <if type="software">
-              <!-- `software` listed under the name of the publisher or developer (MHRA 7.8) -->
+            <if match="any" type="software webpage">
+              <!-- `software` listed under the name of the publisher or developer (MHRA 7.8); an anonymous `webpage` also usually treats this as equivalent to a group author (cf. CMOS18 14.104) -->
               <text variable="publisher"/>
             </if>
             <else-if type="standard">
@@ -403,41 +411,80 @@
             </else-if>
           </choose>
           <text macro="author-review-unsigned"/>
+          <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>
       <text macro="author-contributors"/>
     </group>
   </macro>
   <macro name="author-short">
+    <!-- this macro follows `author-bib`; although it 'may be more appropriate' to give only the title (MHRA 7.12), CSL cannot replicate the examples shown, which require knowing whether an author's name is part of the title and being able to redirect a chapter citation to the parent volume -->
     <choose>
       <if match="any" type="interview personal_communication">
         <text macro="author-short-and-recipient"/>
       </if>
       <else>
         <names variable="composer">
-          <name form="short"/>
+          <name form="short" initialize="true"/>
           <substitute>
             <choose>
-              <if variable="author interviewer">
-                <choose>
-                  <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                    <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
-                    <names variable="interviewer"/>
-                  </if>
-                </choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- `interviewer` is the author of a published interview (MHRA 7.11) -->
+                <names variable="interviewer"/>
               </if>
             </choose>
             <names variable="author"/>
             <names variable="host"/>
-            <names variable="illustrator"/>
+            <names variable="guest"/>
             <choose>
               <if type="song">
                 <names variable="performer"/>
               </if>
             </choose>
             <choose>
-              <if type="software">
-                <!-- `software` listed under the name of the publisher or developer (MHRA 7.8) -->
+              <if type="classic">
+                <!-- editors in author position only for an edited collection (MHRA 8.3) -->
+                <text macro="author-title-substitute-short"/>
+              </if>
+            </choose>
+            <names variable="illustrator"/>
+            <choose>
+              <!-- list an edited multivolume work under the name of the series editor -->
+              <if variable="container-title"/>
+              <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+                <names variable="collection-editor"/>
+              </else-if>
+            </choose>
+            <choose>
+              <if match="none" type="standard">
+                <names variable="editor-translator"/>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <names variable="collection-editor"/>
+              </if>
+            </choose>
+            <names variable="director"/>
+            <names variable="producer"/>
+            <names variable="executive-producer"/>
+            <names variable="series-creator"/>
+            <names variable="editorial-director"/>
+            <names variable="compiler"/>
+            <choose>
+              <if match="any" type="event performance speech">
+                <names variable="chair"/>
+                <names variable="organizer"/>
+              </if>
+            </choose>
+            <names variable="curator"/>
+            <choose>
+              <if match="any" type="software webpage">
+                <!-- `software` listed under the name of the publisher or developer (MHRA 7.8); an anonymous `webpage` also usually treats this as equivalent to a group author (cf. CMOS18 14.104) -->
                 <text variable="publisher"/>
               </if>
               <else-if type="standard">
@@ -445,14 +492,13 @@
                 <text variable="authority"/>
               </else-if>
             </choose>
+            <text macro="author-review-unsigned"/>
+            <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>
+              <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>
@@ -468,7 +514,7 @@
       <else-if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard thesis">
         <names variable="contributor">
           <label form="verb" suffix=" "/>
-          <name/>
+          <name initialize="false"/>
         </names>
       </else-if>
     </choose>
@@ -476,57 +522,78 @@
   <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 (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>
-        <else-if variable="author interviewer">
+        <!-- accessible `interview` or `personal_communication`: standard citation -->
+        <else-if variable="interviewer">
           <choose>
             <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
               <!-- cite published interviews under interviewer name (MHRA 7.11) -->
               <names variable="interviewer">
-                <name form="short"/>
+                <name form="short" initialize="true"/>
               </names>
             </if>
             <else>
               <names variable="author">
-                <name form="short"/>
+                <name form="short" initialize="true"/>
               </names>
             </else>
           </choose>
         </else-if>
         <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>
@@ -563,77 +630,106 @@
         <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>
-  <!-- 2. Date -->
-  <macro name="date-short">
+  <macro name="author-title-substitute-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>
-        </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">
-        <!-- do not give n.d. for archival collections (cf. CMOS18 14.128), `classic` (cf. 14.143), or reference entries (cf. 14.131) -->
-        <text prefix="-" variable="year-suffix"/>
-      </else-if>
-      <else-if type="manuscript">
-        <!-- do not give n.d. with a bare shelfmark -->
+      <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+        <!-- If a review has no `reviewed-genre` or `reviewed-title`, assume that `title` contains the title of the reviewed work; the description provides it. -->
         <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"/>
+          <if variable="reviewed-genre title">
+            <text macro="title-short"/>
           </if>
+          <else-if variable="reviewed-genre reviewed-title title">
+            <text macro="title-short"/>
+          </else-if>
+          <else>
+            <text macro="title-and-descriptions-short"/>
+          </else>
         </choose>
+      </if>
+      <else-if variable="title">
+        <text macro="title-short"/>
       </else-if>
       <else>
-        <text form="short" term="no date"/>
-        <text prefix="-" variable="year-suffix"/>
+        <!-- if an item has no `title`, substitute with descriptions and capitalize -->
+        <group delimiter=", ">
+          <text macro="description-capitalized"/>
+          <text macro="identifier"/>
+        </group>
       </else>
     </choose>
   </macro>
+  <!-- 2. Date -->
+  <macro name="date-short">
+    <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>
+        </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">
+          <!-- do not give n.d. for archival collections (cf. CMOS18 14.128), `classic` (cf. 14.143), or reference entries (cf. 14.131) -->
+          <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 variable="year-suffix"/>
+            </if>
+          </choose>
+        </else-if>
+        <else>
+          <text form="short" term="no date"/>
+          <text variable="year-suffix"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
   <!-- Date elements -->
   <macro name="date-event-full">
     <choose>
@@ -648,30 +744,26 @@
   <macro name="date-event-year">
     <choose>
       <if is-uncertain-date="issued">
-        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="event-date"/>
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="event-date"/>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="event-date"/>
+        <date date-parts="year" form="numeric" variable="event-date"/>
       </else>
     </choose>
   </macro>
   <macro name="date-issued-full">
     <choose>
-      <if is-uncertain-date="issued">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date form="text" variable="issued"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date form="text" prefix="[" suffix="?]" variable="issued"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="issued" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date form="text" variable="issued"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="issued">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date form="text" prefix="[" suffix="?]" variable="issued"/>
+      </else-if>
       <else>
         <date form="text" variable="issued"/>
       </else>
@@ -679,43 +771,35 @@
   </macro>
   <macro name="date-issued-year">
     <choose>
-      <if is-uncertain-date="issued">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date date-parts="year" form="text" variable="issued"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date date-parts="year" form="text" prefix="[" suffix="?]" variable="issued"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="issued" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date date-parts="year" form="numeric" variable="issued"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="issued">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="issued"/>
+      </else-if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <date date-parts="year" form="numeric" variable="issued"/>
       </else>
     </choose>
   </macro>
   <macro name="date-issued-year-month">
     <choose>
-      <if is-uncertain-date="issued">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date date-parts="year-month" form="text" variable="issued"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date date-parts="year-month" form="text" prefix="[" suffix="?]" variable="issued"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="issued" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date date-parts="year-month" form="text" variable="issued"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="issued">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date date-parts="year-month" form="text" prefix="[" suffix="?]" variable="issued"/>
+      </else-if>
       <else>
         <date date-parts="year-month" form="text" variable="issued"/>
       </else>
@@ -723,21 +807,17 @@
   </macro>
   <macro name="date-original-full">
     <choose>
-      <if is-uncertain-date="original-date">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date form="text" variable="original-date"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date form="text" prefix="[" suffix="?]" variable="original-date"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="original-date" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date form="text" variable="original-date"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="original-date">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date form="text" prefix="[" suffix="?]" variable="original-date"/>
+      </else-if>
       <else>
         <date form="text" variable="original-date"/>
       </else>
@@ -745,43 +825,35 @@
   </macro>
   <macro name="date-original-year">
     <choose>
-      <if is-uncertain-date="original-date">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date date-parts="year" form="text" variable="original-date"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date date-parts="year" form="text" prefix="[" suffix="?]" variable="original-date"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="original-date" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date date-parts="year" form="numeric" variable="original-date"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="original-date">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date date-parts="year" form="numeric" prefix="[" suffix="?]" variable="original-date"/>
+      </else-if>
       <else>
-        <date date-parts="year" form="text" variable="original-date"/>
+        <date date-parts="year" form="numeric" variable="original-date"/>
       </else>
     </choose>
   </macro>
   <macro name="date-original-year-month">
     <choose>
-      <if is-uncertain-date="original-date">
-        <choose>
-          <if type="graphic">
-            <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
-            <group delimiter=" ">
-              <text font-style="italic" form="short" term="circa"/>
-              <date date-parts="year-month" form="text" variable="original-date"/>
-            </group>
-          </if>
-          <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date date-parts="year-month" form="text" prefix="[" suffix="?]" variable="original-date"/>
-          </else>
-        </choose>
+      <if is-uncertain-date="original-date" type="graphic">
+        <!-- artwork exceptionally uses 'c.' with uncertain dates (MHRA 7.9.i) -->
+        <group delimiter=" ">
+          <text font-style="italic" form="short" term="circa"/>
+          <date date-parts="year-month" form="text" variable="original-date"/>
+        </group>
       </if>
+      <else-if is-uncertain-date="original-date">
+        <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
+        <date date-parts="year-month" form="text" prefix="[" suffix="?]" variable="original-date"/>
+      </else-if>
       <else>
         <date date-parts="year-month" form="text" variable="original-date"/>
       </else>
@@ -792,7 +864,17 @@
     <group delimiter=", ">
       <choose>
         <if variable="title">
-          <text macro="title"/>
+          <group delimiter=" ">
+            <choose>
+              <!-- label for unsigned dictionary/encyclopedia entry in notes (MHRA 7.5) -->
+              <if variable="author"/>
+              <else-if match="none" type="entry-dictionary entry-encyclopedia"/>
+              <else-if position="first" variable="container-title title">
+                <text term="entry"/>
+              </else-if>
+            </choose>
+            <text macro="title"/>
+          </group>
           <text macro="description"/>
           <text macro="identifier"/>
         </if>
@@ -811,10 +893,10 @@
         <group delimiter=", ">
           <text macro="title-short"/>
           <choose>
-            <if match="none" type="entry entry-dictionary entry-encyclopedia"/>
-            <else-if match="none" variable="author">
-              <!-- give container title to distinguish an unsigned reference entry -->
-              <text font-style="italic" variable="container-title"/>
+            <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" form="short" variable="container-title"/>
             </else-if>
           </choose>
         </group>
@@ -831,12 +913,19 @@
           <group delimiter=", ">
             <choose>
               <if type="chapter" variable="container-title genre">
-                <!-- MHRA does not cover introductions but NHR 18.2.6 suggests 'introduction in' (cf. CMOS18 14.12, 14.14, 'introduction to') -->
+                <!-- 'introduction to', 'online appendix to' (cf. CMOS18 14.12, 14.14; 'introduction in', NHR 18.2.6) -->
                 <group delimiter=" ">
                   <text macro="title-and-descriptions"/>
                   <text macro="source"/>
                 </group>
               </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"/>
@@ -848,22 +937,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"/>
-              </if>
-            </choose>
+          <else-if match="any" variable="collection-editor compiler editor editorial-director">
+            <!-- monographic types -->
+            <text macro="source-monographic-locator"/>
           </else-if>
+          <!-- omit serial types -->
+          <else-if match="any" type="interview paper-conference"/>
           <else>
+            <!-- monographic types -->
             <text macro="source-monographic-locator"/>
           </else>
         </choose>
         <text macro="source-medium"/>
         <text macro="source-archive"/>
-        <text macro="source-DOI"/>
+        <text prefix="doi:" variable="DOI"/>
       </group>
       <text macro="source-URL"/>
     </group>
@@ -872,37 +961,24 @@
   <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" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="title-primary"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="title-and-part-filter-review"/>
-          </else>
-        </choose>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="title-primary"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="title-and-part-filter-review"/>
       </else-if>
       <else>
-        <group delimiter=" ">
-          <choose>
-            <!-- label for unsigned dictionary/encyclopedia entry in notes (MHRA 7.5) -->
-            <if match="none" position="first"/>
-            <else-if match="none" type="entry-dictionary entry-encyclopedia"/>
-            <else-if variable="author"/>
-            <else-if variable="container-title title">
-              <text term="entry"/>
-            </else-if>
-          </choose>
-          <text macro="title-primary"/>
-        </group>
+        <!-- monographic types -->
+        <text macro="title-primary"/>
       </else>
     </choose>
   </macro>
@@ -948,10 +1024,8 @@
   <macro name="title-and-part-title">
     <group delimiter=", ">
       <text macro="title-primary"/>
-      <group delimiter=", ">
-        <text macro="label-part-number"/>
-        <text macro="title-part"/>
-      </group>
+      <text macro="label-part-number"/>
+      <text macro="title-part"/>
     </group>
   </macro>
   <macro name="title-part">
@@ -984,11 +1058,34 @@
         <!-- 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">
+            <!-- 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 -->
@@ -1093,17 +1190,16 @@
     </choose>
   </macro>
   <macro name="title-volume">
-    <group delimiter=", ">
-      <group delimiter=", ">
-        <text macro="label-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"/>
-      </group>
-      <!-- `part-number` and `part-title` of monographic items refer to the source book/volume -->
-      <group delimiter=", ">
-        <text macro="label-part-number"/>
-        <text macro="title-part"/>
-      </group>
-    </group>
+      </else>
+    </choose>
   </macro>
   <!-- 3.2. Description -->
   <macro name="description">
@@ -1132,38 +1228,100 @@
         <!-- Other description -->
         <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-generic"/>
+        <text macro="description-format"/>
       </else>
     </choose>
   </macro>
-  <macro name="description-short">
+  <macro name="description-capitalized">
     <choose>
       <if match="any" type="interview" variable="interviewer">
-        <text macro="description-interview-short"/>
+        <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-short"/>
+        <text macro="description-review-capitalized"/>
       </else-if>
       <else-if type="personal_communication">
-        <text macro="description-letter-short"/>
+        <text macro="description-letter-capitalized"/>
       </else-if>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="description-serial-short"/>
+        <text macro="description-serial-capitalized"/>
       </else-if>
       <else-if type="paper-conference">
+        <text macro="description-paper-conference-capitalized"/>
+      </else-if>
+      <else-if type="song" variable="composer">
+        <text macro="description-song-capitalized"/>
+      </else-if>
+      <!-- thesis type appears with university name (cf. CMOS18 14.113) -->
+      <else-if type="thesis"/>
+      <else-if match="none" variable="container-title">
+        <!-- Other description -->
+        <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 container-author editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="description-format-short"/>
+          <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-format-capitalized"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-short">
+    <choose>
+      <if match="any" type="interview" variable="interviewer">
+        <choose>
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+            <text macro="description-interview-short"/>
           </if>
           <else>
-            <!-- serial usage -->
-            <text macro="description-serial-short"/>
+            <!-- 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"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <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">
+        <!-- serial types -->
+        <text macro="description-serial-short"/>
       </else-if>
       <else>
+        <!-- monographic types -->
         <text macro="description-format-short"/>
       </else>
     </choose>
@@ -1175,13 +1333,9 @@
       <else-if variable="genre">
         <text variable="genre"/>
       </else-if>
-      <else-if type="manuscript">
-        <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+      <else-if variable="chapter-number title"/>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number-long"/>
       </else-if>
       <else-if type="personal_communication">
         <choose>
@@ -1194,140 +1348,221 @@
           </else>
         </choose>
       </else-if>
-      <else-if variable="chapter-number title"/>
-      <else-if variable="chapter-number">
-        <text macro="label-chapter-number-long"/>
+      <!-- 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>
     </choose>
   </macro>
-  <macro name="description-format-short">
+  <macro name="description-format-capitalized">
     <choose>
-      <if variable="genre">
-        <text variable="genre"/>
-      </if>
-      <else-if variable="medium">
-        <text variable="medium"/>
+      <if variable="genre number"/>
+      <else-if variable="genre">
+        <text text-case="capitalize-first" variable="genre"/>
       </else-if>
-      <else-if type="manuscript">
-        <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+      <else-if variable="chapter-number title"/>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number-long-capitalized"/>
       </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 match="any" variable="archive archive-place container-title DOI number publisher references URL">
+            <!-- 'letter' if no `genre` (MHRA 7.11) -->
+            <text term="letter" text-case="capitalize-first"/>
           </if>
+          <else>
+            <text term="personal-communication" text-case="capitalize-first"/>
+          </else>
         </choose>
       </else-if>
-      <else-if variable="chapter-number">
-        <text macro="label-chapter-number"/>
+      <!-- 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>
     </choose>
   </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">
+  <macro name="description-format-short">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter" variable="container-title genre">
+          <!-- untitled introductions: cf. abbreviated review model, which does not print `genre` on its own (MHRA 7.12) -->
+          <text form="short" variable="genre"/>
+          <choose>
+            <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 type="article-journal" variable="container-title genre volume-title">
+          <!-- untitled introduction to a special issue or supplement -->
+          <text form="short" variable="genre"/>
+          <choose>
+            <if match="none" position="ibid ibid-with-locator">
+              <text macro="source-monographic-preposition"/>
+              <text font-style="italic" form="short" text-case="title" variable="volume-title"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if variable="genre">
+          <text form="short" variable="genre"/>
+        </else-if>
+        <else-if variable="medium">
+          <text form="short" variable="medium"/>
+        </else-if>
+        <else-if variable="chapter-number container-title">
+          <text macro="label-chapter-number"/>
+          <text macro="source-monographic-preposition"/>
+          <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-interview">
+    <!-- list the interviewer as the author and the interviewee in the description (MHRA 7.11) -->
+    <group delimiter=", ">
+      <group delimiter=" ">
         <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="description-format"/>
+          <if variable="genre number interviewer">
+            <!-- `genre` printed with `number` -->
+            <text term="interview"/>
+            <text form="verb" term="contributor"/>
+            <choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
+              </if>
+              <else>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
+              </else>
+            </choose>
           </if>
+          <else-if variable="genre interviewer">
+            <text variable="genre"/>
+            <text form="verb" term="contributor"/>
+            <choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
+              </if>
+              <else>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
+              </else>
+            </choose>
+          </else-if>
+          <else-if variable="interviewer">
+            <text term="interview"/>
+            <text form="verb" term="contributor"/>
+            <choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
+              </if>
+              <else>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <text macro="description-format"/>
+          </else>
         </choose>
-      </if>
-      <else-if match="none" type="document report software standard">
-        <text macro="description-format"/>
-      </else-if>
-    </choose>
+      </group>
+      <text macro="source-event-place-first"/>
+    </group>
   </macro>
-  <macro name="description-interview">
+  <macro name="description-interview-capitalized">
     <!-- list the interviewer as the author and the interviewee in the description (MHRA 7.11) -->
     <group delimiter=", ">
-      <choose>
-        <if variable="author interviewer">
-          <group delimiter=" ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="genre number interviewer">
+            <!-- `genre` printed with `number` -->
+            <text term="interview" text-case="capitalize-first"/>
+            <text form="verb" term="contributor"/>
             <choose>
-              <if variable="genre number interviewer">
-                <!-- `genre` printed with `number` -->
-                <text term="interview"/>
-                <text form="verb" term="contributor"/>
-                <choose>
-                  <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                    <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
-                    <names variable="author"/>
-                  </if>
-                  <else>
-                    <names variable="interviewer"/>
-                  </else>
-                </choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
               </if>
-              <else-if variable="genre interviewer">
-                <text variable="genre"/>
-                <text form="verb" term="contributor"/>
-                <choose>
-                  <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                    <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
-                    <names variable="author"/>
-                  </if>
-                  <else>
-                    <names variable="interviewer"/>
-                  </else>
-                </choose>
-              </else-if>
-              <else-if variable="interviewer">
-                <text term="interview"/>
-                <text form="verb" term="contributor"/>
-                <choose>
-                  <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
-                    <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
-                    <names variable="author"/>
-                  </if>
-                  <else>
-                    <names variable="interviewer"/>
-                  </else>
-                </choose>
-              </else-if>
               <else>
-                <text macro="description-format"/>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
               </else>
             </choose>
-          </group>
-        </if>
-        <else>
-          <choose>
-            <if variable="genre number">
-              <!-- `genre` printed with `number` -->
-              <names variable="interviewer">
-                <label form="verb" suffix=" "/>
-                <name/>
-              </names>
-            </if>
-            <else-if variable="genre">
-              <group delimiter=" ">
-                <text variable="genre"/>
-                <group delimiter=" ">
-                  <text form="verb" term="container-author"/>
-                  <names variable="interviewer"/>
-                </group>
-              </group>
-            </else-if>
-            <else-if variable="interviewer">
-              <names variable="interviewer">
-                <label form="verb" suffix=" "/>
-                <name/>
-              </names>
-            </else-if>
-            <else>
-              <text macro="description-format"/>
-            </else>
-          </choose>
-        </else>
-      </choose>
+          </if>
+          <else-if variable="genre interviewer">
+            <text text-case="capitalize-first" variable="genre"/>
+            <text form="verb" term="contributor"/>
+            <choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
+              </if>
+              <else>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
+              </else>
+            </choose>
+          </else-if>
+          <else-if variable="interviewer">
+            <text term="interview" text-case="capitalize-first"/>
+            <text form="verb" term="contributor"/>
+            <choose>
+              <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
+                <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
+                <names variable="author">
+                  <name initialize="false"/>
+                </names>
+              </if>
+              <else>
+                <names variable="interviewer">
+                  <name initialize="false"/>
+                </names>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <text macro="description-format-capitalized"/>
+          </else>
+        </choose>
+      </group>
       <text macro="source-event-place-first"/>
     </group>
   </macro>
@@ -1340,24 +1575,24 @@
           <if match="any" variable="container-title DOI issue number publisher publisher-place references URL volume">
             <!-- interviewee appears in the description of a published interview only (MHRA 7.11) -->
             <names variable="author">
-              <name form="short"/>
+              <name form="short" initialize="true"/>
             </names>
           </if>
           <else>
             <names variable="interviewer">
-              <name form="short"/>
+              <name form="short" initialize="true"/>
             </names>
           </else>
         </choose>
       </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">
-            <!-- TODO: 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"/>
+            <!-- TODO: capitalize if no author or title? -->
+            <text macro="description-format"/>
           </else>
         </choose>
       </else-if>
@@ -1376,7 +1611,7 @@
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name initialize="false"/>
               </names>
             </if>
             <else>
@@ -1384,7 +1619,7 @@
                 <text macro="description-format"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name/>
+                  <name initialize="false"/>
                 </names>
               </group>
             </else>
@@ -1398,6 +1633,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=" "/>
+                <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=", ">
@@ -1407,26 +1673,33 @@
             <text macro="description-format-short"/>
             <names variable="recipient">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name form="short" initialize="true"/>
             </names>
           </group>
         </if>
         <else>
-          <text macro="description-format-short"/>
+          <text macro="description-format-short"/>
+        </else>
+      </choose>
+      <text variable="event-place"/>
+      <choose>
+        <if variable="event-date">
+          <text macro="date-event-full"/>
+        </if>
+        <else>
+          <text macro="date-issued-full"/>
         </else>
       </choose>
-      <text variable="event-place"/>
-      <text macro="date-event-full"/>
     </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"/>
@@ -1434,6 +1707,21 @@
       </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-capitalized"/>
+      </if>
+      <else>
+        <!-- serial types -->
+        <group delimiter=", ">
+          <text macro="description-serial-capitalized"/>
+          <text macro="source-event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
   <macro name="description-review">
     <group delimiter=", ">
       <group delimiter=" ">
@@ -1447,7 +1735,33 @@
           </else>
         </choose>
         <group delimiter=", ">
-          <names variable="reviewed-author"/>
+          <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-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>
@@ -1458,16 +1772,21 @@
   </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 match="any" position="ibid ibid-with-locator">
+          <text term="review"/>
         </if>
+        <else-if variable="reviewed-author">
+          <!-- cite under author if available (MHRA 7.12) -->
+          <text term="review-of"/>
+          <names variable="reviewed-author">
+            <name initialize="false"/>
+          </names>
+          <!-- use full name, not short -->
+        </else-if>
         <else>
-          <!-- Assume title is title of reviewed work -->
-          <text font-style="italic" form="short" text-case="title" variable="title"/>
+          <text term="review-of"/>
+          <text macro="description-review-title-short"/>
         </else>
       </choose>
     </group>
@@ -1485,6 +1804,19 @@
       </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"/>
@@ -1492,6 +1824,13 @@
       <text macro="label-section"/>
     </group>
   </macro>
+  <macro name="description-serial-capitalized">
+    <group delimiter=", ">
+      <text macro="description-format"/>
+      <!-- `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"/>
@@ -1499,7 +1838,7 @@
         <text macro="description-format-short"/>
       </else-if>
       <else>
-        <text variable="section"/>
+        <text form="short" text-case="title" variable="section"/>
       </else>
     </choose>
   </macro>
@@ -1515,7 +1854,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>
@@ -1533,7 +1891,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` -->
           <text macro="identifier-number"/>
           <text macro="identifier-contributors"/>
         </else-if>
@@ -1558,7 +1916,7 @@
               <!-- if there is a volume or part, contributors except for the series editor follow the corresponding volume -->
               <names variable="collection-editor">
                 <label form="verb-short" suffix=" "/>
-                <name/>
+                <name initialize="false"/>
               </names>
             </if>
             <else-if match="any" variable="number-of-volumes part-number volume">
@@ -1566,7 +1924,7 @@
                 <if variable="collection-editor">
                   <names variable="collection-editor">
                     <label form="verb-short" suffix=" "/>
-                    <name/>
+                    <name initialize="false"/>
                   </names>
                 </if>
                 <else>
@@ -1588,17 +1946,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"/>
@@ -1609,151 +1961,147 @@
     <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="host">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="guest">
-              <label form="verb" 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 match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software"/>
-              <else-if type="thesis"/>
-              <else>
-                <names variable="contributor">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-              </else>
-            </choose>
-          </group>
+          <names variable="container-author">
+            <label form="verb-short" 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>
+          <names variable="editorial-director">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="host">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="guest">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="illustrator narrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="compiler chair organizer curator">
+            <label form="verb-short" 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-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="director">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names variable="performer">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software"/>
+            <else-if type="thesis"/>
+            <else>
+              <names variable="contributor">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </else>
+          </choose>
         </if>
         <else>
-          <!-- Handle `container-title` on `post` or `webpage` as `publisher` -->
-          <group delimiter=", ">
-            <choose>
-              <if match="none" variable="container-title">
-                <names variable="container-author">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editor-translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names delimiter=", " variable="editor translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editorial-director">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="host">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="guest">
-                  <label form="verb" 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 match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software"/>
-                  <else-if type="song"/>
-                  <else-if type="thesis"/>
-                  <else>
-                    <names variable="contributor">
-                      <label form="verb-short" suffix=" "/>
-                      <name/>
-                    </names>
-                  </else>
-                </choose>
-              </if>
-            </choose>
-            <choose>
-              <if type="song">
-                <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
-                <names variable="contributor">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-              </if>
-            </choose>
-          </group>
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` -->
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="container-author">
+                <label form="verb-short" 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>
+              <names variable="editorial-director">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="host">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="guest">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+            </if>
+          </choose>
+          <names delimiter=", " variable="illustrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <names delimiter=", " variable="narrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="false"/>
+          </names>
+          <choose>
+            <if match="none" variable="container-title">
+              <names delimiter=", " variable="compiler chair organizer curator">
+                <label form="verb-short" 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-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="director">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <names variable="performer">
+                <label form="verb" suffix=" "/>
+                <name initialize="false"/>
+              </names>
+              <choose>
+                <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software"/>
+                <else-if type="song"/>
+                <else-if type="thesis"/>
+                <else>
+                  <names variable="contributor">
+                    <label form="verb-short" suffix=" "/>
+                    <name initialize="false"/>
+                  </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 initialize="false"/>
+              </names>
+            </if>
+          </choose>
         </else>
       </choose>
     </group>
@@ -1764,54 +2112,56 @@
         <if type="periodical">
           <names variable="editor">
             <label form="verb-short" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </if>
       </choose>
       <names delimiter=", " variable="translator narrator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="compiler chair organizer curator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <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/>
+        <name initialize="false"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
     </group>
   </macro>
   <macro name="identifier-edition">
     <choose>
-      <if match="none" variable="original-date">
+      <if variable="original-title">
         <text macro="label-edition"/>
       </if>
-      <else-if variable="original-title">
+      <else-if variable="original-date"/>
+      <else>
         <text macro="label-edition"/>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="identifier-number">
     <group delimiter=" ">
       <choose>
-        <if is-numeric="number" type="broadcast" variable="genre">
+        <if type="thesis"/>
+        <else-if is-numeric="number" type="broadcast" variable="genre">
           <text variable="genre"/>
           <text variable="number"/>
-        </if>
+        </else-if>
         <else-if is-numeric="number" type="broadcast">
           <text value="episode"/>
           <text variable="number"/>
@@ -1875,30 +2225,25 @@
   </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` -->
+        <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">
@@ -1953,8 +2298,8 @@
         <!-- Journal special issues (cf. CMOS18 14.77) and supplements (cf. CMOS18 14.78) -->
         <group delimiter=", ">
           <group delimiter=" ">
-            <text term="in"/>
-            <text font-style="italic" text-case="title" variable="volume-title"/>
+            <text macro="source-monographic-preposition"/>
+            <text macro="title-volume"/>
           </group>
           <text macro="source-monographic-identifier-contributors"/>
         </group>
@@ -2009,8 +2354,8 @@
         </else-if>
         <else>
           <choose>
-            <if match="any" type="interview" variable="interviewer">
-              <!-- publisher possible with `interview` (cf. CMOS18 14.110) -->
+            <if match="any" type="interview post-weblog">
+              <!-- publisher possible with broadcast `interview` (cf. CMOS18 14.110) or `post-weblog` (cf. CMOS18 14.105) -->
               <text variable="publisher"/>
             </if>
           </choose>
@@ -2045,7 +2390,16 @@
           <group delimiter=", ">
             <text macro="label-page"/>
             <!-- `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>
           <text macro="label-locator" prefix="(" suffix=")"/>
         </group>
@@ -2086,6 +2440,13 @@
     <group delimiter=" ">
       <choose>
         <if match="any" type="broadcast entry entry-dictionary entry-encyclopedia motion_picture"/>
+        <else-if type="chapter" variable="container-title genre">
+          <!-- <https://www.mhra.org.uk/publications/Encounters-with-Albion/style-tutorial-2> appears to intend 'introduction to' (as CMOS18 14.12, 14.14) rather than 'introduction in' (NHR 18.2.6) -->
+          <text value="to"/>
+        </else-if>
+        <else-if type="article-journal" variable="container-title genre volume-title">
+          <text value="to"/>
+        </else-if>
         <else-if type="song" variable="chapter-number title">
           <text macro="label-chapter-number"/>
           <text term="from"/>
@@ -2109,21 +2470,13 @@
   <!-- 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">
-        <!-- For entries in mobile app reference works, place description after `container-title` -->
+      <if match="any" type="document report software standard">
+        <!-- place description after `container-title` -->
         <text macro="description-format"/>
-      </else-if>
-      <else-if match="any" type="document report standard">
-        <!-- For chapters in report, standards, and generic documents, place description after `container-title` -->
+      </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>
@@ -2145,7 +2498,7 @@
               <!-- if there is a volume or part, contributors except for the series editor follow the corresponding volume -->
               <names variable="collection-editor">
                 <label form="verb-short" suffix=" "/>
-                <name/>
+                <name initialize="false"/>
               </names>
             </if>
             <else-if match="any" variable="number-of-volumes part-number volume">
@@ -2153,7 +2506,7 @@
                 <if variable="collection-editor">
                   <names variable="collection-editor">
                     <label form="verb-short" suffix=" "/>
-                    <name/>
+                    <name initialize="false"/>
                   </names>
                 </if>
                 <else>
@@ -2173,47 +2526,47 @@
     <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>
       <names variable="host">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="guest">
-        <label form="verb" suffix=" "/>
-        <name/>
+        <label form="verb-short" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="chair organizer">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names delimiter=", " variable="illustrator narrator compiler curator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <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/>
+        <name initialize="false"/>
       </names>
       <names variable="editorial-director">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="director">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="false"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="false"/>
       </names>
       <choose>
         <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software"/>
@@ -2223,7 +2576,7 @@
           <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
           <names variable="contributor">
             <label form="verb-short" suffix=" "/>
-            <name/>
+            <name initialize="false"/>
           </names>
         </else>
       </choose>
@@ -2232,24 +2585,43 @@
   <!-- Monographic source locator -->
   <macro name="source-monographic-locator">
     <group delimiter=", ">
-      <text macro="source-monographic-locator-volume"/>
-      <group delimiter=" ">
-        <choose>
-          <if variable="page">
+      <choose>
+        <if match="none" type="post webpage">
+          <!-- part number/title always at the analytic level -->
+          <text macro="source-monographic-locator-volume"/>
+        </if>
+      </choose>
+      <choose>
+        <!-- archival locators appear after the shelfmark (MHRA 7.7) -->
+        <if locator="column" variable="archive archive_location page"/>
+        <else-if locator="folio" variable="archive archive_location page"/>
+        <else-if locator="page" variable="archive archive_location page"/>
+        <else-if variable="archive archive_location page">
+          <text macro="label-locator"/>
+        </else-if>
+        <else-if variable="page">
+          <group delimiter=" ">
             <text macro="label-page"/>
             <text macro="label-locator" prefix="(" suffix=")"/>
-          </if>
-          <else>
-            <text macro="label-locator"/>
-          </else>
-        </choose>
-      </group>
+          </group>
+        </else-if>
+        <else-if locator="column" variable="archive archive_location"/>
+        <else-if locator="folio" variable="archive archive_location"/>
+        <else-if locator="page" variable="archive archive_location"/>
+        <else>
+          <text macro="label-locator"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="source-monographic-locator-volume">
     <group delimiter=" ">
       <group delimiter=", ">
+        <text macro="label-volume"/>
         <text macro="title-volume"/>
+        <!-- `part-number` and `part-title` of monographic items refer to the source book/volume -->
+        <text macro="label-part-number"/>
+        <text macro="title-part"/>
         <choose>
           <if type="broadcast">
             <text macro="identifier-number"/>
@@ -2365,9 +2737,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>
@@ -2410,19 +2783,18 @@
   <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 -->
-              <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 -->
+          <text macro="source-publication-and-date"/>
+        </else-if>
+        <!-- omit serial types -->
+        <else-if match="any" type="interview paper-conference"/>
         <else>
+          <!-- monographic types -->
           <text macro="source-publication-and-date"/>
         </else>
       </choose>
@@ -2448,7 +2820,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>
@@ -2465,7 +2837,7 @@
       <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>
@@ -2478,81 +2850,69 @@
   </macro>
   <macro name="source-monographic-publication-short-bracketed">
     <!-- mirrors `source-monographic-publication-bracketed` -->
-    <choose>
-      <if disambiguate="true">
-        <group delimiter=", " prefix="(" suffix=")">
+    <group delimiter=", " prefix="(" suffix=")">
+      <choose>
+        <if disambiguate="true" match="none"/>
+        <!-- Facts of publication with brackets for print monographic formats -->
+        <else-if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
           <choose>
-            <!-- Facts of publication with brackets for print monographic formats -->
-            <if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
-              <text macro="source-date"/>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
             </if>
-            <else-if type="article" variable="genre publisher">
-              <!-- without brackets for a preprint in a repository (cf. CMOS18 14.76), with brackets for a working paper (cf. CMOS18 14.116) -->
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
-              <text macro="source-date"/>
-            </else-if>
-            <else-if type="motion_picture" variable="publisher">
-              <choose>
-                <if disambiguate="true">
-                  <text macro="source-publication-publisher"/>
-                </if>
-              </choose>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="article" variable="genre publisher">
+          <!-- without brackets for a preprint in a repository (cf. CMOS18 14.76), with brackets for a working paper (cf. CMOS18 14.116) -->
+          <choose>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
+            </if>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="motion_picture" variable="publisher">
+          <choose>
+            <if disambiguate="true">
+              <text macro="source-publication-publisher"/>
+            </if>
+          </choose>
+          <text macro="source-date"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+              <!-- in an edited collection -->
               <text macro="source-date"/>
-            </else-if>
-            <else-if type="personal_communication">
-              <choose>
-                <if match="any" variable="collection-editor compiler editor editorial-director publisher">
-                  <!-- in an edited collection -->
-                  <text macro="source-date"/>
-                </if>
-              </choose>
-            </else-if>
+            </if>
           </choose>
-        </group>
-      </if>
-    </choose>
+        </else-if>
+      </choose>
+    </group>
   </macro>
   <macro name="source-monographic-publication-short-unbracketed">
     <!-- mirrors `source-monographic-publication-unbracketed` -->
     <choose>
-      <if disambiguate="true">
+      <if disambiguate="true" match="none"/>
+      <!-- Facts of publication without brackets -->
+      <else-if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis"/>
+      <else-if type="article" variable="genre publisher"/>
+      <else-if type="motion_picture" variable="publisher"/>
+      <else-if type="personal_communication">
         <choose>
-          <!-- Facts of publication without brackets -->
-          <if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis"/>
-          <else-if type="article" variable="genre publisher"/>
-          <else-if type="motion_picture" variable="publisher"/>
-          <else-if type="personal_communication">
-            <choose>
-              <if match="none" variable="collection-editor compiler editor editorial-director publisher">
-                <!-- not in an edited collection -->
-                <text macro="source-date"/>
-              </if>
-            </choose>
-          </else-if>
-          <else>
+          <if match="none" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+            <!-- not in an edited collection -->
             <text macro="source-date"/>
-          </else>
+          </if>
         </choose>
-      </if>
+      </else-if>
+      <else>
+        <text macro="source-date"/>
+      </else>
     </choose>
   </macro>
   <macro name="source-publication-and-date">
     <group delimiter=", ">
-      <choose>
-        <if match="any" type="post webpage">
-          <!-- `container-title` functions like a publisher with social media and website sources (cf. CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
-        </if>
-      </choose>
       <text macro="source-publication-history"/>
       <group delimiter=" ">
         <text macro="source-date-status"/>
@@ -2572,7 +2932,7 @@
         <!-- thesis type appears with university name (MHRA 7.10) -->
         <group delimiter=" ">
           <text value="unpublished"/>
-          <text macro="description-format"/>
+          <text variable="genre"/>
         </group>
       </else-if>
       <else-if match="any" variable="original-publisher original-publisher-place">
@@ -2588,16 +2948,16 @@
     </choose>
   </macro>
   <macro name="source-publication-history">
-    <choose>
-      <if variable="original-title">
-        <!-- `original-title` is covered in `source-publication-original-title-bib` -->
-        <group delimiter=", ">
-          <text macro="source-publication-description"/>
-          <text macro="source-publication-publisher"/>
-        </group>
-      </if>
-      <else-if match="any" variable="edition original-publisher original-publisher-place">
-        <group delimiter="; ">
+    <group delimiter="; ">
+      <choose>
+        <if variable="original-title">
+          <!-- `original-title` is covered in `source-publication-original-title-bib` -->
+          <group delimiter=", ">
+            <text macro="source-publication-description"/>
+            <text macro="source-publication-publisher"/>
+          </group>
+        </if>
+        <else-if match="any" variable="edition original-publisher original-publisher-place">
           <!-- semicolon to separate original date if `original-publisher` (cf. CMOS18 14.16) -->
           <group delimiter=", ">
             <text macro="source-publication-publisher-original"/>
@@ -2614,19 +2974,17 @@
               <text macro="source-publication-publisher"/>
             </group>
           </group>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter="; ">
+        </else-if>
+        <else>
           <!-- semicolon to separate original date if no publisher (cf. CMOS18 14.165) -->
           <text macro="source-date-original"/>
           <group delimiter=", ">
             <text macro="source-publication-description"/>
             <text macro="source-publication-publisher"/>
           </group>
-        </group>
-      </else>
-    </choose>
+        </else>
+      </choose>
+    </group>
   </macro>
   <macro name="source-publication-original-title">
     <!-- Work originally published under a different title (cf. CMOS18 13.101) -->
@@ -2635,7 +2993,9 @@
         <group delimiter=" ">
           <text term="original-work-published"/>
           <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=")">
@@ -2696,7 +3056,7 @@
   <macro name="source-date">
     <choose>
       <if variable="available-date issued">
-        <date date-parts="year" form="text" variable="available-date"/>
+        <date date-parts="year" form="numeric" variable="available-date"/>
       </if>
       <else>
         <text macro="source-date-issued-or-status"/>
@@ -2714,21 +3074,6 @@
         <!-- Provide issue date for letters listed under event-date -->
         <text macro="date-issued-year"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="source-date-issued-full-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="date-issued-year"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-date-issued-full-serial"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -2740,15 +3085,27 @@
           </else>
         </choose>
       </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software speech standard webpage">
         <text macro="date-issued-full"/>
       </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="source-date-issued-full-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-issued-full-serial"/>
+      </else-if>
       <else-if variable="issued">
         <text macro="date-issued-year"/>
       </else-if>
       <else-if variable="available-date">
         <!-- possible recourse for multivolume series (e.g. CMOS18 14.26) -->
-        <date date-parts="year" form="text" variable="available-date"/>
+        <date date-parts="year" form="numeric" variable="available-date"/>
       </else-if>
       <else-if variable="event-date">
         <text macro="date-event-year"/>
@@ -2815,21 +3172,6 @@
         <!-- Provide original date for letters listed under event-date -->
         <text macro="date-original-year"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="source-date-original-full-serial"/>
-      </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="date-original-year"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-date-original-full-serial"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -2841,10 +3183,23 @@
           </else>
         </choose>
       </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software speech standard webpage">
         <text macro="date-original-full"/>
       </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="source-date-original-full-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="date-original-year"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-original-full-serial"/>
+      </else-if>
       <else>
+        <!-- monographic types -->
         <text macro="date-original-year"/>
       </else>
     </choose>
@@ -2874,7 +3229,7 @@
         <text variable="status"/>
       </else-if>
       <!-- 'published online' for a work available ahead of print (MHRA 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>
@@ -2886,17 +3241,11 @@
       <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="source-locator-subsequent-serial"/>
       </if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="source-locator-subsequent-monographic"/>
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="source-locator-subsequent-monographic"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-locator-subsequent-serial"/>
-          </else>
-        </choose>
+        <text macro="source-locator-subsequent-serial"/>
       </else-if>
       <else>
         <text macro="source-locator-subsequent-monographic"/>
@@ -2904,19 +3253,19 @@
     </choose>
   </macro>
   <macro name="source-locator-subsequent-monographic">
-    <group delimiter=", ">
-      <choose>
-        <if variable="container-title">
-          <!-- Do not provide `volume` or `part-number` for defined section -->
-          <text macro="label-locator"/>
-        </if>
-        <else>
+    <choose>
+      <if variable="container-title">
+        <!-- Do not provide `volume` or `part-number` for defined section -->
+        <text macro="label-locator"/>
+      </if>
+      <else>
+        <group delimiter=", ">
           <text macro="label-volume"/>
           <text macro="label-part-number"/>
           <text macro="label-locator"/>
-        </else>
-      </choose>
-    </group>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="source-locator-subsequent-serial">
     <group delimiter=", ">
@@ -2944,6 +3293,63 @@
       <text variable="archive"/>
       <text variable="archive_collection"/>
       <text variable="archive_location"/>
+      <choose>
+        <!-- archival locators appear after the shelfmark (MHRA 7.7) -->
+        <if locator="column" variable="archive archive_location page">
+          <text macro="source-archive-locator-page"/>
+        </if>
+        <else-if locator="folio" variable="archive archive_location page">
+          <text macro="source-archive-locator-page"/>
+        </else-if>
+        <else-if locator="page" variable="archive archive_location page">
+          <text macro="source-archive-locator-page"/>
+        </else-if>
+        <else-if variable="archive archive_location page">
+          <choose>
+            <if is-numeric="page">
+              <!-- TODO: remove this conditional when `page` parsing is fixed for different locator types -->
+              <text macro="label-page"/>
+            </if>
+            <else>
+              <text variable="page"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if locator="column" variable="archive archive_location">
+          <text macro="label-locator"/>
+        </else-if>
+        <else-if locator="folio" variable="archive archive_location">
+          <text macro="label-locator"/>
+        </else-if>
+        <else-if locator="page" variable="archive archive_location">
+          <text macro="label-locator"/>
+        </else-if>
+      </choose>
+      <choose>
+        <!-- database identifier, if not included elsewhere (cf. CMOS18 14.113) -->
+        <if match="any" variable="archive_collection archive_location archive-place"/>
+        <else-if type="thesis">
+          <text variable="number"/>
+        </else-if>
+        <else-if match="any" type="dataset entry song" variable="genre"/>
+        <else-if variable="archive">
+          <text variable="number"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="source-archive-locator-page">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="page">
+          <!-- TODO: remove this conditional when `page` parsing is fixed for different locator types -->
+          <text macro="label-page"/>
+        </if>
+        <else>
+          <text variable="page"/>
+        </else>
+      </choose>
+      <text macro="label-locator" prefix="(" suffix=")"/>
     </group>
   </macro>
   <macro name="source-archive-short">
@@ -2954,25 +3360,18 @@
           <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-DOI">
-    <choose>
-      <if variable="DOI">
-        <text prefix="doi:" variable="DOI"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="source-URL">
     <choose>
-      <if variable="DOI URL"/>
+      <if variable="DOI"/>
       <else-if variable="URL">
         <group delimiter=" ">
           <text prefix="&lt;" suffix="&gt;" variable="URL"/>
-          <!-- provide an access date for URL but not DOIs (MHRA 6.1, 6.3, 7.4) -->
+          <!-- provide an access date for URLs but not DOIs (MHRA 6.1, 6.3, 7.4) -->
           <group delimiter=" " prefix="[" suffix="]">
             <text term="accessed"/>
             <date form="text" variable="accessed"/>
@@ -2989,14 +3388,15 @@
         <text macro="title-and-descriptions-short"/>
         <text macro="citation-notes-shortened-author-title-disambiguate"/>
         <choose>
-          <if match="any" type="interview personal_communication">
-            <choose>
-              <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-                <!-- unpublished `interview` or `personal_communication` use inline format (NHR 17.3.2) -->
-                <text macro="date-short"/>
-              </if>
-            </choose>
-          </if>
+          <!-- inaccessible `interview` or `personal_communication` uses in-text format (cf. NHR 17.3.2, CMOS18 14.111): give the date at the first citation in shortened notes -->
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
+          <else-if position="first" type="interview">
+            <text macro="date-short"/>
+            <text macro="source-medium"/>
+          </else-if>
+          <else-if position="first" type="personal_communication">
+            <text macro="source-medium"/>
+          </else-if>
         </choose>
         <text macro="source-monographic-publication-short-unbracketed"/>
       </group>
@@ -3010,7 +3410,7 @@
         <if disambiguate="true">
           <names variable="editor-translator">
             <label form="verb-short" suffix=" "/>
-            <name form="short"/>
+            <name form="short" initialize="true"/>
             <substitute>
               <names variable="editor"/>
               <names variable="translator"/>
@@ -3028,20 +3428,18 @@
   </macro>
   <citation disambiguate-add-givenname="true" disambiguate-add-names="true">
     <layout delimiter="; " suffix=".">
-      <choose>
-        <if position="subsequent">
-          <group delimiter=", ">
+      <group delimiter=", ">
+        <choose>
+          <if position="subsequent">
             <text macro="citation-notes-shortened-author-title-item"/>
             <text macro="source-locator-subsequent"/>
-          </group>
-        </if>
-        <else>
-          <group delimiter=", ">
+          </if>
+          <else>
             <text macro="author-note"/>
             <text macro="title-and-source"/>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
     </layout>
   </citation>
   <!-- Bibliography -->
@@ -3084,24 +3482,15 @@
             </if>
           </choose>
         </else-if>
-        <else-if match="any" type="interview personal_communication">
-          <!-- Personal communications only appear in the bibliography if the reader can retrieve them (cf. MHRA 7.11, NHR 17.3.2, CMOS18 14.13, 14.111) -->
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
-        </else-if>
-        <else-if match="any" type="document manuscript paper-conference speech">
-          <!-- In note styles, the bibliography also omits inaccessible manuscripts (cf. CMOS18 14.114), conference papers (cf. CMOS18 14.115), and private documents (cf. CMOS18 14.118) -->
-          <choose>
-            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
-        </else-if>
         <!-- social media content usually omitted from the bibliography (cf. CMOS18 14.106) -->
         <else-if type="post"/>
+        <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+          <text macro="bibliography-notes"/>
+        </else-if>
+        <!-- Personal communications only appear in the bibliography if the reader can retrieve them (cf. MHRA 7.11, NHR 17.3.2, CMOS18 14.13, 14.111) -->
+        <else-if match="any" type="interview personal_communication"/>
+        <!-- In note styles, the bibliography also omits inaccessible manuscripts (cf. CMOS18 14.114), conference papers (cf. CMOS18 14.115), and private documents (cf. CMOS18 14.118) -->
+        <else-if match="any" type="document manuscript paper-conference speech"/>
         <else>
           <text macro="bibliography-notes"/>
         </else>