From 21ba5d8d8f1103d8fad25cd8ee7c868dbf2a3b8a Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Thu, 15 Apr 2021 05:03:35 +0200
Subject: [PATCH] Update aquatic-conservation.csl (#5379)

---
 aquatic-conservation.csl | 101 +++++++++++++++++++++++----------------
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git a/aquatic-conservation.csl b/aquatic-conservation.csl
index 7b083b793bf7..cb0c81339c85 100644
--- a/aquatic-conservation.csl
+++ b/aquatic-conservation.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" delimiter-precedes-last="never" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Aquatic Conservation: Marine and Freshwater Ecosystems</title>
     <id>http://www.zotero.org/styles/aquatic-conservation</id>
@@ -19,18 +19,31 @@
     <issn>1052-7613</issn>
     <eissn>1099-0755</eissn>
     <summary>style for Aquatic Conservation: Marine and Freshwater Ecosystems, derived primarily from Cell and AMA styles</summary>
-    <updated>2020-12-03T16:59:23+00:00</updated>
+    <updated>2021-04-14T07:21:19+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="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="(" suffix=")." delimiter=", ">
+    <names variable="editor translator" delimiter=", ">
       <name and="text" initialize-with="" delimiter=", "/>
       <label form="short" prefix=", " text-case="capitalize-first" strip-periods="true"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name et-al-min="11" et-al-use-first="10" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <name initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -41,8 +54,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " initialize-with="" et-al-min="3" et-al-use-first="1"/>
-      <et-al font-style="italic"/>
+      <name form="short" initialize-with=""/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -79,7 +91,7 @@
       <if variable="version" match="any">
         <text variable="title"/>
       </if>
-      <else-if type="bill book graphic legal_case motion_picture song" match="any">
+      <else-if type="bill book graphic legal_case motion_picture song report" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
       <else>
@@ -94,8 +106,8 @@
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
-      <text variable="publisher-place"/>
       <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="access">
@@ -111,19 +123,13 @@
           </group>
           <group delimiter=" " prefix="[" suffix="]">
             <text term="accessed" text-case="capitalize-first"/>
-            <date form="text" date-parts="year-month-day" variable="issued"/>
+            <date form="text" variable="accessed"/>
           </group>
         </group>
       </else-if>
     </choose>
   </macro>
-  <macro name="pages">
-    <group delimiter=" ">
-      <label variable="page" form="short"/>
-      <text variable="page"/>
-    </group>
-  </macro>
-  <citation disambiguate-add-year-suffix="true" collapse="year">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
       <key macro="issued"/>
       <key macro="author"/>
@@ -135,7 +141,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography and="symbol" et-al-min="7" et-al-use-first="6" entry-spacing="0" line-spacing="2" hanging-indent="true">
+  <bibliography et-al-min="7" et-al-use-first="6" entry-spacing="0" line-spacing="2" hanging-indent="true">
     <sort>
       <key macro="author" names-min="1" names-use-first="1"/>
       <key macro="author-count" names-min="3" names-use-first="3"/>
@@ -144,69 +150,80 @@
       <key macro="author"/>
     </sort>
     <layout>
-      <group delimiter=". ">
+      <group delimiter=". " suffix=".">
         <text macro="author"/>
         <date variable="issued" prefix="(" suffix=")">
           <date-part name="year"/>
         </date>
-        <text macro="title" prefix=" "/>
         <choose>
           <if type="bill book graphic legal_case motion_picture song" match="any">
             <group delimiter=". ">
-              <text macro="editor-translator"/>
+              <group delimiter=", ">
+                <text macro="title" prefix=" "/>
+                <text macro="editor-translator" prefix=" "/>
+                <text macro="edition"/>
+              </group>
               <text prefix=" " suffix="." macro="publisher"/>
             </group>
           </if>
           <else-if type="report" match="any">
-            <group>
-              <group suffix=".">
-                <text variable="genre" prefix=" "/>
-                <text variable="number" prefix=" No. "/>
-              </group>
-              <text macro="publisher" prefix=" "/>
+            <group delimiter=". ">
+              <text macro="title" prefix=" "/>
+              <text variable="publisher" prefix=" "/>
+              <text variable="number" prefix="Report number: "/>
             </group>
           </else-if>
           <else-if type="thesis" match="any">
-            <group suffix="." delimiter=", ">
-              <text variable="genre"/>
-              <text macro="publisher"/>
+            <text macro="title" prefix=" "/>
+            <group prefix=".">
+              <group prefix=" ">
+                <group suffix="." delimiter=", ">
+                  <text variable="genre"/>
+                  <text variable="publisher"/>
+                  <text variable="publisher-place"/>
+                </group>
+              </group>
             </group>
           </else-if>
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=". ">
+              <text macro="title" prefix=" "/>
               <group delimiter=" ">
                 <group delimiter=": ">
                   <text term="in" text-case="capitalize-first"/>
                   <names variable="editor">
-                    <name et-al-min="8" et-al-use-first="3" initialize-with="" name-as-sort-order="first" sort-separator=" "/>
-                    <label form="short" text-case="capitalize-first" strip-periods="false" prefix=" (" suffix=")"/>
+                    <name et-al-min="8" et-al-use-first="3" name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=", "/>
+                    <label form="short" strip-periods="true" prefix=" (" suffix=")."/>
                   </names>
                 </group>
                 <text variable="container-title" font-style="italic"/>
               </group>
               <group delimiter=", ">
-                <text macro="publisher" prefix=" "/>
-                <text macro="pages"/>
+                <text macro="publisher"/>
+                <group delimiter=" ">
+                  <label variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
               </group>
             </group>
           </else-if>
           <else>
-            <group suffix=".">
+            <group delimiter=". ">
               <text macro="title" prefix=" "/>
               <text macro="editor-translator" prefix=" "/>
-            </group>
-            <group delimiter=", " prefix=" " suffix=".">
-              <text variable="container-title" font-style="italic"/>
-              <group prefix=" ">
-                <text variable="volume" font-weight="normal"/>
-                <text variable="issue" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix=" " suffix=".">
+                <text variable="container-title" font-style="italic"/>
+                <group prefix=" ">
+                  <text variable="volume" font-weight="normal"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+                <text variable="page"/>
               </group>
-              <text variable="page"/>
             </group>
           </else>
         </choose>
-        <text macro="access"/>
       </group>
+      <text macro="access" prefix=" "/>
     </layout>
   </bibliography>
 </style>