csl-styles 2.0.2 → 2.1.0

data/vendor/styles/{modern-humanities-research-association-notes-no-url.csl → oxford-journals-scimed-numeric-parentheses.csl}

@@ -1,31 +1,39 @@
 <?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" class="in-text" delimiter-precedes-et-al="never" delimiter-precedes-last="always" demote-non-dropping-particle="display-and-sort" et-al-min="4" et-al-use-first="3" initialize-with="" initialize-with-hyphen="false" name-as-sort-order="all" name-delimiter=", " names-delimiter=", " page-range-format="minimal" sort-separator=" " 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, without URLs)</title>
-    <title-short>MHRA Style Guide (notes, no URLs)</title-short>
-    <id>http://www.zotero.org/styles/modern-humanities-research-association-notes-no-url</id>
-    <link href="http://www.zotero.org/styles/modern-humanities-research-association-notes-no-url" rel="self"/>
-    <link href="https://www.mhra.org.uk/style/" rel="documentation"/>
+    <title>Oxford University Press - Science and Medicine Journals (numbered, parentheses)</title>
+    <title-short>OUP SciMed (author-number/numeric/citation-sequence/Vancouver), based on New Hart's Rules/NHR</title-short>
+    <id>http://www.zotero.org/styles/oxford-journals-scimed-numeric-parentheses</id>
+    <link href="http://www.zotero.org/styles/oxford-journals-scimed-numeric-parentheses" rel="self"/>
+    <link href="http://www.zotero.org/styles/new-harts-rules-notes" rel="template"/>
+    <link href="https://en.wikipedia.org/wiki/Hart's_Rules" rel="documentation"/>
+    <link href="http://zotero.org/groups/2205533/collections/499SCKUW" rel="documentation"/>
+    <link href="https://academic.oup.com/emph/pages/Manuscript_Preparation" rel="documentation"/>
     <author>
       <name>Andrew Dunning</name>
       <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </author>
-    <category citation-format="note"/>
-    <category field="generic-base"/>
-    <category field="history"/>
-    <category field="humanities"/>
-    <category field="linguistics"/>
-    <category field="literature"/>
-    <category field="philosophy"/>
-    <category field="theology"/>
-    <summary>MHRA source citations, notes system, without URLs</summary>
-    <updated>2025-08-07T00:00:00+00:00</updated>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <category field="science"/>
+    <summary>Oxford source citations, numbered system, with in-text references in parentheses: Oxford Journals customization using bibliography entries punctuated with full stops with unspaced initials, bracketed roles, article titles in sentence case without quotes, short journal titles, abbreviated journal identification, publisher name.</summary>
+    <updated>2026-02-05T00:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part form="short" name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
     <terms>
+      <!-- Like Chicago, Oxford omits 'by' from `verb-short` forms; it abbreviates only the most common roles -->
+      <term name="accessed">date last accessed</term>
       <term name="advance-online-publication">published online</term>
+      <term form="verb-short" name="collection-editor">ed.</term>
+      <term form="verb-short" name="compiler">comp.</term>
+      <term form="verb-short" name="editor">ed.</term>
       <term form="short" name="editor-translator">
         <single>ed. and trans.</single>
         <multiple>eds and trans.</multiple>
@@ -34,17 +42,18 @@
         <single>ed. and trans.</single>
         <multiple>eds and trans.</multiple>
       </term>
-      <term form="verb-short" name="editor-translator">ed. and trans. by</term>
-      <term form="verb-short" name="editortranslator">ed. and trans. by</term>
-      <term name="et-al">and others</term>
+      <term form="verb-short" name="editor-translator">ed. and trans.</term>
+      <term form="verb-short" name="editortranslator">ed. and trans.</term>
+      <term form="verb-short" name="illustrator">illus.</term>
       <term name="manuscript">unpublished manuscript</term>
-      <term name="original-work-published">originally published as</term>
       <term form="short" name="paper-conference">paper</term>
+      <term form="verb-short" name="translator">trans.</term>
     </terms>
   </locale>
+  <!-- This file's main source is the New Oxford Style Manual (2016), with reference also to the Oxford Style Manual (2003) <https://archive.org/details/oxfordstylemanua0000unse>, which provides more detailed guidance on many points. -->
   <!-- Contents:
     
-       This file interprets MHRA using APA's four basic reference elements:
+       This file interprets Oxford style using APA's four basic reference elements:
 
         1. Author
         2. Date (author-date system only)
@@ -63,8 +72,15 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
+       
+       Freeform annotations to bibliography entries: 
+        
+        5. Notes
+       
+       Legal references (NHR 13) use OSCOLA:
+
+        6. Legal references
   -->
-  <!-- MHRA draws heavily on the Oxford Style Manual <https://archive.org/details/oxfordstylemanua0000unse> (especially its approach to the author-date system, 15.19), with some updates from more recent editions (including New Hart's Rules). This file follows OSM/NHR guidance where MHRA is silent. It also reuses code written for the Chicago Manual of Style (CMOS) and APA. -->
   <!-- Categories of CSL item types:
 
        Serial
@@ -113,6 +129,19 @@
       <text variable="chapter-number"/>
     </group>
   </macro>
+  <macro name="label-chapter-number-long-capitalized">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="chapter-number" type="song">
+          <text text-case="capitalize-first" value="track"/>
+        </if>
+        <else-if is-numeric="chapter-number">
+          <label text-case="capitalize-first" variable="chapter-number"/>
+        </else-if>
+      </choose>
+      <text variable="chapter-number"/>
+    </group>
+  </macro>
   <macro name="label-edition">
     <group delimiter=" ">
       <choose>
@@ -121,22 +150,18 @@
           <label form="short" variable="edition"/>
         </if>
         <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- full label for serial edition (cf. CMOS18 14.89) -->
+          <!-- serial types: full label (cf. CMOS18 14.89) -->
           <text variable="edition"/>
           <label variable="edition"/>
         </else-if>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text variable="edition"/>
+        </else-if>
         <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor compiler editor editorial-director">
-              <!-- monographic usage -->
-              <text variable="edition"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text variable="edition"/>
-              <label variable="edition"/>
-            </else>
-          </choose>
+          <!-- serial types -->
+          <text variable="edition"/>
+          <label variable="edition"/>
         </else-if>
         <else>
           <text variable="edition"/>
@@ -152,24 +177,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>
@@ -184,10 +206,11 @@
   <macro name="label-locator">
     <group delimiter=" ">
       <choose>
-        <if is-numeric="locator">
+        <if locator="column page" match="any"/>
+        <else-if is-numeric="locator">
           <label form="short" variable="locator"/>
-        </if>
-        <!-- a non-numeric canonical reference is described by its formatting and does not need a label, similar to a timestamp (MHRA 7.3c) -->
+        </else-if>
+        <!-- a non-numeric canonical reference is described by its formatting and does not need a label, similar to a timestamp (NHR 17.2.5) -->
         <else-if locator="chapter line verse" match="any"/>
         <else>
           <label form="short" variable="locator"/>
@@ -196,6 +219,12 @@
       <text variable="locator"/>
     </group>
   </macro>
+  <macro name="label-locator-all">
+    <group delimiter=" ">
+      <label form="short" variable="locator"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
   <macro name="label-number">
     <group delimiter=" ">
       <choose>
@@ -258,10 +287,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>
@@ -279,36 +312,29 @@
     </group>
   </macro>
   <macro name="label-volume">
-    <!-- label a volume by rendering it in Roman numerals (MHRA 7.3) -->
-    <choose>
-      <if is-numeric="volume">
-        <number font-variant="small-caps" form="roman" variable="volume"/>
-      </if>
-      <else>
-        <text variable="volume"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="volume">
+          <label form="short" variable="volume"/>
+        </if>
+      </choose>
+      <text variable="volume"/>
+    </group>
+    <!-- in OGS and other styles, label a volume by rendering it in Roman numerals (NHR 18.2.7): -->
+    <!-- <choose><if is-numeric="volume"><number form="roman" variable="volume"/></if><else><text variable="volume"/></else></choose>-->
   </macro>
   <!-- 1. Author -->
   <macro name="author-bib">
     <group delimiter=", ">
       <names variable="composer">
-        <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" name-as-sort-order="first"/>
+        <!-- for OGS: -->
+        <!-- <name delimiter-precedes-et-al="after-inverted-name" delimiter-precedes-last="always" font-variant="small-caps" initialize="true" name-as-sort-order="first"/><et-al font-variant="normal"/>-->
+        <et-al font-style="italic"/>
         <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>
-          </choose>
           <names variable="author"/>
-          <names variable="host"/>
           <names variable="guest"/>
+          <names variable="host"/>
           <choose>
             <if type="song">
               <names variable="performer"/>
@@ -316,7 +342,7 @@
           </choose>
           <choose>
             <if type="classic">
-              <!-- editors in author position only for an edited collection (MHRA 8.3) -->
+              <!-- editors in author position only for an edited collection (NHR 18.2.2) -->
               <text macro="author-title-substitute"/>
             </if>
           </choose>
@@ -343,8 +369,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">
+              <!-- list under a publisher, developer, or owner/sponsor name (NHR 18.8.1-5) -->
               <text variable="publisher"/>
             </if>
             <else-if type="standard">
@@ -352,197 +378,24 @@
               <text variable="authority"/>
             </else-if>
           </choose>
-          <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>
-          </choose>
-        </substitute>
-      </names>
-      <text macro="author-contributors"/>
-    </group>
-  </macro>
-  <macro name="author-note">
-    <group delimiter=", ">
-      <names variable="composer">
-        <name delimiter-precedes-last="contextual"/>
-        <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>
-          </choose>
-          <names variable="author"/>
-          <names variable="illustrator"/>
           <choose>
-            <if type="song">
-              <names variable="performer"/>
+            <if type="webpage">
+              <!-- website title substituted if no `publisher` (NHR 18.8.1-5) -->
+              <text text-case="title" variable="container-title"/>
             </if>
           </choose>
-          <!-- do not list editors or translators as authors (MHRA 7.3) -->
+          <text macro="author-title-substitute"/>
           <choose>
-            <if type="software">
-              <!-- `software` listed under the name of the publisher or developer (MHRA 7.8) -->
-              <text variable="publisher"/>
-            </if>
-            <else-if type="standard">
-              <!-- `standard` listed in bibliography under organization, but note omits this (cf. CMOS18 14.159) -->
-              <text variable="authority"/>
+            <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>
-          <text macro="author-review-unsigned"/>
         </substitute>
       </names>
-      <text macro="author-contributors"/>
     </group>
   </macro>
-  <macro name="author-short">
-    <choose>
-      <if match="any" type="interview personal_communication">
-        <text macro="author-short-and-recipient"/>
-      </if>
-      <else>
-        <names variable="composer">
-          <name form="short"/>
-          <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>
-            </choose>
-            <names variable="author"/>
-            <names variable="host"/>
-            <names variable="illustrator"/>
-            <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) -->
-                <text variable="publisher"/>
-              </if>
-              <else-if type="standard">
-                <!-- `standard` listed in bibliography under organization, but note omits this (cf. CMOS18 14.159) -->
-                <text variable="authority"/>
-              </else-if>
-            </choose>
-            <choose>
-              <if type="manuscript">
-                <choose>
-                  <if match="none" variable="container-title event-date event-place event-title genre title publisher publisher-place">
-                    <text macro="source-archive-short"/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </substitute>
-        </names>
-      </else>
-    </choose>
-  </macro>
   <!-- Author elements -->
-  <macro name="author-contributors">
-    <!-- contributors immediately follow the main author (MHRA 7.9.v); assumed that this should appear with most bracketed types -->
-    <choose>
-      <if match="none" variable="author composer interviewer performer"/>
-      <else-if match="any" type="classic thesis"/>
-      <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/>
-        </names>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="author-short-and-recipient">
-    <group delimiter=" ">
-      <choose>
-        <!-- Inaccessible personal commmunication is cited in-text (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/>
-              </names>
-            </if>
-          </choose>
-        </if>
-        <else-if variable="author 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"/>
-              </names>
-            </if>
-            <else>
-              <names variable="author">
-                <name form="short"/>
-              </names>
-            </else>
-          </choose>
-        </else-if>
-        <else-if variable="author recipient">
-          <names variable="author">
-            <label/>
-            <name form="short"/>
-          </names>
-          <choose>
-            <if match="none" variable="genre">
-              <names variable="recipient">
-                <label form="verb" suffix=" "/>
-                <name form="short"/>
-              </names>
-            </if>
-          </choose>
-        </else-if>
-        <else>
-          <names variable="author">
-            <name form="short"/>
-            <substitute>
-              <text macro="title-and-descriptions-short"/>
-            </substitute>
-          </names>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="author-review-unsigned">
-    <choose>
-      <!-- [Anon.] with an unsigned review (MHRA 7.4.x) -->
-      <if type="article-journal" variable="reviewed-author">
-        <text form="short" prefix="[" suffix="]" term="anonymous" text-case="capitalize-first"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="author-title-substitute">
     <choose>
       <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
@@ -563,82 +416,29 @@
         <text macro="title"/>
       </else-if>
       <else>
-        <!-- If an item has no `title`, substitute with descriptions. -->
-        <text macro="title-and-descriptions"/>
-      </else>
-    </choose>
-  </macro>
-  <!-- 2. Date -->
-  <macro name="date-short">
-    <choose>
-      <if variable="issued">
-        <group delimiter=" ">
-          <text macro="date-original-year" prefix="[" suffix="]"/>
-          <group>
-            <choose>
-              <if match="any" type="interview personal_communication">
-                <choose>
-                  <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-                    <!-- These variables indicate that the communication is retrievable by the reader. If not, then use the in-text-only personal communication format -->
-                    <text macro="date-issued-full"/>
-                  </if>
-                  <else>
-                    <text macro="date-issued-year"/>
-                  </else>
-                </choose>
-              </if>
-              <else>
-                <text macro="date-issued-year"/>
-              </else>
-            </choose>
-            <text variable="year-suffix"/>
-          </group>
+        <!-- if an item has no `title`, substitute with descriptions and capitalize -->
+        <group delimiter=", ">
+          <text macro="description-capitalized"/>
+          <text macro="identifier"/>
         </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 -->
-        <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>
-        </choose>
-      </else-if>
-      <else>
-        <text form="short" term="no date"/>
-        <text prefix="-" variable="year-suffix"/>
       </else>
     </choose>
   </macro>
+  <!-- 2. Date -->
   <!-- Date elements -->
   <macro name="date-event-full">
     <choose>
       <if is-uncertain-date="issued">
-        <date form="text" prefix="[" suffix="?]" variable="event-date"/>
+        <choose>
+          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
+            <group prefix="[" suffix="]">
+              <date form="text" suffix="?" variable="event-date"/>
+            </group>
+          </if>
+          <else>
+            <date form="text" suffix="?" variable="event-date"/>
+          </else>
+        </choose>
       </if>
       <else>
         <date form="text" variable="event-date"/>
@@ -648,10 +448,19 @@
   <macro name="date-event-year">
     <choose>
       <if is-uncertain-date="issued">
-        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="event-date"/>
+        <choose>
+          <if type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
+            <group prefix="[" suffix="]">
+              <date date-parts="year" form="numeric" suffix="?" variable="event-date"/>
+            </group>
+          </if>
+          <else>
+            <date date-parts="year" form="numeric" suffix="?" variable="event-date"/>
+          </else>
+        </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="event-date"/>
+        <date date-parts="year" form="numeric" variable="event-date"/>
       </else>
     </choose>
   </macro>
@@ -659,16 +468,13 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date form="text" suffix="?" variable="issued"/>
             </group>
           </if>
           <else>
-            <!-- uncertain dates are presumably bracketed for other types (MHRA 7.3) -->
-            <date form="text" prefix="[" suffix="?]" variable="issued"/>
+            <date form="text" suffix="?" variable="issued"/>
           </else>
         </choose>
       </if>
@@ -681,21 +487,18 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date date-parts="year" form="numeric" suffix="?" 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"/>
+            <date date-parts="year" form="numeric" suffix="?" variable="issued"/>
           </else>
         </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <date date-parts="year" form="numeric" variable="issued"/>
       </else>
     </choose>
   </macro>
@@ -703,16 +506,13 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date date-parts="year-month" form="text" suffix="?" 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"/>
+            <date date-parts="year-month" form="text" suffix="?" variable="issued"/>
           </else>
         </choose>
       </if>
@@ -725,16 +525,13 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date form="text" suffix="?" 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"/>
+            <date form="text" suffix="?" variable="original-date"/>
           </else>
         </choose>
       </if>
@@ -747,21 +544,18 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date date-parts="year" form="numeric" suffix="?" 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"/>
+            <date date-parts="year" form="numeric" suffix="?" variable="original-date"/>
           </else>
         </choose>
       </if>
       <else>
-        <date date-parts="year" form="text" variable="original-date"/>
+        <date date-parts="year" form="numeric" variable="original-date"/>
       </else>
     </choose>
   </macro>
@@ -769,16 +563,13 @@
     <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"/>
+          <if type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report thesis">
+            <group prefix="[" suffix="]">
+              <date date-parts="year-month" form="text" suffix="?" 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"/>
+            <date date-parts="year-month" form="text" suffix="?" variable="original-date"/>
           </else>
         </choose>
       </if>
@@ -787,7 +578,7 @@
       </else>
     </choose>
   </macro>
-  <!-- 3. Title and descriptions -->
+  <!-- 3. Title and descriptions (cf. CMOS18 13.87-101) -->
   <macro name="title-and-descriptions">
     <group delimiter=", ">
       <choose>
@@ -798,132 +589,96 @@
         </if>
         <else>
           <text macro="description"/>
-          <!-- for author-date: -->
-          <!-- <text macro="description-capitalized"/> -->
           <text macro="identifier"/>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="title-and-descriptions-short">
-    <choose>
-      <if variable="title">
-        <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"/>
-            </else-if>
-          </choose>
-        </group>
-      </if>
-      <else>
-        <text macro="description-short"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="title-and-source">
-    <group delimiter=" ">
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <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') -->
-                <group delimiter=" ">
+    <group delimiter=". ">
+      <group delimiter=" ">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <group delimiter=". ">
+              <choose>
+                <if type="chapter" variable="container-title genre title">
                   <text macro="title-and-descriptions"/>
                   <text macro="source"/>
-                </group>
-              </if>
-              <else>
-                <text macro="title-and-descriptions"/>
-                <text macro="source"/>
-              </else>
-            </choose>
-            <text macro="source-monographic-publication-unbracketed"/>
+                </if>
+                <else-if type="chapter" variable="container-title genre">
+                  <!-- 'introduction in' if no title (NHR 18.2.6; cf. CMOS18 14.12, 14.14) -->
+                  <group delimiter=" ">
+                    <text macro="title-and-descriptions"/>
+                    <text macro="source"/>
+                  </group>
+                </else-if>
+                <else-if type="article-journal" variable="container-title genre volume-title">
+                  <!-- introduction to a special issue or supplement -->
+                  <group delimiter=" ">
+                    <text macro="title-and-descriptions"/>
+                    <text macro="source"/>
+                  </group>
+                </else-if>
+                <else>
+                  <text macro="title-and-descriptions"/>
+                  <text macro="source"/>
+                </else>
+              </choose>
+              <text macro="source-monographic-publication-unbracketed"/>
+            </group>
+            <text macro="source-monographic-publication-bracketed"/>
           </group>
-          <text macro="source-monographic-publication-bracketed"/>
+          <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" variable="collection-editor compiler editor editorial-director">
+              <!-- monographic types -->
+              <text macro="source-monographic-locator"/>
+              <!-- for styles using Roman volume numbers: -->
+              <!-- <text macro="source-monographic-locator-roman-volume"/> -->
+              <!-- for OGS: -->
+              <!-- <text macro="source-monographic-locator-range"/> -->
+            </else-if>
+            <!-- omit serial types -->
+            <else-if match="any" type="interview paper-conference"/>
+            <else>
+              <text macro="source-monographic-locator"/>
+              <!-- for styles using Roman volume numbers: -->
+              <!-- <text macro="source-monographic-locator-roman-volume"/> -->
+              <!-- for OGS: -->
+              <!-- <text macro="source-monographic-locator-range"/> -->
+            </else>
+          </choose>
         </group>
-        <choose>
-          <!-- Locator for monographic types only; serial locator handled in `source-serial-locator` -->
-          <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>
-          <else>
-            <text macro="source-monographic-locator"/>
-          </else>
-        </choose>
-        <text macro="source-medium"/>
-        <text macro="source-archive"/>
+        <text macro="source-medium" prefix="[" suffix="]"/>
       </group>
+      <text macro="source-archive"/>
+      <text macro="source-date-accessed-DOI-URL"/>
     </group>
   </macro>
   <!-- 3.1. Title -->
   <macro name="title">
     <choose>
       <if match="any" type="post webpage">
-        <!-- Handle `container-title` on `post` or `webpage` in manner of `publisher` -->
+        <!-- part number/title always at the analytic level -->
         <text macro="title-and-part-filter-review"/>
       </if>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
         <text macro="title-and-part-filter-review"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="title-monographic"/>
+      </else-if>
       <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="title-primary"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="title-and-part-filter-review"/>
-          </else>
-        </choose>
+        <!-- serial types -->
+        <text macro="title-and-part-filter-review"/>
       </else-if>
       <else>
-        <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>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title-short">
-    <choose>
-      <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
-        <!-- If a review has no `reviewed-title`, assume that `title` contains the title of the reviewed work; the description provides it. -->
-        <choose>
-          <if variable="reviewed-genre title">
-            <!-- Quotes, title case -->
-            <text form="short" quotes="true" text-case="title" variable="title"/>
-          </if>
-          <else-if variable="reviewed-genre reviewed-title title">
-            <!-- Quotes, title case -->
-            <text form="short" quotes="true" text-case="title" variable="title"/>
-          </else-if>
-          <else>
-            <text macro="description-short"/>
-          </else>
-        </choose>
-      </if>
-      <else>
-        <text macro="title-primary-short"/>
+        <!-- monographic types -->
+        <text macro="title-monographic"/>
       </else>
     </choose>
   </macro>
@@ -946,12 +701,27 @@
   <macro name="title-and-part-title">
     <group delimiter=", ">
       <text macro="title-primary"/>
-      <group delimiter=", ">
+      <group delimiter=": ">
         <text macro="label-part-number"/>
         <text macro="title-part"/>
       </group>
     </group>
   </macro>
+  <macro name="title-monographic">
+    <!-- For monographic items, assume `part-number` and `part-title` refer to the book/volume. -->
+    <choose>
+      <if variable="container-title">
+        <text macro="title-primary"/>
+      </if>
+      <else>
+        <!-- For monographic items without `container-title` and with `volume-title`, append `volume-title` to `title` (APA example 30) -->
+        <group delimiter=", ">
+          <text macro="title-primary"/>
+          <text macro="title-volume-and-part"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
   <macro name="title-part">
     <choose>
       <if type="patent">
@@ -968,7 +738,7 @@
       </else-if>
       <else-if type="entry-encyclopedia" variable="author container-title">
         <!-- Signed encyclopedia entry in quotes, title case (cf. CMOS18 14.132) -->
-        <text quotes="true" text-case="title" variable="part-title"/>
+        <text variable="part-title"/>
       </else-if>
       <else-if type="entry-dictionary" variable="container-title">
         <!-- Quotes, sentence case -->
@@ -982,15 +752,39 @@
         <!-- Quotes, sentence case -->
         <text quotes="true" variable="part-title"/>
       </else-if>
+      <else-if type="webpage">
+        <!-- Quotes, title case -->
+        <text variable="part-title"/>
+      </else-if>
       <!-- Other types are formatted based on presence of `container-title` -->
       <else-if variable="container-title">
-        <!-- Quotes, title case -->
-        <text quotes="true" text-case="title" variable="part-title"/>
+        <choose>
+          <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+            <!-- serial types -->
+            <!-- Quotes, title case -->
+            <text 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 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 -->
-        <text quotes="true" text-case="title" variable="part-title"/>
+        <text variable="part-title"/>
       </else-if>
       <else>
         <!-- Italicized, title case (default) -->
@@ -1014,7 +808,7 @@
       </else-if>
       <else-if type="entry-encyclopedia" variable="author container-title">
         <!-- Signed encyclopedia entry in quotes, title case (cf. CMOS18 14.132) -->
-        <text quotes="true" text-case="title" variable="title"/>
+        <text variable="title"/>
       </else-if>
       <else-if type="entry-dictionary" variable="container-title">
         <!-- Quotes, sentence case -->
@@ -1031,12 +825,12 @@
       <!-- Other types are formatted based on presence of `container-title` -->
       <else-if variable="container-title">
         <!-- Quotes, title case -->
-        <text quotes="true" text-case="title" variable="title"/>
+        <text variable="title"/>
       </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 -->
-        <text quotes="true" text-case="title" variable="title"/>
+        <text variable="title"/>
       </else-if>
       <else>
         <!-- Italicized, title case (default) -->
@@ -1044,61 +838,49 @@
       </else>
     </choose>
   </macro>
-  <macro name="title-primary-short">
+  <macro name="title-volume">
     <choose>
-      <if type="patent">
-        <!-- No italics or quotes, sentence case -->
-        <text form="short" text-case="capitalize-first" variable="title"/>
-      </if>
-      <else-if match="any" type="bill collection legislation regulation treaty">
-        <!-- No italics or quotes, title case -->
-        <text form="short" text-case="title" variable="title"/>
-      </else-if>
-      <else-if match="any" type="book classic graphic hearing map periodical">
-        <!-- Italicized, title case (regardless of `container-title`) -->
-        <text font-style="italic" form="short" text-case="title" variable="title"/>
-      </else-if>
-      <else-if type="entry-encyclopedia" variable="author container-title">
-        <!-- Signed encyclopedia entry in quotes, title case (cf. CMOS18 14.132) -->
-        <text form="short" quotes="true" text-case="title" variable="title"/>
-      </else-if>
-      <else-if type="entry-dictionary" variable="container-title">
-        <!-- Quotes, sentence case -->
-        <text form="short" quotes="true" variable="title"/>
-      </else-if>
-      <else-if type="entry-encyclopedia" variable="container-title">
-        <!-- Quotes, sentence case -->
-        <text form="short" quotes="true" variable="title"/>
-      </else-if>
-      <else-if type="post">
-        <!-- Quotes, sentence case -->
-        <text form="short" quotes="true" variable="title"/>
-      </else-if>
-      <!-- Other types are formatted based on presence of `container-title` -->
-      <else-if variable="container-title">
+      <if type="manuscript">
         <!-- Quotes, title case -->
-        <text form="short" quotes="true" text-case="title" variable="title"/>
-      </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 -->
-        <text form="short" quotes="true" text-case="title" variable="title"/>
-      </else-if>
+        <text variable="volume-title"/>
+      </if>
       <else>
-        <!-- Italicized, title case (default) -->
-        <text font-style="italic" form="short" text-case="title" variable="title"/>
+        <!-- Italics, title case -->
+        <text font-style="italic" text-case="title" variable="volume-title"/>
       </else>
     </choose>
   </macro>
-  <macro name="title-volume">
+  <macro name="title-volume-and-part">
     <group delimiter=", ">
-      <group delimiter=", ">
-        <text macro="label-volume"/>
-        <text font-style="italic" text-case="title" variable="volume-title"/>
+      <group delimiter=": ">
+        <choose>
+          <!-- negotiate with `source-monographic-locator` -->
+          <if match="any" variable="part-number part-title volume-title">
+            <text macro="label-volume"/>
+          </if>
+          <else-if locator="column page" match="any"/>
+          <else-if variable="locator">
+            <!-- remove variable="locator" condition for OGS, which prints ranges -->
+            <text macro="label-volume"/>
+          </else-if>
+          <else-if variable="page"/>
+          <else>
+            <text macro="label-volume"/>
+          </else>
+        </choose>
+        <text macro="title-volume"/>
       </group>
       <!-- `part-number` and `part-title` of monographic items refer to the source book/volume -->
-      <group delimiter=", ">
-        <text macro="label-part-number"/>
+      <group delimiter=": ">
+        <choose>
+          <if match="any" variable="part-number part-title volume-title">
+            <text macro="label-part-number"/>
+          </if>
+          <else-if match="any" variable="locator page"/>
+          <else>
+            <text macro="label-part-number"/>
+          </else>
+        </choose>
         <text macro="title-part"/>
       </group>
     </group>
@@ -1115,54 +897,73 @@
       <else-if type="personal_communication">
         <text macro="description-letter"/>
       </else-if>
+      <else-if type="song" variable="composer">
+        <text macro="description-song"/>
+      </else-if>
+      <!-- thesis type appears with university name (cf. CMOS18 14.113) -->
+      <else-if type="thesis"/>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
         <text macro="description-serial"/>
       </else-if>
       <else-if type="paper-conference">
         <text macro="description-paper-conference"/>
       </else-if>
-      <else-if type="song" variable="composer">
-        <text macro="description-song"/>
-      </else-if>
-      <!-- thesis type appears with university name (cf. CMOS18 14.113) -->
-      <else-if type="thesis"/>
       <else-if match="none" variable="container-title">
-        <!-- 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">
+    <!-- identical to `description` -->
     <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 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="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="description-serial-short"/>
+        <!-- serial types -->
+        <text macro="description-serial-capitalized"/>
       </else-if>
       <else-if type="paper-conference">
+        <text macro="description-paper-conference-capitalized"/>
+      </else-if>
+      <else-if match="none" variable="container-title">
+        <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>
-          <else>
-            <!-- serial usage -->
-            <text macro="description-serial-short"/>
-          </else>
         </choose>
       </else-if>
       <else>
-        <text macro="description-format-short"/>
+        <text macro="description-format-capitalized"/>
       </else>
     </choose>
   </macro>
@@ -1173,199 +974,144 @@
       <else-if variable="genre">
         <text variable="genre"/>
       </else-if>
+      <else-if variable="chapter-number title"/>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number-long"/>
+      </else-if>
+      <!-- generic labels if unpublished -->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
       <else-if type="manuscript">
         <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+        <text term="manuscript"/>
       </else-if>
       <else-if type="personal_communication">
-        <choose>
-          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-            <!-- 'letter' if no `genre` (MHRA 7.11) -->
-            <text term="letter"/>
-          </if>
-          <else>
-            <text term="personal-communication"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if variable="chapter-number title"/>
-      <else-if variable="chapter-number">
-        <text macro="label-chapter-number-long"/>
+        <!-- 'personal communication' if no `genre` (cf. CMOS18 14.111) -->
+        <text term="personal-communication" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="description-format-short">
+  <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 variable="chapter-number title"/>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number-long-capitalized"/>
+      </else-if>
+      <!-- generic labels if unpublished -->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL"/>
       <else-if type="manuscript">
         <!-- 'unpublished manuscript' if no `genre` (cf. CMOS18 14.114) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text term="manuscript"/>
-          </if>
-        </choose>
+        <text term="manuscript" text-case="capitalize-first"/>
       </else-if>
       <else-if type="personal_communication">
-        <!-- 'pers. comm.' if no `genre` (cf. CMOS18 14.111) -->
-        <choose>
-          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
-            <text form="short" term="personal-communication"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if variable="chapter-number">
-        <text macro="label-chapter-number"/>
-      </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">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="description-format"/>
-          </if>
-        </choose>
-      </if>
-      <else-if match="none" type="document report software standard">
-        <text macro="description-format"/>
+        <!-- 'personal communication' if no `genre` (cf. CMOS18 14.111) -->
+        <text term="personal-communication" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="description-interview">
-    <!-- list the interviewer as the author and the interviewee in the description (MHRA 7.11) -->
     <group delimiter=", ">
       <choose>
-        <if variable="author interviewer">
+        <if variable="genre number">
+          <!-- `genre` printed with `number` -->
+          <names variable="interviewer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+        </if>
+        <else-if variable="genre">
           <group delimiter=" ">
-            <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>
-              <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"/>
-              </else>
-            </choose>
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <text form="verb" term="container-author"/>
+              <names variable="interviewer">
+                <name initialize="true"/>
+              </names>
+            </group>
           </group>
+        </else-if>
+        <else-if variable="interviewer">
+          <names variable="interviewer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+        </else-if>
+        <else>
+          <text macro="description-format"/>
+        </else>
+      </choose>
+      <text macro="source-event-place-first"/>
+    </group>
+  </macro>
+  <macro name="description-interview-capitalized">
+    <group delimiter=", ">
+      <choose>
+        <if variable="genre number">
+          <!-- `genre` printed with `number` -->
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name initialize="true"/>
+          </names>
         </if>
+        <else-if variable="genre">
+          <group delimiter=" ">
+            <text text-case="capitalize-first" variable="genre"/>
+            <group delimiter=" ">
+              <text form="verb" term="container-author"/>
+              <names variable="interviewer">
+                <name initialize="true"/>
+              </names>
+            </group>
+          </group>
+        </else-if>
+        <else-if variable="interviewer">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name initialize="true"/>
+          </names>
+        </else-if>
         <else>
+          <text macro="description-format-capitalized"/>
+        </else>
+      </choose>
+      <text macro="source-event-place-first"/>
+    </group>
+  </macro>
+  <macro name="description-letter">
+    <choose>
+      <if variable="recipient">
+        <group delimiter=", ">
           <choose>
             <if variable="genre number">
-              <!-- `genre` printed with `number` -->
-              <names variable="interviewer">
+              <!-- `genre` appears with `number` -->
+              <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name initialize="true"/>
               </names>
             </if>
-            <else-if variable="genre">
+            <else>
               <group delimiter=" ">
-                <text variable="genre"/>
-                <group delimiter=" ">
-                  <text form="verb" term="container-author"/>
-                  <names variable="interviewer"/>
-                </group>
+                <text macro="description-format"/>
+                <names variable="recipient">
+                  <label form="verb" suffix=" "/>
+                  <name initialize="true"/>
+                </names>
               </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>
-      <text macro="source-event-place-first"/>
-    </group>
-  </macro>
-  <macro name="description-interview-short">
-    <choose>
-      <if disambiguate="true">
-        <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 form="short"/>
-            </names>
-          </if>
-          <else>
-            <names variable="interviewer">
-              <name form="short"/>
-            </names>
-          </else>
-        </choose>
+          <text variable="event-place"/>
+          <text macro="date-event-full"/>
+        </group>
       </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>
-          <else>
-            <text macro="description-format-short"/>
-          </else>
-        </choose>
-      </else-if>
       <else>
-        <!-- generic description for an unpublished interview (cf. CMOS18 14.108) -->
-        <text term="interview"/>
+        <text macro="description-format"/>
       </else>
     </choose>
   </macro>
-  <macro name="description-letter">
+  <macro name="description-letter-capitalized">
     <choose>
       <if variable="recipient">
         <group delimiter=", ">
@@ -1373,16 +1119,16 @@
             <if variable="genre number">
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
-                <label form="verb" suffix=" "/>
-                <name/>
+                <label form="verb" suffix=" " text-case="capitalize-first"/>
+                <name initialize="true"/>
               </names>
             </if>
             <else>
               <group delimiter=" ">
-                <text macro="description-format"/>
+                <text macro="description-format-capitalized"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name/>
+                  <name initialize="true"/>
                 </names>
               </group>
             </else>
@@ -1392,39 +1138,33 @@
         </group>
       </if>
       <else>
-        <text macro="description-format"/>
+        <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=", ">
-      <choose>
-        <if variable="genre recipient">
-          <group delimiter=" ">
-            <text macro="description-format-short"/>
-            <names variable="recipient">
-              <label form="verb" suffix=" "/>
-              <name/>
-            </names>
-          </group>
-        </if>
-        <else>
-          <text macro="description-format-short"/>
-        </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 types -->
+        <group delimiter=", ">
+          <text macro="description-serial"/>
+          <text macro="source-event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-paper-conference-capitalized">
+    <choose>
+      <if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="description-format"/>
       </if>
       <else>
-        <!-- serial usage -->
+        <!-- serial types -->
         <group delimiter=", ">
           <text macro="description-serial"/>
           <text macro="source-event"/>
@@ -1445,7 +1185,9 @@
           </else>
         </choose>
         <group delimiter=", ">
-          <names variable="reviewed-author"/>
+          <names variable="reviewed-author">
+            <name initialize="true"/>
+          </names>
           <text macro="description-review-title"/>
           <text variable="reviewed-genre"/>
         </group>
@@ -1454,20 +1196,28 @@
       <text macro="label-section"/>
     </group>
   </macro>
-  <macro name="description-review-short">
-    <group delimiter=" ">
-      <text term="review-of"/>
-      <choose>
-        <if match="any" variable="reviewed-genre reviewed-title">
-          <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title -->
-          <!-- Adapt for `reviewed-container-title` or similar if it becomes available -->
-          <text font-style="italic" form="short" text-case="title" variable="reviewed-title"/>
-        </if>
-        <else>
-          <!-- Assume title is title of reviewed work -->
-          <text font-style="italic" form="short" text-case="title" variable="title"/>
-        </else>
-      </choose>
+  <macro name="description-review-capitalized">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="genre">
+            <!-- assume that `genre` is entered as 'Review of the book' or similar -->
+            <text text-case="capitalize-first" variable="genre"/>
+          </if>
+          <else>
+            <text term="review-of" text-case="capitalize-first"/>
+          </else>
+        </choose>
+        <group delimiter=", ">
+          <names variable="reviewed-author">
+            <name initialize="true"/>
+          </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-title">
@@ -1490,16 +1240,12 @@
       <text macro="label-section"/>
     </group>
   </macro>
-  <macro name="description-serial-short">
-    <choose>
-      <if variable="title"/>
-      <else-if variable="genre">
-        <text macro="description-format-short"/>
-      </else-if>
-      <else>
-        <text variable="section"/>
-      </else>
-    </choose>
+  <macro name="description-serial-capitalized">
+    <group delimiter=", ">
+      <text macro="description-format-capitalized"/>
+      <!-- `section` provides magazine departments (cf. CMOS18 14.88) and newspaper column names (cf. CMOS18 14.93) -->
+      <text macro="label-section"/>
+    </group>
   </macro>
   <macro name="description-song">
     <!-- Performer of classical music works -->
@@ -1513,7 +1259,26 @@
         </if>
       </choose>
       <names variable="author">
-        <name delimiter-precedes-last="always"/>
+        <name delimiter-precedes-last="always" initialize="true"/>
+        <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="true"/>
         <substitute>
           <names variable="performer"/>
         </substitute>
@@ -1531,15 +1296,17 @@
           <text macro="identifier-report"/>
         </else-if>
         <else-if match="any" type="post webpage">
-          <!-- Handle `container-title` on `post` or `webpage` as `publisher` -->
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
           <text macro="identifier-number"/>
+          <text macro="label-version"/>
+          <text macro="identifier-edition"/>
           <text macro="identifier-contributors"/>
+          <text macro="identifier-volume"/>
         </else-if>
         <else-if variable="container-title">
           <choose>
-            <if match="any" type="graphic map motion_picture">
+            <if match="any" type="broadcast graphic map motion_picture">
               <!-- For audiovisual media, number information comes after `title`, not `container-title`; `song` places album catalogue `number` with `publisher` (cf. CMOS18 14.163-164) -->
-              <!-- most styles would place `broadcast` in this position but here it is in `source-monographic-locator-volume` (MHRA 7.8.xiii) -->
               <text macro="identifier-number"/>
             </if>
           </choose>
@@ -1547,35 +1314,14 @@
         </else-if>
         <else>
           <choose>
-            <if match="none" type="broadcast song">
+            <if match="none" type="song">
               <text macro="identifier-number"/>
             </if>
           </choose>
-          <choose>
-            <if match="any" variable="available-date part-title volume-title">
-              <!-- 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/>
-              </names>
-            </if>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <choose>
-                <if variable="collection-editor">
-                  <names variable="collection-editor">
-                    <label form="verb-short" suffix=" "/>
-                    <name/>
-                  </names>
-                </if>
-                <else>
-                  <text macro="identifier-contributors"/>
-                </else>
-              </choose>
-            </else-if>
-            <else>
-              <text macro="identifier-contributors"/>
-            </else>
-          </choose>
+          <text macro="label-version"/>
+          <text macro="identifier-edition"/>
+          <text macro="identifier-contributors"/>
+          <text macro="identifier-volume"/>
         </else>
       </choose>
     </group>
@@ -1586,17 +1332,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"/>
@@ -1607,151 +1347,190 @@
     <group delimiter=", ">
       <choose>
         <if match="any" type="post webpage">
-          <group delimiter=", ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="editor-translator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names delimiter=", " variable="editor translator">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="editorial-director">
-              <label form="verb-short" suffix=" "/>
-              <name/>
-            </names>
-            <names variable="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" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="editor-translator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names delimiter=", " variable="editor translator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <choose>
+            <if variable="collection-editor editor"/>
+            <else-if variable="collection-editor editor-translator"/>
+            <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+              <names variable="collection-editor">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+            </else-if>
+          </choose>
+          <names variable="editorial-director">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="guest">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="host">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="illustrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="compiler">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names delimiter=", " variable="chair organizer curator">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names delimiter=", " variable="series-creator executive-producer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="producer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="director">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <choose>
+            <if match="any" type="broadcast performance">
+              <names variable="script-writer">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="performer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <choose>
+            <if match="none" type="thesis">
+              <names variable="contributor">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+            </if>
+          </choose>
         </if>
         <else>
-          <!-- Handle `container-title` on `post` or `webpage` as `publisher` -->
-          <group delimiter=", ">
-            <choose>
-              <if match="none" variable="container-title">
-                <names variable="container-author">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editor-translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names delimiter=", " variable="editor translator">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="editorial-director">
-                  <label form="verb-short" suffix=" "/>
-                  <name/>
-                </names>
-                <names variable="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` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="container-author">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names variable="editor-translator">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names delimiter=", " variable="editor translator">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <choose>
+                <if variable="collection-editor editor"/>
+                <else-if variable="collection-editor editor-translator"/>
+                <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+                  <names variable="collection-editor">
+                    <label form="verb-short" suffix=" "/>
+                    <name initialize="true"/>
+                  </names>
+                </else-if>
+              </choose>
+              <names variable="editorial-director">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names variable="guest">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names variable="host">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="illustrator">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <names variable="narrator">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+          <choose>
+            <if match="none" variable="container-title">
+              <names variable="compiler">
+                <label form="verb-short" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names delimiter=", " variable="chair organizer curator">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names delimiter=", " variable="series-creator executive-producer">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names variable="producer">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <names variable="director">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <choose>
+                <if match="any" type="broadcast performance">
+                  <names variable="script-writer">
+                    <label form="verb" suffix=" "/>
+                    <name initialize="true"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="performer">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+              <choose>
+                <if match="none" type="song thesis">
+                  <names variable="contributor">
+                    <label form="verb" suffix=" "/>
+                    <name initialize="true"/>
+                  </names>
+                </if>
+              </choose>
+            </if>
+          </choose>
+          <choose>
+            <if type="song">
+              <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
+              <names variable="contributor">
+                <label form="verb" suffix=" "/>
+                <name initialize="true"/>
+              </names>
+            </if>
+          </choose>
         </else>
       </choose>
     </group>
@@ -1762,43 +1541,54 @@
         <if type="periodical">
           <names variable="editor">
             <label form="verb-short" suffix=" "/>
-            <name/>
+            <name initialize="true"/>
           </names>
         </if>
       </choose>
-      <names delimiter=", " variable="translator narrator">
+      <names variable="translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
+      </names>
+      <names variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
-      <names delimiter=", " variable="compiler chair organizer curator">
+      <names variable="compiler">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
+      </names>
+      <names delimiter=", " variable="chair organizer curator">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
       <names variable="producer">
         <!-- not abbreviated (cf. CMOS18 14.168) -->
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
       <names variable="director">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </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">
+      <!-- critical editions or original date require placement in brackets -->
+      <else-if match="any" type="classic" variable="original-date"/>
+      <else-if match="any" variable="collection-editor editor editorial-director">
+        <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
         <text macro="label-edition"/>
       </else-if>
     </choose>
@@ -1806,10 +1596,11 @@
   <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"/>
@@ -1871,45 +1662,81 @@
       </choose>
     </group>
   </macro>
+  <macro name="identifier-volume">
+    <choose>
+      <!-- notes show the number of volumes only when not referring to a specific volume -->
+      <if match="any" variable="part-number part-title volume volume-title"/>
+      <!-- unlike Chicago, display the number of volumes with a locator (NHR 18.2.7) -->
+      <else>
+        <text macro="label-number-of-volumes"/>
+      </else>
+    </choose>
+  </macro>
   <!-- 4. Source -->
   <macro name="source">
+    <choose>
+      <if type="patent"/>
+      <else-if match="any" type="post webpage">
+        <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (NHR 18.8.5, cf. CMOS18 14.104-106) -->
+        <text text-case="title" variable="container-title"/>
+      </else-if>
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <text macro="source-serial"/>
+      </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="source-monographic"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <text macro="source-serial"/>
+      </else-if>
+      <else>
+        <text macro="source-monographic"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 4.1. Serial sources -->
+  <macro name="source-serial">
     <group delimiter=", ">
+      <text macro="source-serial-title-volume"/>
       <choose>
-        <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- Serial items -->
-          <text macro="source-serial"/>
+        <!-- use correct punctuation depending on whether a bracket immediately follows the title -->
+        <if type="article-newspaper">
+          <group delimiter=" ">
+            <text macro="source-serial-title"/>
+            <text macro="source-serial-identifier"/>
+          </group>
         </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 match="any" variable="collection-title issue supplement-number volume">
+          <group delimiter=" ">
+            <text macro="source-serial-title"/>
+            <text macro="source-serial-identifier"/>
+          </group>
+        </else-if>
+        <else-if type="interview" variable="publisher">
+          <!-- publisher possible with `interview` (NHR 18.7.3) -->
+          <text macro="source-serial-title"/>
+          <group delimiter=" ">
+            <text variable="publisher"/>
+            <text macro="source-serial-identifier"/>
+            <!-- for author-date: -->
+            <!-- <text macro="source-serial-identifier-author-date"/> -->
+          </group>
         </else-if>
-        <else-if match="any" type="patent post webpage"/>
         <else>
-          <text macro="source-monographic"/>
+          <group delimiter=" ">
+            <text macro="source-serial-title"/>
+            <text macro="source-serial-identifier"/>
+            <!-- for author-date: -->
+            <!-- <text macro="source-serial-identifier-author-date"/> -->
+          </group>
         </else>
       </choose>
     </group>
   </macro>
-  <!-- 4.1. Serial sources -->
-  <macro name="source-serial">
-    <group delimiter=", ">
-      <text macro="source-serial-title-volume"/>
-      <text macro="source-serial-title"/>
-      <text macro="source-serial-identifier"/>
-    </group>
-  </macro>
   <!-- Serial source title -->
   <macro name="source-serial-name">
     <group delimiter=" ">
-      <text font-style="italic" text-case="title" variable="container-title"/>
+      <text font-style="italic" form="short" strip-periods="true" text-case="title" variable="container-title"/>
       <choose>
         <!-- TODO: remove conditional when Zotero stops double-mapping `event-place` and `publisher-place` -->
         <if match="none" variable="event-date event-title">
@@ -1919,30 +1746,36 @@
     </group>
   </macro>
   <macro name="source-serial-title">
-    <group delimiter=" ">
+    <group delimiter=", ">
       <choose>
-        <!-- Journal special issues and supplements (MHRA 7.4) -->
+        <!-- Journal special issues and supplements (cf. CMOS18 14.77-78, MHRA4 7.4) -->
         <if match="none" variable="container-title"/>
         <else-if match="none" type="periodical" variable="supplement-number volume-title"/>
         <!-- TODO: use `container-genre` here once available to allow a custom description of the journal volume -->
         <else-if variable="supplement-number volume-title">
           <text term="supplement"/>
-          <text value="to"/>
         </else-if>
         <else-if type="periodical" variable="supplement-number title">
           <text term="supplement"/>
-          <text value="to"/>
         </else-if>
         <else-if variable="volume-title">
           <text term="special-issue"/>
-          <text value="of"/>
         </else-if>
         <else-if type="periodical" variable="title">
           <text term="special-issue"/>
-          <text value="of"/>
         </else-if>
       </choose>
-      <text macro="source-serial-name"/>
+      <group delimiter=": ">
+        <choose>
+          <!-- 'in' for reviews only (NHR 18.3.5) -->
+          <if match="none" variable="container-title"/>
+          <else-if match="any" type="periodical" variable="supplement-number volume-title"/>
+          <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+            <text term="in" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+        <text macro="source-serial-name"/>
+      </group>
     </group>
   </macro>
   <macro name="source-serial-title-volume">
@@ -1950,68 +1783,50 @@
       <if variable="volume-title">
         <!-- 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"/>
+          <group delimiter=": ">
+            <text term="in" text-case="capitalize-first"/>
+            <group delimiter=", ">
+              <text macro="source-monographic-author"/>
+              <text macro="title-volume"/>
+            </group>
           </group>
-          <text macro="source-monographic-identifier-contributors"/>
         </group>
       </if>
     </choose>
   </macro>
   <!-- Serial source identifier -->
   <macro name="source-serial-identifier">
-    <group delimiter=", ">
-      <text macro="source-serial-identifier-volume"/>
+    <group delimiter=":">
+      <text macro="source-serial-identifier-volume-abbreviated"/>
       <!-- periodical edition always capitalized (cf. CMOS18 14.89) -->
       <text macro="label-edition-capitalized"/>
       <text macro="source-serial-locator"/>
+      <!-- for OGS: -->
+      <!-- <text macro="source-serial-locator-range"/> -->
     </group>
   </macro>
-  <macro name="source-serial-identifier-volume">
+  <macro name="source-serial-identifier-volume-abbreviated">
     <group delimiter=", ">
       <!-- `collection-title` is for any serial with multiple series (e.g. 'second series') -->
       <text variable="collection-title"/>
       <choose>
         <if type="article-newspaper">
-          <!-- newspapers cited by date (MHRA 7.6) -->
+          <!-- newspapers cited by date (NHR 18.3.3) -->
           <text macro="source-serial-volume-status"/>
         </if>
         <else-if match="any" variable="issue supplement-number volume">
-          <group delimiter=" ">
-            <group delimiter=", ">
-              <choose>
-                <if variable="issue volume">
-                  <group delimiter=".">
-                    <text variable="volume"/>
-                    <text variable="issue"/>
-                  </group>
-                </if>
-                <else>
-                  <text variable="volume"/>
-                  <text macro="label-issue"/>
-                </else>
-              </choose>
-              <text macro="label-supplement-number"/>
+          <group delimiter=";">
+            <text macro="source-date"/>
+            <group>
+              <text font-weight="bold" variable="volume"/>
+              <group delimiter=", " prefix="(" suffix=")">
+                <text variable="issue"/>
+                <text macro="label-supplement-number"/>
+              </group>
             </group>
-            <text macro="source-date" prefix="(" suffix=")"/>
           </group>
         </else-if>
-        <else-if type="paper-conference">
-          <!-- with an unpublished conference paper, event place and date are bracketed in `source-event` (MHRA 7.10.vi) -->
-          <choose>
-            <if variable="page">
-              <text macro="source-serial-volume-status"/>
-            </if>
-          </choose>
-        </else-if>
         <else>
-          <choose>
-            <if match="any" type="interview" variable="interviewer">
-              <!-- publisher possible with `interview` (cf. CMOS18 14.110) -->
-              <text variable="publisher"/>
-            </if>
-          </choose>
           <text macro="source-serial-volume-status"/>
         </else>
       </choose>
@@ -2038,18 +1853,24 @@
   <!-- Serial source locator -->
   <macro name="source-serial-locator">
     <choose>
-      <if match="any" variable="number page">
-        <group delimiter=" ">
-          <group delimiter=", ">
-            <text macro="label-page"/>
-            <!-- `number` is an article ID (cf. CMOS18 14.71) -->
-            <text macro="label-number-article"/>
-          </group>
-          <text macro="label-locator" prefix="(" suffix=")"/>
+      <if match="any" variable="locator number">
+        <group delimiter=", ">
+          <text macro="label-locator"/>
+          <!-- `number` is an article ID (cf. CMOS18 14.71) -->
+          <choose>
+            <!-- if there is an `archive` with no other reference, `number` appears in `source-archive-database-number` -->
+            <if match="any" variable="archive_collection archive_location archive-place">
+              <text macro="label-number-article"/>
+            </if>
+            <else-if variable="archive"/>
+            <else>
+              <text macro="label-number-article"/>
+            </else>
+          </choose>
         </group>
       </if>
       <else>
-        <text macro="label-locator"/>
+        <text variable="page"/>
       </else>
     </choose>
   </macro>
@@ -2060,11 +1881,11 @@
       <choose>
         <if variable="container-title">
           <group delimiter=", ">
-            <group delimiter=" ">
-              <text macro="source-monographic-preposition"/>
+            <group delimiter=": ">
+              <text macro="source-monographic-preposition-capitalized"/>
               <group delimiter=", ">
-                <names variable="container-author"/>
-                <text font-style="italic" text-case="title" variable="container-title"/>
+                <text macro="source-monographic-author"/>
+                <text macro="source-monographic-title"/>
               </group>
             </group>
             <text macro="source-monographic-description"/>
@@ -2072,58 +1893,101 @@
           </group>
         </if>
       </choose>
+      <!-- remove `source-series` for OGS: -->
       <text macro="source-series"/>
       <text macro="source-event"/>
-      <text macro="label-version"/>
-      <text macro="identifier-edition"/>
-      <text macro="label-number-of-volumes"/>
     </group>
   </macro>
-  <macro name="source-monographic-preposition">
-    <!-- MHRA does not define how to display a chapter number; this macro is based on CMOS -->
-    <group delimiter=" ">
-      <choose>
-        <if match="any" type="broadcast entry entry-dictionary entry-encyclopedia motion_picture"/>
-        <else-if type="song" variable="chapter-number title">
-          <text macro="label-chapter-number"/>
-          <text term="from"/>
-        </else-if>
-        <else-if type="song" variable="title">
-          <text term="from"/>
-        </else-if>
-        <else-if variable="chapter-number page title">
-          <text term="in"/>
-        </else-if>
-        <else-if variable="chapter-number title">
+  <!-- Monographic source title -->
+  <macro name="source-monographic-preposition-capitalized">
+    <choose>
+      <if match="any" type="broadcast motion_picture"/>
+      <else-if variable="chapter-number page title">
+        <text term="in" text-case="capitalize-first"/>
+      </else-if>
+      <else-if variable="chapter-number title">
+        <group delimiter=" ">
           <text macro="label-chapter-number"/>
           <text term="in"/>
-        </else-if>
-        <else>
-          <text term="in"/>
-        </else>
-      </choose>
+        </group>
+      </else-if>
+      <else>
+        <text term="in" text-case="capitalize-first"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="source-monographic-author">
+    <!-- based on `author-note` -->
+    <names variable="container-author">
+      <et-al font-style="italic"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="guest"/>
+        <names variable="host"/>
+        <choose>
+          <if type="song">
+            <names variable="performer"/>
+          </if>
+        </choose>
+        <names variable="illustrator"/>
+        <choose>
+          <if match="none" type="classic performance standard">
+            <names variable="editor-translator"/>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <names variable="collection-editor"/>
+          </if>
+        </choose>
+        <names variable="director"/>
+        <choose>
+          <!-- serial `broadcast` prioritizes title (cf. CMOS18 14.165, 14.168) -->
+          <if type="broadcast" variable="container-title number title"/>
+          <else>
+            <names variable="producer"/>
+            <names variable="executive-producer"/>
+            <names variable="series-creator"/>
+            <choose>
+              <if type="broadcast">
+                <names variable="contributor"/>
+              </if>
+            </choose>
+          </else>
+        </choose>
+        <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"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="source-monographic-title">
+    <group delimiter=", ">
+      <text font-style="italic" text-case="title" variable="container-title"/>
+      <text macro="title-volume-and-part"/>
     </group>
   </macro>
   <!-- Monographic source description -->
   <macro name="source-monographic-description">
     <choose>
-      <if match="any" type="event paper-conference performance speech">
-        <!-- Conference presentations should describe the session unless published in a proceedings -->
-        <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director">
-            <!-- serial usage -->
-            <text macro="description-format"/>
-          </if>
-        </choose>
-      </if>
-      <else-if type="software">
+      <if type="software">
         <!-- For entries in mobile app reference works, place description after `container-title` -->
         <text macro="description-format"/>
-      </else-if>
+      </if>
       <else-if match="any" type="document report standard">
         <!-- For chapters in report, standards, and generic documents, place description after `container-title` -->
         <text macro="description-format"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume"/>
+      <else-if match="any" type="event paper-conference performance speech">
+        <!-- unpublished conference presentations should describe the session -->
+        <text macro="description-format"/>
+      </else-if>
     </choose>
   </macro>
   <!-- Monographic source identifier -->
@@ -2138,31 +2002,10 @@
               <text macro="identifier-number"/>
             </if>
           </choose>
-          <choose>
-            <if match="any" variable="available-date part-title volume-title">
-              <!-- 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/>
-              </names>
-            </if>
-            <else-if match="any" variable="number-of-volumes part-number volume">
-              <choose>
-                <if variable="collection-editor">
-                  <names variable="collection-editor">
-                    <label form="verb-short" suffix=" "/>
-                    <name/>
-                  </names>
-                </if>
-                <else>
-                  <text macro="source-monographic-identifier-contributors"/>
-                </else>
-              </choose>
-            </else-if>
-            <else>
-              <text macro="source-monographic-identifier-contributors"/>
-            </else>
-          </choose>
+          <text macro="label-version"/>
+          <text macro="identifier-edition"/>
+          <text macro="source-monographic-identifier-contributors"/>
+          <text macro="identifier-volume"/>
         </group>
       </if>
     </choose>
@@ -2171,112 +2014,133 @@
     <group delimiter=", ">
       <names variable="editor-translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
       <names delimiter=", " variable="editor translator">
         <label form="verb-short" suffix=" "/>
-        <name/>
-      </names>
-      <names variable="host">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
+      <choose>
+        <if variable="collection-editor editor"/>
+        <else-if variable="collection-editor editor-translator"/>
+        <else-if match="any" variable="number-of-volumes part-number part-title volume volume-title">
+          <names variable="collection-editor">
+            <label form="verb-short" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+        </else-if>
+      </choose>
       <names variable="guest">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
+      </names>
+      <names variable="host">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names delimiter=", " variable="chair organizer">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
+      </names>
+      <names variable="illustrator">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
-      <names delimiter=", " variable="illustrator narrator compiler curator">
+      <names variable="narrator">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
+      </names>
+      <names variable="compiler">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
+      </names>
+      <names variable="curator">
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
       <names variable="producer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names variable="editorial-director">
         <label form="verb-short" suffix=" "/>
-        <name/>
+        <name initialize="true"/>
       </names>
+      <choose>
+        <if match="any" type="broadcast performance">
+          <names variable="script-writer">
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
+          </names>
+        </if>
+      </choose>
       <names variable="director">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </names>
       <names variable="performer">
-        <label form="verb-short" suffix=" "/>
-        <name/>
+        <label form="verb" suffix=" "/>
+        <name initialize="true"/>
       </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>
+        <if match="none" type="song thesis">
           <!-- Song contributors attached to album (cf. CMOS18 14.163) -->
           <names variable="contributor">
-            <label form="verb-short" suffix=" "/>
-            <name/>
+            <label form="verb" suffix=" "/>
+            <name initialize="true"/>
           </names>
-        </else>
+        </if>
       </choose>
     </group>
   </macro>
   <!-- Monographic source locator -->
   <macro name="source-monographic-locator">
-    <group delimiter=", ">
-      <text macro="source-monographic-locator-volume"/>
-      <group delimiter=" ">
-        <choose>
-          <if variable="page">
-            <text macro="label-page"/>
-            <text macro="label-locator" prefix="(" suffix=")"/>
-          </if>
-          <else>
-            <text macro="label-locator"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
-  <macro name="source-monographic-locator-volume">
-    <group delimiter=" ">
-      <group delimiter=", ">
-        <text macro="title-volume"/>
-        <choose>
-          <if type="broadcast">
-            <text macro="identifier-number"/>
-          </if>
-        </choose>
-        <choose>
-          <if match="any" variable="available-date part-title volume-title">
-            <text macro="source-monographic-identifier-contributors"/>
-          </if>
-          <else-if match="any" variable="number-of-volumes part-number volume">
-            <choose>
-              <if variable="collection-editor">
-                <text macro="source-monographic-identifier-contributors"/>
-              </if>
-            </choose>
-          </else-if>
-        </choose>
-      </group>
-      <!-- remove volume `issued` date from this position in author-date -->
+    <group delimiter=".">
       <choose>
-        <if variable="available-date issued volume">
-          <text macro="date-issued-year" prefix="(" suffix=")"/>
-        </if>
-        <else-if variable="available-date issued part-number">
-          <text macro="date-issued-year" prefix="(" suffix=")"/>
+        <!-- archival locators appear after the shelfmark (cf. CMOS18 14.127) -->
+        <if locator="column" variable="archive archive_location"/>
+        <else-if locator="folio" variable="archive archive_location"/>
+        <else-if locator="page" variable="archive archive_location"/>
+        <else-if is-numeric="volume" locator="column">
+          <!-- separate a volume and column number with a point (NHR 17.2.5) -->
+          <choose>
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </else-if>
+        <else-if is-numeric="volume" locator="page">
+          <!-- separate a volume and page number with a point (NHR 17.2.5) -->
+          <choose>
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </else-if>
+        <else-if variable="locator">
+          <text macro="label-locator"/>
         </else-if>
-        <else-if type="broadcast" variable="available-date issued number">
-          <text macro="date-issued-year" prefix="(" suffix=")"/>
+        <else-if is-numeric="volume" variable="page">
+          <!-- collapse the volume and page number if adjacent (NHR 17.2.5) -->
+          <choose>
+            <!-- check for variables that might come between the volume and page number -->
+            <if match="none" variable="part-number part-title volume-title">
+              <text variable="volume"/>
+            </if>
+          </choose>
+          <text variable="page"/>
         </else-if>
+        <!-- archival locators appear after the shelfmark (cf. CMOS18 14.127) -->
+        <else-if variable="archive archive_location page"/>
+        <else>
+          <text variable="page"/>
+        </else>
       </choose>
     </group>
   </macro>
@@ -2285,6 +2149,8 @@
     <group delimiter=", ">
       <text text-case="title" variable="collection-title"/>
       <text variable="collection-number"/>
+      <!-- for Roman collection numbers (old Hart's Rules): -->
+      <!-- <number form="roman" variable="collection-number"/> -->
       <text macro="label-issue"/>
     </group>
   </macro>
@@ -2304,7 +2170,7 @@
                 <if match="none" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
                   <!-- Don't print event info for conference papers published in proceedings -->
                   <text macro="source-event-status"/>
-                  <text macro="source-event-unpublished-paper-conference"/>
+                  <text macro="source-event-description"/>
                 </if>
               </choose>
             </if>
@@ -2343,7 +2209,6 @@
               <text value="delivered"/>
             </if>
             <else>
-              <text value="unpublished"/>
               <text form="short" term="paper-conference"/>
               <text value="delivered"/>
             </else>
@@ -2355,7 +2220,7 @@
           </choose>
         </else-if>
         <else-if type="song">
-          <text value="recorded"/>
+          <text value="rec."/>
           <choose>
             <if variable="event-title">
               <text term="at"/>
@@ -2363,9 +2228,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>
@@ -2387,40 +2253,26 @@
       <text variable="event-place"/>
     </group>
   </macro>
-  <macro name="source-event-unpublished-paper-conference">
-    <!-- place and date are rendered in brackets for an unpublished conference paper (MHRA 7.10.vi) -->
-    <group delimiter=" ">
-      <text macro="source-event-title"/>
-      <group delimiter=", " prefix="(" suffix=")">
-        <text variable="event-place"/>
-        <choose>
-          <if variable="event-date">
-            <text macro="date-event-full"/>
-          </if>
-          <else>
-            <text macro="date-issued-full"/>
-          </else>
-        </choose>
-      </group>
-    </group>
-  </macro>
   <!-- 4.5. Facts of publication -->
-  <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>
+  <macro name="source-monographic-publication">
+    <group delimiter="; ">
+      <choose>
         <!-- `patent` date in identification (cf. CMOS18 14.158) -->
-        <else-if type="patent"/>
+        <if type="patent"/>
+        <!-- omit serial types -->
+        <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <!-- add for OGS: -->
+          <!-- <text macro="source-series"/> -->
+          <text macro="source-publication-and-date"/>
+        </else-if>
+        <!-- omit serial types -->
+        <else-if match="any" type="interview paper-conference"/>
         <else>
+          <!-- monographic types -->
+          <!-- add for OGS: -->
+          <!-- <text macro="source-series"/> -->
           <text macro="source-publication-and-date"/>
         </else>
       </choose>
@@ -2430,25 +2282,25 @@
   <macro name="source-monographic-publication-bracketed">
     <!-- Facts of publication with brackets for print monographic formats -->
     <choose>
-      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard thesis">
-        <text macro="source-monographic-publication" prefix="(" suffix=")"/>
+      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage">
+        <text macro="source-monographic-publication"/>
       </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) -->
-        <text macro="source-monographic-publication" prefix="(" suffix=")"/>
+        <text macro="source-monographic-publication"/>
       </else-if>
-      <!-- dictionary/encyclopedia entries probably are bracketed only with publisher (MHRA 7.5) -->
+      <!-- dictionary/encyclopedia entries probably are bracketed only with publisher (cf. MHRA4 7.5) -->
       <else-if type="entry-dictionary" variable="publisher">
-        <text macro="source-monographic-publication" prefix="(" suffix=")"/>
+        <text macro="source-monographic-publication"/>
       </else-if>
       <else-if type="entry-encyclopedia" variable="publisher">
-        <text macro="source-monographic-publication" prefix="(" suffix=")"/>
+        <text macro="source-monographic-publication"/>
       </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=")"/>
+            <text macro="source-monographic-publication"/>
           </if>
         </choose>
       </else-if>
@@ -2457,13 +2309,13 @@
   <macro name="source-monographic-publication-unbracketed">
     <!-- Facts of publication without brackets -->
     <choose>
-      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference report software song standard thesis"/>
+      <if match="any" type="book broadcast chapter classic entry interview motion_picture musical_score pamphlet paper-conference post report software song standard webpage"/>
       <else-if type="article" variable="genre publisher"/>
       <else-if type="entry-dictionary" variable="publisher"/>
       <else-if type="entry-encyclopedia" variable="publisher"/>
       <else-if type="personal_communication">
         <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director publisher">
+          <if match="none" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
             <!-- not in an edited collection -->
             <text macro="source-monographic-publication"/>
           </if>
@@ -2474,83 +2326,8 @@
       </else>
     </choose>
   </macro>
-  <macro name="source-monographic-publication-short-bracketed">
-    <!-- mirrors `source-monographic-publication-bracketed` -->
-    <choose>
-      <if disambiguate="true">
-        <group delimiter=", " prefix="(" suffix=")">
-          <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>
-            <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 publisher">
-                  <!-- in an edited collection -->
-                  <text macro="source-date"/>
-                </if>
-              </choose>
-            </else-if>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="source-monographic-publication-short-unbracketed">
-    <!-- mirrors `source-monographic-publication-unbracketed` -->
-    <choose>
-      <if disambiguate="true">
-        <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>
-            <text macro="source-date"/>
-          </else>
-        </choose>
-      </if>
-    </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"/>
@@ -2564,14 +2341,11 @@
       <if type="article" variable="genre"/>
       <else-if type="article">
         <!-- `preprint` term attached to repository name, but specific working paper descriptors appear in description (cf. CMOS18 14.76, 14.116) -->
-        <text term="preprint"/>
+        <text term="preprint" text-case="capitalize-first"/>
       </else-if>
       <else-if type="thesis">
-        <!-- thesis type appears with university name (MHRA 7.10) -->
-        <group delimiter=" ">
-          <text value="unpublished"/>
-          <text macro="description-format"/>
-        </group>
+        <!-- thesis type appears with university name (cf. MHRA4 7.10) -->
+        <text variable="genre" text-case="capitalize-first"/>
       </else-if>
       <else-if match="any" variable="original-publisher original-publisher-place">
         <choose>
@@ -2591,21 +2365,31 @@
         <!-- `original-title` is covered in `source-publication-original-title-bib` -->
         <group delimiter=", ">
           <text macro="source-publication-description"/>
+          <choose>
+            <if match="none" variable="collection-editor editor editorial-director">
+              <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
+              <text macro="label-edition"/>
+            </if>
+          </choose>
           <text macro="source-publication-publisher"/>
         </group>
       </if>
-      <else-if match="any" variable="edition original-publisher original-publisher-place">
+      <else>
         <group delimiter="; ">
-          <!-- semicolon to separate original date if `original-publisher` (cf. CMOS18 14.16) -->
           <group delimiter=", ">
             <text macro="source-publication-publisher-original"/>
             <text macro="source-date-original"/>
           </group>
           <group delimiter=", ">
             <choose>
-              <if variable="issued original-date">
+              <if match="any" type="classic" variable="original-date">
                 <text macro="label-edition"/>
               </if>
+              <!-- different positioning of edition depending on whether there is a reviser; CSL does not have a proper role for this (NHR 18.2.1) -->
+              <else-if match="any" variable="collection-editor editor editorial-director"/>
+              <else>
+                <text macro="label-edition"/>
+              </else>
             </choose>
             <group delimiter=", ">
               <text macro="source-publication-description"/>
@@ -2613,16 +2397,6 @@
             </group>
           </group>
         </group>
-      </else-if>
-      <else>
-        <group delimiter="; ">
-          <!-- 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>
   </macro>
@@ -2631,12 +2405,19 @@
     <choose>
       <if variable="original-title">
         <group delimiter=" ">
-          <text term="original-work-published"/>
+          <text form="short" term="original-work-published"/>
+          <choose>
+            <if match="none" variable="original-author">
+              <text value="as"/>
+            </if>
+          </choose>
           <group delimiter=", ">
-            <names variable="original-author"/>
+            <names variable="original-author">
+              <name initialize="true"/>
+            </names>
             <text font-style="italic" text-case="title" variable="original-title"/>
           </group>
-          <group delimiter=", " prefix="(" suffix=")">
+          <group delimiter=", " prefix="[" suffix="]">
             <text macro="source-publication-publisher-original"/>
             <text macro="source-date-original"/>
           </group>
@@ -2647,31 +2428,30 @@
   <macro name="source-publication-publisher">
     <group delimiter=" ">
       <choose>
-        <if type="thesis" variable="publisher">
-          <text variable="publisher"/>
-        </if>
-        <else-if type="motion_picture" variable="publisher-place">
-          <!-- prioritize the country of origin for films (MHRA 7.8) -->
-          <text variable="publisher-place"/>
-        </else-if>
-        <else-if type="motion_picture" variable="event-place">
-          <text variable="event-place"/>
-        </else-if>
-        <else-if variable="publisher">
+        <if match="any" type="book chapter classic collection entry entry-dictionary entry-encyclopedia interview manuscript musical_score pamphlet paper-conference performance report">
           <group delimiter=": ">
-            <!-- <text variable="publisher-place"/> -->
+            <choose>
+              <if variable="publisher-place">
+                <text variable="publisher-place"/>
+              </if>
+              <else-if type="report">
+                <text variable="publisher"/>
+              </else-if>
+              <else-if match="any" type="classic entry entry-dictionary entry-encyclopedia interview manuscript personal_communication" variable="original-publisher-place"/>
+              <else>
+                <text form="short" term="no-place"/>
+              </else>
+            </choose>
             <text variable="publisher"/>
           </group>
-        </else-if>
-        <!-- TODO: remove conditional when Zotero fixes double-mapping of `event-place` -->
-        <else-if match="any" variable="event-date event-title"/>
+        </if>
         <else>
-          <text variable="publisher-place"/>
+          <text variable="publisher"/>
         </else>
       </choose>
       <choose>
         <if type="song">
-          <!-- Album catalogue number follows label name (cf. CMOS18 14.163-164) -->
+          <!-- Album catalogue number follows label name (NHR 18.7.2; cf. CMOS18 14.163-164) -->
           <text variable="number"/>
         </if>
       </choose>
@@ -2679,54 +2459,32 @@
   </macro>
   <macro name="source-publication-publisher-original">
     <choose>
-      <if variable="original-publisher">
+      <if match="any" type="book chapter classic entry entry-dictionary entry-encyclopedia interview musical_score pamphlet paper-conference report">
         <group delimiter=": ">
-          <!-- <text variable="original-publisher-place"/> -->
+          <text variable="original-publisher-place"/>
           <text variable="original-publisher"/>
         </group>
       </if>
       <else>
-        <text variable="original-publisher-place"/>
+        <text variable="original-publisher"/>
       </else>
     </choose>
   </macro>
   <!-- 4.6. Date -->
   <macro name="source-date">
-    <choose>
-      <if variable="available-date issued">
-        <date date-parts="year" form="text" variable="available-date"/>
-      </if>
-      <else>
-        <text macro="source-date-issued-or-status"/>
-        <!-- for author-date: -->
-        <!-- <text macro="source-date-issued-day-month"/> -->
-      </else>
-    </choose>
+    <text macro="source-date-issued-or-status"/>
+    <!-- for author-date: -->
+    <!-- <text macro="source-date-issued-day-month"/> -->
   </macro>
   <!-- Date elements -->
   <macro name="source-date-issued-full">
-    <!-- Give full date for more ephemeral types; reflected in `date-sort` -->
+    <!-- Give full date for more ephemeral types; reflected in `date-year-sort` -->
     <!-- NB: any changes must also be applied to `source-date-original-full` -->
     <choose>
       <if type="personal_communication" variable="event-date issued">
         <!-- 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">
@@ -2738,15 +2496,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"/>
@@ -2777,24 +2547,13 @@
       <else-if variable="status">
         <text text-case="lowercase" variable="status"/>
       </else-if>
-      <else-if match="any" type="interview personal_communication">
-        <choose>
-          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-            <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
-            <text form="short" term="no date"/>
-          </if>
-        </choose>
-      </else-if>
-      <!-- no n.d. for `classic` (MHRA 7.3c) -->
-      <else-if match="any" type="classic"/>
-      <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"/>
-          </if>
-        </choose>
+      <!-- no n.d. for `classic` (cf. MHRA4 7.3c) or `manuscript` (NHR 18.6.2) -->
+      <else-if match="any" type="classic manuscript"/>
+      <!-- only give n.d. for accessible personal communication (cf. CMOS18 14.111)-->
+      <else-if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+        <text form="short" term="no date"/>
       </else-if>
+      <else-if match="any" type="interview personal_communication"/>
       <else>
         <text form="short" term="no date"/>
       </else>
@@ -2806,7 +2565,7 @@
     <!-- <text macro="source-date-original-day-month"/> -->
   </macro>
   <macro name="source-date-original-full">
-    <!-- Give full date for more ephemeral types; reflected in `date-sort` -->
+    <!-- Give full date for more ephemeral types; reflected in `date-year-sort` -->
     <!-- Macro derived from `source-date-issued-full` -->
     <choose>
       <if type="personal_communication" variable="event-date original-date">
@@ -2816,18 +2575,6 @@
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
         <text macro="source-date-original-full-serial"/>
       </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text macro="date-original-year"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text macro="source-date-original-full-serial"/>
-          </else>
-        </choose>
-      </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <choose>
           <if match="any" variable="DOI URL">
@@ -2839,9 +2586,17 @@
           </else>
         </choose>
       </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software speech standard webpage">
+      <else-if match="any" type="article broadcast collection dataset document event graphic manuscript map patent performance personal_communication post software speech standard webpage">
         <text macro="date-original-full"/>
       </else-if>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="date-original-year"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="source-date-original-full-serial"/>
+      </else-if>
       <else>
         <text macro="date-original-year"/>
       </else>
@@ -2871,217 +2626,126 @@
         <!-- `status` specifies date type, e.g. 'effective', 'last modified', 'approved' (cf. CMOS18 14.104 for `webpage`; CMOS18 14.159 for `standard`) -->
         <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"/>
+      <!-- 'published online' for a work available ahead of print (cf. MHRA4 7.4) -->
+      <else-if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
       <else-if type="article-journal" variable="DOI issued">
         <text term="advance-online-publication"/>
       </else-if>
     </choose>
   </macro>
   <!-- 4.7. Locator (including page references) -->
-  <macro name="source-locator-subsequent">
-    <choose>
-      <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" 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>
-      </else-if>
-      <else>
-        <text macro="source-locator-subsequent-monographic"/>
-      </else>
-    </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>
-          <text macro="label-volume"/>
-          <text macro="label-part-number"/>
-          <text macro="label-locator"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="source-locator-subsequent-serial">
-    <group delimiter=", ">
-      <text macro="label-part-number"/>
-      <text macro="label-locator"/>
-    </group>
-  </macro>
   <!-- 4.8. Medium -->
   <macro name="source-medium">
-    <choose>
-      <if match="none" type="book broadcast chapter motion_picture song">
-        <!-- works of art give a medium (MHRA 7.9); but no ebook format (MHRA 7.3); no medium or duration for music, films, or television (MHRA 7.8) -->
-        <group delimiter=", ">
-          <text variable="medium"/>
-          <text variable="scale"/>
-          <text variable="dimensions"/>
-        </group>
-      </if>
-    </choose>
+    <!-- the medium appears at both the title and container levels, and both with and without brackets (NHR 18.7.2-3, 18.8.5) -->
+    <group delimiter=", ">
+      <text variable="medium"/>
+      <text variable="scale"/>
+      <text variable="dimensions"/>
+    </group>
   </macro>
   <!-- 4.9. Archival location -->
   <macro name="source-archive">
     <group delimiter=", ">
       <text variable="archive-place"/>
       <text variable="archive"/>
+      <!-- usually `archive`, `archive-place` but sometimes also `archive-place`, `archive` (NHR 18.6.5); the latter is more common elsewhere (OGS 15.11.1 and MHRA4 7.7) -->
       <text variable="archive_collection"/>
       <text variable="archive_location"/>
-    </group>
-  </macro>
-  <macro name="source-archive-short">
-    <!-- shortened reference for an item consisting only of a shelfmark (MHRA 7.7) -->
-    <group delimiter=", ">
+      <text macro="source-archive-locator"/>
+      <!-- for OGS: -->
+      <!-- <text macro="source-archive-locator-range"/> -->
       <choose>
-        <if match="none" variable="archive_collection">
-          <text form="short" variable="archive"/>
-        </if>
+        <!-- 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>
-      <text variable="archive_collection"/>
-      <text variable="archive_location"/>
     </group>
   </macro>
-  <!-- 4.10. DOI or URL -->
-  <!-- Citation -->
-  <macro name="citation-notes-shortened-author-title-item">
-    <group delimiter=" ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="title-and-descriptions-short"/>
-        <text macro="citation-notes-shortened-author-title-disambiguate"/>
+  <macro name="source-archive-locator">
+    <choose>
+      <!-- archival locators appear after the shelfmark (cf. CMOS18 14.127) -->
+      <if locator="column" variable="archive archive_location">
+        <text macro="label-locator-all"/>
+      </if>
+      <else-if locator="folio" variable="archive archive_location">
+        <text macro="label-locator-all"/>
+      </else-if>
+      <else-if locator="page" variable="archive archive_location">
+        <text macro="label-locator-all"/>
+      </else-if>
+      <else-if variable="archive archive_location page">
         <choose>
-          <if 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 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="source-monographic-publication-short-unbracketed"/>
-      </group>
-      <text macro="source-monographic-publication-short-bracketed"/>
-    </group>
+      </else-if>
+    </choose>
   </macro>
-  <macro name="citation-notes-shortened-author-title-disambiguate">
-    <!-- added dates, editors/translators, publisher, date -->
-    <group delimiter=", ">
+  <!-- 4.10. DOI or URL -->
+  <macro name="source-date-accessed-DOI-URL">
+    <group delimiter=" ">
+      <text macro="source-DOI-URL"/>
       <choose>
-        <if disambiguate="true">
-          <names variable="editor-translator">
-            <label form="verb-short" suffix=" "/>
-            <name form="short"/>
-            <substitute>
-              <names variable="editor"/>
-              <names variable="translator"/>
-            </substitute>
-          </names>
-          <choose>
-            <if disambiguate="true">
-              <text macro="label-version"/>
-              <text macro="label-edition"/>
-            </if>
-          </choose>
-        </if>
+        <if variable="DOI"/>
+        <else-if variable="URL">
+          <group delimiter=", " prefix="(" suffix=")">
+            <date form="text" variable="accessed"/>
+            <text term="accessed"/>
+          </group>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <citation disambiguate-add-givenname="true" disambiguate-add-names="true">
-    <layout delimiter="; " suffix=".">
-      <choose>
-        <if position="subsequent">
-          <group delimiter=", ">
-            <text macro="citation-notes-shortened-author-title-item"/>
-            <text macro="source-locator-subsequent"/>
-          </group>
-        </if>
-        <else>
-          <group delimiter=", ">
-            <text macro="author-note"/>
-            <text macro="title-and-source"/>
-          </group>
-        </else>
-      </choose>
+  <macro name="source-DOI-URL">
+    <choose>
+      <if variable="DOI">
+        <text prefix="https://doi.org/" variable="DOI"/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- Citation -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="(" suffix=")">
+      <group delimiter=", ">
+        <text variable="citation-number"/>
+        <group>
+          <label form="short" strip-periods="true" variable="locator"/>
+          <text variable="locator"/>
+        </group>
+      </group>
     </layout>
   </citation>
   <!-- Bibliography -->
   <macro name="bibliography-notes">
     <group delimiter=". ">
-      <group delimiter=", ">
+      <group delimiter=". ">
         <text macro="author-bib"/>
         <text macro="title-and-source"/>
       </group>
       <text variable="references"/>
     </group>
   </macro>
-  <bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;" subsequent-author-substitute-rule="partial-first">
-    <sort>
-      <key macro="author-bib"/>
-      <key macro="title-and-descriptions"/>
-      <key macro="source"/>
-      <key variable="volume"/>
-      <key variable="part-number"/>
-      <key variable="event-date"/>
-      <key variable="original-date"/>
-      <key macro="source-date-issued-or-status"/>
-      <key macro="source-archive"/>
-    </sort>
-    <layout>
-      <!-- MHRA (8.3) does not provide specific guidance on excluding citations from the bibliography, but this seems to be the intent, as some of its examples are only usable in a note; the following draws on guidance from New Hart's Rules and Chicago. -->
-      <choose>
-        <if type="classic">
-          <choose>
-            <if match="any" variable="archive editor translator publisher">
-              <text macro="bibliography-notes"/>
-            </if>
-          </choose>
-        </if>
-        <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-          <choose>
-            <if variable="author">
-              <!-- Only signed reference entries appear in the bibliography: the MHRA model for an unsigned entry is only usable as a note (MHRA 7.5.ix) -->
-              <text macro="bibliography-notes"/>
-            </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>
-          <text macro="bibliography-notes"/>
-        </else>
-      </choose>
+  <bibliography second-field-align="flush">
+    <layout suffix=".">
+      <text suffix="." variable="citation-number"/>
+      <text macro="bibliography-notes"/>
     </layout>
   </bibliography>
 </style>