From 503d3d5eb121056ef9ab562995b4144442a19714 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher <karcher@u.northwestern.edu>
Date: Wed, 1 Nov 2023 00:10:07 -0400
Subject: [PATCH] Update ESA style (#6766)

and dependents https://forums.zotero.org/discussion/comment/447352#Comment_447352
---
 dependent/american-entomologist.csl           |  14 +-
 ...f-the-entomological-society-of-america.csl |  14 +-
 dependent/arthropod-management-tests.csl      |  16 +
 dependent/environmental-entomology.csl        |  13 +-
 .../insect-systematics-and-diversity.csl      |  16 +
 dependent/journal-of-economic-entomology.csl  |  13 +-
 dependent/journal-of-insect-science.csl       |  16 +
 .../journal-of-integrated-pest-management.csl |  16 +
 dependent/journal-of-medical-entomology.csl   |  14 +-
 entomological-society-of-america.csl          | 365 +++++++++---------
 10 files changed, 273 insertions(+), 224 deletions(-)
 create mode 100644 dependent/arthropod-management-tests.csl
 create mode 100644 dependent/insect-systematics-and-diversity.csl
 create mode 100644 dependent/journal-of-insect-science.csl
 create mode 100644 dependent/journal-of-integrated-pest-management.csl

diff --git a/dependent/american-entomologist.csl b/dependent/american-entomologist.csl
index 71998e380b..d9f2271d52 100644
--- a/dependent/american-entomologist.csl
+++ b/dependent/american-entomologist.csl
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>American Entomologist</title>
     <id>http://www.zotero.org/styles/american-entomologist</id>
     <link href="http://www.zotero.org/styles/american-entomologist" rel="self"/>
-    <link href="http://www.zotero.org/styles/entomological-society-of-america" rel="independent-parent"/>
-    <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
-    <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
-    </author>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/ae/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <issn>1046-2821</issn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <eissn>2155-9902</eissn>
+    <updated>2014-06-05T12: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>
 </style>
diff --git a/dependent/annals-of-the-entomological-society-of-america.csl b/dependent/annals-of-the-entomological-society-of-america.csl
index 37e435cfad..2076ac6103 100644
--- a/dependent/annals-of-the-entomological-society-of-america.csl
+++ b/dependent/annals-of-the-entomological-society-of-america.csl
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Annals of the Entomological Society of America</title>
     <id>http://www.zotero.org/styles/annals-of-the-entomological-society-of-america</id>
     <link href="http://www.zotero.org/styles/annals-of-the-entomological-society-of-america" rel="self"/>
-    <link href="http://www.zotero.org/styles/entomological-society-of-america" rel="independent-parent"/>
-    <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
-    <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
-    </author>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/aesa/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <issn>0013-8746</issn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <eissn>1938-2901</eissn>
+    <updated>2014-06-05T12: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>
 </style>
diff --git a/dependent/arthropod-management-tests.csl b/dependent/arthropod-management-tests.csl
new file mode 100644
index 0000000000..eb2f460445
--- /dev/null
+++ b/dependent/arthropod-management-tests.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Arthropod Management Tests</title>
+    <id>http://www.zotero.org/styles/arthropod-management-tests</id>
+    <link href="http://www.zotero.org/styles/arthropod-management-tests" rel="self"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/amt/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2155-9856</eissn>
+    <updated>2014-06-05T12: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>
+</style>
diff --git a/dependent/environmental-entomology.csl b/dependent/environmental-entomology.csl
index ddd3c7667a..cb2281ae92 100644
--- a/dependent/environmental-entomology.csl
+++ b/dependent/environmental-entomology.csl
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Environmental Entomology</title>
     <id>http://www.zotero.org/styles/environmental-entomology</id>
     <link href="http://www.zotero.org/styles/environmental-entomology" rel="self"/>
-    <link href="http://www.zotero.org/styles/entomological-society-of-america" rel="independent-parent"/>
-    <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
-    <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
-    </author>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/ee/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <issn>0046-225X</issn>
     <eissn>1938-2936</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2014-06-05T12: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>
 </style>
diff --git a/dependent/insect-systematics-and-diversity.csl b/dependent/insect-systematics-and-diversity.csl
new file mode 100644
index 0000000000..369237a7d8
--- /dev/null
+++ b/dependent/insect-systematics-and-diversity.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Insect Systematics and Diversity</title>
+    <id>http://www.zotero.org/styles/insect-systematics-and-diversity</id>
+    <link href="http://www.zotero.org/styles/insect-systematics-and-diversity" rel="self"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/isd/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2399-3421</eissn>
+    <updated>2014-06-05T12: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>
+</style>
diff --git a/dependent/journal-of-economic-entomology.csl b/dependent/journal-of-economic-entomology.csl
index 1e929e9e69..541193451d 100644
--- a/dependent/journal-of-economic-entomology.csl
+++ b/dependent/journal-of-economic-entomology.csl
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of Economic Entomology</title>
     <id>http://www.zotero.org/styles/journal-of-economic-entomology</id>
     <link href="http://www.zotero.org/styles/journal-of-economic-entomology" rel="self"/>
-    <link href="http://www.zotero.org/styles/entomological-society-of-america" rel="independent-parent"/>
-    <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
-    <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
-    </author>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/jee/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <issn>0022-0493</issn>
     <eissn>1938-291X</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2014-06-05T12: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>
 </style>
diff --git a/dependent/journal-of-insect-science.csl b/dependent/journal-of-insect-science.csl
new file mode 100644
index 0000000000..d7f1661f41
--- /dev/null
+++ b/dependent/journal-of-insect-science.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Insect Science</title>
+    <id>http://www.zotero.org/styles/journal-of-insect-science</id>
+    <link href="http://www.zotero.org/styles/journal-of-insect-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/jinsectscience/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>1536-2442</eissn>
+    <updated>2014-06-05T12: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>
+</style>
diff --git a/dependent/journal-of-integrated-pest-management.csl b/dependent/journal-of-integrated-pest-management.csl
new file mode 100644
index 0000000000..42e7961ebc
--- /dev/null
+++ b/dependent/journal-of-integrated-pest-management.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Integrated Pest Management</title>
+    <id>http://www.zotero.org/styles/journal-of-integrated-pest-management</id>
+    <link href="http://www.zotero.org/styles/journal-of-integrated-pest-management" rel="self"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/jipm/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2155-7470</eissn>
+    <updated>2014-06-05T12: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>
+</style>
diff --git a/dependent/journal-of-medical-entomology.csl b/dependent/journal-of-medical-entomology.csl
index 58d4e8566b..7930ba8355 100644
--- a/dependent/journal-of-medical-entomology.csl
+++ b/dependent/journal-of-medical-entomology.csl
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Entomological Society of America (ESA), generated from "entsoc" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of Medical Entomology</title>
     <id>http://www.zotero.org/styles/journal-of-medical-entomology</id>
     <link href="http://www.zotero.org/styles/journal-of-medical-entomology" rel="self"/>
-    <link href="http://www.zotero.org/styles/entomological-society-of-america" rel="independent-parent"/>
-    <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
-    <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
-    </author>
-    <category citation-format="author-date"/>
+    <link href="http://www.zotero.org/styles/plos" rel="independent-parent"/>
+    <link href="https://academic.oup.com/jme/pages/General_Instructions" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
-    <category field="generic-base"/>
     <issn>0022-2585</issn>
     <eissn>1938-2928</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2014-06-05T12: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>
 </style>
diff --git a/entomological-society-of-america.csl b/entomological-society-of-america.csl
index 62bdd7bc02..e0e4cd5cfe 100644
--- a/entomological-society-of-america.csl
+++ b/entomological-society-of-america.csl
@@ -8,242 +8,241 @@
     <link href="http://www.zotero.org/styles/elsevier-harvard" rel="template"/>
     <link href="http://www.entsoc.org/pubs/publish/style" rel="documentation"/>
     <author>
-      <name>Seth McNeill</name>
-      <email>styles@anitracks.com</email>
+      <name>Sebastian Karcher</name>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
-    <updated>2012-11-19T21:41:38+00:00</updated>
+    <updated>2023-10-27T21:41:38+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>
-  <macro name="container">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group>
-          <label variable="page" form="short" prefix=", " suffix=" "/>
-          <text variable="page"/>
-        </group>
-        <text term="in" text-case="capitalize-first" font-style="italic" prefix=". " suffix=" "/>
-        <names variable="editor translator" delimiter=", " suffix=", ">
-          <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-          <label form="short" prefix=" (" suffix=")"/>
-        </names>
-        <group delimiter=", ">
-          <text variable="container-title" form="short" text-case="title"/>
-          <text variable="collection-title" text-case="title"/>
-        </group>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-        <group prefix=", " delimiter=", ">
-          <text variable="container-title" form="short" text-case="title"/>
-          <text variable="collection-title"/>
-        </group>
-      </else-if>
-      <else>
-        <group prefix=". " delimiter=", ">
-          <choose>
-            <if variable="author">
-              <text variable="container-title" form="short"/>
-              <text variable="collection-title"/>
-            </if>
-            <else>
-              <text variable="collection-title"/>
-            </else>
-          </choose>
-        </group>
-      </else>
-    </choose>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="long">
+        <single>editor and translator</single>
+        <multiple>editors and translators</multiple>
+      </term>
+      <term name="available at">available from</term>
+      <term name="collection-editor" form="long">
+        <single>editor</single>
+        <multiple>editors</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor translator" delimiter="; " suffix=".">
+      <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label prefix=", "/>
+    </names>
   </macro>
   <macro name="author">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name name-as-sort-order="first" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-          <label form="short" prefix=" (" suffix=")" text-case="capitalize-first" strip-periods="true"/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-          </substitute>
-        </names>
-      </if>
-      <else>
-        <text variable="title" form="short" prefix="(" suffix=") "/>
-        <text variable="container-title"/>
-      </else>
-    </choose>
+    <names variable="author" delimiter="; ">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", " strip-periods="true"/>
+      <substitute>
+        <names variable="editor translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <name form="short" delimiter=", " initialize-with="." and="text"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <choose>
-          <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" form="short" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" form="short" quotes="true"/>
-          </else>
-        </choose>
+        <text variable="title" form="short"/>
       </substitute>
     </names>
   </macro>
-  <macro name="access">
-    <choose>
-      <if type="webpage">
-        <group>
-          <text value="" suffix=" "/>
-          <text variable="URL" prefix="(" suffix=")."/>
-        </group>
-      </if>
-    </choose>
+  <macro name="review">
+    <group delimiter=". ">
+      <text variable="reviewed-title"/>
+      <text variable="container-title"/>
+    </group>
   </macro>
-  <macro name="noauthortitle">
+  <macro name="access">
     <choose>
-      <if variable="author">
-        <text variable="title"/>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else>
-        <text variable="title" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="report thesis" match="any">
-        <text variable="title"/>
-        <group prefix=" (" suffix=")">
-          <text variable="genre"/>
-          <text variable="number" prefix=" No. "/>
+      <else-if variable="URL" match="any">
+        <group delimiter=" ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
         </group>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture report song speech" match="any">
-        <text macro="noauthortitle"/>
-        <text macro="edition" prefix=", "/>
-      </else-if>
-      <else-if type="webpage">
-        <text macro="noauthortitle"/>
       </else-if>
-      <else>
-        <text macro="noauthortitle"/>
-      </else>
     </choose>
   </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="report thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
-      </if>
-      <else>
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
-      </else>
-    </choose>
+  <macro name="title">
+    <group delimiter=" ">
+      <text variable="title"/>
+      <choose>
+        <if type="thesis" match="any">
+          <text variable="genre" form="long" prefix="[" suffix="]"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="event">
-    <choose>
-      <if variable="event">
-        <text term="presented at" text-case="capitalize-first" suffix=" "/>
-        <text variable="event"/>
-      </if>
-    </choose>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
   </macro>
-  <macro name="issued">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if variable="accessed">
+  <macro name="pages">
+    <group delimiter="; ">
+      <group>
+        <label variable="page" form="short" suffix=" " plural="never"/>
+        <text variable="page"/>
+      </group>
+      <group>
+        <text variable="number-of-pages"/>
         <choose>
-          <if type="webpage">
-            <date variable="accessed">
-              <date-part name="year"/>
-            </date>
+          <if is-numeric="number-of-pages">
+            <label variable="number-of-pages" form="short" prefix=" " plural="never"/>
           </if>
-          <else>
-            <text term="no date" form="short"/>
-          </else>
         </choose>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
+      </group>
+    </group>
   </macro>
-  <macro name="edition">
+  <macro name="year-date">
+    <date variable="issued" form="numeric" date-parts="year"/>
+  </macro>
+  <macro name="date">
     <group delimiter=" ">
+      <text macro="year-date"/>
       <choose>
-        <if is-numeric="edition">
-          <number variable="edition" form="ordinal"/>
+        <if type="patent article-newspaper webpage" match="any">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
         </if>
-        <else>
-          <text variable="edition" suffix="."/>
-        </else>
+        <else-if type="article-journal article-magazine" match="any">
+          <choose>
+            <if variable="volume issue" match="none">
+              <date variable="issued" delimiter=" ">
+                <date-part name="month" form="short" strip-periods="true"/>
+                <date-part name="day"/>
+              </date>
+            </if>
+          </choose>
+        </else-if>
       </choose>
-      <text value="ed"/>
     </group>
   </macro>
-  <macro name="locators">
+  <macro name="edition">
     <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <group prefix=". " delimiter=": ">
-          <group>
-            <text variable="volume"/>
-          </group>
-          <text variable="page"/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
-      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection">
+    <choose>
+      <if type="report">
+        <group prefix=" " suffix="." delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="number" prefix=" Report No.: "/>
         </group>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
+      </if>
+      <else>
+        <group prefix=" (" suffix=")." delimiter=" ">
+          <names variable="collection-editor" suffix=". ">
+            <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+            <label prefix=", "/>
+          </names>
+          <text variable="collection-title"/>
         </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
     <sort>
-      <key macro="issued"/>
-      <key macro="author"/>
+      <key macro="year-date"/>
+      <key macro="author-short"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <group delimiter=" ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued"/>
+        <text macro="date"/>
       </group>
+      <text variable="locator" prefix=": "/>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+  <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="3">
     <sort>
       <key macro="author"/>
-      <key macro="issued" sort="ascending"/>
+      <key macro="year-date"/>
     </sort>
-    <layout>
+    <layout suffix=".">
+      <group suffix="." delimiter=". ">
+        <text macro="author"/>
+        <text macro="date"/>
+        <text macro="title"/>
+      </group>
       <group suffix=".">
-        <text macro="author" suffix="." font-weight="bold"/>
-        <text macro="issued" prefix=" " suffix=". " font-weight="bold"/>
-        <group>
-          <text macro="title"/>
-          <text macro="container"/>
-        </group>
-        <text macro="locators"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+            <group prefix=" " suffix="." delimiter=" ">
+              <text macro="edition"/>
+              <text macro="editor"/>
+            </group>
+            <text prefix=" " macro="publisher"/>
+            <text prefix=" " macro="collection"/>
+            <text variable="number-of-pages" suffix=" p." prefix=". "/>
+          </if>
+          <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+            <group prefix=" " delimiter=" ">
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <text macro="editor"/>
+                <text variable="container-title" suffix="."/>
+              </group>
+              <text variable="volume" prefix="Vol. " suffix="."/>
+              <text macro="edition"/>
+              <group suffix="." delimiter=". ">
+                <text macro="publisher"/>
+                <text prefix=" " macro="collection"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="review review-book" match="any">
+            <text macro="editor" prefix=" " suffix="."/>
+            <group prefix=" ">
+              <text macro="review" suffix="."/>
+              <group prefix=" ">
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page" prefix=":"/>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=" " prefix=" ">
+              <text variable="authority"/>
+              <text variable="number"/>
+            </group>
+          </else-if>
+          <else>
+            <text macro="editor" suffix="." prefix=" "/>
+            <group prefix=" ">
+              <text variable="container-title" form="short" suffix="."/>
+              <text variable="volume" prefix=" "/>
+              <text variable="issue" prefix="(" suffix=")"/>
+              <text variable="page" prefix=":"/>
+            </group>
+          </else>
+        </choose>
       </group>
-      <text macro="access" prefix=". "/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>