csl-styles 2.0.1 → 2.0.2

data/vendor/styles/united-states-international-trade-commission.csl

@@ -1,1505 +1,737 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago" default-locale="en-US">
-  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
   <info>
     <title>United States International Trade Commission</title>
     <title-short>USITC</title-short>
     <id>http://www.zotero.org/styles/united-states-international-trade-commission</id>
     <link href="http://www.zotero.org/styles/united-states-international-trade-commission" rel="self"/>
-    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
-    <link href="https://github.com/citation-style-language/styles/pull/5508#issuecomment-861763773" rel="documentation"/>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <link href="https://www.zotero.org/groups/5338814/usitc_referencing/library" rel="documentation"/>
     <author>
-      <name>Tyler Daun</name>
-      <email>Tyler.Daun@usitc.gov</email>
+      <name>Sebastian Karcher</name>
     </author>
-    <author>
-      <name>Gregory LaRocca</name>
-      <email>Gregory.LaRocca@usitc.gov</email>
-    </author>
-    <contributor>
-      <name>Judy Edelhoff</name>
-      <email>Judy.Edelhoff@usitc.gov</email>
-    </contributor>
-    <contributor>
-      <name>Peg Hausman</name>
-      <email>Margaret.Hausman@usitc.gov</email>
-    </contributor>
     <category citation-format="note"/>
-    <category field="generic-base"/>
     <summary>A bibliographical style file for the United States International Trade Commission</summary>
-    <updated>2021-10-07T15:21:08+00:00</updated>
+    <updated>2023-12-25T18:06:05+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
     <terms>
       <term name="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">by</term>
       <term name="translator" form="verb-short">trans.</term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
       <term name="translator" form="short">trans.</term>
-      <term name="editortranslator" form="verb-short">ed. and trans.</term>
-      <term name="editortranslator" form="verb">Edited and translated by</term>
-      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="verb-short">by</term>
+      <term name="recipient" form="verb-short">to</term>
     </terms>
   </locale>
-  <macro name="editor-translator">
-    <group delimiter=", ">
-      <group delimiter=" ">
+  <macro name="creator">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
         <choose>
-          <if variable="container-author reviewed-author" match="any">
-            <group>
-              <names variable="container-author reviewed-author">
-                <label form="verb-short" text-case="lowercase" suffix=" "/>
-                <name and="text" delimiter=", "/>
-              </names>
-            </group>
+          <if type="broadcast entry-encyclopedia article-magazine article-newspaper post-weblog" match="any">
+            <text macro="container-title"/>
           </if>
+          <else>
+            <text macro="title"/>
+          </else>
         </choose>
-      </group>
-    </group>
+      </substitute>
+    </names>
   </macro>
-  <macro name="secondary-contributors-note">
+  <macro name="creator-note">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-        <text macro="editor-translator"/>
+      <if variable="citation-label" match="any">
+        <text variable="citation-label"/>
       </if>
+      <else>
+        <names variable="author">
+          <name form="short" and="text"/>
+          <substitute>
+            <names variable="editor"/>
+            <choose>
+              <if type="entry-encyclopedia" match="any">
+                <text variable="container-title"/>
+              </if>
+              <else-if type="article-magazine article-newspaper broadcast post-weblog">
+                <text macro="container-title"/>
+              </else-if>
+              <else>
+                <text macro="title-short"/>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </else>
     </choose>
   </macro>
-  <macro name="container-contributors-note">
+  <macro name="chapter-secondary-creators">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-        <text macro="editor-translator"/>
+      <if type="chapter" match="any">
+        <group delimiter=", ">
+          <names variable="container-author">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter-precedes-last="always"/>
+          </names>
+          <names variable="editor translator">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter-precedes-last="always"/>
+          </names>
+        </group>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="other-secondary-creators">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-        <names variable="editor translator" delimiter=". ">
-          <label form="verb" text-case="capitalize-first" suffix=" "/>
-          <name and="text" delimiter=", "/>
-        </names>
+      <if type="chapter" variable="part-title" match="none">
+        <text variable="part-title"/>
+        <group delimiter=", ">
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" delimiter-precedes-last="always"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="part-creators">
+    <choose>
+      <if variable="part-title">
+        <group delimiter=" " suffix=",">
+          <text variable="part-title"/>
+          <names variable="container-author">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter-precedes-last="always"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer">
+      <label form="verb-short" suffix=" "/>
+      <name and="text" delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="identifier">
+    <choose>
+      <if type="dataset" match="any">
+        <text variable="number"/>
+      </if>
+      <else-if type="manuscript">
+        <text variable="genre"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book report" match="any">
+        <text variable="title" font-style="italic" text-case="title"/>
       </if>
+      <else-if type="interview">
+        <group delimiter=", ">
+          <text variable="title"/>
+          <text macro="interviewer"/>
+        </group>
+      </else-if>
+      <else-if type="manuscript map">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true" text-case="title"/>
+      </else>
     </choose>
   </macro>
-  <macro name="container-contributors">
+  <macro name="title-short">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if type="book report" match="any">
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="interview">
         <group delimiter=", ">
+          <text variable="title"/>
+          <text macro="interviewer"/>
+        </group>
+      </else-if>
+      <else-if type="manuscript map">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else>
+        <group delimiter=" ">
           <choose>
-            <if variable="author">
-              <choose>
-                <if variable="container-author" match="any">
-                  <names variable="container-author">
-                    <label form="verb-short" text-case="lowercase" suffix=" "/>
-                    <name and="text" delimiter=", "/>
-                  </names>
-                </if>
-              </choose>
+            <if type="entry-encyclopedia">
               <choose>
-                <if variable="container-author author" match="all">
-                  <group delimiter=". ">
-                    <text variable="page"/>
-                    <names variable="editor translator" delimiter=", ">
-                      <label form="verb" suffix=" "/>
-                      <name and="text" delimiter=", "/>
-                    </names>
-                  </group>
+                <if variable="author editor" match="none">
+                  <text term="sub-verbo" form="short"/>
                 </if>
-                <else>
-                  <names variable="editor translator" delimiter=", ">
-                    <label form="verb" text-case="lowercase" suffix=" "/>
-                    <name and="text" delimiter=", "/>
-                  </names>
-                </else>
               </choose>
             </if>
           </choose>
+          <text variable="title" form="short" quotes="true" text-case="title"/>
         </group>
-      </if>
+      </else>
     </choose>
   </macro>
-  <macro name="recipient-note">
-    <names variable="recipient" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="contributors-note">
-    <group delimiter=" ">
-      <choose>
-        <if match="any" variable="note">
-          <text variable="note"/>
-        </if>
-        <else-if type="webpage" match="any"/>
-        <else-if type="article-magazine" match="all">
+  <macro name="letter">
+    <choose>
+      <if type="personal_communication">
+        <group delimiter=" ">
           <choose>
-            <if type="article-magazine" match="all" variable="author">
-              <names variable="author" delimiter=",">
-                <name form="short" and="text"/>
-                <label/>
-                <substitute>
-                  <text macro="editor-note"/>
-                </substitute>
-              </names>
+            <if variable="genre" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
             </if>
             <else>
-              <text variable="container-title" form="short" font-style="italic"/>
+              <text term="letter" text-case="capitalize-first"/>
             </else>
           </choose>
-        </else-if>
-        <else>
-          <names variable="author">
-            <name form="short" and="text" sort-separator=""/>
-            <label form="short" prefix=", "/>
-            <substitute>
-              <text macro="editor-note"/>
-            </substitute>
+          <names variable="recipient">
+            <label form="verb-short" suffix=" "/>
+            <name and="text" delimiter-precedes-last="always"/>
           </names>
-          <text macro="recipient-note"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", "/>
-    </names>
+          <text variable="annote" prefix="(" suffix=")"/>
+          <text variable="source"/>
+        </group>
+      </if>
+    </choose>
   </macro>
-  <macro name="recipient">
-    <group delimiter=" ">
-      <choose>
-        <if type="personal_communication">
+  <macro name="letter-note">
+    <choose>
+      <if type="personal_communication">
+        <group delimiter=" ">
           <choose>
-            <if variable="genre">
-              <text variable="genre" text-case="capitalize-first"/>
+            <if variable="genre" match="any">
+              <text variable="genre"/>
             </if>
             <else>
-              <text term="letter" text-case="capitalize-first"/>
+              <text term="letter"/>
             </else>
           </choose>
+          <names variable="recipient">
+            <label form="verb-short" suffix=" "/>
+            <name and="text"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter">
+          <text term="in" text-case="capitalize-first"/>
         </if>
       </choose>
-      <text macro="recipient-note"/>
-    </group>
-  </macro>
-  <macro name="contributors">
-    <group delimiter=". ">
       <choose>
-        <if type="article-magazine" match="any">
-          <choose>
-            <if type="article-magazine" match="all" variable="author">
-              <names variable="author">
-                <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
-                <substitute>
-                  <text macro="editor"/>
-                </substitute>
-              </names>
-            </if>
-            <else-if type="article-magazine" match="all">
-              <text variable="container-title" font-style="italic"/>
-            </else-if>
-            <else>
-              <text macro="container-title"/>
-            </else>
-          </choose>
+        <if type="document webpage" match="none">
+          <text variable="container-title" font-style="italic"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="post-weblog" match="any">
+          <text variable="genre" prefix="(" suffix=")"/>
         </if>
-        <else>
-          <names variable="author">
-            <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-            <substitute>
-              <text macro="editor"/>
-              <text macro="translator"/>
-              <choose>
-                <if type="webpage post-weblog" match="any">
-                  <text variable="container-title"/>
-                </if>
-              </choose>
-            </substitute>
-          </names>
-          <text macro="recipient"/>
-        </else>
       </choose>
     </group>
   </macro>
-  <macro name="contributors-sort">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="interviewer-note">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
+  <macro name="document-container">
+    <choose>
+      <if type="document" match="any">
+        <group delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+          <text variable="volume"/>
+        </group>
+      </if>
+    </choose>
   </macro>
-  <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="capitalize-first" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
+  <macro name="broadcast-container">
+    <choose>
+      <if type="broadcast" match="any">
+        <text variable="collection-title"/>
+      </if>
+    </choose>
   </macro>
-  <macro name="title-note">
+  <macro name="book-series">
     <choose>
-      <if variable="title" match="none">
-        <text variable="genre"/>
+      <if type="book" match="any">
+        <text variable="collection-title"/>
       </if>
-      <else-if match="any" variable="note">
-        <choose>
-          <if match="none" variable="title">
-            <text variable="genre"/>
-          </if>
-          <else-if type="legislation bill" match="any">
-            <text variable="title" text-case="title"/>
-          </else-if>
-          <else-if type="book graphic map song" match="any">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" suffix=","/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="title" font-style="italic"/>
-              </else>
-            </choose>
-            <group>
-              <text term="version"/>
-              <text variable="version"/>
-            </group>
-          </else-if>
-          <else-if type="legal_case interview patent" match="any">
-            <text variable="title" text-case="title"/>
-          </else-if>
-          <else-if match="all" variable="reviewed-author">
-            <text variable="title" text-case="title" font-style="italic" prefix="review of "/>
-          </else-if>
-          <else-if type="webpage" match="all">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="title" quotes="true"/>
-              </else>
-            </choose>
-          </else-if>
-          <else-if type="motion_picture" match="any">
-            <group>
-              <choose>
-                <if match="any" variable="title-short">
-                  <text variable="title-short" text-case="title"/>
-                  <date form="text" variable="issued" prefix=", "/>
-                </if>
-                <else>
-                  <text variable="title" text-case="title" quotes="true"/>
-                  <date form="text" variable="issued" prefix=", "/>
-                </else>
-              </choose>
-            </group>
-          </else-if>
-          <else-if type="report" match="any">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" font-style="italic"/>
-              </if>
-              <else>
-                <text variable="title" text-case="title" font-style="italic"/>
-              </else>
-            </choose>
-          </else-if>
-          <else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if type="paper-conference speech" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
             <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" form="short" text-case="title" quotes="true"/>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <text variable="title" form="short" text-case="title" quotes="true"/>
+                <text term="speech" text-case="capitalize-first"/>
               </else>
             </choose>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="legislation bill" match="any">
-        <text variable="title" text-case="title"/>
-      </else-if>
-      <else-if type="book graphic map song" match="any">
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" form="short" text-case="title" quotes="false" font-style="italic" suffix=","/>
-          </if>
-          <else>
-            <text variable="title" form="short" text-case="title" quotes="false" font-style="italic"/>
-          </else>
-        </choose>
-        <group delimiter=" " prefix=", ">
-          <text term="version"/>
-          <text variable="version"/>
+            <text term="presented at"/>
+            <text variable="event"/>
+          </group>
+          <date variable="event-date" form="text"/>
         </group>
-      </else-if>
-      <else-if type="legal_case interview patent" match="any">
-        <text variable="title" text-case="title"/>
-      </else-if>
-      <else-if variable="reviewed-author">
-        <text variable="title" text-case="title" font-style="italic" prefix="review of "/>
-      </else-if>
-      <else-if type="webpage" match="all" variable="author">
-        <names variable="author" suffix=", ">
-          <name form="short"/>
-        </names>
-        <text variable="title" form="short" text-case="title" quotes="true"/>
-      </else-if>
-      <else-if type="webpage" match="any"/>
-      <else-if type="article" match="any"/>
-      <else-if type="motion_picture" match="any">
-        <group>
-          <choose>
-            <if match="any" variable="title-short">
-              <text variable="title-short" text-case="title"/>
-            </if>
-            <else>
-              <text variable="title" text-case="title" quotes="true"/>
-            </else>
-          </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="web-genre">
+    <choose>
+      <if type="webpage" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages-chapter">
+    <choose>
+      <if type="chapter" match="any">
+        <text variable="page"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
-      </else-if>
-      <else-if type="report" match="any">
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" text-case="title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" text-case="title" font-style="italic"/>
-          </else>
-        </choose>
-      </else-if>
+      </if>
       <else>
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" form="short" text-case="title" quotes="true"/>
-          </if>
-          <else>
-            <text variable="title" form="short" text-case="title" quotes="true"/>
-          </else>
-        </choose>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="title">
+  <macro name="edition-other">
     <choose>
-      <if variable="title" match="none">
-        <choose>
-          <if type="personal_communication" match="none">
-            <text variable="genre" text-case="capitalize-first"/>
-          </if>
-        </choose>
+      <if type="book" match="none">
+        <text macro="edition" font-style="italic"/>
       </if>
-      <else-if type="book graphic song" match="any">
-        <text variable="title" text-case="title" quotes="false" font-style="italic"/>
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text term="version"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
-      <else-if variable="reviewed-author">
-        <group delimiter=", ">
-          <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
-          <names variable="reviewed-author">
-            <label form="verb-short" text-case="lowercase" suffix=" "/>
-            <name and="text" delimiter=", "/>
-          </names>
+    </choose>
+  </macro>
+  <macro name="edition-book">
+    <choose>
+      <if type="book" match="any">
+        <text macro="edition" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="volume-book">
+    <choose>
+      <if type="book" match="any">
+        <group delimiter=" " font-style="italic">
+          <text term="volume" form="short" text-case="capitalize-first"/>
+          <text variable="volume"/>
         </group>
-      </else-if>
-      <else-if type="bill legislation legal_case interview patent" match="any">
-        <text variable="title" text-case="title"/>
-      </else-if>
-      <else-if type="motion_picture" match="all">
-        <choose>
-          <if match="any" variable="issued">
-            <group>
-              <text variable="title" text-case="title" quotes="true" suffix=","/>
-              <date form="text" variable="issued" prefix=" " suffix=". "/>
-              <text variable="dimensions" prefix="Video, "/>
-            </group>
-          </if>
-          <else-if match="any" variable="accessed">
-            <group>
-              <text variable="title" text-case="title" quotes="true" suffix=","/>
-              <date form="text" variable="accessed" prefix=" accessed " suffix=". "/>
-              <text variable="dimensions" prefix="Video, "/>
-            </group>
-          </else-if>
-          <else>
-            <text variable="title" text-case="title"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="report" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
-      </else-if>
-      <else>
-        <text variable="title" text-case="title" quotes="true"/>
-      </else>
+      </if>
     </choose>
   </macro>
-  <macro name="description-note">
-    <group delimiter=", ">
-      <text macro="interviewer-note"/>
-      <text variable="medium"/>
-      <choose>
-        <if variable="title" match="none"/>
-        <else-if type="manuscript thesis speech" match="any"/>
-        <else-if type="patent">
-          <group delimiter=" ">
-            <text variable="authority"/>
-            <text variable="number"/>
-          </group>
-        </else-if>
-      </choose>
-      <choose>
-        <if type="map">
-          <text variable="scale"/>
-        </if>
-        <else-if type="graphic">
-          <text variable="dimensions"/>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="description">
-    <group delimiter=", ">
-      <group delimiter=". ">
-        <text macro="interviewer"/>
-        <text variable="medium" text-case="capitalize-first"/>
-      </group>
-      <choose>
-        <if variable="title" match="none"/>
-        <else-if type="thesis speech" match="any"/>
-        <else-if type="patent">
-          <group delimiter=" ">
-            <text variable="authority"/>
-            <text variable="number"/>
-          </group>
-        </else-if>
-        <else>
-          <text variable="genre" text-case="capitalize-first"/>
-        </else>
-      </choose>
-      <choose>
-        <if type="map">
-          <text variable="scale"/>
-        </if>
-        <else-if type="graphic">
-          <text variable="dimensions"/>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="container-title-note">
-    <group delimiter=" ">
-      <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-          <text variable="container-title-short" form="short" suffix=","/>
-        </if>
-      </choose>
-      <choose>
-        <if type="webpage" variable="author"/>
-        <else-if type="webpage" match="any">
-          <text variable="container-title" suffix=","/>
-          <text variable="title" text-case="title" quotes="true"/>
-        </else-if>
-        <else-if type="post-weblog">
-          <text variable="container-title" text-case="title" font-style="italic" suffix=" (blog)"/>
-        </else-if>
-        <else-if type="bill legislation legal_case" match="none"/>
-      </choose>
-    </group>
-  </macro>
-  <macro name="container-title">
-    <group delimiter=" ">
-      <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any"/>
-      </choose>
-      <choose>
-        <if type="webpage">
-          <text variable="container-title"/>
-        </if>
-        <else-if type="post-weblog">
-          <text variable="container-title" text-case="title" font-style="italic" suffix=" (blog)"/>
-        </else-if>
-        <else-if type="article-magazine" match="all">
-          <choose>
-            <if match="any" variable="author">
-              <text variable="container-title" font-style="italic"/>
-            </if>
-          </choose>
-        </else-if>
-        <else-if type="bill legislation legal_case" match="none">
-          <text variable="container-title" text-case="title" font-style="italic"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if type="report" match="any">
-          <text variable="number"/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="collection-title">
-    <choose>
-      <if match="none" type="article-journal">
-        <choose>
-          <if match="none" is-numeric="collection-number">
-            <group delimiter=", ">
-              <text variable="collection-title" text-case="title"/>
-              <text variable="collection-number"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="collection-title" text-case="title"/>
-              <text variable="collection-number"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="collection-title-journal">
+  <macro name="journal-info">
     <choose>
       <if type="article-journal">
-        <group delimiter=" ">
-          <text variable="collection-title"/>
-          <text variable="collection-number"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition-note">
-    <choose>
-      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short" suffix=","/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition"/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators-note-join-with-space">
-    <choose>
-      <if type="article-journal" variable="volume" match="all">
-        <choose>
-          <if match="none" variable="collection-title">
-            <text macro="locators-note"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators-note-join-with-comma">
-    <choose>
-      <if type="article-journal" match="none">
-        <text macro="locators-note"/>
-      </if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="volume" match="none">
-            <text macro="locators-note"/>
-          </if>
-          <else-if match="any" variable="collection-title">
-            <text macro="locators-note"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="locators-note">
-    <choose>
-      <if type="article-journal">
-        <group delimiter=", ">
-          <text macro="collection-title-journal"/>
-        </group>
-      </if>
-      <else-if type="bill legislation legal_case" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
-      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
-        <choose>
-          <if match="all" variable="edition volume">
-            <group>
-              <text macro="edition-note"/>
-            </group>
-          </if>
-          <else>
+        <group delimiter=": ">
+          <group delimiter=" ">
             <group delimiter=", ">
-              <text macro="edition-note"/>
-              <group delimiter=" ">
-                <text term="volume" form="short"/>
-                <number variable="volume" form="numeric"/>
-              </group>
-              <choose>
-                <if variable="locator" match="none">
-                  <group delimiter=" ">
-                    <number variable="number-of-volumes" form="numeric"/>
-                    <text term="volume" form="short" plural="true"/>
-                  </group>
-                </if>
-              </choose>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="legal-cites">
-    <choose>
-      <if type="legal_case" match="any">
-        <group delimiter=" ">
-          <choose>
-            <if variable="container-title">
               <text variable="volume"/>
-              <text variable="container-title"/>
               <group delimiter=" ">
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
+                <text term="issue" form="short"/>
+                <text variable="issue"/>
               </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
-        </group>
-      </if>
-      <else-if type="bill legislation" match="any">
-        <group delimiter=", ">
-          <choose>
-            <if variable="number">
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="container-title"/>
-                <text variable="volume"/>
-                <choose>
-                  <if match="any" variable="section">
-                    <text term="section" form="symbol"/>
-                    <text variable="section"/>
-                  </if>
-                </choose>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="locators-join-with-space">
-    <choose>
-      <if type="article-journal" variable="volume" match="all">
-        <choose>
-          <if match="none" variable="collection-title">
-            <text macro="locators"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators-join-with-comma">
-    <choose>
-      <if type="bill chapter legislation legal_case paper-conference" match="any">
-        <text macro="locators"/>
-      </if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="volume" match="none">
-            <text macro="locators"/>
-          </if>
-          <else-if match="any" variable="collection-title">
-            <text macro="locators"/>
-          </else-if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="locators-join-with-period">
-    <choose>
-      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
-        <text macro="locators"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal">
-        <group delimiter=", ">
-          <text macro="collection-title-journal"/>
-          <text variable="volume"/>
-          <group delimiter=" ">
-            <text term="issue" form="short"/>
-            <text variable="issue"/>
+            </group>
+            <date variable="issued" form="text" prefix="(" suffix=")"/>
           </group>
+          <text variable="page"/>
         </group>
       </if>
-      <else-if type="bill legislation legal_case" match="any">
-        <text macro="legal-cites"/>
-      </else-if>
-      <else-if type="book graphic motion_picture report song" match="any">
-        <group delimiter=". ">
-          <text macro="edition"/>
-          <group delimiter=" ">
-            <text term="volume" form="short" text-case="capitalize-first"/>
-            <number variable="volume" form="numeric"/>
-          </group>
-          <group delimiter=" ">
-            <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" plural="true"/>
-          </group>
-        </group>
-      </else-if>
-      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-        <group delimiter=". ">
-          <text macro="edition"/>
-          <choose>
-            <if variable="page" match="none">
-              <group delimiter=" ">
-                <text term="volume" form="short" text-case="capitalize-first"/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </if>
-          </choose>
-        </group>
-      </else-if>
     </choose>
   </macro>
-  <macro name="locators-newspaper">
+  <macro name="magazine-date">
     <choose>
-      <if type="article-newspaper">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <number variable="edition"/>
-            <text term="edition"/>
-          </group>
-          <group delimiter=" ">
-            <text term="section" form="short"/>
-            <text variable="section"/>
-          </group>
-        </group>
+      <if type="article-magazine article-newspaper" match="any">
+        <date variable="issued" form="text"/>
       </if>
     </choose>
   </macro>
-  <macro name="event-note">
-    <text variable="event"/>
-  </macro>
-  <macro name="event">
+  <macro name="report-details">
     <choose>
-      <if variable="title">
+      <if type="report thesis" match="any">
         <group delimiter=" ">
-          <choose>
-            <if variable="genre">
-              <text term="presented at"/>
-            </if>
-            <else>
-              <text term="presented at" text-case="capitalize-first"/>
-            </else>
-          </choose>
-          <text variable="event"/>
+          <text variable="genre"/>
+          <text variable="number"/>
         </group>
       </if>
-      <else>
-        <group delimiter=" ">
-          <text term="presented at" text-case="capitalize-first"/>
-          <text variable="event"/>
-        </group>
-      </else>
     </choose>
   </macro>
-  <macro name="originally-published">
-    <group delimiter=", ">
-      <group delimiter=": ">
-        <text variable="original-publisher-place"/>
-        <text variable="original-publisher"/>
-      </group>
-      <choose>
-        <if is-uncertain-date="original-date">
-          <date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
-        </if>
-        <else>
-          <date variable="original-date" form="numeric" date-parts="year"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="reprint-note">
+  <macro name="medium-other">
     <choose>
-      <if variable="original-date issued" match="all">
-        <choose>
-          <if variable="original-publisher original-publisher-place" match="none">
-            <text value="repr."/>
-          </if>
-        </choose>
+      <if type="book chapter" match="none">
+        <group delimiter=", ">
+          <text variable="medium" text-case="capitalize-first"/>
+          <text variable="dimensions"/>
+        </group>
       </if>
     </choose>
   </macro>
-  <macro name="reprint">
+  <macro name="medium-book">
     <choose>
-      <if variable="original-date issued" match="all">
-        <text value="reprint" text-case="capitalize-first"/>
+      <if type="book chapter" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </if>
     </choose>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="thesis" match="all" variable="issued">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <date date-parts="year" form="text" variable="issued"/>
-        </group>
-      </if>
-      <else-if type="speech">
-        <text variable="event-place"/>
-      </else-if>
-      <else-if type="thesis" match="any">
-        <text variable="publisher"/>
-      </else-if>
-      <else>
+      <if type="article-journal article-magazine article-newspaper" match="none">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if variable="issued">
-        <choose>
-          <if type="legal_case">
-            <group delimiter=" ">
-              <text variable="authority"/>
-              <choose>
-                <if variable="container-title" match="any">
-                  <date variable="issued" form="numeric" date-parts="year"/>
-                </if>
-                <else>
-                  <date variable="issued" form="text"/>
-                </else>
-              </choose>
-            </group>
-          </if>
-          <else-if type="book bill chapter  legislation motion_picture paper-conference song thesis" match="any">
-            <choose>
-              <if is-uncertain-date="issued">
-                <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
-              </if>
-              <else-if match="any" variable="abstract"/>
-              <else>
-                <date form="text" variable="issued"/>
-              </else>
-            </choose>
-          </else-if>
-          <else-if type="patent">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text value="filed"/>
-                <date variable="submitted" form="text"/>
-              </group>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="issued submitted" match="all">
-                    <text term="and"/>
-                  </if>
-                </choose>
-                <text value="issued"/>
-                <date variable="issued" form="text"/>
-              </group>
-            </group>
-          </else-if>
-          <else>
-            <choose>
-              <if is-uncertain-date="issued">
-                <date variable="issued" form="text" prefix="[" suffix="?]"/>
-              </if>
-              <else>
-                <date form="text" variable="issued"/>
-              </else>
-            </choose>
-          </else>
-        </choose>
-      </if>
-      <else-if variable="status">
-        <text variable="status"/>
-      </else-if>
-      <else-if variable="accessed URL" match="all"/>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="point-locators-join-with-colon">
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if variable="locator page" match="any">
-            <choose>
-              <if variable="volume issue" match="any">
-                <text macro="point-locators"/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="point-locators-join-with-comma">
-    <choose>
-      <if type="article-journal" match="none">
-        <text macro="point-locators"/>
-      </if>
-      <else-if variable="volume issue" match="none">
-        <text macro="point-locators"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="point-locators">
-    <choose>
-      <if variable="locator" match="none">
-        <choose>
-          <if type="article-journal chapter paper-conference" match="any">
-            <text variable="page"/>
-          </if>
-        </choose>
-      </if>
-      <else-if type="article-journal">
-        <group delimiter=" ">
-          <choose>
-            <if locator="page" match="none">
-              <label variable="locator" form="short" suffix=" "/>
-            </if>
-          </choose>
-          <text variable="locator"/>
-        </group>
-      </else-if>
-      <else-if type="legal_case"/>
-      <else>
-        <group delimiter=" ">
           <choose>
-            <if locator="page" match="none">
-              <label variable="locator" form="short"/>
+            <if type="webpage" match="any">
+              <text variable="container-title"/>
             </if>
           </choose>
-          <text variable="locator"/>
+          <text variable="publisher"/>
         </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators-chapter">
-    <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-        <choose>
-          <if variable="author container-author" match="all"/>
-          <else>
-            <choose>
-              <if variable="page">
-                <text variable="volume" suffix=":"/>
-                <text variable="page"/>
-              </if>
-            </choose>
-          </else>
-        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="locators-journal-join-with-colon">
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if variable="volume issue" match="any">
-            <text variable="page"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators-journal-join-with-comma">
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if variable="volume issue" match="none">
-            <text variable="page"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
+  <macro name="archive">
+    <group delimiter=", ">
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
   </macro>
-  <macro name="archive-note">
+  <macro name="date">
     <choose>
-      <if type="thesis">
-        <group delimiter=" ">
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </if>
-      <else>
-        <group delimiter=", ">
-          <text variable="archive_location"/>
-          <text variable="archive"/>
-          <text variable="archive-place"/>
-        </group>
-      </else>
+      <if type="article-journal article-magazine article-newspaper" match="none">
+        <date variable="issued" form="text"/>
+      </if>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="date-note">
+    <date variable="issued" form="text"/>
+  </macro>
+  <macro name="access-date">
     <choose>
-      <if type="thesis">
+      <if variable="issued" match="none">
         <group delimiter=" ">
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
+          <text term="accessed" text-case="capitalize-first"/>
+          <date variable="accessed" form="text"/>
         </group>
       </if>
-      <else>
-        <group delimiter=". ">
-          <text variable="archive_location" text-case="capitalize-first"/>
-          <text variable="archive"/>
-          <text variable="archive-place"/>
-        </group>
-      </else>
     </choose>
   </macro>
-  <macro name="issue-note-join-with-space">
+  <macro name="access-date-note">
     <choose>
-      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place event-place publisher" match="any">
-        <choose>
-          <if type="article-newspaper" match="none">
-            <choose>
-              <if type="article-journal" match="none">
-                <text macro="issue-note"/>
-              </if>
-              <else-if variable="issue volume" match="any">
-                <text macro="issue-note"/>
-              </else-if>
-            </choose>
-          </if>
-        </choose>
+      <if variable="issued" match="none">
+        <group delimiter=" ">
+          <text term="accessed"/>
+          <date variable="accessed" form="text"/>
+        </group>
       </if>
     </choose>
   </macro>
-  <macro name="issue-note-join-with-comma">
+  <macro name="URL">
     <choose>
-      <if type="article-journal bill legislation legal_case manuscript speech thesis" variable="publisher-place publisher" match="none">
-        <text macro="issue-note"/>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else-if type="article-newspaper">
-        <text macro="issue-note"/>
-      </else-if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="volume issue" match="none">
-            <text macro="issue-note"/>
-          </if>
-        </choose>
-      </else-if>
+      <else>
+        <text variable="URL"/>
+      </else>
     </choose>
   </macro>
-  <macro name="issue-map-graphic">
+  <macro name="cite-locator">
     <choose>
-      <if type="graphic map" match="any">
-        <choose>
-          <if variable="publisher publisher-place" match="none">
-            <text macro="issued"/>
-          </if>
-        </choose>
+      <if locator="page" match="any">
+        <text variable="locator"/>
       </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else>
     </choose>
   </macro>
-  <macro name="issue-note">
+  <macro name="legal-cites">
     <choose>
-      <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+      <if type="bill">
+        <group delimiter=". ">
+          <text variable="authority"/>
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text variable="number"/>
+            <text variable="chapter-number"/>
+          </group>
+          <date variable="issued" form="text"/>
+          <text variable="URL"/>
+        </group>
       </if>
-      <else-if type="speech" match="any">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
-      </else-if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="volume issue" match="any">
-            <text macro="issued"/>
-          </if>
-          <else>
-            <text macro="issued"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="article-newspaper">
-        <text macro="issued"/>
-      </else-if>
-      <else-if type="manuscript thesis speech" match="any">
-        <group delimiter=", ">
+      <else-if type="legislation">
+        <group delimiter=". ">
+          <names variable="author contributor" delimiter=". ">
+            <name and="text" name-as-sort-order="first"/>
+          </names>
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text variable="title"/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <group delimiter=", ">
+                  <text variable="container-title"/>
+                  <text variable="page" suffix=","/>
+                </group>
+                <group delimiter=" ">
+                  <label variable="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </group>
+              <text variable="number" prefix="Pub. L. No. "/>
+            </group>
+            <text variable="references" prefix="(" suffix=")"/>
+          </group>
           <choose>
-            <if variable="title" match="any"/>
+            <if variable="issued">
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <text macro="access-date"/>
+            </else>
           </choose>
-          <text variable="event"/>
-          <text variable="event-place"/>
-          <text macro="issued"/>
+          <text variable="URL"/>
         </group>
       </else-if>
-      <else-if variable="publisher-place event-place publisher" match="none">
-        <group delimiter=", ">
-          <text macro="event-note"/>
-          <group delimiter="; ">
-            <text macro="originally-published"/>
-            <group delimiter=", ">
-              <text macro="reprint-note"/>
-              <text macro="publisher"/>
+      <else-if type="legal_case">
+        <group delimiter=". ">
+          <text variable="authority"/>
+          <text variable="title"/>
+          <group delimiter=": ">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic"/>
+              <text variable="volume"/>
+              <date variable="issued" form="text" prefix="(" suffix=")"/>
             </group>
+            <text variable="page"/>
           </group>
-          <text macro="issued"/>
         </group>
       </else-if>
-      <else>
-        <text macro="issued"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issue-join-with-space">
-    <choose>
-      <if type="article-journal" match="any">
-        <choose>
-          <if variable="issue volume" match="any">
-            <text macro="issue"/>
-          </if>
-        </choose>
-      </if>
-      <else-if type="bill legislation legal_case" match="any">
-        <text macro="issue"/>
+      <else-if type="hearing">
+        <group delimiter=". ">
+          <names variable="author contributor" delimiter=". ">
+            <name and="text" name-as-sort-order="first"/>
+          </names>
+          <text variable="authority"/>
+          <text variable="section"/>
+          <text variable="title"/>
+          <group delimiter=", ">
+            <text variable="chapter-number"/>
+            <date variable="issued" form="text"/>
+          </group>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if type="regulation">
+        <group delimiter=". ">
+          <text macro="creator"/>
+          <text macro="title"/>
+          <group delimiter=": ">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="page"/>
+          </group>
+          <text macro="date"/>
+          <text variable="URL"/>
+        </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="issue-join-with-period">
-    <choose>
-      <if type="article-journal bill legislation legal_case" match="none">
-        <choose>
-          <if type="speech" variable="publisher publisher-place" match="any">
-            <text macro="issue"/>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issue-join-with-comma">
-    <choose>
-      <if type="bill legislation legal_case" match="none">
-        <choose>
-          <if type="article-journal" match="none">
-            <choose>
-              <if type="speech" variable="publisher publisher-place" match="none">
-                <text macro="issue"/>
-              </if>
-            </choose>
-          </if>
-          <else-if variable="volume issue" match="none">
-            <text macro="issue"/>
-          </else-if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issue">
+  <macro name="legal-cites-note">
     <choose>
-      <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+      <if type="bill">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text variable="number"/>
+            <text variable="chapter-number"/>
+          </group>
+          <date variable="issued" form="text" prefix="(" suffix=")"/>
+        </group>
+        <text macro="cite-locator" prefix=", "/>
       </if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="issue volume" match="any">
-            <text macro="issued" prefix="(" suffix=")"/>
-          </if>
-          <else>
-            <text macro="issued"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="speech" match="all" variable="event event-place">
+      <else-if type="legislation">
         <group delimiter=", ">
           <group delimiter=" ">
-            <choose>
-              <if match="none" variable="title"/>
-              <else>
-                <text variable="genre"/>
-              </else>
-            </choose>
-            <text macro="event"/>
+            <group delimiter=", ">
+              <text variable="title-short"/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <choose>
+                  <if locator="section">
+                    <group delimiter=" ">
+                      <label variable="locator" form="symbol"/>
+                      <text variable="locator"/>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=" ">
+                      <label variable="section" form="symbol"/>
+                      <text variable="section"/>
+                    </group>
+                  </else>
+                </choose>
+              </group>
+              <text variable="number" prefix="Pub. L. No. "/>
+            </group>
+            <text variable="references" prefix="(" suffix=")"/>
+            <date variable="issued" form="text" prefix="(" suffix=")"/>
           </group>
-          <text variable="event-place" quotes="true"/>
-          <text macro="issued"/>
+          <choose>
+            <if locator="section" match="none">
+              <text macro="cite-locator"/>
+            </if>
+          </choose>
         </group>
       </else-if>
-      <else-if type="speech">
-        <group delimiter=", ">
+      <else-if type="legal_case">
+        <group delimiter=". ">
+          <text variable="title" form="short"/>
           <group delimiter=" ">
-            <choose>
-              <if variable="title" match="none"/>
-              <else>
-                <text variable="genre" text-case="capitalize-first"/>
-              </else>
-            </choose>
-            <text macro="event"/>
+            <text variable="volume"/>
+            <text variable="container-title" form="short"/>
+            <group delimiter=", ">
+              <text variable="page-first"/>
+              <text variable="locator"/>
+            </group>
+            <date variable="issued" form="text" prefix="(" suffix=")"/>
           </group>
-          <text variable="event-place" quotes="false"/>
-          <text macro="issued"/>
         </group>
       </else-if>
-      <else-if type="article-newspaper">
-        <text macro="issued"/>
-      </else-if>
-      <else-if variable="publisher-place publisher" match="any">
+      <else-if type="hearing">
         <group delimiter=", ">
           <choose>
-            <if type="thesis">
-              <text variable="genre" text-case="capitalize-first"/>
+            <if variable="citation-label" match="any">
+              <text variable="citation-label"/>
             </if>
+            <else>
+              <names variable="author">
+                <name and="text" form="short" name-as-sort-order="first"/>
+                <substitute>
+                  <names variable="contributor"/>
+                </substitute>
+              </names>
+              <text variable="authority"/>
+            </else>
           </choose>
-          <group delimiter=". ">
-            <text macro="originally-published"/>
-            <group delimiter=", ">
-              <text macro="reprint"/>
-              <text macro="publisher"/>
-            </group>
+          <text variable="section"/>
+          <text variable="title" form="short"/>
+          <group delimiter=", ">
+            <text variable="chapter-number"/>
+            <date variable="issued" form="text"/>
           </group>
-          <text macro="issued"/>
+          <text macro="cite-locator"/>
         </group>
       </else-if>
-      <else-if type="graphic map" match="none">
-        <text macro="issued"/>
+      <else-if type="regulation">
+        <group delimiter=", ">
+          <text variable="title" form="short"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title" font-style="italic" form="short"/>
+            <text variable="page-first"/>
+            <text macro="date" prefix="(" suffix=")"/>
+          </group>
+          <text macro="cite-locator"/>
+        </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="access-note">
-    <group delimiter=" ">
-      <choose>
-        <if type="graphic report" match="any">
-          <text macro="archive-note"/>
-        </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-          <text macro="archive-note"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if variable="issued" match="none" type="legislation">
-          <group font-variant="normal" delimiter=" ">
-            <text term="accessed" text-case="lowercase"/>
-            <date variable="accessed" form="text"/>
-          </group>
-        </if>
-        <else-if type="motion_picture" match="all" is-uncertain-date="accessed">
-          <date form="text" date-parts="year-month-day" variable="issued"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if type="legislation" match="any">
-          <text variable="URL"/>
-          <group prefix="(" suffix=")">
-            <text term="accessed" form="short" text-case="lowercase"/>
-            <date form="text" variable="accessed" prefix=" "/>
-          </group>
-        </if>
-        <else-if type="legal_case" match="none"/>
-      </choose>
-    </group>
-  </macro>
-  <macro name="access">
-    <group delimiter=" ">
-      <choose>
-        <if type="graphic report" match="any">
-          <text macro="archive"/>
-        </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-          <text macro="archive"/>
-        </else-if>
-      </choose>
-      <choose>
-        <if variable="issued" match="none" type="legislation motion_picture">
-          <group delimiter=" " suffix=".">
-            <text term="accessed" text-case="title"/>
-            <date form="text" variable="accessed"/>
-          </group>
-        </if>
-      </choose>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <choose>
-        <if type="legal_case legislation" match="none">
-          <choose>
-            <if variable="DOI">
-              <text variable="DOI" prefix="https://doi.org/"/>
-            </if>
-            <else>
-              <text variable="URL"/>
-            </else>
-          </choose>
+        <if type="bill legal_case hearing legislation regulation" match="any">
+          <text macro="legal-cites-note"/>
         </if>
-        <else-if type="legislation" match="any">
-          <text variable="URL"/>
-          <choose>
-            <if match="any" variable="accessed">
-              <group delimiter=" " prefix="(" suffix=")">
-                <text term="accessed" text-case="lowercase"/>
-                <date form="text" variable="accessed"/>
-              </group>
-            </if>
-          </choose>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="editor-note">
-    <names variable="editor">
-      <name form="short" and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
-    </names>
-  </macro>
-  <macro name="collection-title-note">
-    <choose>
-      <if type="article-journal report book" match="any"/>
-      <else>
-        <choose>
-          <if match="none" is-numeric="collection-number">
-            <group delimiter=", ">
-              <text variable="collection-title"/>
-              <text variable="collection-number"/>
-            </group>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="collection-title"/>
-              <text variable="collection-number"/>
-            </group>
-          </else>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout suffix="." delimiter="; ">
-      <group delimiter=", ">
-        <group delimiter=", ">
+        <else>
           <group delimiter=", ">
-            <group delimiter=", ">
-              <group delimiter=", ">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group delimiter=", ">
-                      <text macro="contributors-note"/>
-                      <text macro="title-note"/>
-                      <text macro="issue-map-graphic"/>
-                    </group>
-                    <text macro="description-note"/>
-                    <text macro="secondary-contributors-note"/>
-                    <text macro="container-title-note"/>
-                    <text macro="container-contributors-note"/>
-                  </group>
-                  <text macro="locators-note-join-with-space"/>
-                </group>
-                <text macro="locators-note-join-with-comma"/>
-                <text macro="collection-title-note"/>
-                <text macro="issue-note-join-with-comma"/>
-              </group>
-              <text macro="issue-note-join-with-space"/>
-            </group>
-            <text macro="locators-newspaper"/>
-            <text macro="point-locators-join-with-comma"/>
+            <text macro="creator-note"/>
+            <text macro="title-short"/>
+            <text macro="volume-book"/>
+            <text macro="edition-book"/>
+            <text macro="letter-note"/>
+            <text macro="medium-other"/>
+            <text variable="archive_collection"/>
+            <text macro="date-note"/>
+            <text macro="access-date-note"/>
+            <text macro="cite-locator"/>
           </group>
-          <text macro="point-locators-join-with-colon"/>
-        </group>
-        <text macro="access-note"/>
-      </group>
+        </else>
+      </choose>
     </layout>
   </citation>
   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" entry-spacing="0">
     <sort>
-      <key macro="contributors-sort"/>
-      <key variable="title"/>
-      <key variable="genre"/>
+      <key macro="creator"/>
       <key variable="issued"/>
+      <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <group delimiter=". ">
-        <group delimiter=": ">
-          <group delimiter=", ">
-            <group delimiter=" ">
-              <group delimiter=". ">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <group delimiter=". ">
-                      <group delimiter=". ">
-                        <text macro="contributors"/>
-                        <text macro="title"/>
-                        <text macro="issue-map-graphic"/>
-                      </group>
-                      <text macro="description"/>
-                      <text macro="secondary-contributors"/>
-                      <group delimiter=", ">
-                        <text macro="container-title"/>
-                        <text macro="container-contributors"/>
-                        <text macro="locators-chapter"/>
-                      </group>
-                      <text macro="locators-join-with-period"/>
-                    </group>
-                    <text macro="locators-join-with-comma"/>
-                  </group>
-                  <text macro="locators-join-with-space"/>
+      <choose>
+        <if type="bill legal_case hearing legislation regulation" match="any">
+          <text macro="legal-cites"/>
+        </if>
+        <else>
+          <group delimiter=". ">
+            <text macro="creator"/>
+            <text macro="identifier"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="volume-book"/>
+              <text macro="edition-book"/>
+            </group>
+            <text macro="other-secondary-creators"/>
+            <text macro="broadcast-container"/>
+            <text macro="book-series"/>
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <group delimiter=", ">
+                  <text macro="container-title"/>
+                  <text macro="edition-other"/>
+                  <text macro="part-creators"/>
                 </group>
-                <text macro="collection-title"/>
-                <text macro="issue-join-with-period"/>
+                <text macro="journal-info"/>
               </group>
-              <text macro="issue-join-with-space"/>
+              <text macro="magazine-date"/>
+              <text macro="chapter-secondary-creators"/>
+              <text macro="pages-chapter"/>
+            </group>
+            <text macro="report-details"/>
+            <text macro="medium-other"/>
+            <group delimiter=", ">
+              <text macro="letter"/>
+              <text macro="event"/>
+              <text macro="web-genre"/>
+              <text macro="publisher"/>
+              <text macro="document-container"/>
+              <text variable="archive_collection"/>
+              <text macro="date"/>
             </group>
-            <text macro="issue-join-with-comma"/>
-            <text macro="locators-journal-join-with-comma"/>
-            <text macro="locators-newspaper"/>
+            <text macro="medium-book"/>
+            <text macro="archive"/>
+            <text macro="access-date"/>
+            <text macro="URL"/>
           </group>
-          <text macro="locators-journal-join-with-colon"/>
-        </group>
-        <text macro="access"/>
-      </group>
+        </else>
+      </choose>
     </layout>
   </bibliography>
 </style>