csl-styles 1.0.1.9 → 1.0.1.10

data/vendor/styles/australian-guide-to-legal-citation.csl

@@ -1,43 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
-    <title>Australian Guide to Legal Citation</title>
+    <title>Australian Guide to Legal Citation 4th edition</title>
     <title-short>AGLC</title-short>
     <id>http://www.zotero.org/styles/australian-guide-to-legal-citation</id>
     <link href="http://www.zotero.org/styles/australian-guide-to-legal-citation" rel="self"/>
-    <link href="https://forums.zotero.org/discussion/4841/new-australian-legal-citation-style/?Focus=20831#Comment_20831" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/australian-guide-to-legal-citation-3rd-edition" rel="template"/>
+    <link href="https://law.unimelb.edu.au/mulr/aglc/about" rel="documentation"/>
+    <link href="https://www.zotero.org/groups/684844/aglc_samples/items" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
-    <author>
-      <name>Anton Hughes</name>
-      <email>antonh@lawtec.net</email>
-    </author>
-    <author>
-      <name>Bruce D'Arcus</name>
-      <email>bdarcus@gmail.com</email>
-    </author>
-    <author>
-      <name>Nancy Sims</name>
-      <email>nsims@umich.edu</email>
-    </author>
-    <author>
-      <name>Nic Suzor</name>
-      <email>nic@suzor.com</email>
-    </author>
-    <contributor>
-      <name>Tim Baxter</name>
-      <email>tbaxter1@unimelb.edu.au</email>
-    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <summary>A modification of the Bluebook legal citation style for Australian conditions.</summary>
-    <updated>2018-09-03T17:14:48+00:00</updated>
+    <summary>Support for the development of the CSL style was provided by the Faculty of Law, University of Technology Sydney. The AGLC is published by the University of Melbourne Faculty of Law.</summary>
+    <updated>2019-07-08T04:39:57+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="et-al">et al</term>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="translator" form="verb-short">tr.</term>
+      <term name="editortranslator" form="verb-short">ed. and tr.</term>
     </terms>
   </locale>
   <!--Authors and Persons-->
@@ -45,32 +30,21 @@
     <!--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="false" initialize-with=""/>
-          </names>
-          <names variable="author" prefix="Interview with ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-          </names>
-        </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 ">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text value="Interview"/>
+            </else>
+          </choose>
+          <names variable="author" prefix="with ">
             <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
           </names>
         </group>
-      </else-if>
-      <else-if type="broadcast">
-        <text variable="publisher"/>
-      </else-if>
-      <else-if type="legal_case legislation" match="any"/>
+      </if>
+      <else-if type="legal_case legislation patent personal_communication" match="any"/>
       <else>
         <names variable="author">
           <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
@@ -87,19 +61,31 @@
   <macro name="author-short">
     <choose>
       <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=""/>
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text value="Interview"/>
+            </else>
+          </choose>
+          <names variable="author" prefix="with ">
+            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
           </names>
         </group>
       </if>
       <else-if type="personal_communication">
         <group delimiter=" ">
           <group delimiter=" from ">
-            <text variable="genre"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text value="Letter"/>
+              </else>
+            </choose>
             <names variable="author">
               <name delimiter-precedes-last="never" and="text" delimiter=", " form="short" initialize="false" initialize-with=""/>
             </names>
@@ -109,8 +95,8 @@
           </names>
         </group>
       </else-if>
-      <else-if type="broadcast">
-        <text variable="publisher"/>
+      <else-if type="patent">
+        <text macro="patent"/>
       </else-if>
       <else>
         <names variable="author">
@@ -128,35 +114,24 @@
     <!--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="false" initialize-with="" name-as-sort-order="first"/>
-          </names>
-          <names variable="author" prefix="Interview with ">
-            <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
-          </names>
-        </group>
-      </if>
-      <else-if type="personal_communication">
         <group delimiter=" ">
-          <group delimiter=", ">
-            <names variable="author">
-              <name delimiter-precedes-last="never" and="text" delimiter=", " name-as-sort-order="first" initialize="false" initialize-with=""/>
-            </names>
-            <text variable="genre"/>
-          </group>
-          <names variable="recipient" prefix="to ">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text value="Interview"/>
+            </else>
+          </choose>
+          <names variable="author" prefix="with ">
             <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
           </names>
         </group>
-      </else-if>
-      <else-if type="broadcast">
-        <text variable="publisher"/>
-      </else-if>
-      <else-if type="legal_case legislation" match="any"/>
+      </if>
+      <else-if type="legal_case legislation patent personal_communication" match="any"/>
       <else>
         <names variable="author">
-          <name delimiter-precedes-last="never" and="text" delimiter=", " name-as-sort-order="first" initialize="false" initialize-with=""/>
+          <name delimiter-precedes-last="never" name-as-sort-order="first" and="text" delimiter=", " initialize="false" initialize-with=""/>
           <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
           <substitute>
             <names variable="editor"/>
@@ -175,10 +150,21 @@
       </names>
     </group>
   </macro>
+  <!--For books as a whole-->
+  <macro name="editor-translator">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=", ">
+          <label form="verb-short" strip-periods="true" suffix=" "/>
+          <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+        </names>
+      </if>
+    </choose>
+  </macro>
   <!-- Titles -->
   <macro name="title">
     <choose>
-      <if type="book legislation webpage thesis motion_picture manuscript" match="any">
+      <if type="book legislation motion_picture manuscript report" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else-if type="bill">
@@ -187,11 +173,30 @@
       <else-if type="legal_case">
         <text variable="title" font-style="italic" strip-periods="true"/>
       </else-if>
+      <else-if type="entry-dictionary">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+      <else-if type="entry-encyclopedia">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else-if>
       <else>
         <text variable="title" quotes="true" text-case="title"/>
       </else>
     </choose>
   </macro>
+  <macro name="title-short-flag">
+    <choose>
+      <if type="book legislation webpage motion_picture manuscript legal_case report" match="any">
+        <text variable="title-short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title-short" text-case="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="title-short">
     <choose>
       <if type="book legislation webpage thesis motion_picture manuscript legal_case" match="any">
@@ -209,16 +214,16 @@
   <macro name="issued-full">
     <date variable="issued" form="text"/>
   </macro>
-  <macro name="date-news">
+  <macro name="date-comma">
     <choose>
-      <if type="article-newspaper broadcast personal_communication manuscript" match="any">
+      <if type="personal_communication manuscript" match="any">
         <date variable="issued" form="text"/>
       </if>
     </choose>
   </macro>
   <macro name="date-parenthesis">
     <choose>
-      <if type="legal_case article-journal article-magazine" match="any">
+      <if type="legal_case article-journal" match="any">
         <choose>
           <if variable="volume">
             <text macro="issued-year" prefix="(" suffix=")"/>
@@ -230,7 +235,10 @@
         </choose>
       </if>
       <else-if type="webpage post-weblog" match="any">
-        <text macro="issued-full" prefix="(" suffix=")"/>
+        <group delimiter=", " prefix="(" suffix=")">
+          <text variable="genre"/>
+          <text macro="issued-full"/>
+        </group>
       </else-if>
       <else-if type="legislation">
         <text macro="issued-year" font-style="italic"/>
@@ -238,25 +246,162 @@
       <else-if type="bill">
         <text macro="issued-year"/>
       </else-if>
+      <else-if type="article-magazine">
+        <text macro="issued-full" prefix="(" suffix=")"/>
+      </else-if>
+      <else-if type="entry-encyclopedia">
+        <group delimiter=" " prefix="(" suffix=")">
+          <choose>
+            <if variable="URL">
+              <text term="online"/>
+              <text term="at"/>
+              <date variable="accessed" form="text"/>
+            </if>
+            <else>
+              <text term="at"/>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="entry-dictionary">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="URL" match="any">
+              <group delimiter=" ">
+                <text term="online"/>
+                <text term="at"/>
+                <date variable="accessed" form="text"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <text macro="edition"/>
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title-dictionary">
+    <choose>
+      <if type="entry-dictionary">
+        <text variable="title" quotes="true"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="titles-encyclopedia">
+    <choose>
+      <if type="entry-encyclopedia">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="collection-number"/>
+            <text variable="collection-title"/>
+          </group>
+          <text variable="title" quotes="true"/>
+        </group>
+      </if>
     </choose>
   </macro>
   <!--publication info -->
+  <macro name="status-article-patent">
+    <choose>
+      <if type="article-journal">
+        <text variable="status" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="patent">
+        <choose>
+          <if variable="issued status" match="none">
+            <date variable="submitted" form="text" prefix="filed on " suffix=","/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <date variable="submitted" form="text" prefix="filed on "/>
+              <group prefix="(" suffix=")">
+                <choose>
+                  <if variable="issued">
+                    <date variable="issued" form="text" prefix="Issued on "/>
+                  </if>
+                  <else>
+                    <text variable="status"/>
+                  </else>
+                </choose>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="patent">
+    <choose>
+      <if type="patent">
+        <group delimiter=" " font-style="italic">
+          <text variable="authority"/>
+          <group delimiter=" ">
+            <text term="number" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="letter">
+    <choose>
+      <if type="personal_communication">
+        <group delimiter=" ">
+          <group delimiter=" from ">
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text value="Letter"/>
+              </else>
+            </choose>
+            <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=""/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
   <macro name="publisher">
     <choose>
-      <if type="book chapter paper-conference article-newspaper report legislation motion_picture speech interview thesis" match="any">
+      <if type="article book bill broadcast chapter paper-conference article-newspaper report legislation motion_picture speech interview thesis" match="any">
         <group prefix="(" suffix=")" delimiter=", ">
           <choose>
-            <if type="report thesis speech interview" match="any">
+            <if type="article report thesis speech" match="any">
               <group delimiter=" ">
                 <text variable="genre"/>
-                <text variable="number"/>
+                <group delimiter=" ">
+                  <text term="issue" form="short" strip-periods="true" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
                 <text variable="event" prefix="at the "/>
               </group>
             </if>
           </choose>
           <choose>
             <if type="article-newspaper">
-              <text variable="publisher-place"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="URL">
+                    <text term="online"/>
+                    <text term="at"/>
+                  </if>
+                </choose>
+                <group delimiter=", ">
+                  <text variable="publisher-place"/>
+                  <text macro="issued-full"/>
+                </group>
+              </group>
             </if>
             <else-if type="legislation bill" match="any">
               <!--this should be jurisdiction we use code instead-->
@@ -268,6 +413,10 @@
                 <label form="verb" text-case="capitalize-first" suffix=" "/>
                 <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
               </names>
+              <names variable="interviewer">
+                <name delimiter-precedes-last="never" and="text" delimiter=", " initialize="false" initialize-with=""/>
+              </names>
+              <text variable="medium" text-case="capitalize-first"/>
               <text variable="publisher"/>
               <choose>
                 <!--if none of these, this we don't want edition either. Might be Loose-Leaf-->
@@ -280,7 +429,7 @@
                   <text variable="event-place"/>
                   <text macro="issued-full"/>
                 </if>
-                <else-if type="report interview" match="any">
+                <else-if type="article broadcast interview motion_picture report" match="any">
                   <text macro="issued-full"/>
                 </else-if>
                 <else>
@@ -289,6 +438,7 @@
               </choose>
             </else>
           </choose>
+          <text variable="status"/>
         </group>
       </if>
     </choose>
@@ -298,13 +448,13 @@
       <if type="book">
         <choose>
           <if variable="publisher issued" match="none">
-            <group prefix="(at " suffix=")">
+            <group prefix="(" suffix=")">
               <choose>
                 <if variable="edition">
-                  <text variable="edition"/>
+                  <text variable="edition" prefix="at "/>
                 </if>
                 <else>
-                  <date variable="accessed" form="text"/>
+                  <date variable="accessed" form="text" prefix="online at "/>
                 </else>
               </choose>
             </group>
@@ -315,7 +465,7 @@
   </macro>
   <macro name="volume-book">
     <choose>
-      <if type="book chapter report" match="any">
+      <if type="book report entry-encyclopedia" match="any">
         <group delimiter=" ">
           <label variable="volume" form="short" strip-periods="true"/>
           <text variable="volume"/>
@@ -342,12 +492,9 @@
         <text term="in" suffix=" "/>
         <group delimiter=", ">
           <text macro="editor"/>
-          <text variable="container-title" font-style="italic"/>
+          <text variable="container-title" font-style="italic" text-case="title"/>
         </group>
       </if>
-      <else-if type="webpage">
-        <text variable="container-title"/>
-      </else-if>
     </choose>
   </macro>
   <macro name="broadcast-container">
@@ -357,9 +504,26 @@
       </if>
     </choose>
   </macro>
+  <macro name="case-medium-neutral">
+    <choose>
+      <if variable="authority number issued" type="legal_case" match="all">
+        <group delimiter=" ">
+          <text variable="authority" form="short" strip-periods="true"/>
+          <text variable="number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="newspaper-container">
+    <choose>
+      <if type="article-newspaper" match="any">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
   <macro name="article-case-info">
     <choose>
-      <if type="article-journal article-magazine article-newspaper legal_case" match="any">
+      <if type="article-journal  article-magazine legal_case" match="any">
         <group delimiter=" ">
           <group>
             <text variable="volume"/>
@@ -371,21 +535,17 @@
                 <if variable="container-title">
                   <text variable="container-title" form="short"/>
                 </if>
-                <else-if variable="authority number" match="all">
-                  <!--Assume that only cases with a Medium Neutral Citation have a docket number -->
-                  <group delimiter=" ">
-                    <text variable="authority" form="short" strip-periods="true"/>
-                    <text variable="number"/>
-                    <text macro="issued-full" prefix="(" suffix=")"/>
-                  </group>
-                </else-if>
+                <!--Assume that only cases with a Medium Neutral Citation have a docket number -->
+                <else-if variable="authority number issued" match="all"/>
+                <!--Unreported cases w/o medium neutral and proceedings-->
                 <else>
                   <group delimiter=", " prefix="(" suffix=")">
-                    <text value="Unreported"/>
                     <text variable="authority"/>
                     <names variable="author">
                       <name name-as-sort-order="all" delimiter-precedes-last="never" and="text" delimiter=", " sort-separator=" "/>
                     </names>
+                    <text variable="number"/>
+                    <date variable="event-date" form="text" prefix="commenced "/>
                     <text macro="issued-full"/>
                   </group>
                 </else>
@@ -400,7 +560,14 @@
     </choose>
   </macro>
   <macro name="page-first">
-    <text variable="page-first"/>
+    <choose>
+      <if is-numeric="page">
+        <text variable="page-first"/>
+      </if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
   </macro>
   <!--Others -->
   <macro name="manuscript-catchall">
@@ -412,17 +579,25 @@
   </macro>
   <macro name="blog-info">
     <choose>
-      <if type="post-weblog">
-        <group delimiter=" ">
-          <text value="on"/>
-          <text variable="container-title" font-style="italic"/>
+      <if type="post-weblog webpage" match="any">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <choose>
+      <if type="personal_communication">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+          <text variable="archive_location"/>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="URL">
     <choose>
-      <if type="legal_case legislation bill" match="none">
+      <if type="legal_case legislation bill entry-dictionary entry-encyclopedia" match="none">
         <text variable="URL" prefix="&lt;" suffix="&gt;"/>
       </if>
     </choose>
@@ -466,50 +641,18 @@
           <text term="ibid" strip-periods="true"/>
         </else-if>
         <else-if position="subsequent">
-          <choose>
-            <if type="legal_case bill legislation manuscript" match="any">
-              <!--don't use short form and above note for legal citations -->
-              <group delimiter=" ">
-                <group delimiter=", ">
-                  <text macro="author-note"/>
-                  <choose>
-                    <if match="any" variable="title-short">
-                      <text macro="title-short"/>
-                    </if>
-                    <else>
-                      <text macro="title"/>
-                    </else>
-                  </choose>
-                </group>
-                <!-- we could work with title-short here-->
-                <group delimiter=" ">
-                  <text macro="date-parenthesis"/>
-                  <text macro="article-case-info"/>
-                  <text macro="book-container"/>
-                  <text macro="publisher"/>
-                </group>
-              </group>
-              <text macro="manuscript-catchall" prefix=", "/>
-              <text macro="date-news" prefix=", "/>
-              <group delimiter=", " prefix=" ">
-                <text macro="looseleaf"/>
-                <text macro="page-first"/>
-                <text variable="locator"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=", ">
-                <text macro="author-short"/>
-                <choose>
-                  <if disambiguate="true">
-                    <text macro="title-short"/>
-                  </if>
-                </choose>
-                <text variable="first-reference-note-number" prefix="above n "/>
-                <text variable="locator"/>
-              </group>
-            </else>
-          </choose>
+          <group delimiter=", ">
+            <text macro="author-short"/>
+            <choose>
+              <if disambiguate="true" type="legal_case bill legislation" match="any">
+                <text macro="title-short"/>
+              </if>
+            </choose>
+          </group>
+          <group prefix=" " delimiter=" ">
+            <text variable="first-reference-note-number" prefix="(n " suffix=")"/>
+            <text variable="locator"/>
+          </group>
         </else-if>
         <else>
           <!--general whole citation -->
@@ -520,32 +663,44 @@
                   <text macro="author-note"/>
                   <text macro="title"/>
                   <text macro="broadcast-container"/>
+                  <text macro="newspaper-container"/>
+                  <text macro="editor-translator"/>
+                  <text macro="volume-book"/>
+                  <text macro="blog-info"/>
                 </group>
                 <group delimiter=" ">
-                  <text macro="blog-info"/>
                   <text macro="date-parenthesis"/>
+                  <text macro="title-dictionary"/>
+                  <text macro="titles-encyclopedia"/>
                   <text macro="article-case-info"/>
                   <text macro="book-container"/>
                   <text macro="publisher"/>
                 </group>
               </group>
-              <text macro="manuscript-catchall"/>
-              <text macro="date-news"/>
             </group>
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text macro="volume-book"/>
+          </group>
+          <group delimiter=", ">
+            <text macro="manuscript-catchall" prefix=", "/>
+            <text macro="letter"/>
+            <text macro="patent"/>
+            <group delimiter=" " prefix=" ">
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text macro="date-comma"/>
+                  <text macro="archive"/>
+                </group>
                 <text macro="looseleaf"/>
+                <text macro="case-medium-neutral"/>
+                <text macro="page-first"/>
+                <group delimiter=" ">
+                  <text macro="status-article-patent"/>
+                  <text variable="locator"/>
+                </group>
               </group>
-              <text macro="page-first"/>
-              <text variable="locator"/>
+              <text variable="references"/>
+              <text macro="URL"/>
+              <text macro="title-short-flag" quotes="true" prefix="(" suffix=")"/>
             </group>
-            <choose>
-              <if type="legal_case bill legislation manuscript" match="any">
-                <text macro="title-short" text-case="title" quotes="true" prefix=" (" suffix=")"/>
-              </if>
-            </choose>
-            <text macro="URL"/>
           </group>
         </else>
       </choose>
@@ -554,34 +709,50 @@
   <bibliography et-al-min="4" et-al-use-first="1">
     <sort>
       <key macro="sort-type"/>
-      <key macro="author" names-min="1" names-use-first="1"/>
-      <key variable="issued"/>
+      <key macro="author"/>
+      <key variable="title"/>
     </sort>
     <layout>
       <group delimiter=" ">
         <group delimiter=", ">
-          <text macro="author"/>
-          <text macro="title"/>
-          <text macro="broadcast-container"/>
-        </group>
-        <group delimiter=" ">
-          <text macro="blog-info"/>
-          <text macro="date-parenthesis"/>
-          <text macro="article-case-info"/>
-          <text macro="book-container"/>
-          <text macro="publisher"/>
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text macro="author"/>
+              <text macro="title"/>
+              <text macro="broadcast-container"/>
+              <text macro="newspaper-container"/>
+              <text macro="editor-translator"/>
+              <text macro="volume-book"/>
+              <text macro="blog-info"/>
+            </group>
+            <group delimiter=" ">
+              <text macro="date-parenthesis"/>
+              <text macro="title-dictionary"/>
+              <text macro="titles-encyclopedia"/>
+              <text macro="article-case-info"/>
+              <text macro="book-container"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
         </group>
       </group>
-      <text macro="manuscript-catchall" prefix=", "/>
-      <text macro="date-news" prefix=", "/>
-      <group delimiter=", " prefix=" ">
-        <group delimiter=" ">
-          <text macro="volume-book"/>
-          <text macro="looseleaf"/>
+      <group delimiter=", ">
+        <text macro="manuscript-catchall" prefix=", "/>
+        <text macro="letter"/>
+        <text macro="patent"/>
+        <group delimiter=" " prefix=" ">
+          <group delimiter=", ">
+            <text macro="date-comma"/>
+            <text macro="looseleaf"/>
+            <text macro="case-medium-neutral"/>
+            <text macro="page-first"/>
+            <text macro="status-article-patent"/>
+          </group>
+          <text variable="references"/>
+          <text macro="URL"/>
+          <text macro="title-short-flag" quotes="true" prefix="(" suffix=")"/>
         </group>
-        <text macro="page-first"/>
       </group>
-      <text macro="URL" prefix=" "/>
     </layout>
   </bibliography>
 </style>