csl-styles 2.0.2 → 2.1.0

data/vendor/styles/oscola-journal-abbreviations.csl

@@ -1,14 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" default-locale="en-GB">
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" delimiter-precedes-last="never" demote-non-dropping-particle="never" et-al-min="4" et-al-use-first="1" initialize-with="" name-delimiter=", " version="1.0" default-locale="en-GB">
+  <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
-    <title>OSCOLA (Oxford University Standard for Citation of Legal Authorities, with journal abbreviations)</title>
-    <title-short>OSCOLA (with journal abbreviations)</title-short>
+    <title>OSCOLA 4th edition (journal abbreviations)</title>
+    <title-short>Oxford University Standard for Citation of Legal Authorities</title-short>
     <id>http://www.zotero.org/styles/oscola-journal-abbreviations</id>
     <link href="http://www.zotero.org/styles/oscola-journal-abbreviations" rel="self"/>
     <link href="http://www.zotero.org/styles/oscola" rel="template"/>
-    <link href="http://www.law.ox.ac.uk/publications/oscola.php" rel="documentation"/>
+    <link href="https://www.law.ox.ac.uk/oscola" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
+      <uri>https://orcid.org/0000-0001-8249-7388</uri>
+    </author>
+    <author>
+      <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </author>
     <contributor>
       <name>Aaron Timoshanko</name>
@@ -18,32 +24,74 @@
     </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <summary>The OSCOLA Standards, with journal abbreviations. For a Zotero Group showing data-entry in Zotero see: https://www.zotero.org/groups/oscola_samples/items/order/itemType</summary>
-    <updated>2025-02-23T10:56:32+00:00</updated>
+    <summary>Oxford University Standard for Citation of Legal Authorities, notes system, with journal abbreviations. For a Zotero group showing data entry: https://zotero.org/groups/2205533/collections/AC7ETLN4</summary>
+    <updated>2026-02-07T00:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
     <terms>
-      <term name="chapter" form="short">
-        <single>ch.</single>
-        <multiple>chs.</multiple>
+      <term name="et-al">and others</term>
+      <term form="short" name="first-reference-note-number">
+        <single>n.</single>
+        <multiple>nn.</multiple>
       </term>
-      <term name="section" form="short">
+      <term form="short" name="section">
         <single>s</single>
         <multiple>ss</multiple>
       </term>
-      <term name="paragraph" form="short">
-        <single>para</single>
-        <multiple>paras</multiple>
-      </term>
-      <term name="translator" form="short">
+      <term form="short" name="translator">
         <single>tr.</single>
         <multiple>trs.</multiple>
       </term>
-      <term name="edition" form="short">edn.</term>
-      <term name="et-al">and others</term>
     </terms>
   </locale>
+  <!-- Variable labels -->
+  <macro name="label-edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number form="ordinal" variable="edition"/>
+          <label form="short" strip-periods="true" variable="edition"/>
+        </if>
+        <else>
+          <text variable="edition"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="label-first-reference-note-number">
+    <group delimiter=" ">
+      <label form="short" strip-periods="true" variable="first-reference-note-number"/>
+      <text variable="first-reference-note-number"/>
+    </group>
+  </macro>
+  <macro name="label-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page"/>
+        <else>
+          <label form="short" strip-periods="true" variable="locator"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="label-locator-all">
+    <group delimiter=" ">
+      <label form="short" strip-periods="true" variable="locator"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="label-volume">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="volume">
+          <label form="short" strip-periods="true" variable="volume"/>
+        </if>
+      </choose>
+      <text variable="volume"/>
+    </group>
+  </macro>
   <!--Authors and Persons-->
   <macro name="author-note">
     <!--for bills & hearing this should start with jurisdiction once available-->
@@ -51,34 +99,38 @@
       <if type="interview">
         <group delimiter=", ">
           <names variable="interviewer">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-          </names>
-          <names variable="author" prefix="Interview with ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+            <name initialize="false"/>
           </names>
+          <group delimiter=" ">
+            <text term="interview" text-case="capitalize-first"/>
+            <text form="verb" term="contributor"/>
+            <names variable="author">
+              <name initialize="false"/>
+            </names>
+          </group>
         </group>
       </if>
       <else-if type="personal_communication">
         <group delimiter=" ">
-          <group delimiter=" from ">
-            <text variable="genre"/>
-            <names variable="author">
-              <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-            </names>
-          </group>
-          <names variable="recipient" prefix="to ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+          <text variable="genre"/>
+          <text term="from"/>
+          <names variable="author">
+            <name initialize="false"/>
+          </names>
+          <names variable="recipient">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
           </names>
         </group>
       </else-if>
       <else-if type="broadcast">
         <text variable="publisher"/>
       </else-if>
-      <else-if type="legal_case legislation" match="any"/>
+      <else-if match="any" type="legal_case legislation"/>
       <else>
         <names variable="author">
-          <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+          <name initialize="false"/>
+          <label form="short" prefix=" (" strip-periods="true" suffix=")"/>
           <substitute>
             <names variable="editor"/>
             <names variable="translator"/>
@@ -93,23 +145,29 @@
       <if type="interview">
         <group delimiter=", ">
           <names variable="interviewer">
-            <name delimiter-precedes-last="never" and="text" form="short" delimiter=", " initialize="false" initialize-with=""/>
-          </names>
-          <names variable="author" prefix="Interview with ">
-            <name delimiter-precedes-last="never" and="text" form="short" delimiter=", " initialize="false" initialize-with=""/>
+            <name form="short"/>
           </names>
+          <group delimiter=" ">
+            <text term="interview" text-case="capitalize-first"/>
+            <text form="verb" term="contributor"/>
+            <names variable="author">
+              <name form="short"/>
+            </names>
+          </group>
         </group>
       </if>
       <else-if type="personal_communication">
         <group delimiter=" ">
-          <group delimiter=" from ">
+          <group delimiter=" ">
             <text variable="genre"/>
+            <text term="from"/>
             <names variable="author">
-              <name delimiter-precedes-last="never" and="text" delimiter=", " form="short" initialize="false" initialize-with=""/>
+              <name form="short"/>
             </names>
           </group>
-          <names variable="recipient" prefix="to ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" form="short" initialize-with=""/>
+          <names variable="recipient">
+            <label form="verb" suffix=" "/>
+            <name form="short"/>
           </names>
         </group>
       </else-if>
@@ -118,7 +176,7 @@
       </else-if>
       <else>
         <names variable="author">
-          <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with="" form="short"/>
+          <name form="short"/>
           <substitute>
             <names variable="editor"/>
             <names variable="translator"/>
@@ -128,40 +186,45 @@
       </else>
     </choose>
   </macro>
-  <macro name="author">
+  <macro name="author-bib">
     <!--for bills & hearing this should start with jurisdiction once available-->
     <choose>
       <if type="interview">
         <group delimiter=", ">
           <names variable="interviewer">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-          </names>
-          <names variable="author" prefix="Interview with ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+            <name name-as-sort-order="all" sort-separator=" "/>
           </names>
+          <group delimiter=" ">
+            <text term="interview" text-case="capitalize-first"/>
+            <text form="verb" term="contributor"/>
+            <names variable="author">
+              <name initialize="false"/>
+            </names>
+          </group>
         </group>
       </if>
       <else-if type="personal_communication">
         <group delimiter=" ">
           <group delimiter=", ">
             <names variable="author">
-              <name delimiter-precedes-last="never" and="text" delimiter=", " initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+              <name name-as-sort-order="all" sort-separator=" "/>
             </names>
             <text variable="genre"/>
           </group>
-          <names variable="recipient" prefix="to ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+          <names variable="recipient">
+            <label form="verb" suffix=" "/>
+            <name initialize="false"/>
           </names>
         </group>
       </else-if>
       <else-if type="broadcast">
         <text variable="publisher"/>
       </else-if>
-      <else-if type="legal_case legislation" match="any"/>
+      <else-if match="any" type="legal_case legislation"/>
       <else>
         <names variable="author">
-          <name delimiter-precedes-last="never" and="text" delimiter=", " name-as-sort-order="all" initialize-with="" sort-separator=" "/>
-          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+          <name name-as-sort-order="all" sort-separator=" "/>
+          <label form="short" prefix=" (" strip-periods="true" suffix=")"/>
           <substitute>
             <names variable="editor"/>
             <names variable="translator"/>
@@ -173,243 +236,202 @@
   </macro>
   <macro name="editor">
     <choose>
-      <if type="chapter paper-conference entry-encyclopedia" match="none">
-        <names variable="editor translator container-author" delimiter=", ">
-          <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+      <if match="none" type="chapter entry-encyclopedia paper-conference">
+        <names delimiter=", " variable="container-author editor translator">
+          <name initialize="false"/>
           <label form="short" prefix=" " strip-periods="true"/>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="editor-chapter">
-    <group>
-      <text term="in" suffix=" "/>
-      <names variable="editor translator container-author" delimiter=", ">
-        <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-        <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+    <group delimiter=" ">
+      <text term="in"/>
+      <names delimiter=", " variable="container-author editor translator">
+        <name initialize="false"/>
+        <label form="short" prefix=" (" strip-periods="true" suffix=")"/>
       </names>
     </group>
   </macro>
   <!-- Titles -->
   <macro name="title">
     <choose>
-      <if type="book motion_picture treaty" match="any">
-        <text variable="title" font-style="italic" text-case="title"/>
+      <if match="any" type="book motion_picture treaty">
+        <text font-style="italic" text-case="title" variable="title"/>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if match="any" type="bill legislation">
         <text variable="title"/>
       </else-if>
       <else-if type="legal_case">
-        <text variable="title" font-style="italic" strip-periods="true"/>
+        <text font-style="italic" strip-periods="true" variable="title"/>
       </else-if>
       <else>
-        <text variable="title" quotes="true" text-case="title"/>
+        <text quotes="true" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
   <macro name="title-short">
     <choose>
-      <if type="book motion_picture treaty" match="any">
-        <text variable="title" font-style="italic" text-case="title" form="short"/>
+      <if match="any" type="book motion_picture treaty">
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
       </if>
-      <else-if type="bill legislation" match="any">
-        <text variable="title" form="short"/>
+      <else-if match="any" type="bill legislation">
+        <text form="short" variable="title"/>
       </else-if>
       <else-if type="legal_case">
-        <choose>
-          <if variable="title-short">
-            <text variable="title-short" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" font-style="italic"/>
-          </else>
-        </choose>
+        <text font-style="italic" form="short" variable="title"/>
       </else-if>
       <else>
-        <text variable="title" quotes="true" text-case="title" form="short"/>
+        <text form="short" quotes="true" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
   <!--Dates-->
   <macro name="issued-year">
-    <date variable="issued" form="text" date-parts="year"/>
+    <date date-parts="year" form="numeric" variable="issued"/>
   </macro>
   <macro name="issued-full">
-    <date variable="issued" form="text"/>
+    <date form="text" variable="issued"/>
   </macro>
   <macro name="date-parenthesis">
     <choose>
-      <if type="legal_case article-journal article-magazine" match="any">
-        <choose>
-          <if variable="number authority" match="all">
-            <text macro="issued-year" prefix="[" suffix="]"/>
-          </if>
-          <else-if variable="volume">
-            <text macro="issued-year" prefix="(" suffix=")"/>
-          </else-if>
-          <else-if variable="container-title volume number" match="any">
-            <!--no year in square brackets for unreported case w/o medium neutral citation-->
-            <text macro="issued-year" prefix="[" suffix="]"/>
-          </else-if>
-        </choose>
-      </if>
-      <else-if type="legislation bill" match="any">
+      <if match="any" type="bill legislation">
         <text macro="issued-year"/>
+      </if>
+      <else-if match="none" type="article-journal article-magazine legal_case"/>
+      <else-if variable="authority number">
+        <text macro="issued-year" prefix="[" suffix="]"/>
+      </else-if>
+      <else-if variable="volume">
+        <text macro="issued-year" prefix="(" suffix=")"/>
+      </else-if>
+      <else-if match="any" variable="container-title number volume">
+        <!--no year in square brackets for unreported case w/o medium neutral citation-->
+        <text macro="issued-year" prefix="[" suffix="]"/>
       </else-if>
     </choose>
   </macro>
   <!--publication info -->
   <macro name="publisher">
-    <choose>
-      <if type="book chapter broadcast personal_communication manuscript paper-conference article-newspaper report legislation motion_picture speech interview thesis entry-encyclopedia webpage post-weblog article" match="any">
-        <group delimiter=" ">
-          <group prefix="(" suffix=")" delimiter=", ">
+    <group delimiter=" ">
+      <group delimiter=", " prefix="(" suffix=")">
+        <choose>
+          <if type="article-newspaper">
+            <text strip-periods="true" variable="publisher-place"/>
+            <date form="text" variable="issued"/>
+          </if>
+          <else-if match="any" type="broadcast personal_communication treaty">
+            <date form="text" variable="issued"/>
+          </else-if>
+          <else-if match="any" type="bill legislation">
+            <!--this should be jurisdiction we use code instead-->
+            <text strip-periods="true" variable="container-title"/>
+          </else-if>
+          <else-if match="any" type="article book chapter entry-encyclopedia interview manuscript motion_picture paper-conference post-weblog report speech thesis webpage">
+            <names variable="director">
+              <label form="verb" suffix=" " text-case="capitalize-first"/>
+              <name initialize="false"/>
+            </names>
+            <text macro="editor"/>
+            <choose>
+              <!--if none of these, this we don't want edition either. Might be Loose-Leaf-->
+              <if match="any" variable="container-title genre issued publisher">
+                <text macro="label-edition"/>
+              </if>
+            </choose>
             <choose>
-              <if type="article-newspaper">
-                <text variable="publisher-place" strip-periods="true"/>
-                <date variable="issued" form="text"/>
+              <if type="speech">
+                <text variable="event"/>
+                <text variable="event-place"/>
+                <text macro="issued-full"/>
               </if>
-              <else-if type="broadcast personal_communication treaty" match="any">
-                <date variable="issued" form="text"/>
+              <else-if type="thesis">
+                <text strip-periods="true" variable="genre"/>
+                <group delimiter=" ">
+                  <text strip-periods="true" variable="publisher"/>
+                  <text macro="issued-year"/>
+                </group>
               </else-if>
-              <else-if type="legislation bill" match="any">
-                <!--this should be jurisdiction we use code instead-->
-                <text variable="container-title" strip-periods="true"/>
+              <else-if match="any" type="post-weblog webpage">
+                <text font-style="italic" variable="container-title"/>
+                <text macro="issued-full"/>
+              </else-if>
+              <else-if type="interview">
+                <text macro="issued-full"/>
+              </else-if>
+              <else-if type="article">
+                <text strip-periods="true" variable="publisher"/>
+                <text macro="issued-full"/>
               </else-if>
               <else>
-                <names variable="director">
-                  <!--this won't work in Zotero yet, but does no harm -->
-                  <label form="verb" text-case="capitalize-first" suffix=" "/>
-                  <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-                </names>
-                <text macro="editor"/>
-                <choose>
-                  <!--if none of these, this we don't want edition either. Might be Loose-Leaf-->
-                  <if variable="publisher issued genre container-title" match="any">
-                    <text macro="edition"/>
-                  </if>
-                </choose>
-                <choose>
-                  <if type="speech">
-                    <text variable="event"/>
-                    <text variable="event-place"/>
-                    <text macro="issued-full"/>
-                  </if>
-                  <else-if type="thesis" match="any">
-                    <text variable="genre" strip-periods="true"/>
-                    <group delimiter=" ">
-                      <text variable="publisher" strip-periods="true"/>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else-if>
-                  <else-if type="webpage post-weblog" match="any">
-                    <text variable="container-title" font-style="italic"/>
-                    <text macro="issued-full"/>
-                  </else-if>
-                  <else-if type="interview" match="any">
-                    <text macro="issued-full"/>
-                  </else-if>
-                  <else-if type="article" match="any">
-                    <text variable="publisher" strip-periods="true"/>
-                    <text macro="issued-full"/>
-                  </else-if>
-                  <else>
-                    <group delimiter=" ">
-                      <text variable="publisher" strip-periods="true"/>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else>
-                </choose>
-              </else>
-            </choose>
-          </group>
-          <choose>
-            <if type="report interview manuscript" match="any">
-              <group delimiter=" ">
-                <text variable="genre" strip-periods="true"/>
-                <text variable="number"/>
-              </group>
-            </if>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="looseleaf-note">
-    <choose>
-      <if type="book">
-        <choose>
-          <if variable="publisher issued" match="none">
-            <choose>
-              <if variable="locator">
                 <group delimiter=" ">
-                  <label variable="locator" form="short" strip-periods="true"/>
-                  <text variable="locator"/>
-                  <text variable="edition" prefix="(" suffix=")"/>
+                  <text strip-periods="true" variable="publisher"/>
+                  <text macro="issued-year"/>
                 </group>
-              </if>
+              </else>
             </choose>
-          </if>
+          </else-if>
         </choose>
-      </if>
-    </choose>
+      </group>
+      <choose>
+        <if match="any" type="interview manuscript report">
+          <text strip-periods="true" variable="genre"/>
+          <text variable="number"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="volume-book">
+  <macro name="looseleaf-note">
     <choose>
-      <if type="book chapter report" match="any">
+      <if match="any" variable="issued publisher"/>
+      <else-if type="book" variable="locator">
         <group delimiter=" ">
-          <label variable="volume" form="short" strip-periods="true"/>
-          <text variable="volume"/>
+          <text macro="label-locator-all"/>
+          <text prefix="(" suffix=")" variable="edition"/>
         </group>
-      </if>
+      </else-if>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="volume-book">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <label variable="edition" form="short" strip-periods="true"/>
-        </group>
+      <if match="any" type="book chapter report">
+        <text macro="label-volume"/>
       </if>
-      <else>
-        <text variable="edition" strip-periods="true"/>
-      </else>
     </choose>
   </macro>
   <macro name="book-container">
     <choose>
-      <if type="chapter paper-conference entry-encyclopedia" match="any">
-        <group>
-          <text macro="editor-chapter" prefix=" "/>
-          <text variable="container-title" font-style="italic" prefix=", "/>
+      <if match="any" type="chapter entry-encyclopedia paper-conference">
+        <group delimiter=", ">
+          <text macro="editor-chapter"/>
+          <text font-style="italic" variable="container-title"/>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="broadcast-container">
     <choose>
-      <if type="broadcast" match="any">
-        <text variable="container-title" font-style="italic"/>
+      <if type="broadcast">
+        <text font-style="italic" variable="container-title"/>
       </if>
     </choose>
   </macro>
   <macro name="bill-number">
     <choose>
       <if type="bill">
-        <text variable="number" prefix="[" suffix="]"/>
+        <text prefix="[" suffix="]" variable="number"/>
       </if>
     </choose>
   </macro>
   <macro name="article-case-info">
     <choose>
-      <if type="article-journal article-magazine article-newspaper legal_case" match="any">
+      <if match="any" type="article-journal article-magazine article-newspaper legal_case">
         <group delimiter=", ">
           <!--Assume that only cases with a Medium Neutral Citation have a docket number -->
           <choose>
-            <if variable="authority number" match="all">
+            <if variable="authority number">
               <group delimiter=" ">
-                <text variable="authority" form="short" strip-periods="true"/>
+                <text form="short" strip-periods="true" variable="authority"/>
                 <text variable="number"/>
               </group>
             </if>
@@ -417,25 +439,21 @@
           <group delimiter=" ">
             <text variable="volume"/>
             <choose>
-              <if type="legal_case">
-                <choose>
-                  <if variable="container-title">
-                    <text variable="container-title" form="short" strip-periods="true"/>
-                  </if>
-                </choose>
+              <if type="legal_case" variable="container-title">
+                <text form="short" strip-periods="true" variable="container-title"/>
               </if>
-              <else-if type="article-journal" match="any">
+              <else-if type="article-journal">
                 <choose>
-                  <if match="any" variable="container-title-short">
-                    <text variable="container-title-short" form="short" strip-periods="true"/>
+                  <if variable="container-title-short">
+                    <text form="short" strip-periods="true" variable="container-title-short"/>
                   </if>
                   <else>
-                    <text variable="container-title" strip-periods="true"/>
+                    <text strip-periods="true" variable="container-title"/>
                   </else>
                 </choose>
               </else-if>
-              <else-if type="article-magazine article-newspaper" match="any">
-                <text variable="container-title" font-style="italic"/>
+              <else-if match="any" type="article-magazine article-newspaper">
+                <text font-style="italic" variable="container-title"/>
               </else-if>
               <else>
                 <text variable="container-title"/>
@@ -448,90 +466,66 @@
   </macro>
   <macro name="page-first">
     <choose>
-      <if type="chapter report paper-conference" match="none">
+      <if match="none" type="chapter report paper-conference">
         <text variable="page-first"/>
       </if>
     </choose>
   </macro>
   <macro name="court">
     <choose>
-      <if type="legal_case">
-        <choose>
-          <if variable="number" match="none">
-            <text variable="authority" prefix="(" suffix=")" strip-periods="true"/>
-          </if>
-        </choose>
-      </if>
+      <if variable="number"/>
+      <else-if type="legal_case">
+        <text prefix="(" strip-periods="true" suffix=")" variable="authority"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="locator-basic">
     <choose>
-      <if type="legal_case">
-        <choose>
-          <if locator="paragraph">
-            <text variable="locator" prefix="[" suffix="]"/>
-          </if>
-          <else-if variable="number container-title volume page" match="all"/>
-          <else-if variable="authority">
-            <text variable="locator"/>
-          </else-if>
-        </choose>
+      <if locator="paragraph" type="legal_case">
+        <text prefix="[" suffix="]" variable="locator"/>
       </if>
+      <else-if type="legal_case" variable="container-title number page volume"/>
+      <else-if type="legal_case" variable="authority">
+        <text variable="locator"/>
+      </else-if>
       <else>
-        <group delimiter=" ">
-          <choose>
-            <if locator="page" match="none">
-              <label variable="locator" form="short" strip-periods="true"/>
-            </if>
-          </choose>
-          <text variable="locator"/>
-        </group>
+        <text macro="label-locator"/>
       </else>
     </choose>
   </macro>
   <macro name="locator-space">
     <choose>
-      <if type="legal_case">
-        <choose>
-          <if locator="paragraph">
-            <text variable="locator" prefix="[" suffix="]"/>
-          </if>
-          <else-if variable="number container-title volume page" match="all"/>
-          <else-if variable="authority">
-            <text variable="locator"/>
-          </else-if>
-        </choose>
+      <if locator="paragraph" type="legal_case">
+        <text prefix="[" suffix="]" variable="locator"/>
       </if>
-      <else-if type="legislation book article-journal article-magazine" match="none">
-        <text macro="locator-basic"/>
+      <else-if type="legal_case" variable="container-title number page volume"/>
+      <else-if type="legal_case" variable="authority">
+        <text variable="locator"/>
       </else-if>
-      <else-if type="book">
-        <choose>
-          <if variable="issued publisher" match="any">
-            <text macro="locator-basic"/>
-          </if>
-        </choose>
+      <else-if type="book" variable="issued">
+        <text macro="label-locator"/>
+      </else-if>
+      <else-if type="book" variable="publisher">
+        <text macro="label-locator"/>
       </else-if>
+      <else-if match="any" type="article-journal article-magazine book legislation"/>
+      <else>
+        <text macro="label-locator"/>
+      </else>
     </choose>
   </macro>
   <macro name="locator-comma">
     <choose>
-      <if type="legal_case">
-        <choose>
-          <if locator="paragraph" match="none">
-            <choose>
-              <if variable="authority" match="none">
-                <text variable="locator"/>
-              </if>
-              <else-if variable="number container-title volume page" match="all">
-                <text variable="locator"/>
-              </else-if>
-            </choose>
-          </if>
-        </choose>
-      </if>
-      <else-if type="legislation article-journal article-magazine" match="any">
-        <text macro="locator-basic"/>
+      <if locator="paragraph" type="legal_case"/>
+      <else-if type="legal_case" variable="container-title number page volume">
+        <text variable="locator"/>
+      </else-if>
+      <else-if type="legal_case" variable="authority"/>
+      <else-if type="legal_case">
+        <text variable="locator"/>
+      </else-if>
+      <else-if match="any" type="article-journal article-magazine legislation">
+        <text macro="label-locator"/>
       </else-if>
     </choose>
   </macro>
@@ -545,19 +539,24 @@
   </macro>
   <macro name="URL">
     <choose>
-      <if type="legal_case legislation bill" match="none">
-        <choose>
-          <if variable="URL">
-            <group delimiter=" ">
-              <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-              <group delimiter=" ">
-                <text term="accessed"/>
-                <date variable="accessed" form="text"/>
-              </group>
-            </group>
-          </if>
-        </choose>
-      </if>
+      <if match="any" type="bill legal_case legislation"/>
+      <else-if match="any" variable="DOI URL">
+        <!-- OSCOLA does not distinguish between DOIs and URLs; used here as a permalink -->
+        <group delimiter=" ">
+          <choose>
+            <if variable="DOI">
+              <text prefix="&lt;https://doi.org/" suffix="&gt;" variable="DOI"/>
+            </if>
+            <else>
+              <text prefix="&lt;" suffix="&gt;" variable="URL"/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </group>
+      </else-if>
     </choose>
   </macro>
   <macro name="author-count">
@@ -569,57 +568,42 @@
     </names>
   </macro>
   <macro name="sort-type">
-    <!--This should just sort secondary sources first. I'm leaving the rest from AGLC for simplicity-->
+    <!-- sort secondary sources first -->
     <choose>
-      <if type="book chapter paper-conference article-magazine article-newspaper article-journal manuscript report speech entry-encyclopedia" match="any">
+      <if match="any" type="bill hearing legal_case legislation regulation treaty">
         <text value="1"/>
       </if>
-      <else-if type="legal_case">
-        <text value="2"/>
-        <text variable="title"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="3"/>
-        <choose>
-          <if type="legislation">
-            <text variable="title"/>
-          </if>
-        </choose>
-      </else-if>
-      <else-if type="treaty">
-        <text value="4"/>
-      </else-if>
       <else>
-        <text value="1"/>
+        <text value="0"/>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1">
-    <layout suffix="." delimiter="; ">
+  <citation>
+    <layout delimiter="; " suffix=".">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=" ">
-            <text term="ibid" strip-periods="true" text-case="lowercase"/>
+            <text strip-periods="true" term="ibid" text-case="lowercase"/>
             <text variable="locator"/>
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" strip-periods="true" text-case="lowercase"/>
+          <text strip-periods="true" term="ibid" text-case="lowercase"/>
         </else-if>
         <else-if position="subsequent">
           <choose>
-            <if type="legal_case bill legislation treaty" match="any">
+            <if match="any" type="bill hearing legal_case legislation regulation treaty">
               <!--don't use short form and above note for legal citations -->
               <group delimiter=" ">
                 <text macro="author-note"/>
                 <text macro="title-short"/>
                 <text macro="looseleaf-note"/>
                 <choose>
-                  <if type="legislation" match="none">
-                    <text variable="first-reference-note-number" prefix="(n " suffix=")"/>
+                  <if match="none" type="legislation">
+                    <text macro="label-first-reference-note-number" prefix="(" suffix=")"/>
                   </if>
                 </choose>
-                <text macro="locator-basic"/>
+                <text macro="label-locator"/>
               </group>
             </if>
             <else>
@@ -633,7 +617,7 @@
                     </if>
                   </choose>
                 </group>
-                <text variable="first-reference-note-number" prefix="(n " suffix=")"/>
+                <text macro="label-first-reference-note-number" prefix="(" suffix=")"/>
                 <text macro="locator-basic"/>
               </group>
             </else>
@@ -645,7 +629,7 @@
               <group delimiter=" ">
                 <group delimiter=", ">
                   <text macro="author-note"/>
-                  <group>
+                  <group delimiter=" ">
                     <text macro="title"/>
                     <text macro="book-container"/>
                   </group>
@@ -676,12 +660,12 @@
       </choose>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;">
+  <bibliography subsequent-author-substitute="&#8212;&#8212;">
     <sort>
       <key macro="sort-type"/>
-      <key macro="author" names-min="1" names-use-first="1"/>
+      <key macro="author-bib" names-min="1" names-use-first="1"/>
       <key macro="author-count" names-min="2" names-use-first="2"/>
-      <key macro="author"/>
+      <key macro="author-bib"/>
       <key variable="issued"/>
       <key variable="title"/>
     </sort>
@@ -690,8 +674,8 @@
         <group delimiter=", ">
           <group delimiter=" ">
             <group delimiter=", ">
-              <text macro="author"/>
-              <group>
+              <text macro="author-bib"/>
+              <group delimiter=" ">
                 <text macro="title"/>
                 <text macro="book-container"/>
               </group>