csl-styles 2.0.2 → 2.1.0

data/vendor/styles/apa-single-spaced.csl

@@ -1,57 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="never" initialize-with=". " names-delimiter=", " page-range-format="expanded" version="1.0">
+  <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
-    <title>American Psychological Association 7th edition (single-spaced bibliography)</title>
-    <title-short>APA (single-spaced)</title-short>
+    <title>APA Style 7th edition (single-spaced bibliography)</title>
+    <title-short>Publication Manual of the American Psychological Association, with Bluebook (single-spaced bibliography)</title-short>
     <id>http://www.zotero.org/styles/apa-single-spaced</id>
     <link href="http://www.zotero.org/styles/apa-single-spaced" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references" rel="documentation"/>
+    <link href="https://zotero.org/groups/2205533/collections/MR2N872S" rel="documentation"/>
     <author>
       <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
+      <uri>https://orcid.org/0000-0001-9560-6336</uri>
     </author>
+    <author>
+      <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
+    </author>
+    <contributor>
+      <name>Jay Pfaffman</name>
+      <email>jay@literatecomputing.com</email>
+    </contributor>
     <category citation-format="author-date"/>
-    <category field="psychology"/>
+    <category field="anthropology"/>
+    <category field="communications"/>
     <category field="generic-base"/>
-    <updated>2024-07-09T20:08:41+00:00</updated>
+    <category field="law"/>
+    <category field="medicine"/>
+    <category field="psychology"/>
+    <category field="social_science"/>
+    <category field="sociology"/>
+    <summary>APA Style, with single-spaced bibliography</summary>
+    <updated>2026-02-07T00: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">
     <terms>
-      <term name="editortranslator" form="short">
-        <single>ed. &amp; trans.</single>
-        <multiple>eds. &amp; trans.</multiple>
-      </term>
-      <term name="editor-translator" form="short">
-        <single>ed. &amp; trans.</single>
-        <multiple>eds. &amp; trans.</multiple>
+      <term name="ad"> C.E.</term>
+      <term name="bc"> B.C.E.</term>
+      <term form="short" name="circa">ca.</term>
+      <term name="guest">
+        <single>guest expert</single>
+        <multiple>guest experts</multiple>
       </term>
-      <term name="translator" form="short">trans.</term>
-      <term name="interviewer" form="short">
+      <term form="short" name="illustrator">illus.</term>
+      <term form="short" name="interviewer">
         <single>interviewer</single>
         <multiple>interviewers</multiple>
       </term>
-      <term name="collection-editor" form="short">
-        <single>ed.</single>
-        <multiple>eds.</multiple>
-      </term>
-      <term name="performer" form="verb">recorded by</term>
-      <term name="circa" form="short">ca.</term>
-      <term name="bc"> B.C.E.</term>
-      <term name="ad"> C.E.</term>
-      <term name="issue" form="long">
-        <single>issue</single>
-        <multiple>issues</multiple>
-      </term>
-      <term name="software">computer software</term>
-      <term name="at" form="long">before the</term>
-      <term name="collection">archival collection</term>
+      <term form="short" name="legislation">Pub. L.</term>
+      <term name="manuscript">unpublished manuscript</term>
+      <term form="verb" name="performer">recorded by</term>
       <term name="post">online post</term>
-      <term name="at" form="long">before the</term>
-      <term name="hearing" form="verb">testimony of</term>
-      <term name="review-of" form="long">review of the</term>
-      <term name="review-of" form="short">review of</term>
+      <term name="review-of">review of the</term>
+      <term form="short" name="review-of">review of</term>
+      <term name="software">computer software</term>
+      <term name="dataset">data set</term>
+      <term form="short" name="supplement">
+        <single>suppl.</single>
+        <multiple>suppls.</multiple>
+      </term>
     </terms>
   </locale>
   <locale xml:lang="da">
@@ -71,7 +80,7 @@
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="editor" form="short">
+      <term form="short" name="editor">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
@@ -92,244 +101,420 @@
       <term name="et-al">et al.</term>
     </terms>
   </locale>
+  <locale xml:lang="pl">
+    <terms>
+      <term name="et-al">i in.</term>
+    </terms>
+  </locale>
   <locale xml:lang="ro">
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-  <!-- For Indigeneous Knowledge, assume the item is stored as `document` or `speech`
-       and that Nation/Community, treaty, where the Elder lives, 
-       and topic are all stored in `title`
-       cf. https://libguides.norquest.ca/c.php?g=314831&p=5188823.
-       If the item is stored as `interview`, assume that Nation/Community, treat, and topic
-       are stored in `title`, 'Oral teaching' or similar is stored in `archive`, and where
-       the Elder lives is stored in `archive-place`. 
-  -->
-  <!-- Reviews are detected if an item has type `review` or `review-book` or if it has any of the variables
-       `reviewed-title`, `reviewed-author`, or `reviewed-genre`. For the latter case, reviews are commonly 
-       stored as types `article-journal`, `article-magazine`, `article-newspaper`, `post-weblog`, or `webpage` 
+  <!-- Contents:
+
+       APA uses four main reference elements:
+
+        1. Author (APA 9.7-12)
+        2. Date (APA 9.13-17)
+        3. Title and descriptions (APA 9.18-22)
+            3.1. Title (APA 9.18)
+            3.2. Identifier (in parentheses) (APA 9.19)
+            3.3. Description [in square brackets] (APA 9.21-22)
+        4. Source (APA 9.23-37)
+            4.1. Serial sources (APA 9.25-27)
+            4.2. Monographic sources (APA 9.28)
+            4.3. Publisher sources (APA 9.29)
+            4.4. Database and archive sources (APA 9.30)
+            4.5. Works with specific locations (APA 9.31)
+            4.6. Social media and website sources (APA 9.32-33)
+            4.7. DOI or URL (APA 9.34-36)
+
+       A note on the source may follow the main reference elements:
+
+        5. Publication history (APA 9.39-41)
+
+       APA also provides parallel rules for legal references following The Bluebook: A Uniform System of Citation (chap. 11):
+
+        6. Legal references
   -->
-  <!-- General categories of item types:
-       Periodical: article-journal article-magazine article-newspaper periodical post-weblog review review-book
-       Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter classic collection dataset document
-                 entry entry-dictionary entry-encyclopedia event figure
-                 graphic interview manuscript map motion_picture musical_score
-                 pamphlet patent performance personal_communication post report
-                 software song speech standard thesis webpage
-       Legal: bill hearing legal_case legislation regulation treaty
+  <!-- APA categorizes all sources as serial (APA 9.25-27) or monographic (APA 9.28).
+
+       Serial
+       : article-journal article-magazine article-newspaper periodical post-weblog review review-book
+
+       Serial or Monographic
+       : interview paper-conference
+
+         Monographic with any of `collection-editor compiler editor editorial-director`.
+         A serial `paper-conference` is unpublished if it lacks any of `issue page supplement-number volume`.
+
+       Monographic
+       : article book broadcast chapter classic collection dataset document entry entry-dictionary entry-encyclopedia event figure graphic manuscript map motion_picture musical_score pamphlet patent performance personal_communication post report software song speech standard thesis webpage
+
+       Legal
+       : bill hearing legal_case legislation regulation treaty
   -->
   <!-- Equivalencies:
-       classic == book
-       document == report, but give full date
-       standard == report
-       performance == speech
-       event == speech
-       collection == book, but give full date
+
+       `classic` == `book`
+       `document` == `report` (but give full date)
+       `standard` == `report`
+       `performance` == `speech`
+       `event` == `speech`
   -->
   <!-- Role equivalencies:
-       compiler == editor
-       organizer, curator == chair
-       script-writer == director
-       producer == director (but don't print both)
-       guest, host == director
-       series-creator, executive-producer == editor
+
+       `compiler` == `editor`
+       `organizer`, `curator` == `chair`
+       `script-writer` == `director`
+       `producer` == `director` (but don't print both)
+       `guest`, `host` == `director`
+       `series-creator`, `executive-producer` == `editor`
   -->
-  <!-- APA references contain four parts: author, date, title, source -->
-  <macro name="author-bib">
+  <!-- Reviews are detected if an item has type `review` or `review-book` or if it has any of the variables `reviewed-title`, `reviewed-author`, or `reviewed-genre`. For the latter case, reviews are commonly stored as types `article-journal`, `article-magazine`, `article-newspaper`, `post-weblog`, or `webpage`. -->
+  <!-- Indigeneous knowledge: Assume the item is stored as `document` or `speech` and that Nation/Community, treaty territory, where the Elder lives, and topic are all stored in `title`. Cf. <https://libguides.norquest.ca/c.php?g=314831&p=5188823>. If the item is stored as `interview`, assume that Nation/Community, treaty territory, and topic are stored in `title`. 'Oral teaching' or similar is stored in `archive`, and where the Elder lives is stored in `archive-place`. -->
+  <!-- Variable labels -->
+  <macro name="label-chapter-number">
     <group delimiter=" ">
-      <names variable="composer" delimiter=", &amp; ">
-        <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-        <substitute>
-          <names variable="author"/>
-          <!-- Note: `narrator` only cited in secondary-contributors -->
-          <names variable="illustrator"/>
-          <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. -->
-          <choose>
-            <if type="broadcast">
-              <names variable="script-writer director">
-                <!-- Note: Actors/performers and producers [not executive] not cited in APA style. -->
-                <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                <label form="long" prefix=" (" suffix=")" text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="director">
-            <!-- For non-broadcast items, APA only cites directors and not writers. -->
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. -->
-          <names variable="guest host">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="producer">
-            <!-- Note: Producers not cited if there is a writer/director, but use if they are the principle creator. -->
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <choose>
-            <if variable="container-title">
-              <choose>
-                <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any">
-                  <!-- Items with book-like container-title substitute with their title and parenthetical, 
-                       but leave bracketed after container-title. This mimics the `container-booklike` formatting. -->
-                  <choose>
-                    <if variable="title">
-                      <group delimiter=" ">
-                        <text macro="title"/>
-                        <text macro="parenthetical"/>
-                      </group>
-                    </if>
-                    <else>
-                      <text macro="title-and-descriptions"/>
-                    </else>
-                  </choose>
-                </if>
-              </choose>
-            </if>
-          </choose>
-          <names variable="executive-producer">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="series-creator">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="editor-translator">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <!-- Note: Translator is not cited as a primary creator (only as Ed. & Trans.). -->
-          <names variable="editor">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="editorial-director">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="compiler">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <choose>
-            <if type="event performance speech" match="any">
-              <names variable="chair">
-                <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                <label form="long" prefix=" (" suffix=")" text-case="title"/>
-              </names>
-              <names variable="organizer">
-                <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-                <label form="long" prefix=" (" suffix=")" text-case="title"/>
-              </names>
-            </if>
-          </choose>
-          <names variable="curator">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="long" prefix=" (" suffix=")" text-case="title"/>
-          </names>
-          <names variable="collection-editor">
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" prefix=" (" suffix=")" text-case="title"/>
-          </names>
+      <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>
+        <if is-numeric="edition">
+          <number form="ordinal" variable="edition"/>
+          <label form="short" variable="edition"/>
+        </if>
+        <else>
+          <text variable="edition"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="label-issue">
+    <group delimiter=" ">
+      <label text-case="capitalize-first" variable="issue"/>
+      <text variable="issue"/>
+    </group>
+  </macro>
+  <macro name="label-locator">
+    <!-- Abbreviate page and paragraph; leave other locator labels in long form (APA 8.13) -->
+    <group delimiter=" ">
+      <choose>
+        <if locator="page">
+          <label form="short" variable="locator"/>
+        </if>
+        <else-if match="any" type="bill hearing legal_case legislation regulation treaty">
+          <!-- Bluebook-style labels for legal types -->
           <choose>
-            <if variable="title">
-              <!-- If an item has a title, substitute missing author with title and parenthetical, but leave bracketed 
-                   after the date (in the 'title' position). -->
-              <group delimiter=" ">
-                <text macro="title"/>
-                <text macro="parenthetical"/>
-              </group>
+            <if locator="chapter paragraph section" match="any">
+              <label form="symbol" variable="locator"/>
             </if>
             <else>
-              <!-- If an item has no title, substitute with bracketed followed by parenthetical. -->
-              <text macro="title-and-descriptions"/>
+              <label text-case="capitalize-first" variable="locator"/>
             </else>
           </choose>
-        </substitute>
-      </names>
+        </else-if>
+        <else-if locator="paragraph">
+          <label form="short" variable="locator"/>
+        </else-if>
+        <else-if is-numeric="locator">
+          <label text-case="capitalize-first" variable="locator"/>
+        </else-if>
+        <!-- a non-numeric canonical reference is identified by its formatting and does not need a label, similar to a timestamp -->
+        <else-if locator="chapter line verse" match="any"/>
+        <else>
+          <label text-case="capitalize-first" variable="locator"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="label-number">
+    <group delimiter=" ">
+      <choose>
+        <if type="standard"/>
+        <else-if is-numeric="number" match="any" type="legislation patent regulation">
+          <label form="short" text-case="capitalize-first" variable="number"/>
+        </else-if>
+      </choose>
+      <text text-case="capitalize-first" variable="number"/>
+    </group>
+  </macro>
+  <macro name="label-number-capitalized">
+    <!-- alias for cross-compatibility of Bluebook macros -->
+    <text macro="label-number"/>
+  </macro>
+  <macro name="label-number-article">
+    <!-- APA example 6: Journal article with article number or eLocator -->
+    <group delimiter=" ">
+      <text term="article-locator" text-case="capitalize-first"/>
+      <text variable="number"/>
+    </group>
+  </macro>
+  <macro name="label-number-of-volumes">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="number-of-volumes">
+          <label form="short" text-case="capitalize-first" variable="number-of-volumes"/>
+          <group>
+            <text prefix="1" term="page-range-delimiter"/>
+            <number variable="number-of-volumes"/>
+          </group>
+        </if>
+        <else>
+          <text variable="number-of-volumes"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="label-page">
+    <group delimiter=" ">
+      <label form="short" variable="page"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="label-part-number">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="part-number">
+          <!-- TODO: Replace with `part-number` label when CSL provides one -->
+          <text form="short" term="part" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <text text-case="capitalize-first" variable="part-number"/>
+    </group>
+  </macro>
+  <macro name="label-section-symbol">
+    <group delimiter=" ">
+      <label form="symbol" variable="section"/>
+      <text variable="section"/>
+    </group>
+  </macro>
+  <macro name="label-supplement-number">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="supplement-number">
+          <!-- TODO: Replace with `supplement-number` label when CSL provides one -->
+          <text form="short" term="supplement" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <text text-case="capitalize-first" variable="supplement-number"/>
+    </group>
+  </macro>
+  <macro name="label-version">
+    <group delimiter=" ">
+      <label text-case="capitalize-first" variable="version"/>
+      <text variable="version"/>
+    </group>
+  </macro>
+  <macro name="label-volume">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="volume">
+          <label form="short" text-case="capitalize-first" variable="volume"/>
+        </if>
+      </choose>
+      <text text-case="capitalize-first" variable="volume"/>
+    </group>
+  </macro>
+  <!-- 1. Author (APA 9.7-12) -->
+  <macro name="author">
+    <!-- Substitutes for missing authors: order prioritizes primary creators (e.g., composer, author) over secondary roles (e.g., editor, curator), with title as the final fallback. -->
+    <names variable="composer">
+      <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")" text-case="title"/>
+      <substitute>
+        <names variable="author"/>
+        <!-- `narrator` only cited in `identifier-contributors` -->
+        <names variable="illustrator"/>
+        <choose>
+          <if type="broadcast">
+            <names variable="script-writer director">
+              <!-- Actors/performers and producers [not executive] not cited in APA style. -->
+              <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+              <label prefix=" (" suffix=")" text-case="title"/>
+            </names>
+          </if>
+        </choose>
+        <names variable="director">
+          <!-- For non-broadcast items, APA only cites directors and not writers. -->
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="guest host">
+          <!-- TODO: Collapse variables when that becomes available. -->
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="producer">
+          <!-- Producers not cited if there is a writer/director, but use if they are the principal creator. -->
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if match="any" type="entry-dictionary entry-encyclopedia">
+            <text variable="publisher"/>
+          </if>
+        </choose>
+        <choose>
+          <if match="none" variable="container-title"/>
+          <else-if match="any" type="book classic entry entry-dictionary entry-encyclopedia">
+            <!-- Items with a monographic `container-title` substitute their title and identifier, but leave description after `container-title`. This mimics the `source-monographic` macro. -->
+            <text macro="author-title-substitute"/>
+          </else-if>
+        </choose>
+        <names variable="executive-producer">
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="series-creator">
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editor-translator"/>
+        <!-- `translator` is not cited as a primary creator (only as Ed. & Trans.). -->
+        <names variable="editor"/>
+        <names variable="editorial-director"/>
+        <names variable="compiler">
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if match="any" type="event performance speech">
+            <names variable="chair">
+              <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+              <label prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="organizer">
+              <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+              <label prefix=" (" suffix=")" text-case="title"/>
+            </names>
+          </if>
+        </choose>
+        <names variable="curator">
+          <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+          <label prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor"/>
+        <choose>
+          <if match="any" type="software webpage">
+            <!-- `software` (APA 10.10) and `webpage` (APA 10.16) can be cited under "name of group": likely in `publisher` if no `author` -->
+            <text variable="publisher"/>
+          </if>
+          <else-if type="standard">
+            <text variable="authority"/>
+          </else-if>
+        </choose>
+        <text macro="author-title-substitute"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-and-contributors">
+    <group delimiter=" ">
+      <text macro="author"/>
       <choose>
-        <!-- Print "with" contributor for books, but not for other types that commonly have them (eg, thesis, software) -->
-        <if type="book classic collection" match="any">
-          <names variable="contributor" prefix="(" suffix=")">
+        <!-- add nonprimary authors equivalent to those appearing "on a book cover"; do not modify the in-text citation (APA 9.8) -->
+        <if match="none" variable="author compiler composer editor editor-translator illustrator"/>
+        <else-if match="any" type="book musical_score pamphlet report standard">
+          <names prefix="(" suffix=")" variable="contributor">
             <label form="verb" suffix=" "/>
-            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+            <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
           </names>
-        </if>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="author-intext">
+  <macro name="author-short">
     <choose>
-      <if type="bill hearing legal_case legislation regulation treaty" match="any">
-        <text macro="title-intext"/>
+      <if match="any" type="bill hearing legal_case legislation regulation treaty">
+        <text macro="title-and-descriptions-short"/>
       </if>
-      <else-if type="interview personal_communication" match="any">
+      <else-if match="any" type="interview personal_communication">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader.
-                If not, then use the APA in-text-only personal communication format -->
-          <if variable="archive container-title DOI publisher URL" match="none">
+          <!-- These variables indicate that the letter is retrievable by the reader. If not, use the APA in-text-only personal communication format. -->
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+            <names variable="author">
+              <name and="symbol" form="short"/>
+              <substitute>
+                <text macro="title-and-descriptions-short"/>
+              </substitute>
+            </names>
+          </if>
+          <else>
             <group delimiter=", ">
               <names variable="author">
-                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <name and="symbol"/>
                 <substitute>
-                  <text macro="title-intext"/>
+                  <text macro="title-and-descriptions-short"/>
                 </substitute>
               </names>
               <text term="personal-communication"/>
             </group>
-          </if>
-          <else>
-            <names variable="author" delimiter=", ">
-              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-              <substitute>
-                <text macro="title-intext"/>
-              </substitute>
-            </names>
           </else>
         </choose>
       </else-if>
       <else>
-        <names variable="composer" delimiter=" &amp; ">
-          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+        <names variable="composer">
+          <name and="symbol" form="short"/>
           <substitute>
             <names variable="author"/>
             <names variable="illustrator"/>
-            <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. -->
             <choose>
               <if type="broadcast">
-                <names variable="script-writer director"/>
+                <!-- TODO: Collapse variables when that becomes available. -->
+                <!-- Ideally combine as `script-writer director` -->
+                <names variable="script-writer"/>
               </if>
             </choose>
             <names variable="director"/>
-            <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. -->
+            <!-- TODO: Collapse variables when that becomes available. -->
             <names variable="guest host"/>
             <names variable="producer"/>
             <choose>
-              <if variable="container-title">
-                <choose>
-                  <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any">
-                    <text macro="title-intext"/>
-                  </if>
-                </choose>
+              <if match="any" type="entry-dictionary entry-encyclopedia">
+                <text variable="publisher"/>
               </if>
             </choose>
+            <choose>
+              <if match="none" variable="container-title"/>
+              <else-if match="any" type="book classic entry entry-dictionary entry-encyclopedia">
+                <text macro="title-and-descriptions-short"/>
+              </else-if>
+            </choose>
             <names variable="executive-producer"/>
             <names variable="series-creator"/>
             <names variable="editor"/>
             <names variable="editorial-director"/>
             <names variable="compiler"/>
             <choose>
-              <if type="event performance speech" match="any">
+              <if match="any" type="event performance speech">
                 <names variable="chair"/>
                 <names variable="organizer"/>
               </if>
             </choose>
             <names variable="curator"/>
-            <text macro="title-intext"/>
+            <names variable="collection-editor"/>
+            <choose>
+              <if match="any" type="software webpage">
+                <!-- `software` (APA 10.10) and `webpage` (APA 10.16) can be cited under "name of group": likely in `publisher` if no `author` -->
+                <text form="short" variable="publisher"/>
+              </if>
+              <else-if type="standard">
+                <text form="short" variable="authority"/>
+              </else-if>
+            </choose>
+            <text macro="title-and-descriptions-short"/>
           </substitute>
         </names>
       </else>
@@ -337,100 +522,144 @@
   </macro>
   <macro name="author-sort">
     <choose>
-      <if type="bill hearing legal_case legislation regulation treaty" match="any">
-        <text macro="title-legal"/>
+      <if match="any" type="bill hearing legal_case legislation regulation treaty">
+        <text macro="legal-title"/>
       </if>
       <else>
-        <text macro="author-bib"/>
+        <text macro="author"/>
       </else>
     </choose>
   </macro>
-  <macro name="date-bib">
-    <group delimiter=" " prefix="(" suffix=")">
+  <!-- Author elements -->
+  <macro name="author-title-substitute">
+    <choose>
+      <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+        <!-- `title` is only the review title if there is a separate `reviewed-genre` or `reviewed-title`; otherwise, it is the title of the reviewed work, printed in the description -->
+        <choose>
+          <if variable="reviewed-genre title">
+            <text macro="title"/>
+          </if>
+          <else-if variable="reviewed-title title">
+            <text macro="title"/>
+          </else-if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="title">
+        <!-- If an item has a `title`, substitute missing author with title and identifier, but leave description after the date (in the title position). -->
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="identifier"/>
+        </group>
+      </else-if>
+      <else>
+        <!-- If an item has no `title`, substitute with descriptions. -->
+        <text macro="title-and-descriptions"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 2. Date (APA 9.13-17) -->
+  <macro name="date">
+    <!-- Full dates included for ephemeral sources (e.g. broadcasts, interviews) to provide maximum specificity, while books use year only. -->
+    <group delimiter="-" prefix="(" suffix=")">
       <choose>
-        <if is-uncertain-date="issued">
-          <text term="circa" form="short"/>
+        <if variable="issued">
+          <group delimiter=", ">
+            <group>
+              <text macro="date-issued-year"/>
+              <text variable="year-suffix"/>
+            </group>
+            <choose>
+              <if match="any" type="article-magazine article-newspaper broadcast collection document event motion_picture pamphlet performance personal_communication post post-weblog song speech webpage">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <text macro="date-issued-month-day"/>
+              </if>
+              <!-- Only show the month and day for an unpublished `interview` or `paper-conference` -->
+              <else-if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume"/>
+              <else-if match="any" type="interview paper-conference">
+                <text macro="date-issued-month-day"/>
+              </else-if>
+              <!-- Only year: article article-journal book chapter classic entry entry-dictionary entry-encyclopedia dataset figure graphic manuscript map musical_score paper-conference[published] patent periodical report review review-book software standard thesis -->
+            </choose>
+          </group>
         </if>
+        <else-if variable="status">
+          <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
+          <text text-case="lowercase" variable="status"/>
+          <text variable="year-suffix"/>
+        </else-if>
+        <else>
+          <text form="short" term="no date"/>
+          <text variable="year-suffix"/>
+        </else>
       </choose>
-      <group>
-        <choose>
-          <if variable="issued">
-            <group delimiter=", ">
-              <group>
-                <date variable="issued" date-parts="year" form="numeric"/>
-                <text variable="year-suffix"/>
-              </group>
+    </group>
+  </macro>
+  <macro name="date-short">
+    <group delimiter="-">
+      <choose>
+        <if variable="issued">
+          <group delimiter="/">
+            <text macro="date-original-year"/>
+            <group>
               <choose>
-                <if type="article-magazine article-newspaper broadcast collection document event interview motion_picture pamphlet performance personal_communication post post-weblog song speech webpage" match="any">
-                  <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
-                  <date variable="issued">
-                    <date-part name="month"/>
-                    <date-part name="day" prefix=" "/>
-                  </date>
+                <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+                  <text macro="date-issued-year"/>
                 </if>
-                <else-if type="paper-conference">
-                  <!-- Capture 'speech' stored as 'paper-conference' -->
-                  <choose>
-                    <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
-                      <date variable="issued">
-                        <date-part name="month"/>
-                        <date-part name="day" prefix=" "/>
-                      </date>
-                    </if>
-                  </choose>
+                <else-if match="any" type="interview personal_communication">
+                  <!-- use the in-text-only format for inaccessible personal communications -->
+                  <text macro="date-issued-full"/>
                 </else-if>
-                <!-- Only year: article article-journal book chapter classic entry entry-dictionary entry-encyclopedia dataset figure graphic
-                     manuscript map musical_score paper-conference[published] patent periodical report review review-book software standard thesis -->
+                <else>
+                  <text macro="date-issued-year"/>
+                </else>
               </choose>
+              <text variable="year-suffix"/>
             </group>
-          </if>
-          <else-if variable="status">
-            <group>
-              <!-- We print the status variable directly rather than using in-press, etc. terms. -->
-              <text variable="status" text-case="lowercase"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
-          </else-if>
-          <else>
-            <text term="no date" form="short"/>
-            <text variable="year-suffix" prefix="-"/>
-          </else>
-        </choose>
-      </group>
+          </group>
+        </if>
+        <else-if variable="status">
+          <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
+          <text text-case="lowercase" variable="status"/>
+          <text variable="year-suffix"/>
+        </else-if>
+        <else>
+          <text form="short" term="no date"/>
+          <text variable="year-suffix"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="date-sort">
-    <!-- This is necessary to ensure that citeproc sorts all item types chonologically in the same list. -->
+    <!-- Sort items by issue date as printed -->
     <choose>
-      <if type="article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic manuscript map musical_score patent report review review-book thesis" match="any">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if match="any" type="article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic manuscript map musical_score patent report review review-book thesis">
+        <date date-parts="year" form="numeric" variable="issued"/>
       </if>
       <else-if type="paper-conference">
-        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <!-- Determine whether published and serial or monographic -->
         <choose>
-          <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
-            <date variable="issued" date-parts="year" form="numeric"/>
+          <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+            <date date-parts="year" form="numeric" variable="issued"/>
           </if>
           <else>
-            <date variable="issued">
-              <date-part name="year" form="long"/>
-              <date-part name="month" form="numeric-leading-zeros"/>
-              <date-part name="day" form="numeric-leading-zeros"/>
-            </date>
+            <text macro="date-issued-leading-zeros"/>
           </else>
         </choose>
       </else-if>
       <else>
-        <date variable="issued">
-          <date-part name="year" form="long"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
-        </date>
+        <text macro="date-issued-leading-zeros"/>
       </else>
     </choose>
   </macro>
   <macro name="date-sort-group">
-    <!-- APA sorts 1. no-date items, 2. items with dates, 3. in-press (status) items -->
+    <!-- Sorts items with and without dates:
+
+          1. `no date` items (= 0)
+          2. items with dates (= 1)
+          3. items with `status` (forthcoming, in press, etc.) (= 2) -->
     <choose>
       <if variable="issued">
         <text value="1"/>
@@ -443,1102 +672,971 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-intext">
-    <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <group delimiter=" ">
-            <choose>
-              <if is-uncertain-date="original-date">
-                <text term="circa" form="short"/>
-              </if>
-            </choose>
-            <date variable="original-date">
-              <date-part name="year"/>
-            </date>
-          </group>
-          <group delimiter=" ">
-            <choose>
-              <if is-uncertain-date="issued">
-                <text term="circa" form="short"/>
-              </if>
-            </choose>
-            <group>
-              <choose>
-                <if type="interview personal_communication" match="any">
-                  <choose>
-                    <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader.
-                           If not, then use the in-text-only personal communication format -->
-                      <date variable="issued" form="text"/>
-                    </if>
-                    <else>
-                      <date variable="issued">
-                        <date-part name="year"/>
-                      </date>
-                    </else>
-                  </choose>
-                </if>
-                <else>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                </else>
-              </choose>
-              <text variable="year-suffix"/>
-            </group>
-          </group>
-        </group>
-      </if>
-      <else-if variable="status">
-        <!-- We print the status variable directly rather than using in-press, etc. terms. -->
-        <text variable="status" text-case="lowercase"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else>
-    </choose>
-  </macro>
-  <!-- APA has two description elements following the title:
-       title (parenthetical) [bracketed] -->
+  <!-- Date elements -->
+  <macro name="date-event-full">
+    <group delimiter=" ">
+      <choose>
+        <if is-uncertain-date="event-date">
+          <text form="short" term="circa"/>
+        </if>
+      </choose>
+      <date form="text" variable="event-date"/>
+    </group>
+  </macro>
+  <macro name="date-issued-full">
+    <group delimiter=" ">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text form="short" term="circa"/>
+        </if>
+      </choose>
+      <date form="text" variable="issued"/>
+    </group>
+  </macro>
+  <macro name="date-issued-leading-zeros">
+    <date delimiter="-" variable="issued">
+      <date-part name="year"/>
+      <date-part form="numeric-leading-zeros" name="month"/>
+      <date-part form="numeric-leading-zeros" name="day"/>
+    </date>
+  </macro>
+  <macro name="date-issued-month-day">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="date-issued-year">
+    <group delimiter=" ">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text form="short" term="circa"/>
+        </if>
+      </choose>
+      <date date-parts="year" form="numeric" variable="issued"/>
+    </group>
+  </macro>
+  <macro name="date-original-year">
+    <group delimiter=" ">
+      <choose>
+        <if is-uncertain-date="original-date">
+          <text form="short" term="circa"/>
+        </if>
+      </choose>
+      <date date-parts="year" form="numeric" variable="original-date"/>
+    </group>
+  </macro>
+  <!-- 3. Title and descriptions (APA 9.18-22) -->
   <macro name="title-and-descriptions">
+    <group delimiter=" ">
+      <choose>
+        <if variable="title">
+          <text macro="title"/>
+          <text macro="identifier"/>
+          <text macro="description"/>
+        </if>
+        <else-if match="any" type="bill report">
+          <!-- Bills, resolutions, and congressional reports substitute bill number if no title. -->
+          <!-- Congressional reports are indistinguishable from other reports -->
+          <text macro="identifier-number"/>
+          <text macro="description"/>
+          <text macro="identifier"/>
+        </else-if>
+        <else>
+          <text macro="description"/>
+          <text macro="identifier"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title-and-descriptions-short">
     <choose>
       <if variable="title">
-        <group delimiter=" ">
-          <text macro="title"/>
-          <text macro="parenthetical"/>
-          <text macro="bracketed"/>
-        </group>
+        <text macro="title-short"/>
       </if>
+      <else-if match="any" type="bill report">
+        <!-- Bills, resolutions, and congressional reports substitute bill number if no title. -->
+        <text macro="legal-identifier-bill-report"/>
+      </else-if>
       <else>
-        <choose>
-          <if type="bill report" match="any">
-            <!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. -->
-            <!-- Can't distinguish congressional reports from other reports, 
-                 but giving the genre and number seems fine for other reports too. -->
-            <text macro="number"/>
-            <text macro="bracketed"/>
-            <text macro="parenthetical"/>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text macro="bracketed"/>
-              <text macro="parenthetical"/>
-            </group>
-          </else>
-        </choose>
+        <text macro="description-short"/>
       </else>
     </choose>
   </macro>
+  <!-- 3.1. Title (APA 9.18) -->
   <macro name="title">
     <choose>
-      <if type="post webpage" match="any">
-        <!-- Webpages are always italicized -->
-        <text macro="title-plus-part-title" font-style="italic"/>
+      <if match="any" type="post webpage">
+        <!-- part number/title always at the analytic level -->
+        <text font-style="italic" macro="title-and-part-filter-review"/>
       </if>
-      <!-- Other types are italicized based on presence of container-title.
-             Assume that review and review-book are published in periodicals/blogs,
-             not just on a web page (ex. 69) -->
-      <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
-        <text macro="periodical-title"/>
+      <!-- Other types are italicized based on presence of `container-title`. Assume that `review` and `review-book` are published either in a serial or on a webpage (APA example 69) -->
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <text macro="title-serial"/>
       </else-if>
-      <else-if type="paper-conference">
-        <!-- Treat paper-conference as book-like if it has an editor, otherwise as periodical-like -->
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <text macro="title-monographic"/>
+      </else-if>
+      <else-if match="any" type="interview paper-conference">
+        <text macro="title-serial"/>
+      </else-if>
+      <else>
+        <text macro="title-monographic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+        <!-- `title` is only the review title if there is a separate `reviewed-genre` or `reviewed-title`; otherwise, it is the title of the reviewed work, printed in the description -->
         <choose>
-          <if variable="collection-editor compiler editor editorial-director" match="any">
-            <text macro="booklike-title"/>
+          <if variable="reviewed-genre title">
+            <!-- Quotes, title case -->
+            <text form="short" quotes="true" text-case="title" variable="title"/>
           </if>
+          <else-if variable="reviewed-title title">
+            <!-- Quotes, title case -->
+            <text form="short" quotes="true" text-case="title" variable="title"/>
+          </else-if>
           <else>
-            <text macro="periodical-title"/>
+            <text macro="description-short"/>
           </else>
         </choose>
+      </if>
+      <else-if match="any" type="bill legislation regulation report treaty">
+        <!-- No italics or quotes, title case -->
+        <text form="short" text-case="title" variable="title"/>
+      </else-if>
+      <else-if match="any" type="legal_case post">
+        <!-- Italicized, sentence case -->
+        <text font-style="italic" form="short" variable="title"/>
+      </else-if>
+      <else-if match="any" type="hearing webpage">
+        <!-- Italicized, title case (regardless of `container-title`) -->
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
+      </else-if>
+      <!-- Other types are formatted based on presence of `container-title`, as in title macro -->
+      <else-if variable="container-title">
+        <!-- Quotes, title case -->
+        <text form="short" quotes="true" text-case="title" variable="title"/>
       </else-if>
       <else>
-        <text macro="booklike-title"/>
+        <!-- Italicized, title case (default) -->
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="periodical-title">
-    <!-- For periodicals, assume that part-number and part-title refer to the article and append to title -->
+  <!-- Title elements -->
+  <macro name="title-and-part-filter-review">
     <choose>
-      <if variable="container-title" match="any">
-        <text macro="title-plus-part-title"/>
+      <if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+        <!-- If a review has no `reviewed-genre` or `reviewed-title`, assume that `title` contains the title of the reviewed work; the description provides it. -->
+        <choose>
+          <if variable="reviewed-genre title">
+            <text macro="title-and-part-title"/>
+          </if>
+          <else-if variable="reviewed-title title">
+            <text macro="title-and-part-title"/>
+          </else-if>
+        </choose>
       </if>
       <else>
-        <!-- for periodical items without container titles, don't append volume-title to title -->
-        <text macro="title-plus-part-title" font-style="italic"/>
+        <text macro="title-and-part-title"/>
       </else>
     </choose>
   </macro>
-  <macro name="booklike-title">
-    <!-- For book-like items, assume part-number and part-title refer to the book/volume. -->
+  <macro name="title-and-part-title">
+    <group delimiter=": ">
+      <text variable="title"/>
+      <text macro="title-part"/>
+    </group>
+  </macro>
+  <macro name="title-and-volume-title">
+    <group delimiter=": ">
+      <text variable="title"/>
+      <text macro="title-volume"/>
+    </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" match="any">
+      <if variable="container-title">
         <text variable="title"/>
       </if>
       <else>
-        <!-- For book-like items without container titles and with volume-title, append volume-title to title (ex. 30) -->
-        <text macro="title-plus-volume-title" font-style="italic"/>
+        <!-- For monographic items without `container-title` and with `volume-title`, append `volume-title` to `title` (APA example 30) -->
+        <text font-style="italic" macro="title-and-volume-title"/>
       </else>
     </choose>
   </macro>
-  <macro name="title-plus-part-title">
+  <macro name="title-part">
     <choose>
-      <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any">
-        <!-- If a review has no `reviewed-title`, assume that `title` contains the title of the reviewed work
-             and omit it here; it is printed in the `reviewed-item` macro. -->
-        <choose>
-          <if variable="reviewed-title" match="none"/>
-          <else>
-            <group delimiter=": ">
-              <text variable="title"/>
-              <text macro="part-title"/>
-            </group>
-          </else>
-        </choose>
+      <if variable="part-title">
+        <group delimiter=". ">
+          <text macro="label-part-number"/>
+          <text text-case="capitalize-first" variable="part-title"/>
+        </group>
       </if>
+      <else-if is-numeric="part-number"/>
       <else>
-        <group delimiter=": ">
-          <text variable="title"/>
-          <text macro="part-title"/>
-        </group>
+        <text macro="label-part-number"/>
       </else>
     </choose>
   </macro>
-  <macro name="part-title">
-    <group delimiter=". ">
-      <group delimiter=" ">
-        <label variable="part-number" form="short" text-case="capitalize-first"/>
-        <text variable="part-number"/>
-      </group>
-      <text variable="part-title" text-case="capitalize-first"/>
-    </group>
-  </macro>
-  <macro name="title-plus-volume-title">
-    <group delimiter=": ">
-      <text variable="title"/>
-      <text macro="volume-title"/>
-    </group>
-  </macro>
-  <macro name="volume-title">
-    <group delimiter=": ">
-      <choose>
-        <if variable="volume-title">
-          <group delimiter=" ">
-            <group delimiter=". ">
-              <group delimiter=" ">
-                <label variable="volume" form="short" text-case="capitalize-first"/>
-                <text variable="volume"/>
-              </group>
-              <text variable="volume-title"/>
-            </group>
-          </group>
-        </if>
-        <else-if is-numeric="volume" match="none">
-          <group delimiter=" ">
-            <label variable="volume" form="short" text-case="capitalize-first"/>
-            <text variable="volume"/>
-          </group>
-        </else-if>
-      </choose>
-      <!-- For book-like items, assume part-number and part-title refer to the book/volume. -->
-      <text macro="part-title"/>
-    </group>
-  </macro>
-  <macro name="title-intext">
+  <macro name="title-serial">
+    <!-- For serials, assume that `part-number` and `part-title` refer to the article and append to `title` -->
     <choose>
-      <if type="bill report">
-        <!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. -->
-        <!-- Can't distinguish congressional reports from other reports, 
-             but giving the genre and number seems fine for other reports too. -->
-        <choose>
-          <if variable="title">
-            <text variable="title" form="short" text-case="title"/>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="genre"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="chapter-number container-title" match="none">
-                    <label variable="number" form="short" text-case="capitalize-first"/>
-                  </if>
-                </choose>
-                <text variable="number"/>
-              </group>
-            </group>
-          </else>
-        </choose>
+      <if variable="container-title">
+        <text macro="title-and-part-filter-review"/>
       </if>
       <else>
-        <choose>
-          <if variable="title" match="none">
-            <text macro="bracketed-intext"/>
-          </if>
-          <else-if type="hearing">
-            <!-- Hearings are italicized -->
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </else-if>
-          <else-if type="legal_case" match="any">
-            <!-- Cases are italicized -->
-            <text variable="title" font-style="italic"/>
-          </else-if>
-          <else-if type="legislation regulation treaty" match="any">
-            <!-- Legislation, regulations, and treaties not italicized or quoted -->
-            <text variable="title" form="short" text-case="title"/>
-          </else-if>
-          <else-if type="post webpage" match="any">
-            <!-- Webpages are always italicized -->
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </else-if>
-          <else-if variable="container-title" match="any">
-            <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-            <text variable="title" form="short" quotes="true" text-case="title"/>
-          </else-if>
-          <else>
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </else>
-        </choose>
+        <!-- for serial items without `container-title`, don't append `volume-title` to `title` -->
+        <text font-style="italic" macro="title-and-part-filter-review"/>
       </else>
     </choose>
   </macro>
-  <macro name="parenthetical">
-    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
-    <group prefix="(" suffix=")">
+  <macro name="title-volume">
+    <group delimiter=", ">
       <choose>
-        <if type="patent">
-          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-          <group delimiter=" ">
-            <text variable="authority" form="short"/>
-            <choose>
-              <if variable="genre">
-                <text variable="genre" text-case="capitalize-first"/>
-              </if>
-              <else>
-                <text term="patent" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <group delimiter=" ">
-              <label variable="number" form="short" text-case="capitalize-first"/>
-              <text variable="number"/>
+        <!-- Assume that `part-number` and `part-title` of monographic items refer to the source book/volume -->
+        <if variable="volume-title">
+          <group delimiter=": ">
+            <group delimiter=". ">
+              <text macro="label-volume"/>
+              <text variable="volume-title"/>
             </group>
+            <text macro="title-part"/>
           </group>
         </if>
-        <else-if type="post webpage" match="any">
-          <!-- For post webpage, container-title is treated as publisher -->
-          <group delimiter="; ">
-            <text macro="secondary-contributors"/>
-            <text macro="database-location"/>
-            <text macro="number"/>
-            <text macro="locators-booklike"/>
-          </group>
+        <else-if variable="part-title">
+          <text macro="label-volume"/>
+          <text macro="title-part"/>
         </else-if>
-        <else-if type="report" match="any">
-          <choose>
-            <if variable="title" match="none">
-              <!-- If there is no title, then genre and number are already printed as the title. -->
-              <group delimiter="; ">
-                <text macro="secondary-contributors"/>
-                <text macro="database-location"/>
-                <text macro="locators-booklike"/>
-              </group>
-            </if>
-            <!-- If the report is a chapter in a larger report, then most parenthetical information is printed after the container. -->
-            <else-if variable="container-title">
-              <text macro="secondary-contributors"/>
-            </else-if>
-            <else>
-              <group delimiter="; ">
-                <text macro="secondary-contributors"/>
-                <text macro="database-location"/>
-                <text macro="number"/>
-                <text macro="locators-booklike"/>
-              </group>
-            </else>
-          </choose>
+        <!-- if there is no `part-title` or `volume title`, `part-number` and `volume` appear in `identifier` if numeric -->
+        <else-if is-numeric="part-number volume"/>
+        <else-if is-numeric="part-number" variable="volume">
+          <text macro="label-volume"/>
         </else-if>
-        <else-if variable="container-title">
-          <group delimiter="; ">
-            <text macro="secondary-contributors"/>
-            <choose>
-              <if type="broadcast graphic map motion_picture song" match="any">
-                <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
-                <text macro="number"/>
-              </if>
-            </choose>
-          </group>
+        <else-if is-numeric="volume" variable="part-number">
+          <text macro="label-part-number"/>
         </else-if>
+        <else-if is-numeric="part-number"/>
+        <else-if is-numeric="volume"/>
         <else>
-          <group delimiter="; ">
-            <text macro="secondary-contributors"/>
-            <text macro="database-location"/>
-            <text macro="number"/>
-            <text macro="locators-booklike"/>
-          </group>
+          <text macro="label-volume"/>
+          <text macro="label-part-number"/>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="parenthetical-container">
-    <choose>
-      <if variable="container-title" match="any">
-        <group prefix="(" suffix=")">
-          <group delimiter="; ">
-            <text macro="database-location"/>
-            <choose>
-              <if type="broadcast graphic map motion_picture song" match="none">
-                <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
-                <text macro="number"/>
-              </if>
-            </choose>
-            <text macro="locators-booklike"/>
-          </group>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="bracketed">
-    <!-- [Descriptive information] -->
-    <!-- If there is a number, genre is already printed in macro="number" -->
-    <group prefix="[" suffix="]">
+  <!-- 3.2. Identifier (in parentheses) (APA 9.19) -->
+  <macro name="identifier">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
+    <group delimiter="; " prefix="(" suffix=")">
       <choose>
-        <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any">
-          <text macro="reviewed-item"/>
+        <if type="patent">
+          <text macro="identifier-patent"/>
         </if>
-        <else-if type="thesis">
-          <!-- Thesis type and institution -->
-          <group delimiter="; ">
-            <choose>
-              <if variable="number" match="none">
-                <group delimiter=", ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <choose>
-                    <if variable="archive DOI URL" match="any">
-                      <!-- Include the university in brackets if thesis is published -->
-                      <text variable="publisher"/>
-                    </if>
-                  </choose>
-                </group>
-              </if>
-            </choose>
-            <text variable="medium" text-case="capitalize-first"/>
-          </group>
+        <else-if match="any" type="post webpage">
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` -->
+          <text macro="identifier-contributors"/>
+          <text macro="identifier-number"/>
+          <text macro="identifier-monographic"/>
+        </else-if>
+        <else-if type="report" variable="container-title">
+          <!-- If the report is a chapter in a larger report, then most identifying information is printed in the source. -->
+          <text macro="identifier-contributors"/>
+        </else-if>
+        <else-if type="report" variable="title">
+          <text macro="identifier-contributors"/>
+          <text macro="identifier-number"/>
+          <text macro="identifier-monographic"/>
+        </else-if>
+        <else-if type="report">
+          <!-- If there is no `title`, then `genre` and `number` are already printed as the title. -->
+          <text macro="identifier-contributors"/>
+          <text macro="identifier-monographic"/>
         </else-if>
-        <else-if variable="interviewer" type="interview" match="any">
-          <!-- Interview information -->
+        <else-if variable="container-title">
           <choose>
-            <if variable="title">
-              <text macro="format"/>
+            <if match="none" variable="genre title">
+              <text macro="label-chapter-number"/>
             </if>
-            <else-if variable="genre">
-              <group delimiter="; ">
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <group delimiter=" ">
-                    <text term="container-author" form="verb"/>
-                    <names variable="interviewer">
-                      <name and="symbol" initialize-with=". " delimiter=", "/>
-                    </names>
-                  </group>
-                </group>
-              </group>
-            </else-if>
-            <else-if variable="interviewer">
-              <group delimiter="; ">
-                <names variable="interviewer">
-                  <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
-                <text variable="medium" text-case="capitalize-first"/>
-              </group>
-            </else-if>
-            <else>
-              <text macro="format"/>
-            </else>
           </choose>
-        </else-if>
-        <else-if type="personal_communication">
-          <!-- Letter information -->
+          <text macro="identifier-contributors"/>
           <choose>
-            <if variable="recipient">
-              <group delimiter="; ">
-                <group delimiter=" ">
-                  <choose>
-                    <if variable="number" match="none">
-                      <choose>
-                        <if variable="genre">
-                          <text variable="genre" text-case="capitalize-first"/>
-                        </if>
-                        <else-if variable="medium">
-                          <text variable="medium" text-case="capitalize-first"/>
-                        </else-if>
-                        <else>
-                          <text term="letter" text-case="capitalize-first"/>
-                        </else>
-                      </choose>
-                    </if>
-                    <else>
-                      <choose>
-                        <if variable="medium">
-                          <text variable="medium" text-case="capitalize-first"/>
-                        </if>
-                        <else>
-                          <text term="letter" text-case="capitalize-first"/>
-                        </else>
-                      </choose>
-                    </else>
-                  </choose>
-                  <names variable="recipient" delimiter=", ">
-                    <label form="verb" suffix=" "/>
-                    <name and="symbol" delimiter=", "/>
-                  </names>
-                </group>
-                <choose>
-                  <if variable="genre" match="any">
-                    <choose>
-                      <if variable="number" match="none">
-                        <text variable="medium" text-case="capitalize-first"/>
-                      </if>
-                    </choose>
-                  </if>
-                </choose>
-              </group>
+            <if match="any" type="broadcast graphic map motion_picture">
+              <!-- For some audiovisual media, `number` information comes after title, not `container-title` (APA example 94); but an album track number is `chapter-number` -->
+              <text macro="identifier-number"/>
             </if>
-            <else>
-              <text macro="format"/>
-            </else>
           </choose>
-        </else-if>
-        <else-if variable="composer" type="song" match="all">
-          <!-- Performer of classical music works -->
-          <group delimiter="; ">
-            <choose>
-              <if variable="number" match="none">
-                <group delimiter=" ">
-                  <choose>
-                    <if variable="genre">
-                      <text variable="genre" text-case="capitalize-first"/>
-                      <group delimiter=" ">
-                        <text term="performer" form="verb"/>
-                        <names variable="author">
-                          <name and="symbol" initialize-with=". " delimiter=", "/>
-                          <substitute>
-                            <names variable="performer"/>
-                          </substitute>
-                        </names>
-                      </group>
-                    </if>
-                    <else-if variable="medium">
-                      <text variable="medium" text-case="capitalize-first"/>
-                      <group delimiter=" ">
-                        <text term="performer" form="verb"/>
-                        <names variable="author">
-                          <name and="symbol" initialize-with=". " delimiter=", "/>
-                          <substitute>
-                            <names variable="performer"/>
-                          </substitute>
-                        </names>
-                      </group>
-                    </else-if>
-                    <else>
-                      <text term="performer" form="verb" text-case="capitalize-first"/>
-                      <names variable="author">
-                        <name and="symbol" initialize-with=". " delimiter=", "/>
-                        <substitute>
-                          <names variable="performer"/>
-                        </substitute>
-                      </names>
-                    </else>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <choose>
-                    <if variable="medium">
-                      <text variable="medium" text-case="capitalize-first"/>
-                      <group delimiter=" ">
-                        <text term="performer" form="verb"/>
-                        <names variable="author">
-                          <name and="symbol" initialize-with=". " delimiter=", "/>
-                          <substitute>
-                            <names variable="performer"/>
-                          </substitute>
-                        </names>
-                      </group>
-                    </if>
-                    <else>
-                      <text term="performer" form="verb" text-case="capitalize-first"/>
-                      <names variable="author">
-                        <name and="symbol" initialize-with=". " delimiter=", "/>
-                        <substitute>
-                          <names variable="performer"/>
-                        </substitute>
-                      </names>
-                    </else>
-                  </choose>
-                </group>
-              </else>
-            </choose>
-            <choose>
-              <if variable="genre" match="any">
-                <choose>
-                  <if variable="number" match="none">
-                    <text variable="medium" text-case="capitalize-first"/>
-                  </if>
-                </choose>
-              </if>
-            </choose>
-          </group>
-        </else-if>
-        <else-if variable="container-title" match="none">
-          <!-- Other description -->
-          <text macro="format"/>
+          <text macro="identifier-serial"/>
         </else-if>
         <else>
-          <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software, 
-               place bracketed after the container title -->
-          <choose>
-            <if type="event paper-conference performance speech" match="any">
-              <choose>
-                <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </if>
-            <else-if type="document report software standard" match="none">
-              <text macro="format"/>
-            </else-if>
-          </choose>
+          <text macro="identifier-contributors"/>
+          <text macro="identifier-number"/>
+          <text macro="identifier-monographic"/>
+          <text macro="identifier-serial"/>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="bracketed-intext">
-    <group prefix="[" suffix="]">
+  <!-- Identifier elements -->
+  <macro name="identifier-contributors">
+    <choose>
+      <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">
+        <text macro="identifier-contributors-serial"/>
+      </else-if>
+      <else>
+        <text macro="identifier-contributors-monographic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="identifier-contributors-monographic">
+    <group delimiter="; ">
       <choose>
-        <if variable="reviewed-title" match="any">
-          <group delimiter=" ">
-            <text term="review-of" text-case="capitalize-first"/>
-            <text macro="reviewed-title-intext"/>
-          </group>
-        </if>
-        <else-if variable="interviewer" type="interview" match="any">
+        <if variable="title">
           <names variable="interviewer">
-            <label form="verb" suffix=" " text-case="capitalize-first"/>
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <substitute>
-              <text macro="format-intext"/>
-            </substitute>
+            <name and="symbol"/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if match="any" type="post webpage">
+          <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` -->
+          <names variable="container-author">
+            <label form="verb-short" suffix=" " text-case="title"/>
+            <name and="symbol"/>
+          </names>
+          <names delimiter="; " variable="editor translator">
+            <name and="symbol"/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+          <names delimiter="; " variable="illustrator narrator">
+            <name and="symbol"/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+          <names delimiter="; " variable="compiler chair organizer curator series-creator executive-producer">
+            <name and="symbol"/>
+            <label prefix=", " text-case="title"/>
+          </names>
+        </if>
+        <else>
+          <names delimiter="; " variable="illustrator narrator">
+            <name and="symbol"/>
+            <label form="short" prefix=", " text-case="title"/>
           </names>
-        </else-if>
-        <else-if type="personal_communication">
-          <!-- Letter information -->
           <choose>
-            <if variable="recipient">
-              <group delimiter=" ">
-                <choose>
-                  <if variable="number" match="none">
-                    <text variable="genre" text-case="capitalize-first"/>
-                  </if>
-                  <else>
-                    <text term="letter" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <names variable="recipient" delimiter=", ">
-                  <label form="verb" suffix=" "/>
-                  <name and="symbol" delimiter=", "/>
-                </names>
-              </group>
-            </if>
+            <if variable="container-title editor-translator"/>
+            <else-if variable="container-title">
+              <!-- TODO: Check logic once processors start to automatically populate `editor-translator` -->
+              <names delimiter="; " variable="translator">
+                <name and="symbol"/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </else-if>
             <else>
-              <text macro="format-intext"/>
+              <names variable="container-author">
+                <label form="verb-short" suffix=" " text-case="title"/>
+                <name and="symbol"/>
+              </names>
+              <names delimiter="; " variable="editor translator">
+                <name and="symbol"/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+              <names delimiter="; " variable="compiler chair organizer curator series-creator executive-producer">
+                <name and="symbol"/>
+                <label prefix=", " text-case="title"/>
+              </names>
             </else>
           </choose>
-        </else-if>
-        <else>
-          <text macro="format-intext"/>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="reviewed-item">
-    <!-- Reviewed item -->
+  <macro name="identifier-contributors-serial">
     <group delimiter="; ">
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <choose>
-            <if variable="reviewed-genre">
-              <group delimiter=" ">
-                <text term="review-of" form="long" text-case="capitalize-first"/>
-                <text variable="reviewed-genre" text-case="lowercase"/>
-              </group>
-            </if>
-            <!-- If no `reviewed-genre`, assume that `genre` or `medium` is entered as 'Review of the book' or similar -->
-            <else-if variable="number" match="none">
-              <choose>
-                <if variable="genre">
-                  <text variable="genre" text-case="capitalize-first"/>
-                </if>
-                <else-if variable="medium">
-                  <text variable="medium" text-case="capitalize-first"/>
-                </else-if>
-                <else-if type="review-book">
-                  <group delimiter=" ">
-                    <text term="review-of" form="long" text-case="capitalize-first"/>
-                    <text term="book" form="long" text-case="lowercase"/>
-                  </group>
-                </else-if>
-                <else>
-                  <text term="review-of" form="short" text-case="capitalize-first"/>
-                </else>
-              </choose>
-            </else-if>
-            <else>
-              <choose>
-                <if variable="medium">
-                  <text variable="medium" text-case="capitalize-first"/>
-                </if>
-                <else-if type="review-book">
-                  <group delimiter=" ">
-                    <text term="review-of" form="long" text-case="capitalize-first"/>
-                    <text term="book" form="long" text-case="lowercase"/>
-                  </group>
-                </else-if>
-                <else>
-                  <text term="review-of" form="short" text-case="capitalize-first"/>
-                </else>
-              </choose>
-            </else>
-          </choose>
-          <text macro="reviewed-title"/>
-        </group>
-        <names variable="reviewed-author">
-          <label form="verb-short" suffix=" "/>
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-        </names>
-      </group>
       <choose>
-        <if variable="genre" match="any">
-          <choose>
-            <if variable="number" match="none">
-              <text variable="medium" text-case="capitalize-first"/>
-            </if>
-          </choose>
+        <if variable="title">
+          <names delimiter="; " variable="interviewer">
+            <name and="symbol"/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
         </if>
       </choose>
+      <names delimiter="; " variable="translator narrator">
+        <name and="symbol"/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
     </group>
   </macro>
-  <macro name="bracketed-container">
-    <group prefix="[" suffix="]">
+  <macro name="identifier-locators">
+    <choose>
+      <if variable="page">
+        <text macro="label-page"/>
+      </if>
+      <else-if variable="chapter-number genre">
+        <text macro="label-chapter-number"/>
+      </else-if>
+      <else-if variable="chapter-number title">
+        <text macro="label-chapter-number"/>
+      </else-if>
+      <!-- `chapter-number` appears earlier in `identifier` if there is no `title` or `genre` -->
+    </choose>
+  </macro>
+  <macro name="identifier-monographic">
+    <choose>
+      <!-- omit serial types -->
+      <if match="any" type="article-journal article-magazine article-newspaper broadcast event patent performance periodical post post-weblog review review-book speech webpage"/>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text macro="identifier-monographic-item"/>
+      </else-if>
+      <!-- omit serial types -->
+      <else-if match="any" type="interview paper-conference"/>
+      <else>
+        <!-- monographic types -->
+        <text macro="identifier-monographic-item"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="identifier-monographic-item">
+    <group delimiter=", ">
+      <text macro="label-version"/>
+      <text macro="label-edition"/>
+      <text macro="identifier-series"/>
+      <text macro="label-supplement-number"/>
+      <text macro="identifier-number-volume"/>
+      <text macro="identifier-number-part"/>
+      <text macro="label-issue"/>
+      <text macro="identifier-locators"/>
+    </group>
+  </macro>
+  <macro name="identifier-number">
+    <group delimiter=" ">
       <choose>
-        <if type="event paper-conference performance speech" match="any">
-          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
-          <choose>
-            <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
-              <text macro="format"/>
-            </if>
-          </choose>
+        <if type="thesis" variable="genre">
+          <!-- `genre` provided with thesis description (APA example 65) -->
+          <text text-case="capitalize-first" value="publication"/>
         </if>
-        <else-if type="software" match="all">
-          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
-          <text macro="format"/>
-        </else-if>
-        <else-if type="document report standard">
-          <!-- For chapters in report, standards, and generic documents, place bracketed after the container title -->
-          <text macro="format"/>
+        <else-if variable="number">
+          <text text-case="title" variable="genre"/>
         </else-if>
       </choose>
+      <text macro="label-number"/>
     </group>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="identifier-number-part">
     <choose>
-      <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
-        <text macro="secondary-contributors-periodical"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor compiler editor editorial-director" match="any">
-            <text macro="secondary-contributors-booklike"/>
-          </if>
-          <else>
-            <text macro="secondary-contributors-periodical"/>
-          </else>
-        </choose>
+      <!-- Part number printed with part title -->
+      <if variable="part-title"/>
+      <!-- Non-numeric part numbers printed as part of the title -->
+      <else-if is-numeric="part-number">
+        <text macro="label-part-number"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="identifier-number-volume">
+    <choose>
+      <!-- Volume number printed with volume/part title -->
+      <if variable="volume volume-title"/>
+      <else-if variable="part-title volume"/>
+      <!-- Non-numeric volumes printed as part of the book title -->
+      <else-if is-numeric="volume">
+        <text macro="label-volume"/>
       </else-if>
       <else>
-        <text macro="secondary-contributors-booklike"/>
+        <text macro="label-number-of-volumes"/>
       </else>
     </choose>
   </macro>
-  <macro name="secondary-contributors-periodical">
-    <group delimiter="; ">
+  <macro name="identifier-patent">
+    <!-- `authority`: U.S. ; `genre`: patent ; `number`: 123,445 -->
+    <group delimiter=" ">
+      <text form="short" variable="authority"/>
       <choose>
-        <if variable="title">
-          <names variable="interviewer" delimiter="; ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
+        <if variable="genre">
+          <text text-case="capitalize-first" variable="genre"/>
         </if>
+        <else>
+          <text term="patent" text-case="capitalize-first"/>
+        </else>
       </choose>
-      <names variable="translator narrator" delimiter="; ">
-        <name and="symbol" initialize-with=". " delimiter=", "/>
-        <label form="short" prefix=", " text-case="title"/>
-      </names>
+      <text macro="label-number"/>
     </group>
   </macro>
-  <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
+  <macro name="identifier-serial">
+    <choose>
+      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial types -->
+        <text macro="identifier-number-part"/>
+      </if>
+      <!-- omit monographic types -->
+      <else-if match="any" variable="collection-editor compiler editor editorial-director"/>
+      <else-if match="any" type="interview paper-conference">
+        <!-- serial types -->
+        <text macro="identifier-number-part"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="identifier-series">
+    <!-- Series given only for report-like types (APA example 52) -->
+    <choose>
+      <if match="any" type="document report standard">
+        <group delimiter=" ">
+          <text text-case="title" variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <!-- 3.3. Description [in square brackets] (APA 9.21) -->
+  <macro name="description">
+    <group prefix="[" suffix="]">
       <choose>
-        <if variable="title">
-          <names variable="interviewer">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
+        <if match="any" type="interview" variable="interviewer">
+          <text macro="description-interview"/>
         </if>
+        <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+          <text macro="description-review"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <text macro="description-letter"/>
+        </else-if>
+        <else-if type="song" variable="composer">
+          <text macro="description-song"/>
+        </else-if>
+        <else-if type="thesis">
+          <text macro="description-thesis"/>
+        </else-if>
+        <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+          <text macro="description-serial"/>
+        </else-if>
+        <else-if match="none" variable="container-title">
+          <!-- Other description -->
+          <text macro="description-format"/>
+        </else-if>
+        <!-- For unpublished conference presentations/performances/events, chapters in reports/standards/generic documents, software, place description within the source element -->
+        <else-if match="any" type="document report software standard"/>
+        <else-if match="any" type="event paper-conference performance speech">
+          <choose>
+            <if match="any" variable="collection-editor compiler editor editorial-director issue page supplement-number volume">
+              <text macro="description-format"/>
+            </if>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="description-format"/>
+        </else>
       </choose>
+    </group>
+  </macro>
+  <macro name="description-short">
+    <group prefix="[" suffix="]">
       <choose>
-        <if type="post webpage" match="none">
-          <!-- Webpages treat container-title like publisher -->
-          <group delimiter="; ">
-            <names variable="illustrator narrator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-            <choose>
-              <if variable="container-title" match="none">
-                <group delimiter="; ">
-                  <names variable="container-author">
-                    <label form="verb-short" suffix=" " text-case="title"/>
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                  </names>
-                  <names variable="editor translator" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="short" prefix=", " text-case="title"/>
-                  </names>
-                  <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; ">
-                    <name and="symbol" initialize-with=". " delimiter=", "/>
-                    <label form="long" prefix=", " text-case="title"/>
-                  </names>
-                </group>
-              </if>
-              <else>
-                <choose>
-                  <!-- TODO: Check logic once processors start to automatically populate editor-translator. -->
-                  <if variable="editor-translator" match="none">
-                    <names variable="translator" delimiter="; ">
-                      <name and="symbol" initialize-with=". " delimiter=", "/>
-                      <label form="short" prefix=", " text-case="title"/>
-                    </names>
-                  </if>
-                </choose>
-              </else>
-            </choose>
-          </group>
+        <if match="any" type="interview" variable="interviewer">
+          <text macro="description-interview-short"/>
         </if>
+        <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
+          <text macro="description-review-short"/>
+        </else-if>
+        <else-if type="personal_communication">
+          <text macro="description-letter-short"/>
+        </else-if>
+        <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+          <!-- serial types -->
+          <text macro="description-serial-short"/>
+        </else-if>
+        <else-if match="any" variable="collection-editor compiler editor editorial-director">
+          <!-- monographic types -->
+          <text macro="description-format-short"/>
+        </else-if>
+        <else-if match="any" type="interview paper-conference">
+          <!-- serial types -->
+          <text macro="description-serial-short"/>
+        </else-if>
         <else>
-          <group delimiter="; ">
-            <names variable="container-author">
-              <label form="verb-short" suffix=" " text-case="title"/>
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-            </names>
-            <names variable="editor translator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-            <names variable="illustrator narrator" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" prefix=", " text-case="title"/>
-            </names>
-            <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; ">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="long" prefix=", " text-case="title"/>
-            </names>
-          </group>
+          <!-- monographic types -->
+          <text macro="description-format-short"/>
         </else>
       </choose>
     </group>
   </macro>
-  <macro name="database-location">
+  <!-- Description elements -->
+  <macro name="description-format">
     <choose>
-      <if variable="archive-place" match="none">
-        <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <text variable="archive_location"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="number">
-    <choose>
-      <if variable="number">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <group delimiter=" ">
-              <label variable="number" form="short" text-case="capitalize-first"/>
-              <text variable="number"/>
-            </group>
-          </group>
+      <if match="any" variable="genre medium">
+        <group delimiter="; ">
           <choose>
-            <if type="thesis">
-              <choose>
-                <!-- Include the university in brackets if thesis is published -->
-                <if variable="archive DOI URL" match="any">
-                  <text variable="publisher"/>
-                </if>
-              </choose>
+            <if match="none" variable="number">
+              <text text-case="capitalize-first" variable="genre"/>
             </if>
           </choose>
+          <text text-case="capitalize-first" variable="medium"/>
         </group>
       </if>
+      <else>
+        <text macro="description-format-term-generic"/>
+      </else>
     </choose>
   </macro>
-  <macro name="locators-booklike">
+  <macro name="description-format-short">
     <choose>
-      <if type="article-journal article-magazine article-newspaper broadcast event interview patent performance periodical post post-weblog review review-book speech webpage" match="any"/>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor compiler editor editorial-director" match="any">
-            <group delimiter=", ">
-              <text macro="version"/>
-              <text macro="edition"/>
-              <text macro="volume-booklike"/>
-            </group>
-          </if>
-        </choose>
+      <if variable="genre">
+        <text form="short" text-case="capitalize-first" variable="genre"/>
+      </if>
+      <else-if variable="medium">
+        <text form="short" text-case="capitalize-first" variable="medium"/>
       </else-if>
       <else>
-        <group delimiter=", ">
-          <text macro="version"/>
-          <text macro="edition"/>
-          <text macro="volume-booklike"/>
-        </group>
+        <text macro="description-format-term-generic"/>
       </else>
     </choose>
   </macro>
-  <macro name="version">
-    <group delimiter=" ">
-      <label variable="version" text-case="capitalize-first"/>
-      <text variable="version"/>
-    </group>
-  </macro>
-  <macro name="edition">
+  <macro name="description-format-term-generic">
+    <!-- Generic labels for specific types -->
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <label variable="edition" form="short"/>
-        </group>
+      <if type="broadcast">
+        <text term="broadcast" text-case="capitalize-first"/>
       </if>
-      <else>
-        <text variable="edition"/>
-      </else>
+      <else-if type="collection">
+        <text term="collection" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="dataset">
+        <text term="dataset" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="figure">
+        <text term="figure" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="graphic">
+        <text term="graphic" text-case="capitalize-first"/>
+      </else-if>
+      <else-if match="any" type="interview personal_communication">
+        <choose>
+          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
+            <text term="personal-communication" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text term="letter" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript">
+        <choose>
+          <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
+            <text term="manuscript" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text term="map" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="motion_picture">
+        <text term="motion_picture" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="periodical" variable="container-title supplement-number">
+        <text term="supplement" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="periodical" variable="container-title title">
+        <text term="special-issue" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="song">
+        <text term="song" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="post">
+        <text term="post" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="review">
+        <text term="review" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="review-book">
+        <text term="review-book" text-case="capitalize-first"/>
+      </else-if>
     </choose>
   </macro>
-  <macro name="volume-booklike">
-    <group delimiter=", ">
-      <!-- Report series [ex. 52] -->
-      <choose>
-        <if type="document report standard">
-          <group delimiter=" ">
-            <text variable="collection-title" text-case="title"/>
-            <text variable="collection-number"/>
-          </group>
-        </if>
-      </choose>
-      <group delimiter=" ">
-        <label variable="supplement-number" text-case="capitalize-first"/>
-        <text variable="supplement-number"/>
-      </group>
-      <choose>
-        <if variable="volume" match="any">
-          <choose>
-            <!-- Non-numeric volumes are already printed as part of the book title -->
-            <if variable="volume-title"/>
-            <else-if is-numeric="volume" match="none"/>
-            <else>
-              <group delimiter=" ">
-                <label variable="volume" form="short" text-case="capitalize-first"/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </else>
+  <macro name="description-interview">
+    <group delimiter="; ">
+      <choose>
+        <if variable="interviewer title">
+          <!-- Avoid repeating 'interview' -->
+          <choose>
+            <if match="none" variable="number">
+              <text text-case="capitalize-first" variable="genre"/>
+            </if>
           </choose>
+          <text text-case="capitalize-first" variable="medium"/>
         </if>
-        <else>
-          <group>
-            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
-            <text term="page-range-delimiter" prefix="1"/>
-            <number variable="number-of-volumes" form="numeric"/>
+        <else-if variable="title">
+          <text macro="description-format"/>
+        </else-if>
+        <else-if variable="genre">
+          <group delimiter=" ">
+            <text text-case="capitalize-first" variable="genre"/>
+            <choose>
+              <if variable="interviewer">
+                <text form="verb" term="container-author"/>
+                <names variable="interviewer">
+                  <name and="symbol"/>
+                </names>
+              </if>
+            </choose>
           </group>
+        </else-if>
+        <else-if variable="interviewer">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol"/>
+          </names>
+          <text text-case="capitalize-first" variable="medium"/>
+        </else-if>
+        <else>
+          <text macro="description-format"/>
         </else>
       </choose>
-      <group delimiter=" ">
-        <label variable="issue" text-case="capitalize-first"/>
-        <text variable="issue"/>
-      </group>
-      <group delimiter=" ">
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-      </group>
     </group>
   </macro>
-  <macro name="reviewed-title">
+  <macro name="description-interview-short">
+    <names variable="interviewer">
+      <label form="verb" suffix=" " text-case="capitalize-first"/>
+      <name and="symbol" form="short"/>
+      <substitute>
+        <text macro="description-format-short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="description-letter">
     <choose>
-      <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed
-             works without reviewed-container-title [Ex. 69] -->
-        <!-- Adapt for reviewed-container-title if that becomes available -->
-        <text variable="reviewed-title" font-style="italic"/>
+      <if variable="recipient">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <text macro="description-format"/>
+            <names variable="recipient">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" initialize="false"/>
+            </names>
+          </group>
+          <text macro="description-medium"/>
+        </group>
       </if>
       <else>
-        <!-- Assume title is title of reviewed work -->
-        <text variable="title" font-style="italic"/>
+        <text macro="description-format"/>
       </else>
     </choose>
   </macro>
-  <macro name="reviewed-title-intext">
+  <macro name="description-letter-short">
     <choose>
-      <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed
-             works without reviewed-container-title [Ex. 69] -->
-        <!-- Adapt for reviewed-container-title if that becomes available -->
-        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      <if variable="recipient">
+        <group delimiter=" ">
+          <text macro="description-format-short"/>
+          <names variable="recipient">
+            <label form="verb" suffix=" "/>
+            <name and="symbol" form="short"/>
+          </names>
+        </group>
       </if>
       <else>
-        <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic" text-case="title"/>
+        <text macro="description-format-short"/>
       </else>
     </choose>
   </macro>
-  <macro name="format">
+  <macro name="description-medium">
     <choose>
-      <if variable="genre medium" match="any">
-        <group delimiter="; ">
+      <if variable="number"/>
+      <else-if variable="genre">
+        <text text-case="capitalize-first" variable="medium"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="description-review">
+    <group delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
           <choose>
-            <if variable="number" match="none">
-              <text variable="genre" text-case="capitalize-first"/>
+            <if variable="reviewed-genre">
+              <text term="review-of" text-case="capitalize-first"/>
+              <text variable="reviewed-genre"/>
             </if>
+            <else-if variable="number">
+              <!-- Genre printed with `number` -->
+              <text form="short" term="review-of" text-case="capitalize-first"/>
+            </else-if>
+            <!-- If no `reviewed-genre`, assume that `genre` or `medium` is entered as 'Review of the book' or similar -->
+            <else-if variable="genre">
+              <text text-case="capitalize-first" variable="genre"/>
+            </else-if>
+            <else-if variable="medium">
+              <text text-case="capitalize-first" variable="medium"/>
+            </else-if>
+            <else-if type="review-book">
+              <text term="review-of" text-case="capitalize-first"/>
+              <text term="book" text-case="lowercase"/>
+            </else-if>
+            <else>
+              <text form="short" term="review-of" text-case="capitalize-first"/>
+            </else>
           </choose>
-          <text variable="medium" text-case="capitalize-first"/>
+          <text macro="description-review-title"/>
         </group>
+        <names variable="reviewed-author">
+          <label form="verb-short" suffix=" "/>
+          <name and="symbol"/>
+        </names>
+      </group>
+      <text macro="description-medium"/>
+    </group>
+  </macro>
+  <macro name="description-review-short">
+    <group delimiter=" ">
+      <text form="short" term="review-of" text-case="capitalize-first"/>
+      <text macro="description-review-title-short"/>
+    </group>
+  </macro>
+  <macro name="description-review-title">
+    <choose>
+      <if match="any" variable="reviewed-genre reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title (APA example 69) -->
+        <!-- TODO: Adapt for `reviewed-container-title` or similar if it becomes available -->
+        <text font-style="italic" variable="reviewed-title"/>
       </if>
       <else>
-        <text macro="generic-type-label"/>
+        <!-- Assume `title` is the title of the reviewed work -->
+        <text font-style="italic" variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="format-intext">
+  <macro name="description-review-title-short">
     <choose>
-      <if variable="genre" match="any">
-        <text variable="genre" text-case="capitalize-first"/>
+      <if match="any" variable="reviewed-genre reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works without a reviewed source title (APA example 69) -->
+        <!-- TODO: 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-if variable="medium">
-        <text variable="medium" text-case="capitalize-first"/>
-      </else-if>
       <else>
-        <text macro="generic-type-label"/>
+        <!-- Assume `title` is the title of the reviewed work -->
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="generic-type-label">
-    <!-- Generic labels for specific types -->
+  <macro name="description-serial">
+    <group delimiter="; ">
+      <text macro="description-format"/>
+      <choose>
+        <if match="none" variable="title">
+          <text variable="section"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="description-serial-short">
     <choose>
-      <if type="dataset">
-        <text term="dataset" text-case="capitalize-first"/>
-      </if>
-      <else-if type="software">
-        <text term="software" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="interview personal_communication" match="any">
-        <choose>
-          <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="personal-communication" text-case="capitalize-first"/>
-          </if>
-          <else-if type="interview">
-            <text term="interview" text-case="capitalize-first"/>
-          </else-if>
-        </choose>
-      </else-if>
-      <else-if type="map">
-        <text term="map" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="collection">
-        <text term="collection" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="song">
-        <text term="song" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="motion_picture">
-        <text term="motion_picture" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="post">
-        <text term="post" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="review">
-        <text term="review" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="review-book">
-        <text term="review-book" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text term="broadcast" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="figure">
-        <text term="figure" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="graphic">
-        <text term="graphic" text-case="capitalize-first"/>
+      <if variable="title"/>
+      <else-if variable="section">
+        <text form="short" text-case="capitalize-first" variable="section"/>
       </else-if>
+      <else>
+        <text macro="description-format-short"/>
+      </else>
     </choose>
   </macro>
-  <!-- APA 'source' element contains four parts:
-       container, event, publisher, access -->
-  <macro name="container">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
-        <!-- Periodical items -->
-        <text macro="container-periodical"/>
-      </if>
-      <else-if type="paper-conference">
-        <!-- Determine if paper-conference is a periodical- or book-like -->
+  <macro name="description-song">
+    <!-- Performer of classical music works -->
+    <group delimiter="; ">
+      <group delimiter=" ">
+        <!-- Based on `description-format` macro -->
         <choose>
-          <if variable="editor editorial-director collection-editor container-author" match="any">
-            <text macro="container-booklike"/>
+          <if match="any" variable="genre medium">
+            <choose>
+              <if match="none" variable="number">
+                <text text-case="capitalize-first" variable="genre"/>
+              </if>
+            </choose>
+            <text text-case="capitalize-first" variable="medium"/>
+            <text form="verb" term="performer"/>
           </if>
           <else>
-            <text macro="container-periodical"/>
+            <text form="verb" term="performer" text-case="capitalize-first"/>
           </else>
         </choose>
-      </else-if>
-      <else-if type="post webpage" match="none">
-        <!-- post and webpage treat container-title like publisher -->
-        <text macro="container-booklike"/>
-      </else-if>
-    </choose>
+        <names variable="author">
+          <name and="symbol"/>
+          <substitute>
+            <names variable="performer"/>
+          </substitute>
+        </names>
+      </group>
+      <text macro="description-medium"/>
+    </group>
   </macro>
-  <macro name="container-periodical">
-    <group delimiter=". ">
+  <macro name="description-thesis">
+    <group delimiter="; ">
       <group delimiter=", ">
-        <text variable="container-title" font-style="italic" text-case="title"/>
+        <text text-case="capitalize-first" variable="genre"/>
         <choose>
-          <if variable="volume">
-            <group>
-              <text variable="volume" font-style="italic"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
+          <if match="any" variable="archive DOI URL">
+            <!-- Include the university in description if thesis is published -->
+            <text variable="publisher"/>
           </if>
-          <else>
-            <text variable="issue" font-style="italic"/>
-          </else>
         </choose>
+      </group>
+      <text text-case="capitalize-first" variable="medium"/>
+    </group>
+  </macro>
+  <!-- 4. Source (APA 9.23-37) -->
+  <macro name="source">
+    <group delimiter=". ">
+      <choose>
+        <if match="any" type="post webpage"/>
+        <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>
+      <text macro="source-publisher"/>
+      <text macro="source-archive"/>
+      <text macro="source-location"/>
+      <text macro="source-website"/>
+    </group>
+  </macro>
+  <!-- 4.1. Serial sources (APA 9.25-27) -->
+  <macro name="source-serial">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <group delimiter=", " font-style="italic">
+          <text text-case="title" variable="container-title"/>
+          <!-- `collection-title` is for any serial with multiple series (e.g. 'second series') -->
+          <text text-case="title" variable="collection-title"/>
+        </group>
+        <group>
+          <text font-style="italic" variable="volume"/>
+          <group delimiter=", " prefix="(" suffix=")">
+            <text variable="issue"/>
+            <text macro="label-supplement-number"/>
+          </group>
+        </group>
         <choose>
           <if variable="number">
-            <!-- Ex. 6: Journal article with article number or eLocator -->
-            <group delimiter=" ">
-              <text term="article-locator" text-case="capitalize-first"/>
-              <text variable="number"/>
-            </group>
+            <text macro="label-number-article"/>
           </if>
           <else>
             <text variable="page"/>
@@ -1546,20 +1644,19 @@
         </choose>
       </group>
       <choose>
-        <if variable="issued">
-          <choose>
-            <if variable="issue number page volume" match="none">
-              <!-- We print the status variable directly rather than using in-press, etc. terms. -->
-              <text variable="status" text-case="capitalize-first"/>
-            </if>
-          </choose>
-        </if>
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="issued status">
+          <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
+          <text text-case="capitalize-first" variable="status"/>
+        </else-if>
       </choose>
     </group>
   </macro>
-  <macro name="container-booklike">
+  <!-- 4.2. Monographic sources (APA 9.28) -->
+  <macro name="source-monographic">
+    <!-- Monographic sources repeat main reference elements -->
     <choose>
-      <if variable="container-title" match="any">
+      <if variable="container-title">
         <group delimiter=" ">
           <choose>
             <if type="song">
@@ -1570,562 +1667,610 @@
             </else>
           </choose>
           <group delimiter=", ">
-            <names variable="executive-producer">
-              <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="long" text-case="title" prefix=" (" suffix=")"/>
-              <substitute>
-                <names variable="series-creator"/>
-                <names variable="editor-translator">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" text-case="title" prefix=" (" suffix=")"/>
-                </names>
-                <!-- TODO: Translator omitted here on the assumption that editor-translators are uncommon 
-                           for chapter citations. If needed, direct entry or automatic population of
-                           `editor-translator` can produce combined labels. -->
-                <names variable="editor">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" text-case="title" prefix=" (" suffix=")"/>
-                </names>
-                <names variable="editorial-director">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" text-case="title" prefix=" (" suffix=")"/>
-                </names>
-                <names variable="compiler"/>
-                <choose>
-                  <if type="event performance speech" match="any">
-                    <names variable="chair"/>
-                    <names variable="organizer"/>
-                  </if>
-                </choose>
-                <names variable="curator"/>
-                <names variable="collection-editor">
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                  <label form="short" text-case="title" prefix=" (" suffix=")"/>
-                </names>
-                <names variable="container-author"/>
-              </substitute>
-            </names>
-            <group delimiter=": " font-style="italic">
-              <text variable="container-title"/>
-              <text macro="volume-title"/>
-            </group>
+            <text macro="source-monographic-author"/>
+            <text macro="source-monographic-title"/>
           </group>
-          <text macro="parenthetical-container"/>
-          <text macro="bracketed-container"/>
+          <text macro="source-monographic-identifier"/>
+          <text macro="source-monographic-description"/>
         </group>
       </if>
     </choose>
   </macro>
-  <macro name="publisher">
-    <group delimiter="; ">
-      <choose>
-        <if type="thesis">
-          <choose>
-            <if variable="archive DOI URL" match="none">
-              <text variable="publisher"/>
-            </if>
-          </choose>
-        </if>
-        <else-if type="post webpage" match="any">
-          <!-- For websites, treat container title like publisher -->
-          <group delimiter="; ">
-            <text variable="container-title" text-case="title"/>
-            <text variable="publisher"/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
-          <choose>
-            <if variable="collection-editor compiler editor editorial-director" match="any">
-              <text variable="publisher"/>
-            </if>
-          </choose>
-        </else-if>
-        <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="none">
-          <text variable="publisher"/>
-        </else-if>
-      </choose>
-      <group delimiter=", ">
+  <!-- Monographic source author -->
+  <macro name="source-monographic-author">
+    <names variable="container-author">
+      <name and="symbol"/>
+      <label prefix=" (" suffix=")" text-case="title"/>
+      <substitute>
+        <names variable="executive-producer"/>
+        <names variable="series-creator"/>
+        <names variable="editor-translator">
+          <name and="symbol"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <!-- TODO: Translator omitted on the assumption that editor-translators are uncommon for chapter citations. If needed, direct entry or automatic population of `editor-translator` can produce combined labels. -->
+        <names delimiter="; " variable="editor">
+          <name and="symbol"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name and="symbol"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="compiler"/>
         <choose>
-          <if variable="archive-place">
-            <!-- With `archive-place`: physical archives. Without: online archives. -->
-            <!-- For physical archives, print the location before the archive name.
-                For electronic archives, these are printed in macro="description". -->
-            <!-- Must test for archive_collection:
-                With collection: archive_collection (archive_location), archive, archive-place
-                No collection: archive (archive_location), archive-place
-            -->
-            <choose>
-              <if variable="archive_collection">
-                <group delimiter=" ">
-                  <text variable="archive_collection"/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
-                <text variable="archive"/>
-                <text variable="archive-place"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="archive"/>
-                  <text variable="archive_location" prefix="(" suffix=")"/>
-                </group>
-                <text variable="archive-place"/>
-              </else>
-            </choose>
+          <if match="any" type="event performance speech">
+            <names variable="chair"/>
+            <names variable="organizer"/>
           </if>
-          <else>
-            <text variable="archive"/>
-          </else>
         </choose>
-      </group>
+        <names variable="curator"/>
+        <names variable="collection-editor">
+          <name and="symbol"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+      </substitute>
+    </names>
+  </macro>
+  <!-- Monographic source title -->
+  <macro name="source-monographic-title">
+    <group delimiter=": " font-style="italic">
+      <text variable="container-title"/>
+      <text macro="title-volume"/>
     </group>
   </macro>
-  <macro name="access">
+  <!-- Monographic source identifier -->
+  <macro name="source-monographic-identifier">
     <choose>
-      <if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
-      </if>
-      <else-if variable="URL">
-        <group delimiter=" ">
+      <if variable="container-title">
+        <group delimiter="; " prefix="(" suffix=")">
           <choose>
-            <if variable="issued status" match="none">
-              <group delimiter=" ">
-                <text term="retrieved" text-case="capitalize-first"/>
-                <date variable="accessed" form="text" suffix=","/>
-                <text term="from"/>
-              </group>
+            <if match="none" type="broadcast graphic map motion_picture">
+              <!-- For some audiovisual media, number information comes after `title`, not `container-title` (APA example 94); but an album track number is `chapter-number` -->
+              <text macro="identifier-number"/>
             </if>
           </choose>
-          <text variable="URL"/>
+          <text macro="identifier-monographic"/>
         </group>
+      </if>
+    </choose>
+  </macro>
+  <!-- Monographic source description -->
+  <macro name="source-monographic-description">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if match="any" type="document report software standard">
+          <!-- place description after `container-title` -->
+          <text macro="description-format"/>
+        </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>
+    </group>
+  </macro>
+  <!-- 4.3. Publisher sources (APA 9.29) -->
+  <macro name="source-publisher">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if match="none" variable="archive DOI URL">
+            <!-- Provide university in `publisher` if unpublished -->
+            <text variable="publisher"/>
+          </if>
+        </choose>
+      </if>
+      <!-- omit serial types -->
+      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
+      <else-if match="any" variable="collection-editor compiler editor editorial-director">
+        <!-- monographic types -->
+        <text variable="publisher"/>
+      </else-if>
+      <else-if type="interview">
+        <!-- give publisher for a broadcast `interview` handled as a serial type -->
+        <text variable="publisher"/>
       </else-if>
+      <!-- omit serial `paper-conference` -->
+      <else-if type="paper-conference"/>
+      <else>
+        <text variable="publisher"/>
+      </else>
     </choose>
   </macro>
-  <macro name="event">
+  <!-- 4.4. Database and archive sources (APA 9.30) -->
+  <macro name="source-archive">
+    <group delimiter=", ">
+      <choose>
+        <if variable="archive_collection">
+          <!-- With collection: `archive_collection` (`archive_location`), `archive`, `archive-place` -->
+          <group delimiter=" ">
+            <text variable="archive_collection"/>
+            <text prefix="(" suffix=")" variable="archive_location"/>
+          </group>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </if>
+        <else>
+          <!-- No collection: `archive` (`archive_location`), `archive-place` -->
+          <group delimiter=" ">
+            <text variable="archive"/>
+            <text prefix="(" suffix=")" variable="archive_location"/>
+          </group>
+          <text variable="archive-place"/>
+        </else>
+      </choose>
+      <!-- a database identifier/number is stored in `number` and appears in `identifier-number` -->
+    </group>
+  </macro>
+  <!-- 4.5. Works with specific locations (APA 9.31) -->
+  <macro name="source-location">
     <choose>
-      <if variable="event event-title" match="any">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+      <if match="any" variable="event event-title">
+        <!-- TODO: To prevent Zotero from printing `event-place`, due to its double-mapping of `publisher-place` and `event-place`. Remove this when that is changed. -->
         <choose>
           <if type="paper-conference">
             <choose>
-              <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
+              <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 a proceedings -->
-                <group delimiter=", ">
-                  <text macro="event-title"/>
-                  <text variable="event-place"/>
-                </group>
+                <text macro="source-location-title-place-date"/>
               </if>
             </choose>
           </if>
           <else>
-            <!-- For other item types, print event info even if published (e.g., for collection catalogs, performance programs.
-                 These items aren't given explicit examples in the APA manual, so err on the side of providing too much information. -->
-            <group delimiter=", ">
-              <text macro="event-title"/>
-              <text variable="event-place"/>
-            </group>
+            <!-- For other item types, print event info even if published (e.g. collection catalogs, performance programs). These items aren't given explicit examples in the APA manual, so err on the side of providing too much information. -->
+            <text macro="source-location-title-place-date"/>
           </else>
         </choose>
       </if>
     </choose>
   </macro>
-  <macro name="event-title">
+  <macro name="source-location-title-place-date">
+    <group delimiter=", ">
+      <choose>
+        <!-- TODO: We expect `event-title` to be used, but processors and applications may not be updated yet. This macro ensures that either `event` or `event-title` can be accepted. Remove if processor logic and application adoption can handle this. -->
+        <if variable="event-title">
+          <text text-case="capitalize-first" variable="event-title"/>
+        </if>
+        <else>
+          <text text-case="capitalize-first" variable="event"/>
+        </else>
+      </choose>
+      <text variable="event-place"/>
+      <text macro="date-event-full"/>
+    </group>
+  </macro>
+  <!-- 4.6. Social media and website sources (APA 9.32-33) -->
+  <macro name="source-website">
     <choose>
-      <!-- TODO: We expect "event-title" to be used,
-           but processors and applications may not be updated yet.
-           This macro ensures that either "event" or "event-title" can be accpeted.
-           Remove if procesor logic and application adoption can handle this. -->
-      <if variable="event-title">
-        <text variable="event-title"/>
+      <if match="any" type="post webpage">
+        <text text-case="title" variable="container-title"/>
       </if>
-      <else>
-        <text variable="event"/>
-      </else>
     </choose>
   </macro>
-  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
-  <macro name="publication-history">
+  <!-- 4.7. DOI or URL (APA 9.34-36) -->
+  <macro name="source-DOI-URL">
     <choose>
-      <if type="patent">
-        <text variable="references" prefix="(" suffix=")"/>
+      <if variable="DOI">
+        <text prefix="https://doi.org/" variable="DOI"/>
       </if>
-      <else>
-        <group delimiter="; " prefix="(" suffix=")">
-          <!-- Print `status` here for things like "retracted" if it's not printed elsewhere already. -->
+      <else-if variable="URL">
+        <group delimiter=" ">
           <choose>
-            <if variable="issued">
-              <choose>
-                <if variable="issue number page volume" match="any">
-                  <text variable="status" text-case="capitalize-first"/>
-                </if>
-              </choose>
+            <if match="none" variable="issued status">
+              <text term="retrieved" text-case="capitalize-first"/>
+              <group delimiter=", ">
+                <date form="text" variable="accessed"/>
+                <text term="from"/>
+              </group>
             </if>
           </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- 5. Publication history (APA 9.39-41) -->
+  <macro name="publication-history">
+    <!-- Notes on source element: original publication, reprint info, retraction info -->
+    <group delimiter="; " prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <text variable="references"/>
+        </if>
+        <else>
+          <!-- Print `status` here for "retracted" etc. if it's not printed elsewhere. -->
+          <choose>
+            <if match="none" variable="issued"/>
+            <else-if match="any" variable="collection-title issue number page supplement-number volume">
+              <text text-case="capitalize-first" variable="status"/>
+            </else-if>
+          </choose>
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description
-                    of publication history, such as full "reprinted" references
-                    (examples 11, 43, 44) -->
+              <!-- Provide the option for more elaborate description of publication history, such as full "reprinted" references (APA examples 11, 43, 44) -->
               <text variable="references"/>
             </if>
             <else>
+              <!-- Format publication history using CSL variables -->
               <group delimiter=" ">
                 <text term="original-work-published" text-case="capitalize-first"/>
-                <choose>
-                  <if is-uncertain-date="original-date">
-                    <text term="circa" form="short"/>
-                  </if>
-                </choose>
-                <date variable="original-date">
-                  <date-part name="year"/>
-                </date>
+                <group delimiter=", ">
+                  <group delimiter=" ">
+                    <text value="as"/>
+                    <text font-style="italic" variable="original-title"/>
+                  </group>
+                  <text macro="date-original-year"/>
+                  <text variable="original-publisher"/>
+                </group>
               </group>
             </else>
           </choose>
-        </group>
-      </else>
-    </choose>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <!-- Legal citations have their own rules -->
-  <macro name="legal-cites">
-    <!-- `treaty`: for treaties -->
-    <!-- `legal_case`: for all legal and court cases -->
-    <!-- `bill`: for bills, resolutions, federal reports -->
-    <!-- `hearing`: for hearings and testimony -->
-    <!-- `legislation`: for statutes, constitutional items, and charters -->
-    <!-- `regulation`: codified regulations, uncodified regulations, executive orders -->
-    <group delimiter=" ">
+  <!-- 6. Legal references: Bluebook style (shared with Chicago) -->
+  <!-- Where APA or Chicago diverge from Bluebook, the official manual is followed -->
+  <macro name="legal-reference">
+    <!-- Type usage:
+
+         `bill`
+         : bills, resolutions, federal reports
+
+         `legal_case`
+         : all legal and court cases
+
+         `hearing`
+         : hearings and testimony
+
+         `legislation`
+         : statutes, constitutional items, and charters
+
+         `regulation`
+         : codified regulations, uncodified regulations, executive orders
+
+         `treaty`
+         : treaties
+    -->
+    <group delimiter=", ">
       <choose>
         <if type="treaty">
-          <group delimiter=", " suffix=".">
-            <!-- APA generally defers to Bluebook for legal citations, but diverges without
-                explanation for treaty items. We follow the Bluebook format that was used 
-                in APA 6th ed. -->
-            <!-- APA manual omits treaty parties/authors, but per Bluebook 
-                they should be included at least for bilateral treaties. -->
-            <names variable="author">
-              <name initialize-with="." form="short" delimiter="-"/>
-            </names>
-            <text macro="date-legal"/>
-            <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL. 
-                Both are included here, following the APA style used for all other item types 
-                to end the reference with a period, then give the URL afterward. -->
-            <text macro="container-legal"/>
-          </group>
+          <text macro="legal-title"/>
+          <names variable="author">
+            <!-- Treaty parties should be included at least for bilateral treaties (Bluebook 21.4.2) -->
+            <name delimiter="-" et-al-min="100" et-al-use-first="99" form="short" initialize="false"/>
+          </names>
+          <text macro="legal-date"/>
+          <!-- treaty source/report in addition to URL (Bluebook 21.4.5) -->
+          <text macro="legal-source"/>
         </if>
         <else>
-          <group delimiter=" " suffix=".">
+          <group delimiter=" ">
             <group delimiter=", ">
-              <text macro="title-legal"/>
-              <text macro="container-legal"/>
+              <text macro="legal-title"/>
+              <text macro="legal-source"/>
             </group>
-            <text macro="date-legal"/>
-            <text macro="parenthetical-legal"/>
+            <text macro="legal-date"/>
+            <text macro="legal-identifier"/>
           </group>
         </else>
       </choose>
-      <text variable="references"/>
-      <text macro="access"/>
+      <group delimiter=" ">
+        <!-- locator for use in notes -->
+        <choose>
+          <if locator="page" variable="page">
+            <text term="at"/>
+          </if>
+        </choose>
+        <text macro="label-locator"/>
+      </group>
     </group>
   </macro>
-  <macro name="title-legal">
-    <choose>
-      <if type="bill legal_case legislation regulation treaty" match="any">
-        <text variable="title" text-case="title"/>
-      </if>
-      <else-if type="hearing">
-        <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony, 
-             but follows Bluebook rules (colon delimiter, prefix before the committee name) for
-             references to the whole hearing. We simply follow the Bluebook rules for both, but
-             use APA style capitalization (not capitalizing "Before" or the title of the hearing). -->
-        <group delimiter=": " font-style="italic">
-          <text variable="title" text-case="capitalize-first"/>
-          <group delimiter=" ">
-            <text term="hearing" form="long" text-case="capitalize-first"/>
-            <group delimiter=" ">
-              <group delimiter=" ">
-                <!-- APA manual omits the bill number, but it should be included per Bluebook if relevant -->
-                <text term="on"/>
-                <text variable="number"/>
-              </group>
-              <group delimiter=" ">
-                <!-- Use the `at` term to hold "before the" -->
-                <text term="at" form="long"/>
-                <text variable="section"/>
-              </group>
-            </group>
-          </group>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="date-legal">
+  <!-- 6.1. Legal date -->
+  <macro name="legal-date">
     <choose>
       <if type="treaty">
-        <date variable="issued" form="text"/>
+        <text macro="date-issued-full"/>
       </if>
       <else-if type="legal_case">
-        <group prefix="(" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!-- Print only year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <!-- APA manual doesn't include examples of cases not yet
-                   published in a reporter, but this is Bluebook style. -->
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
+        <text macro="legal-date-case"/>
       </else-if>
-      <else-if type="bill hearing legislation regulation" match="any">
-        <group prefix="(" suffix=")" delimiter=" ">
+      <else-if match="any" type="bill hearing legislation regulation">
+        <group delimiter=" " prefix="(" suffix=")">
           <group delimiter=" ">
-            <date variable="original-date">
-              <date-part name="year"/>
-            </date>
-            <text term="and" form="symbol"/>
+            <text macro="date-original-year"/>
+            <text form="symbol" term="and"/>
           </group>
           <choose>
             <if variable="issued">
-              <!-- APA manual includes "rev." before the revision year, 
-                   but this isn't part of the Bluebook rules. -->
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <text macro="date-issued-year"/>
             </if>
             <else>
-              <!-- Show proposal date for uncodified regualtions. 
-                   Assume date is entered literally ala "proposed May 23, 2016".
-                   TODO: Add 'proposed' term here if that becomes available -->
-              <date variable="submitted" form="text"/>
+              <!-- Show proposal date for uncodified regulations. Assume date is entered literally ala "proposed May 23, 2016". -->
+              <!-- TODO: Add `proposed` date here if that becomes available -->
+              <date form="text" variable="submitted"/>
             </else>
           </choose>
         </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="container-legal">
-    <!-- Expect legal item container-titles to be stored in short form -->
+  <macro name="legal-date-case">
+    <group delimiter=" " prefix="(" suffix=")">
+      <text variable="authority"/>
+      <choose>
+        <if variable="container-title">
+          <!-- Print only year for cases published in reporters-->
+          <text macro="date-issued-year"/>
+        </if>
+        <else>
+          <text macro="date-issued-full"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <!-- 6.2.1. Legal title -->
+  <macro name="legal-title">
     <choose>
-      <if type="treaty">
-        <group delimiter=" ">
-          <number variable="volume"/>
-          <text variable="container-title"/>
-          <choose>
-            <if variable="page page-first" match="any">
-              <text variable="page-first"/>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <label variable="number" form="short" text-case="capitalize-first"/>
-                <text variable="number"/>
-              </group>
-            </else>
-          </choose>
-        </group>
+      <if match="any" type="bill legal_case legislation regulation treaty">
+        <text text-case="title" variable="title"/>
       </if>
-      <else-if type="legal_case">
-        <group delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <group delimiter=" ">
-                  <label variable="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
-                <choose>
-                  <if variable="page page-first" match="any">
-                    <text variable="page-first"/>
-                  </if>
-                  <else>
-                    <text value="___"/>
-                  </else>
-                </choose>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <label variable="number" form="short" text-case="capitalize-first"/>
-                <text variable="number"/>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill">
-        <group delimiter=", ">
+      <else-if type="hearing">
+        <!-- use standard format (Bluebook 13.3) -->
+        <group delimiter=": " font-style="italic">
+          <text text-case="capitalize-first" variable="title"/>
           <group delimiter=" ">
-            <text variable="genre"/>
+            <text term="hearing" text-case="capitalize-first"/>
             <group delimiter=" ">
-              <choose>
-                <!-- If there is no session number or code/record title, assume
-                     assume the item is a congressional report and include 'No.' term. -->
-                <if variable="chapter-number container-title" match="none">
-                  <!-- The item is a congressional report, rather than a bill or resultion. -->
-                  <label variable="number" form="short" text-case="capitalize-first"/>
-                </if>
-              </choose>
+              <text term="on"/>
               <text variable="number"/>
             </group>
-          </group>
-          <group delimiter=" ">
-            <text variable="authority"/>
-            <!-- 'session' is `chapter-number` -->
-            <text variable="chapter-number"/>
-          </group>
-          <group delimiter=" ">
-            <text variable="volume"/>
-            <text variable="container-title"/>
-            <text variable="page-first"/>
+            <group delimiter=" ">
+              <text value="before the"/>
+              <text variable="section"/>
+            </group>
           </group>
         </group>
       </else-if>
+    </choose>
+  </macro>
+  <!-- 6.2.2. Legal identifier -->
+  <macro name="legal-identifier">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if type="hearing">
+          <!-- Use the 'verb' form of the hearing term to hold 'testimony of' -->
+          <text form="verb" term="hearing"/>
+          <names variable="author">
+            <name and="symbol" initialize="false"/>
+          </names>
+        </if>
+        <else-if match="any" type="bill legislation regulation">
+          <!-- For uncodified regulations, assume future code section is in `status`. -->
+          <text variable="status"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="legal-identifier-bill-report">
+    <group delimiter=" ">
+      <text variable="genre"/>
+      <choose>
+        <if match="any" variable="authority chapter-number container-title">
+          <text variable="number"/>
+        </if>
+        <else>
+          <!-- If there is no legislative body, session number, or code/record title, assume the item is a congressional report and include 'No.' label. -->
+          <text macro="label-number-capitalized"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <!-- 6.3. Legal source -->
+  <macro name="legal-source">
+    <!-- Expect legal item `container-title` to be stored in short form -->
+    <choose>
+      <if type="bill">
+        <text macro="legal-source-bill"/>
+      </if>
       <else-if type="hearing">
-        <group delimiter=" ">
-          <text variable="authority"/>
-          <!-- 'session' is `chapter-number` -->
-          <text variable="chapter-number"/>
-        </group>
+        <text macro="legal-source-hearing"/>
+      </else-if>
+      <else-if type="legal_case">
+        <text macro="legal-source-case"/>
       </else-if>
       <else-if type="legislation">
-        <choose>
-          <if variable="number">
-            <!-- There's a public law number. -->
-            <group delimiter=", ">
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <choose>
-                <if variable="section">
-                  <group delimiter=" ">
-                    <label variable="section" form="symbol"/>
-                    <text variable="section"/>
-                  </group>
-                </if>
-                <else>
-                  <text variable="page-first"/>
-                </else>
-              </choose>
-            </group>
-          </else>
-        </choose>
+        <text macro="legal-source-legislation"/>
       </else-if>
       <else-if type="regulation">
+        <text macro="legal-source-regulation"/>
+      </else-if>
+      <else-if type="treaty">
+        <text macro="legal-source-treaty"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- Legal source types -->
+  <macro name="legal-source-bill">
+    <group delimiter=", ">
+      <text macro="legal-identifier-bill-report"/>
+      <group delimiter=" ">
+        <text variable="authority"/>
+        <!-- `chapter-number` is a session number -->
+        <text variable="chapter-number"/>
+      </group>
+      <group delimiter=" ">
+        <text variable="volume"/>
+        <text variable="container-title"/>
+        <text variable="page-first"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="legal-source-case">
+    <group delimiter=" ">
+      <choose>
+        <if variable="container-title">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+          <text macro="label-section-symbol"/>
+          <choose>
+            <if match="any" variable="page page-first">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <text value="___"/>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <text macro="label-number-capitalized"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="legal-source-hearing">
+    <group delimiter=" ">
+      <text variable="authority"/>
+      <!-- `chapter-number` is a session number -->
+      <text variable="chapter-number"/>
+    </group>
+  </macro>
+  <macro name="legal-source-legislation">
+    <choose>
+      <if variable="number">
+        <!-- `number` is a public law number -->
         <group delimiter=", ">
           <group delimiter=" ">
-            <text variable="genre"/>
-            <group delimiter=" ">
-              <label variable="number" form="short" text-case="capitalize-first"/>
-              <text variable="number"/>
-            </group>
-          </group>
-          <group delimiter=" ">
-            <text variable="volume"/>
-            <text variable="container-title"/>
             <choose>
-              <if variable="section">
-                <group delimiter=" ">
-                  <label variable="section" form="symbol"/>
-                  <text variable="section"/>
-                </group>
+              <if variable="genre">
+                <text text-case="capitalize-first" variable="genre"/>
               </if>
               <else>
-                <text variable="page-first"/>
+                <text form="short" term="legislation" text-case="capitalize-first"/>
               </else>
             </choose>
+            <text macro="label-number-capitalized"/>
+          </group>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
           </group>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="parenthetical-legal">
-    <choose>
-      <if type="hearing">
-        <group prefix="(" suffix=")" delimiter=" ">
-          <!-- Use the 'verb' form of the hearing term to hold 'testimony of' -->
-          <text term="hearing" form="verb"/>
-          <names variable="author">
-            <name and="symbol" delimiter=", "/>
-          </names>
         </group>
       </if>
-      <else-if type="bill legislation regulation" match="any">
-        <!-- For uncodified regulations, assume future code section is in `status`. -->
-        <text variable="status" prefix="(" suffix=")"/>
-      </else-if>
+      <else>
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+          <choose>
+            <if variable="section">
+              <text macro="label-section-symbol"/>
+            </if>
+            <else>
+              <text variable="page-first"/>
+            </else>
+          </choose>
+        </group>
+      </else>
     </choose>
   </macro>
-  <macro name="citation-locator">
-    <!-- Abbreviate page and paragraph, leave other locator labels in long form, cf. Rule 8.13 -->
+  <macro name="legal-source-regulation">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <text variable="genre"/>
+        <text macro="label-number-capitalized"/>
+      </group>
+      <group delimiter=" ">
+        <text variable="volume"/>
+        <text variable="container-title"/>
+        <choose>
+          <if variable="section">
+            <text macro="label-section-symbol"/>
+          </if>
+          <else>
+            <text variable="page-first"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="legal-source-treaty">
     <group delimiter=" ">
+      <number variable="volume"/>
+      <text variable="container-title"/>
       <choose>
-        <if locator="page paragraph" match="any">
-          <label variable="locator" form="short"/>
+        <if match="any" variable="page page-first">
+          <text variable="page-first"/>
         </if>
         <else>
-          <label variable="locator" text-case="capitalize-first"/>
+          <text macro="label-number-capitalized"/>
         </else>
       </choose>
-      <text variable="locator"/>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name-with-initials">
+  <!-- Citation -->
+  <citation collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true" et-al-min="3" et-al-use-first="1" givenname-disambiguation-rule="primary-name-with-initials">
     <sort>
       <key macro="author-sort" names-min="3" names-use-first="1"/>
-      <key macro="date-sort-group" sort="ascending"/>
-      <key macro="date-sort" sort="ascending"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort"/>
       <key variable="status"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
+    <layout delimiter="; " prefix="(" suffix=")">
       <group delimiter=", ">
-        <text macro="author-intext"/>
-        <text macro="date-intext"/>
-        <text macro="citation-locator"/>
+        <text macro="author-short"/>
+        <text macro="date-short"/>
+        <text macro="label-locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="1">
+  <!-- Bibliography -->
+  <macro name="bibliography">
+    <group delimiter=" ">
+      <choose>
+        <if match="any" type="bill hearing legal_case legislation regulation treaty">
+          <!-- Legal items have different orders and delimiters -->
+          <text macro="legal-reference" suffix="."/>
+          <text macro="source-DOI-URL"/>
+          <text variable="references"/>
+        </if>
+        <else>
+          <group delimiter=". " suffix=".">
+            <text macro="author-and-contributors"/>
+            <text macro="date"/>
+            <text macro="title-and-descriptions"/>
+            <text macro="source"/>
+          </group>
+          <text macro="source-DOI-URL"/>
+          <text macro="publication-history"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <bibliography entry-spacing="0" et-al-min="21" et-al-use-first="19" et-al-use-last="true" hanging-indent="true" line-spacing="1">
     <sort>
       <key macro="author-sort"/>
-      <key macro="date-sort-group" sort="ascending"/>
-      <key macro="date-sort" sort="ascending"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort"/>
       <key variable="status"/>
       <key macro="title"/>
+      <key variable="volume"/>
+      <key variable="part-number"/>
+      <key variable="event-date"/>
+      <key variable="original-date"/>
+      <key macro="source-archive"/>
     </sort>
     <layout>
       <choose>
-        <if type="bill hearing legal_case legislation regulation treaty" match="any">
-          <!-- Legal items have different orders and delimiters -->
-          <text macro="legal-cites"/>
+        <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+          <text macro="bibliography"/>
         </if>
+        <!-- an inaccessible `interview` or `personal_communication` is cited in-text only (APA 8.9) -->
+        <else-if match="any" type="interview personal_communication"/>
         <else>
-          <group delimiter=" ">
-            <group delimiter=". " suffix=".">
-              <text macro="author-bib"/>
-              <text macro="date-bib"/>
-              <text macro="title-and-descriptions"/>
-              <text macro="container"/>
-              <text macro="event"/>
-              <text macro="publisher"/>
-            </group>
-            <text macro="access"/>
-            <text macro="publication-history"/>
-          </group>
+          <text macro="bibliography"/>
         </else>
       </choose>
     </layout>