csl-styles 2.0.1 → 2.0.2

data/vendor/styles/apa-numeric-superscript-brackets.csl

@@ -15,7 +15,7 @@
     <category field="psychology"/>
     <category field="generic-base"/>
     <summary>APA style, with numeric in-text citations in brackets</summary>
-    <updated>2022-01-31T09:43:56-05:00</updated>
+    <updated>2024-07-09T20:08:41+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">
@@ -24,6 +24,10 @@
         <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>
       <term name="translator" form="short">trans.</term>
       <term name="interviewer" form="short">
         <single>interviewer</single>
@@ -33,54 +37,41 @@
         <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="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
+      <term name="at" form="long">before the</term>
+      <term name="collection">archival collection</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>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,109 +81,196 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
     </terms>
   </locale>
-  <locale xml:lang="tr">
+  <locale xml:lang="ro">
     <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
+      <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` 
+  -->
   <!-- General categories of item types:
-       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical: article-journal article-magazine article-newspaper periodical post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+       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
+  -->
+  <!-- Equivalencies:
+       classic == book
+       document == report, but give full date
+       standard == report
+       performance == speech
+       event == speech
+       collection == book, but give full date
+  -->
+  <!-- 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
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
-    <names variable="composer" delimiter=", ">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-        <names variable="author"/>
-        <names variable="illustrator"/>
-        <names variable="director">
-          <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 entry entry-dictionary entry-encyclopedia" match="any">
-                <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>
-        <!-- Test for editortranslator and put that first as that becomes available -->
-        <names variable="editor" delimiter=", ">
-          <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="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 variable="title">
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="parenthetical"/>
-            </group>
-          </if>
-          <else>
-            <text macro="title-and-descriptions"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
+    <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 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>
+            <else>
+              <!-- If an item has no title, substitute with bracketed followed by parenthetical. -->
+              <text macro="title-and-descriptions"/>
+            </else>
+          </choose>
+        </substitute>
+      </names>
+      <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=")">
+            <label form="verb" suffix=" "/>
+            <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          </names>
+        </if>
+      </choose>
+    </group>
   </macro>
   <macro name="author-intext">
     <choose>
-      <if type="bill legal_case legislation treaty" match="any">
+      <if type="bill hearing legal_case legislation regulation treaty" match="any">
         <text macro="title-intext"/>
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- 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">
             <group delimiter=", ">
@@ -202,8 +280,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -217,29 +294,58 @@
         </choose>
       </else-if>
       <else>
-        <names variable="composer" delimiter=", ">
+        <names variable="composer" delimiter=" &amp; ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <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"/>
+              </if>
+            </choose>
             <names variable="director"/>
+            <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. -->
+            <names variable="guest host"/>
+            <names variable="producer"/>
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                  <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any">
                     <text macro="title-intext"/>
                   </if>
                 </choose>
               </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">
+                <names variable="chair"/>
+                <names variable="organizer"/>
+              </if>
+            </choose>
+            <names variable="curator"/>
             <text macro="title-intext"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
+  <macro name="author-sort">
+    <choose>
+      <if type="bill hearing legal_case legislation regulation treaty" match="any">
+        <text macro="title-legal"/>
+      </if>
+      <else>
+        <text macro="author-bib"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="date-bib">
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
@@ -250,35 +356,38 @@
       <group>
         <choose>
           <if variable="issued">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="year-suffix"/>
-            <choose>
-              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet 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 prefix=", " name="month"/>
-                  <date-part prefix=" " name="day"/>
-                </date>
-              </if>
-              <else-if type="paper-conference">
-                <!-- Capture 'speech' stored as 'paper-conference' -->
-                <choose>
-                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
-                    <date variable="issued">
-                      <date-part prefix=", " name="month"/>
-                      <date-part prefix=" " name="day"/>
-                    </date>
-                  </if>
-                </choose>
-              </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
-                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
-            </choose>
+            <group delimiter=", ">
+              <group>
+                <date variable="issued" date-parts="year" form="numeric"/>
+                <text variable="year-suffix"/>
+              </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>
+                <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>
+                <!-- 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">
             <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>
@@ -291,7 +400,38 @@
       </group>
     </group>
   </macro>
+  <macro name="date-sort">
+    <!-- This is necessary to ensure that citeproc sorts all item types chonologically in the same list. -->
+    <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>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
+            <date variable="issued" date-parts="year" form="numeric"/>
+          </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>
+          </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>
+      </else>
+    </choose>
+  </macro>
   <macro name="date-sort-group">
+    <!-- APA sorts 1. no-date items, 2. items with dates, 3. in-press (status) items -->
     <choose>
       <if variable="issued">
         <text value="1"/>
@@ -304,9 +444,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -332,7 +469,7 @@
                 <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. 
+                      <!-- 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>
@@ -355,6 +492,7 @@
         </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>
@@ -365,7 +503,7 @@
     </choose>
   </macro>
   <!-- APA has two description elements following the title:
-       title (parenthetical) [bracketed]  -->
+       title (parenthetical) [bracketed] -->
   <macro name="title-and-descriptions">
     <choose>
       <if variable="title">
@@ -376,10 +514,22 @@
         </group>
       </if>
       <else>
-        <group delimiter=" ">
-          <text macro="bracketed"/>
-          <text macro="parenthetical"/>
-        </group>
+        <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>
       </else>
     </choose>
   </macro>
@@ -387,80 +537,134 @@
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" font-style="italic"/>
+        <text macro="title-plus-part-title" font-style="italic"/>
       </if>
-      <else-if variable="container-title" match="any">
-        <!-- Other types are italicized based on presence of container-title.
+      <!-- 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) -->
-        <text variable="title"/>
+      <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
+        <text macro="periodical-title"/>
       </else-if>
-      <else>
+      <else-if type="paper-conference">
+        <!-- Treat paper-conference as book-like if it has an editor, otherwise as periodical-like -->
         <choose>
-          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
-            <text variable="title" font-style="italic"/>
+          <if variable="collection-editor compiler editor editorial-director" match="any">
+            <text macro="booklike-title"/>
           </if>
-          <else-if type="paper-conference">
-            <choose>
-              <if variable="collection-editor editor editorial-director" match="any">
-                <group delimiter=": " font-style="italic">
-                  <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
-                  <choose>
-                    <if is-numeric="volume" match="none">
-                      <group delimiter=" ">
-                        <label variable="volume" form="short" text-case="capitalize-first"/>
-                        <text variable="volume"/>
-                      </group>
-                    </if>
-                  </choose>
-                </group>
-              </if>
-              <else>
-                <text variable="title" font-style="italic"/>
-              </else>
-            </choose>
-          </else-if>
           <else>
-            <group delimiter=": " font-style="italic">
+            <text macro="periodical-title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="booklike-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 -->
+    <choose>
+      <if variable="container-title" match="any">
+        <text macro="title-plus-part-title"/>
+      </if>
+      <else>
+        <!-- for periodical items without container titles, don't append volume-title to title -->
+        <text macro="title-plus-part-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="booklike-title">
+    <!-- For book-like items, assume part-number and part-title refer to the book/volume. -->
+    <choose>
+      <if variable="container-title" match="any">
+        <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"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-plus-part-title">
+    <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"/>
-              <!-- Replace with volume-title as that becomes available -->
-              <choose>
-                <if is-numeric="volume" match="none">
-                  <group delimiter=" ">
-                    <label variable="volume" form="short" text-case="capitalize-first"/>
-                    <text variable="volume"/>
-                  </group>
-                </if>
-              </choose>
+              <text macro="part-title"/>
             </group>
           </else>
         </choose>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text variable="title"/>
+          <text macro="part-title"/>
+        </group>
       </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">
     <choose>
-      <if variable="title" match="none">
-        <text macro="bracketed-intext" prefix="[" suffix="]"/>
-      </if>
-      <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+      <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="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -468,25 +672,36 @@
             </group>
           </else>
         </choose>
-      </else-if>
-      <else-if type="legal_case" match="any">
-        <!-- Cases are italicized -->
-        <text variable="title" font-style="italic"/>
-      </else-if>
-      <else-if type="legislation treaty" match="any">
-        <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
-      </else-if>
-      <else-if type="post webpage" match="any">
-        <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
-      </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"/>
-      </else-if>
+      </if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <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>
       </else>
     </choose>
   </macro>
@@ -503,13 +718,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -523,12 +736,36 @@
             <text macro="locators-booklike"/>
           </group>
         </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>
+        </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 -->
+                <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
                 <text macro="number"/>
               </if>
             </choose>
@@ -553,7 +790,7 @@
             <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 -->
+                <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
                 <text macro="number"/>
               </if>
             </choose>
@@ -568,56 +805,8 @@
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- Reviewed item -->
-          <group delimiter="; ">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <!-- Assume that genre is entered as 'Review of the book' or similar -->
-                <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>
-                        <!-- Replace with term="review" as that becomes available -->
-                        <text value="Review of"/>
-                      </else>
-                    </choose>
-                  </if>
-                  <else>
-                    <choose>
-                      <if variable="medium">
-                        <text variable="medium" text-case="capitalize-first"/>
-                      </if>
-                      <else>
-                        <!-- Replace with term="review" as that becomes available -->
-                        <text value="Review of"/>
-                      </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>
-            </choose>
-          </group>
+        <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any">
+          <text macro="reviewed-item"/>
         </if>
         <else-if type="thesis">
           <!-- Thesis type and institution -->
@@ -649,7 +838,7 @@
                 <group delimiter=" ">
                   <text variable="genre" text-case="capitalize-first"/>
                   <group delimiter=" ">
-                    <text term="author" form="verb"/>
+                    <text term="container-author" form="verb"/>
                     <names variable="interviewer">
                       <name and="symbol" initialize-with=". " delimiter=", "/>
                     </names>
@@ -687,7 +876,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -697,7 +886,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -732,22 +921,35 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
-                      <names variable="author" prefix="recorded by ">
-                        <name and="symbol" initialize-with=". " delimiter=", "/>
-                      </names>
+                      <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"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
-                      <names variable="author" prefix="recorded by ">
-                        <name and="symbol" initialize-with=". " delimiter=", "/>
-                      </names>
+                      <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>
-                      <!-- Replace prefix with performer label as that becomes available -->
-                      <names variable="author" prefix="Recorded by ">
+                      <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>
@@ -758,15 +960,23 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
-                      <names variable="author" prefix="recorded by ">
-                        <name and="symbol" initialize-with=". " delimiter=", "/>
-                      </names>
+                      <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>
-                      <!-- Replace prefix with performer label as that becomes available -->
-                      <names variable="author" prefix="Recorded by ">
+                      <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>
@@ -789,23 +999,17 @@
           <text macro="format"/>
         </else-if>
         <else>
-          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+          <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software, 
+               place bracketed after the container title -->
           <choose>
-            <if type="paper-conference speech" match="any">
+            <if type="event paper-conference performance speech" match="any">
               <choose>
-                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
                   <text macro="format"/>
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="document report software standard" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -816,9 +1020,11 @@
   <macro name="bracketed-intext">
     <group prefix="[" suffix="]">
       <choose>
-        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+        <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">
           <names variable="interviewer">
@@ -839,7 +1045,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -859,23 +1065,90 @@
       </choose>
     </group>
   </macro>
+  <macro name="reviewed-item">
+    <!-- Reviewed item -->
+    <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>
+      </choose>
+    </group>
+  </macro>
   <macro name="bracketed-container">
     <group prefix="[" suffix="]">
       <choose>
-        <if type="paper-conference speech" match="any">
+        <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 editor editorial-director issue page volume" match="none">
+            <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
               <text macro="format"/>
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <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="report">
-          <!-- For chapters in reports, place bracketed after the container title -->
+        <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>
       </choose>
@@ -883,12 +1156,12 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+      <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 editor editorial-director" match="any">
+          <if variable="collection-editor compiler editor editorial-director" match="any">
             <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
@@ -911,7 +1184,7 @@
           </names>
         </if>
       </choose>
-      <names variable="translator" delimiter="; ">
+      <names variable="translator narrator" delimiter="; ">
         <name and="symbol" initialize-with=". " delimiter=", "/>
         <label form="short" prefix=", " text-case="title"/>
       </names>
@@ -927,24 +1200,44 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
-          <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>
-              </group>
-            </if>
-          </choose>
+          <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>
         <else>
           <group delimiter="; ">
@@ -956,6 +1249,14 @@
               <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>
         </else>
       </choose>
@@ -965,7 +1266,6 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
         <text variable="archive_location"/>
       </if>
     </choose>
@@ -974,18 +1274,12 @@
     <choose>
       <if variable="number">
         <group delimiter=", ">
-          <group delimiter=" ">
-            <text variable="genre" text-case="title"/>
-            <choose>
-              <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
-                <text variable="number"/>
-              </if>
-              <else>
-                <text variable="number"/>
-              </else>
-            </choose>
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <group delimiter=" ">
+              <label variable="number" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
           </group>
           <choose>
             <if type="thesis">
@@ -1003,10 +1297,10 @@
   </macro>
   <macro name="locators-booklike">
     <choose>
-      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <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 editor editorial-director" match="any">
+          <if variable="collection-editor compiler editor editorial-director" match="any">
             <group delimiter=", ">
               <text macro="version"/>
               <text macro="edition"/>
@@ -1025,18 +1319,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>
@@ -1055,18 +1341,23 @@
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
-        <if type="report">
+        <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 is-numeric="volume" match="none"/>
+            <if variable="volume-title"/>
+            <else-if is-numeric="volume" match="none"/>
             <else>
               <group delimiter=" ">
                 <label variable="volume" form="short" text-case="capitalize-first"/>
@@ -1077,8 +1368,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <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"/>
           </group>
@@ -1097,8 +1387,9 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
-              works [Ex. 69] -->
+        <!-- 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>
       <else>
@@ -1110,12 +1401,14 @@
   <macro name="reviewed-title-intext">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <!-- 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>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
@@ -1131,28 +1424,9 @@
           <text variable="medium" text-case="capitalize-first"/>
         </group>
       </if>
-      <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
-      <else-if type="dataset">
-        <text value="Data set"/>
-      </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
-      </else-if>
-      <else-if type="interview personal_communication" match="any">
-        <choose>
-          <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" 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 value="Map"/>
-      </else-if>
+      <else>
+        <text macro="generic-type-label"/>
+      </else>
     </choose>
   </macro>
   <macro name="format-intext">
@@ -1163,19 +1437,24 @@
       <else-if variable="medium">
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
-      <else-if type="dataset">
-        <text value="Data set"/>
-      </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else>
+        <text macro="generic-type-label"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="generic-type-label">
+    <!-- Generic labels for specific types -->
+    <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="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1183,7 +1462,34 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="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"/>
       </else-if>
     </choose>
   </macro>
@@ -1191,12 +1497,12 @@
        container, event, publisher, access -->
   <macro name="container">
     <choose>
-      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+      <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 booklike -->
+        <!-- Determine if paper-conference is a periodical- or book-like -->
         <choose>
           <if variable="editor editorial-director collection-editor container-author" match="any">
             <text macro="container-booklike"/>
@@ -1228,20 +1534,23 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
+          <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>
           </if>
           <else>
-            <!-- Ex. 6: Journal article with article number or eLocator -->
-            <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <text variable="page"/>
           </else>
         </choose>
       </group>
       <choose>
         <if variable="issued">
           <choose>
-            <if variable="issue page volume" match="none">
+            <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>
@@ -1253,29 +1562,53 @@
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
-          <text term="in" text-case="capitalize-first"/>
+          <choose>
+            <if type="song">
+              <text term="on" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="in" text-case="capitalize-first"/>
+            </else>
+          </choose>
           <group delimiter=", ">
-            <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+            <names variable="executive-producer">
               <name and="symbol" initialize-with=". " delimiter=", "/>
-              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <label form="long" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
-                <names variable="editorial-director"/>
-                <names variable="collection-editor"/>
+                <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"/>
-              <!-- Replace with volume-title as that becomes available -->
-              <choose>
-                <if is-numeric="volume" match="none">
-                  <group delimiter=" ">
-                    <label variable="volume" form="short" text-case="capitalize-first"/>
-                    <text variable="volume"/>
-                  </group>
-                </if>
-              </choose>
+              <text macro="volume-title"/>
             </group>
           </group>
           <text macro="parenthetical-container"/>
@@ -1304,12 +1637,12 @@
         <else-if type="paper-conference">
           <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
           <choose>
-            <if variable="collection-editor editor editorial-director" match="any">
+            <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 post-weblog" match="none">
+        <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="none">
           <text variable="publisher"/>
         </else-if>
       </choose>
@@ -1319,16 +1652,32 @@
             <!-- 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". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
             -->
-            <text variable="archive_location"/>
+            <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>
+          <else>
+            <text variable="archive"/>
+          </else>
         </choose>
-        <text variable="archive"/>
-        <text variable="archive-place"/>
       </group>
     </group>
   </macro>
@@ -1355,36 +1704,75 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <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. -->
         <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
+          <if type="paper-conference">
+            <choose>
+              <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
+                <!-- Don't print event info for conference papers published in a proceedings -->
+                <group delimiter=", ">
+                  <text macro="event-title"/>
+                  <text variable="event-place"/>
+                </group>
+              </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 variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
-          </if>
+          </else>
         </choose>
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <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>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
-      <if type="patent" match="none">
-        <group prefix="(" suffix=")">
+      <if type="patent">
+        <text variable="references" prefix="(" suffix=")"/>
+      </if>
+      <else>
+        <group delimiter="; " prefix="(" suffix=")">
+          <!-- Print `status` here for things like "retracted" if it's not printed elsewhere already. -->
+          <choose>
+            <if variable="issued">
+              <choose>
+                <if variable="issue number page volume" match="any">
+                  <text variable="status" text-case="capitalize-first"/>
+                </if>
+              </choose>
+            </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) or retracted references -->
+              <!-- This provides the option for more elaborate description
+                    of publication history, such as full "reprinted" references
+                    (examples 11, 43, 44) -->
               <text variable="references"/>
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1397,96 +1785,88 @@
             </else>
           </choose>
         </group>
-      </if>
-      <else>
-        <text variable="references" prefix="(" suffix=")"/>
       </else>
     </choose>
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
-    <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
+    <!-- `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=" ">
+      <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="access"/>
-        </group>
-      </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
-                <text variable="title"/>
-              </else>
-            </choose>
-            <group delimiter=" ">
+        </if>
+        <else>
+          <group delimiter=" " suffix=".">
+            <group delimiter=", ">
+              <text macro="title-legal"/>
               <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
-                  <names variable="author" prefix="(testimony of " suffix=")">
-                    <name and="symbol" delimiter=", "/>
-                  </names>
-                </if>
-                <else>
-                  <text variable="status" prefix="(" suffix=")"/>
-                </else>
-              </choose>
             </group>
-            <text variable="references"/>
+            <text macro="date-legal"/>
+            <text macro="parenthetical-legal"/>
           </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
+        </else>
+      </choose>
+      <text variable="references"/>
+      <text macro="access"/>
+    </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=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
+              <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>
-            <text variable="references"/>
           </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="date-legal">
     <choose>
-      <if type="legal_case">
+      <if type="treaty">
+        <date variable="issued" form="text"/>
+      </if>
+      <else-if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
           <text variable="authority"/>
           <choose>
@@ -1495,12 +1875,14 @@
               <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>
-      </if>
-      <else-if type="bill legislation" match="any">
+      </else-if>
+      <else-if type="bill hearing legislation regulation" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1508,20 +1890,46 @@
             </date>
             <text term="and" form="symbol"/>
           </group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <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>
+            </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"/>
+            </else>
+          </choose>
         </group>
       </else-if>
-      <else-if type="treaty">
-        <date variable="issued" form="text"/>
-      </else-if>
     </choose>
   </macro>
   <macro name="container-legal">
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
-      <if type="legal_case">
+      <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>
+      <else-if type="legal_case">
         <group delimiter=" ">
           <choose>
             <if variable="container-title">
@@ -1529,8 +1937,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1545,34 +1952,34 @@
             </if>
             <else>
               <group delimiter=" ">
-                <choose>
-                  <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
-                  </if>
-                </choose>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
           </choose>
         </group>
-      </if>
+      </else-if>
       <else-if type="bill">
         <group delimiter=", ">
           <group delimiter=" ">
             <text variable="genre"/>
             <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">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <!-- The item is a congressional report, rather than a bill or resultion. -->
+                  <label variable="number" form="short" text-case="capitalize-first"/>
                 </if>
               </choose>
               <text variable="number"/>
             </group>
           </group>
-          <text variable="authority"/>
-          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <!-- 'session' is `chapter-number` -->
+            <text variable="chapter-number"/>
+          </group>
           <group delimiter=" ">
             <text variable="volume"/>
             <text variable="container-title"/>
@@ -1580,10 +1987,17 @@
           </group>
         </group>
       </else-if>
+      <else-if type="hearing">
+        <group delimiter=" ">
+          <text variable="authority"/>
+          <!-- 'session' is `chapter-number` -->
+          <text variable="chapter-number"/>
+        </group>
+      </else-if>
       <else-if type="legislation">
         <choose>
           <if variable="number">
-            <!--There's a public law number-->
+            <!-- There's a public law number. -->
             <group delimiter=", ">
               <text variable="number" prefix="Pub. L. No. "/>
               <group delimiter=" ">
@@ -1600,8 +2014,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1613,34 +2026,60 @@
           </else>
         </choose>
       </else-if>
-      <else-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=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
-                <text variable="number"/>
-              </group>
-            </else>
-          </choose>
+      <else-if type="regulation">
+        <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>
+              <else>
+                <text variable="page-first"/>
+              </else>
+            </choose>
+          </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>
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- Abbreviate page and paragraph, leave other locator labels in long form, cf. Rule 8.13 -->
     <group delimiter=" ">
       <choose>
-        <if locator="chapter">
-          <label variable="locator" text-case="capitalize-first"/>
+        <if locator="page paragraph" match="any">
+          <label variable="locator" form="short"/>
         </if>
         <else>
-          <label variable="locator" form="short"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </else>
       </choose>
       <text variable="locator"/>
@@ -1662,16 +2101,9 @@
       <group delimiter=". ">
         <text variable="citation-number"/>
         <choose>
-          <if type="bill legal_case legislation treaty" match="any">
+          <if type="bill hearing legal_case legislation regulation treaty" match="any">
             <!-- Legal items have different orders and delimiters -->
-            <choose>
-              <if variable="DOI URL" match="any">
-                <text macro="legal-cites"/>
-              </if>
-              <else>
-                <text macro="legal-cites" suffix="."/>
-              </else>
-            </choose>
+            <text macro="legal-cites"/>
           </if>
           <else>
             <group delimiter=" ">