From e82a7838306c0f7e7daeb1a22285255b4637522f Mon Sep 17 00:00:00 2001
From: POBrien333 <954979+POBrien333@users.noreply.github.com>
Date: Tue, 24 Mar 2020 05:12:34 +0100
Subject: [PATCH] Fix paper-conference in journal-of-new-zealand-grasslands.csl
 (#4637)

---
 journal-of-new-zealand-grasslands.csl | 43 +++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/journal-of-new-zealand-grasslands.csl b/journal-of-new-zealand-grasslands.csl
index 5ace1e175aab..2812f9731c5a 100644
--- a/journal-of-new-zealand-grasslands.csl
+++ b/journal-of-new-zealand-grasslands.csl
@@ -15,7 +15,7 @@
     <category field="biology"/>
     <issn>2463-2872</issn>
     <eissn>2463-2880</eissn>
-    <updated>2020-03-13T14:38:52+00:00</updated>
+    <updated>2020-03-23T13: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>
@@ -55,6 +55,11 @@
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text variable="title" font-style="italic"/>
+        <choose>
+          <if type="report" match="any">
+            <text variable="number" prefix=" [Report " suffix="]"/>
+          </if>
+        </choose>
       </if>
       <else>
         <text variable="title"/>
@@ -73,19 +78,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="journal-info">
-    <choose>
-      <if type="article-journal article-magazine paper-conference" match="any">
-        <group delimiter=": ">
-          <group delimiter=" ">
-            <text variable="container-title" font-style="italic"/>
-            <text variable="volume" font-style="italic"/>
-          </group>
-          <text variable="page"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
   <macro name="publisher">
     <group delimiter=", ">
       <text variable="publisher"/>
@@ -141,16 +133,29 @@
         <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
-        <text macro="journal-info"/>
         <choose>
           <if type="chapter paper-conference" match="any">
-            <group delimiter=": ">
-              <text term="in" text-case="capitalize-first"/>
-              <text macro="editor-translator"/>
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor-translator"/>
+              </group>
+              <text variable="container-title" font-style="italic"/>
             </group>
           </if>
+          <else-if type="paper-conference chapter" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </else-if>
+          <else-if type="article-journal article" match="any">
+            <group delimiter=": ">
+              <group delimiter=" ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="volume" font-style="italic"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </else-if>
         </choose>
-        <text variable="container-title" font-style="italic"/>
         <group delimiter=", ">
           <text macro="publisher"/>
           <text macro="page"/>