csl-styles 1.0.1.9 → 1.0.1.10

data/vendor/styles/universiti-kebangsaan-malaysia.csl

@@ -13,7 +13,7 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2018-01-07T03:44:07+00:00</updated>
+    <updated>2019-04-17T02:29:07+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>
@@ -105,13 +105,18 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
+    <group delimiter=" ">
       <choose>
-        <if type="article-journal article-magazine" match="none">
-          <text variable="genre"/>
-          <text variable="publisher"/>
+        <if type="thesis" match="all">
+          <text variable="genre" suffix=","/>
+          <text variable="publisher" suffix=","/>
           <text variable="publisher-place"/>
         </if>
+        <else-if type="article-journal article-magazine" match="none">
+          <text variable="genre" suffix=","/>
+          <text variable="publisher" suffix=":"/>
+          <text variable="publisher-place"/>
+        </else-if>
       </choose>
     </group>
   </macro>

data/vendor/styles/university-of-aleppo-faculty-of-medicine.csl

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <title>University of Aleppo - Faculty of Medicine</title>
+    <title-short>UAFM</title-short>
+    <id>http://www.zotero.org/styles/university-of-aleppo-faculty-of-medicine</id>
+    <link href="http://www.zotero.org/styles/university-of-aleppo-faculty-of-medicine" rel="self"/>
+    <link href="https://github.com/firasuke/Citation-Style-Language-Styles/blob/master/University%20of%20Aleppo%20-%20Faculty%20of%20Medicine/documentation.md" rel="documentation"/>
+    <author>
+      <name>Firas Khalil Khana</name>
+      <email>firasuke@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1022-680X</issn>
+    <summary>Created for use in articles, dissertations and theses in the Faculty of Medicine at the University of Aleppo</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>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with=". " name-as-sort-order="all" sort-separator=" "/>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title" text-case="title"/>
+  </macro>
+  <macro name="date">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="edition">
+    <number suffix=" ed. " variable="edition" form="ordinal"/>
+  </macro>
+  <macro name="publisher-place">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <macro name="volume">
+    <text variable="volume"/>
+  </macro>
+  <macro name="issue">
+    <text variable="issue"/>
+  </macro>
+  <macro name="container-title">
+    <text variable="container-title"/>
+  </macro>
+  <macro name="url">
+    <text variable="URL"/>
+  </macro>
+  <macro name="doi">
+    <text variable="DOI"/>
+  </macro>
+  <macro name="isbn">
+    <text variable="ISBN" prefix="ISBN: "/>
+  </macro>
+  <citation>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="sup" delimiter="، " prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography second-field-align="flush">
+    <sort>
+      <key variable="author"/>
+    </sort>
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="] "/>
+      <group delimiter=". " suffix=". ">
+        <text macro="author" text-decoration="none"/>
+        <text macro="date"/>
+        <text macro="title" text-decoration="underline"/>
+        <text macro="container-title" font-style="italic"/>
+        <text macro="publisher"/>
+      </group>
+      <text macro="edition"/>
+      <text macro="publisher-place" suffix=". "/>
+      <text macro="volume"/>
+      <text macro="issue" prefix="(" suffix="):"/>
+      <text macro="page" suffix=". "/>
+      <choose>
+        <if match="all" variable="DOI">
+          <text macro="doi" prefix="DOI: "/>
+        </if>
+        <else-if match="all" variable="URL">
+          <text macro="url" prefix="URL: "/>
+        </else-if>
+        <else-if type="book" match="any">
+          <text macro="isbn"/>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>

data/vendor/styles/university-of-bradford-harvard.csl

@@ -1,6 +1,6 @@
 <?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">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>University of Bradford - Harvard</title>
     <id>http://www.zotero.org/styles/university-of-bradford-harvard</id>
@@ -11,10 +11,15 @@
       <name>Diego Zaccariotto</name>
       <email>d.zaccariotto@bradford.ac.uk</email>
     </author>
+    <contributor>
+      <name>Gregory Goltsov</name>
+      <email>gregory@goltsov.info</email>
+      <uri>http://www.mendeley.com/profiles/gregory-goltsov</uri>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Bradford version of the Harvard author-date style (based on University of Abertay Dundee style from Gregory Goltsov)</summary>
-    <updated>2018-10-01T17:05:05+00:00</updated>
+    <updated>2019-06-19T01:53:20+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-GB">
@@ -32,9 +37,9 @@
           <text term="in"/>
         </if>
       </choose>
-      <names variable="editor" delimiter=", " suffix=",">
+      <names variable="editor" delimiter=", " suffix=", ">
         <name and="symbol" initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-        <label form="short" prefix=" (" suffix=")"/>
+        <label prefix=" (" suffix=")"/>
       </names>
     </group>
   </macro>
@@ -43,8 +48,8 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
-      <label form="short" prefix=" (" suffix=")"/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
         <text macro="anon"/>
@@ -56,25 +61,31 @@
       <name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
-        <names variable="translator"/>
         <text macro="anon"/>
       </substitute>
     </names>
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-        <text variable="title" form="long" text-case="capitalize-first" font-style="normal" font-variant="normal"/>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage post post-weblog" match="any">
+        <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else>
-        <text variable="title" form="long" quotes="false" font-style="normal"/>
+        <text variable="title" suffix=". "/>
       </else>
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
+    <group>
+      <text variable="publisher-place" suffix=": "/>
+      <choose>
+        <if type="chapter" match="any">
+          <text variable="publisher" suffix=". "/>
+        </if>
+        <else>
+          <text variable="publisher"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="year-date">
@@ -92,8 +103,8 @@
   <macro name="locators-journal">
     <choose>
       <if type="article-journal article-magazine" match="any">
-        <group delimiter=", ">
-          <text variable="volume" strip-periods="false"/>
+        <group delimiter=" " suffix=", ">
+          <text variable="volume"/>
           <text variable="issue" prefix="(" suffix=")"/>
         </group>
       </if>
@@ -107,16 +118,15 @@
   </macro>
   <macro name="pages">
     <group delimiter=" ">
-      <label variable="page" form="short"/>
       <text variable="page"/>
     </group>
   </macro>
   <macro name="edition">
     <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
+      <if variable="edition">
+        <group delimiter=" " suffix=". ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" strip-periods="true"/>
+          <text term="edition" text-case="capitalize-first" strip-periods="true"/>
         </group>
       </if>
       <else>
@@ -129,21 +139,21 @@
       <if type="post post-weblog webpage" match="any">
         <choose>
           <if variable="URL">
-            <text value="viewed"/>
+            <text variable="URL" suffix=" "/>
+            <text term="accessed" text-case="capitalize-first"/>
             <group prefix=" " delimiter=", ">
               <date variable="accessed" delimiter=" ">
                 <date-part name="day"/>
-                <date-part name="month" suffix=","/>
+                <date-part name="month"/>
                 <date-part name="year"/>
               </date>
-              <text variable="URL" prefix="&lt;" suffix="&gt;"/>
             </group>
           </if>
         </choose>
       </if>
     </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" givenname-disambiguation-rule="by-cite">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
@@ -154,30 +164,34 @@
             </if>
           </choose>
           <text macro="year-date"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="locator" plural="never" form="short"/>
-          <text variable="page" form="short"/>
+          <choose>
+            <if match="any" locator="page">
+              <text variable="locator" prefix=": "/>
+            </if>
+          </choose>
         </group>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true">
+  <bibliography entry-spacing="0" hanging-indent="true">
     <sort>
       <key macro="author"/>
       <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <group delimiter=", ">
-        <group delimiter=" ">
+      <group>
+        <group delimiter=" " suffix=" ">
           <text macro="author"/>
-          <text macro="year-date"/>
-        </group>
-        <text macro="title"/>
-        <group delimiter=" ">
           <text macro="editor"/>
-          <text variable="container-title" font-style="italic"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
         </group>
+        <text macro="title"/>
+        <choose>
+          <if type="post post-weblog webpage" match="any"/>
+          <else>
+            <text variable="container-title" font-style="italic" suffix=" "/>
+          </else>
+        </choose>
         <text macro="locators-journal"/>
         <text macro="edition"/>
         <text variable="genre"/>

data/vendor/styles/university-of-gothenburg-apa-swedish-legislations.csl

@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="law"/>
     <summary>This is a translated and edited version of American Psychological Association 6th edition for University of Gothenburg with support for references to Swedish legislations, motions, propositions and Official Reports of the Swedish Government through the use of the Zotero item type "statute" (författning), for use in Swedish and English.</summary>
-    <updated>2018-03-28T23:10:24+00:00</updated>
+    <updated>2019-07-20T15:19: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>
   <!--- Change "tillgänglig vid" to "tillgänglig" for Swedish locale.-->
@@ -653,7 +653,7 @@
       </if>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort"/>

data/vendor/styles/university-of-helsinki-faculty-of-theology.csl

@@ -1,49 +1,48 @@
 <?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="fi-FI">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="fi-FI">
   <info>
-    <title>University of Helsinki - Faculty of Theology (Finnish)</title>
+    <title>Helsingin yliopisto - Teologinen tiedekunta (Finnish)</title>
     <id>http://www.zotero.org/styles/university-of-helsinki-faculty-of-theology</id>
     <link href="http://www.zotero.org/styles/university-of-helsinki-faculty-of-theology" rel="self"/>
     <link href="http://www.zotero.org/styles/currents-in-biblical-research" rel="template"/>
-    <link href="https://github.com/citation-style-language/styles/pull/1044" rel="documentation"/>
+    <link href="https://blogs.helsinki.fi/tutkivakirjoittaminen/files/2019/03/Teologian_tyyli_19.pdf" rel="documentation"/>
     <author>
+      <name>Tuuli Helminen</name>
+      <email>tuuli.helminen@gmail.com</email>
+    </author>
+    <contributor>
       <name>Jukka Peranto</name>
       <uri>http://www.mendeley.com/profiles/jukka-peranto/</uri>
-    </author>
-    <category citation-format="author-date"/>
+    </contributor>
+    <category citation-format="note"/>
     <category field="theology"/>
-    <summary>Helsinki University, the Faculty of Theology. Modified from Currents in Biblical Research Style. Incomplete.</summary>
-    <updated>2015-01-24T19:52:30+00:00</updated>
+    <summary>Currently doesn't include the styles for more complex cases, e.g. primary sources.</summary>
+    <updated>2019-12-21T20:36: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>
-    <style-options punctuation-in-quote="false"/>
+  <locale xml:lang="fi">
     <terms>
-      <term name="open-quote">‘</term>
-      <term name="close-quote">’</term>
-      <term name="open-inner-quote">“</term>
-      <term name="close-inner-quote">”</term>
-      <term name="editor" form="verb-short">ed.</term>
-      <term name="translator" form="verb-short">suom.</term>
+      <term name="no date">s.a.</term>
+      <term name="accessed">luettu</term>
     </terms>
   </locale>
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter paper-conference" match="none">
-        <group delimiter=".">
+        <group>
           <choose>
             <if variable="author">
-              <names variable="editor">
-                <label form="verb-short" text-case="capitalize-first" suffix=" "/>
-                <name and="text" initialize-with=".."/>
+              <names variable="editor" delimiter=" ">
+                <name and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with=""/>
+                <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
               </names>
             </if>
           </choose>
           <choose>
             <if variable="author editor" match="any">
-              <names variable="translator" suffix=".">
-                <label form="verb-short" text-case="capitalize-first" suffix=" "/>
-                <name and="text" initialize="false" initialize-with=""/>
+              <names variable="translator" prefix=" ">
+                <label text-case="capitalize-first" suffix=" "/>
+                <name and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with=""/>
               </names>
             </if>
           </choose>
@@ -58,34 +57,25 @@
           <choose>
             <if variable="author">
               <names variable="editor">
-                <name and="text" prefix=" " delimiter=", " initialize-with=". "/>
-                <label form="short" prefix=" (" suffix=")"/>
+                <name prefix=" " and="symbol" initialize="false" initialize-with=" "/>
               </names>
               <names variable="container-author" prefix=" ">
-                <label form="verb-short" suffix=" " strip-periods="true"/>
-                <name and="text" delimiter=", " initialize-with=". "/>
+                <name and="symbol" initialize="false" initialize-with=". "/>
               </names>
             </if>
           </choose>
           <choose>
             <if variable="author editor" match="any">
               <names variable="translator">
-                <label form="short" text-case="capitalize-first" font-variant="normal" vertical-align="baseline" prefix=" "/>
-                <name and="text" prefix=" " delimiter=", " initialize-with=". "/>
+                <name prefix=" " and="text" initialize="false" initialize-with=". "/>
               </names>
             </if>
           </choose>
+          <text term="editor" form="short" prefix="(" suffix=")"/>
         </group>
       </if>
     </choose>
   </macro>
-  <macro name="anon">
-    <choose>
-      <if variable="author editor translator" match="none">
-        <text term="anonymous" form="short" text-case="capitalize-first"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="recipient">
     <choose>
       <if type="personal_communication">
@@ -106,14 +96,12 @@
   </macro>
   <macro name="contributors">
     <names variable="author">
-      <name delimiter=" " and="symbol" delimiter-precedes-last="always" initialize="false" name-as-sort-order="all"/>
-      <label form="verb-short" prefix=", "/>
+      <name and="symbol" delimiter-precedes-last="never" initialize="false" name-as-sort-order="first"/>
       <substitute>
-        <names variable="editor"/>
+        <names variable="editor" font-style="normal"/>
         <names variable="translator"/>
       </substitute>
     </names>
-    <text macro="anon"/>
     <text macro="recipient"/>
   </macro>
   <macro name="contributors-short">
@@ -124,7 +112,6 @@
         <names variable="translator"/>
       </substitute>
     </names>
-    <text macro="anon"/>
   </macro>
   <macro name="interviewer">
     <names variable="interviewer" delimiter=", ">
@@ -133,14 +120,14 @@
     </names>
   </macro>
   <macro name="archive">
-    <group delimiter=". ">
+    <group>
       <text variable="archive_location" text-case="capitalize-first"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
   <macro name="access">
-    <group delimiter=". ">
+    <group>
       <choose>
         <if type="graphic report" match="any">
           <text macro="archive"/>
@@ -149,7 +136,7 @@
           <text macro="archive"/>
         </else-if>
       </choose>
-      <text variable="DOI" prefix="doi:"/>
+      <text variable="DOI" prefix="DOI: "/>
     </group>
   </macro>
   <macro name="title">
@@ -161,11 +148,11 @@
           </if>
         </choose>
       </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="normal" suffix="."/>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song article" match="any">
+        <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper chapter article" match="any">
-        <text variable="title" quotes="false" suffix=" &#8211; "/>
+        <text variable="title" quotes="false"/>
       </else-if>
       <else>
         <text variable="title"/>
@@ -179,12 +166,9 @@
           <if is-numeric="edition">
             <group delimiter=" ">
               <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
+              <text term="edition"/>
             </group>
           </if>
-          <else>
-            <text variable="edition" suffix="."/>
-          </else>
         </choose>
       </if>
     </choose>
@@ -193,7 +177,7 @@
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
-        <text variable="issue" prefix=" (" suffix=")"/>
+        <text variable="issue" prefix="(" suffix=")"/>
       </if>
       <else-if type="legal_case">
         <text variable="volume" prefix=", "/>
@@ -207,7 +191,7 @@
       <if type="chapter paper-conference" match="any">
         <choose>
           <if variable="page">
-            <group prefix=": ">
+            <group>
               <text variable="volume" suffix=":"/>
               <text variable="page"/>
             </group>
@@ -231,43 +215,21 @@
         </group>
       </if>
       <else-if type="article-journal">
-        <text variable="page" prefix=": "/>
+        <text variable="page" prefix=", "/>
       </else-if>
     </choose>
   </macro>
-  <macro name="point-locators">
-    <group>
-      <choose>
-        <if locator="page" match="none">
-          <choose>
-            <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-              <choose>
-                <if variable="volume">
-                  <group>
-                    <text term="volume" form="short" suffix=" "/>
-                    <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=" "/>
-                  </group>
-                </if>
-                <else>
-                  <label variable="locator" form="short" suffix=" "/>
-                </else>
-              </choose>
-            </if>
-          </choose>
-        </if>
-        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <number variable="volume" form="numeric" suffix=":"/>
-        </else-if>
-      </choose>
-      <text variable="locator"/>
-    </group>
-  </macro>
   <macro name="container-title">
     <choose>
-      <if type="legal_case" match="none">
-        <text variable="container-title" font-style="normal"/>
+      <if type="entry-dictionary entry-encyclopedia chapter paper-conference" match="any">
+        <text variable="container-title" font-style="italic"/>
       </if>
+      <else-if match="any" variable="page issue">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
     </choose>
   </macro>
   <macro name="publisher">
@@ -289,7 +251,7 @@
         </group>
       </if>
       <else-if type="chapter paper-conference" match="any">
-        <group suffix="; " delimiter=" ">
+        <group delimiter=" " suffix=". ">
           <text variable="collection-title"/>
           <text variable="collection-number"/>
         </group>
@@ -312,16 +274,20 @@
       <text variable="publisher" prefix=" "/>
     </group>
   </macro>
-  <macro name="date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
   </macro>
   <macro name="day-month">
-    <date variable="issued">
-      <date-part name="month"/>
-      <date-part name="day" prefix=" "/>
-    </date>
+    <date form="numeric" variable="issued"/>
   </macro>
   <macro name="event">
     <group>
@@ -338,25 +304,22 @@
         </group>
       </if>
       <else>
-        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+        <text variable="medium" text-case="capitalize-first"/>
       </else>
     </choose>
     <choose>
       <if variable="title" match="none"/>
       <else-if type="thesis"/>
       <else>
-        <text variable="genre" text-case="capitalize-first" prefix=". "/>
+        <text variable="genre" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
   <macro name="issue">
     <choose>
-      <if type="article-journal">
-        <text macro="day-month" prefix=" (" suffix=")"/>
-      </if>
-      <else-if type="legal_case">
+      <if type="legal_case">
         <text variable="authority" prefix=". "/>
-      </else-if>
+      </if>
       <else-if type="speech">
         <group prefix=" " delimiter=", ">
           <text macro="event"/>
@@ -365,7 +328,7 @@
         </group>
       </else-if>
       <else-if type="article-newspaper article-magazine" match="any">
-        <text macro="day-month" prefix=", "/>
+        <text macro="day-month"/>
       </else-if>
       <else>
         <group prefix=" " delimiter=", ">
@@ -375,45 +338,143 @@
             </if>
           </choose>
           <text macro="publisher" prefix=" "/>
-          <text macro="day-month"/>
         </group>
       </else>
     </choose>
   </macro>
+  <macro name="note">
+    <text variable="note" prefix="(" suffix=")"/>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
-    <layout delimiter="; ">
-      <group delimiter=": ">
-        <group delimiter=" ">
-          <text macro="contributors-short"/>
-          <text macro="date"/>
-        </group>
-        <text macro="point-locators"/>
-      </group>
+    <layout delimiter="; " suffix=".">
+      <choose>
+        <if match="none" variable="author editor translator">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="title" strip-periods="false"/>
+              <choose>
+                <if variable="issued">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </if>
+                <else>
+                  <text term="no date" font-style="italic"/>
+                </else>
+              </choose>
+            </group>
+            <group>
+              <text variable="locator"/>
+            </group>
+          </group>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <choose>
+                <if match="any" variable="issued">
+                  <date date-parts="year" form="numeric" variable="issued"/>
+                </if>
+                <else>
+                  <text term="no date" font-style="italic"/>
+                </else>
+              </choose>
+            </group>
+            <group>
+              <text variable="locator"/>
+            </group>
+          </group>
+        </else>
+      </choose>
     </layout>
   </citation>
-  <bibliography et-al-min="11" et-al-use-first="7" subsequent-author-substitute="" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="" entry-spacing="2">
     <sort>
       <key macro="contributors"/>
-      <key variable="issued"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
     </sort>
-    <layout suffix=". ">
-      <group display="indent">
-        <text macro="contributors"/>
-      </group>
-      <text macro="date" display="left-margin" suffix=" "/>
-      <group display="right-inline">
-        <text macro="title"/>
-        <text macro="description"/>
-        <text macro="secondary-contributors" prefix=". "/>
-        <text macro="container-title" suffix="."/>
-        <text macro="container-contributors"/>
-        <text macro="edition" prefix=". "/>
-        <text macro="locators"/>
-        <text macro="issue"/>
-        <text macro="locators-article"/>
-        <text macro="locators-chapter"/>
-        <text macro="access" prefix=". "/>
-      </group>
+    <layout suffix=".">
+      <choose>
+        <if variable="author editor translator" match="none">
+          <group delimiter=". ">
+            <text macro="title"/>
+            <text macro="issued-year" prefix="(" suffix=")"/>
+            <choose>
+              <if type="broadcast post-weblog webpage" match="any">
+                <date form="numeric" variable="issued" prefix="(" suffix=")"/>
+              </if>
+            </choose>
+            <text macro="description"/>
+            <text macro="secondary-contributors"/>
+            <group delimiter=",">
+              <text macro="container-contributors"/>
+              <text macro="container-title"/>
+            </group>
+            <text macro="edition" prefix=". "/>
+            <group delimiter=", ">
+              <text macro="issue"/>
+              <group>
+                <text macro="locators"/>
+                <text macro="locators-article"/>
+                <text macro="locators-chapter"/>
+              </group>
+            </group>
+            <text variable="URL" strip-periods="false" prefix=" "/>
+            <text macro="access" prefix=". "/>
+            <group delimiter=" " prefix="(" suffix=")">
+              <choose>
+                <if type="webpage post-weblog" match="any">
+                  <text term="accessed"/>
+                  <date form="numeric" variable="accessed"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="note"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=". ">
+            <group>
+              <text macro="contributors" suffix=" "/>
+              <text macro="issued-year" display="left-margin" prefix="(" suffix=")"/>
+            </group>
+            <text macro="title"/>
+            <choose>
+              <if type="webpage post-weblog post broadcast" match="any">
+                <date form="numeric" variable="issued" prefix="(" suffix=")"/>
+              </if>
+            </choose>
+            <text macro="description"/>
+            <text macro="secondary-contributors"/>
+            <group delimiter=", ">
+              <text macro="container-contributors"/>
+              <text macro="container-title"/>
+            </group>
+            <text macro="edition"/>
+            <group delimiter=", ">
+              <text macro="issue"/>
+              <group>
+                <text macro="locators"/>
+                <text macro="locators-article"/>
+                <text macro="locators-chapter"/>
+              </group>
+            </group>
+            <text variable="URL" prefix=" "/>
+            <text macro="access"/>
+            <group delimiter=" " prefix="(" suffix=")">
+              <choose>
+                <if type="post-weblog webpage" match="any">
+                  <text term="accessed" text-case="lowercase"/>
+                  <date form="numeric" variable="accessed"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="note"/>
+          </group>
+        </else>
+      </choose>
     </layout>
   </bibliography>
 </style>