From bbdc9c47191f5d2dd19e6ac9e2fe0a755194abc7 Mon Sep 17 00:00:00 2001
From: areographe <60025277+areographe@users.noreply.github.com>
Date: Tue, 14 Apr 2020 12:34:08 +1000
Subject: [PATCH] Update to better match RMIT Easy Cite (#4697)

---
 rmit-university-harvard.csl | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/rmit-university-harvard.csl b/rmit-university-harvard.csl
index cc6ce25f919f..1e19a8031fa2 100644
--- a/rmit-university-harvard.csl
+++ b/rmit-university-harvard.csl
@@ -12,7 +12,7 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2020-01-13T00:52:05+00:00</updated>
+    <updated>2020-04-13T04:40: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 xml:lang="en">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL" type="webpage">
+      <if variable="URL" type="article-newspaper webpage speech">
         <group prefix=" " delimiter=", ">
           <date variable="accessed" prefix="viewed ">
             <date-part name="day" suffix=" "/>
@@ -98,6 +98,31 @@
       </if>
     </choose>
   </macro>
+  <macro name="newspaper-webpage">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=" " delimiter=", ">
+          <date variable="issued" prefix="">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" suffix=""/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="presentation">
+    <choose>
+      <if type="speech">
+        <group delimiter=", ">
+          <!-- suffix=", "> -->
+          <text variable="genre"/>
+          <!-- <text term="presented at"/> -->
+          <text variable="event"/>
+          <text variable="event-place"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
@@ -148,14 +173,14 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="author-short"/>
           <text macro="year-date"/>
         </group>
-        <group>
+        <group delimiter=" ">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -210,6 +235,8 @@
           </group>
         </else>
       </choose>
+      <text prefix=", " macro="presentation"/>
+      <text prefix=", " macro="newspaper-webpage"/>
       <text prefix=", " macro="access"/>
     </layout>
   </bibliography>